details: http://code.openbravo.com/erp/devel/pi/rev/2105bfaecba1
changeset: 3274:2105bfaecba1
user: Gorka Mauleon <gorka.maul...@openbravo.com>
date: Mon Mar 02 12:39:10 2009 +0100
description:
Fixes 0007843: Print record and email option icons are visible in Trial Balance
Report page
diffs (108 lines):
diff -r 4e00daed7e3d -r 2105bfaecba1
src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java Mon Mar
02 12:33:46 2009 +0100
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTrialBalance.java Mon Mar
02 12:39:10 2009 +0100
@@ -61,7 +61,8 @@
"ReportTrialBalance|AccountFrom", "");
String strAccountTo = vars.getGlobalVariable("inpAccountTo",
"ReportTrialBalance|AccountTo",
ReportTrialBalanceData.selectLastAccount(this,
Utility.getContext(this, vars,
- "#AccessibleOrgTree", "Account"), Utility.getContext(this, vars,
"#User_Client", "Account")));
+ "#AccessibleOrgTree", "Account"), Utility.getContext(this, vars,
"#User_Client",
+ "Account")));
String strcBpartnerId =
vars.getRequestInGlobalVariable("inpcBPartnerId_IN",
"ReportTrialBalance|cBpartnerId");
@@ -170,15 +171,15 @@
discard[1] = "sectionNoBP";
data = ReportTrialBalanceData.selectBP(this, strDateFrom, strDateTo,
strOrg,
strOrgFamily, Utility.getContext(this, vars, "#User_Client",
"ReportTrialBalance"),
- Utility.getContext(this, vars, "#AccessibleOrgTree",
"ReportTrialBalance"), strDateFrom,
- DateTimeData.nDaysAfter(this, strDateTo, "1"), strAccountFrom,
strAccountTo,
- strcBpartnerId, strcAcctSchemaId);
+ Utility.getContext(this, vars, "#AccessibleOrgTree",
"ReportTrialBalance"),
+ strDateFrom, DateTimeData.nDaysAfter(this, strDateTo, "1"),
strAccountFrom,
+ strAccountTo, strcBpartnerId, strcAcctSchemaId);
} else {
data = ReportTrialBalanceData.select(this, strDateFrom, strDateTo,
strOrg,
strTreeAccount, strcAcctSchemaId, strOrgFamily,
Utility.getContext(this, vars,
"#User_Client", "ReportTrialBalance"),
Utility.getContext(this, vars,
- "#AccessibleOrgTree", "ReportTrialBalance"), strDateFrom,
DateTimeData.nDaysAfter(this,
- strDateTo, "1"), strAccountFrom, strAccountTo);
+ "#AccessibleOrgTree", "ReportTrialBalance"), strDateFrom,
DateTimeData
+ .nDaysAfter(this, strDateTo, "1"), strAccountFrom,
strAccountTo);
}
} else {
data = ReportTrialBalanceData.select(this, strDateFrom, strDateTo,
strOrg, strTreeAccount,
@@ -218,7 +219,7 @@
}
ToolBar toolbar = new ToolBar(this, vars.getLanguage(),
"ReportTrialBalance", false, "", "",
- "imprimir();return false;", false, "ad_reports", strReplaceWith,
false, true);
+ "", false, "ad_reports", strReplaceWith, false, true);
toolbar.prepareSimpleToolBarTemplate();
xmlDocument.setParameter("toolbar", toolbar.toString());
@@ -250,11 +251,11 @@
}
xmlDocument.setData("reportAccountFrom_ID", "liststructure",
ReportTrialBalanceData
- .selectAccount(this, Utility.getContext(this, vars,
"#AccessibleOrgTree", "Account"), Utility
- .getContext(this, vars, "#User_Client", "Account"), "",
strcAcctSchemaId));
+ .selectAccount(this, Utility.getContext(this, vars,
"#AccessibleOrgTree", "Account"),
+ Utility.getContext(this, vars, "#User_Client", "Account"), "",
strcAcctSchemaId));
xmlDocument.setData("reportAccountTo_ID", "liststructure",
ReportTrialBalanceData
- .selectAccount(this, Utility.getContext(this, vars,
"#AccessibleOrgTree", "Account"), Utility
- .getContext(this, vars, "#User_Client", "Account"), "",
strcAcctSchemaId));
+ .selectAccount(this, Utility.getContext(this, vars,
"#AccessibleOrgTree", "Account"),
+ Utility.getContext(this, vars, "#User_Client", "Account"), "",
strcAcctSchemaId));
xmlDocument.setData("reportAD_ORGID", "liststructure",
GeneralAccountingReportsData
.selectCombo(this, vars.getRole()));
xmlDocument.setData("reportC_ACCTSCHEMA_ID", "liststructure",
ReportGeneralLedgerData
@@ -281,17 +282,17 @@
xmlDocument.setParameter("paramAll0", strAll.equals("") ? "0" : "1");
xmlDocument.setData("reportCBPartnerId_IN", "liststructure",
ReportRefundInvoiceCustomerDimensionalAnalysesData.selectBpartner(this,
Utility.getContext(
- this, vars, "#AccessibleOrgTree", ""), Utility.getContext(this,
vars, "#User_Client", ""),
- strcBpartnerIdAux));
+ this, vars, "#AccessibleOrgTree", ""), Utility.getContext(this,
vars, "#User_Client",
+ ""), strcBpartnerIdAux));
- xmlDocument.setParameter("accounFromArray",
- arrayDobleEntrada("arrAccountFrom",
ReportTrialBalanceData.selectAccountDouble(this,
- Utility.getContext(this, vars, "#AccessibleOrgTree", "Account"),
Utility.getContext(this, vars,
- "#User_Client", "Account"), "")));
- xmlDocument.setParameter("accounToArray",
- arrayDobleEntrada("arrAccountTo",
ReportTrialBalanceData.selectAccountDouble(this, Utility
- .getContext(this, vars, "#AccessibleOrgTree", "Account"),
Utility.getContext(this, vars,
- "#User_Client", "Account"), "")));
+ xmlDocument.setParameter("accounFromArray",
arrayDobleEntrada("arrAccountFrom",
+ ReportTrialBalanceData.selectAccountDouble(this,
Utility.getContext(this, vars,
+ "#AccessibleOrgTree", "Account"), Utility.getContext(this, vars,
"#User_Client",
+ "Account"), "")));
+ xmlDocument.setParameter("accounToArray", arrayDobleEntrada("arrAccountTo",
+ ReportTrialBalanceData.selectAccountDouble(this,
Utility.getContext(this, vars,
+ "#AccessibleOrgTree", "Account"), Utility.getContext(this, vars,
"#User_Client",
+ "Account"), "")));
if (new_data == null || new_data.length == 0)
new_data = ReportTrialBalanceData.set();
if (log4j.isDebugEnabled())
@@ -353,15 +354,15 @@
discard[1] = "sectionNoBP";
data = ReportTrialBalanceData.selectBP(this, strDateFrom, strDateTo,
strOrg,
strOrgFamily, Utility.getContext(this, vars, "#User_Client",
"ReportTrialBalance"),
- Utility.getContext(this, vars, "#AccessibleOrgTree",
"ReportTrialBalance"), strDateFrom,
- DateTimeData.nDaysAfter(this, strDateTo, "1"), strAccountFrom,
strAccountTo,
- strcBpartnerId, strcAcctSchemaId);
+ Utility.getContext(this, vars, "#AccessibleOrgTree",
"ReportTrialBalance"),
+ strDateFrom, DateTimeData.nDaysAfter(this, strDateTo, "1"),
strAccountFrom,
+ strAccountTo, strcBpartnerId, strcAcctSchemaId);
} else {
data = ReportTrialBalanceData.select(this, strDateFrom, strDateTo,
strOrg,
strTreeAccount, strcAcctSchemaId, strOrgFamily,
Utility.getContext(this, vars,
"#User_Client", "ReportTrialBalance"),
Utility.getContext(this, vars,
- "#AccessibleOrgTree", "ReportTrialBalance"), strDateFrom,
DateTimeData.nDaysAfter(this,
- strDateTo, "1"), strAccountFrom, strAccountTo);
+ "#AccessibleOrgTree", "ReportTrialBalance"), strDateFrom,
DateTimeData
+ .nDaysAfter(this, strDateTo, "1"), strAccountFrom,
strAccountTo);
}
} else {
data = ReportTrialBalanceData.select(this, strDateFrom, strDateTo,
strOrg, strTreeAccount,
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
