details: https://code.openbravo.com/erp/devel/pi/rev/be398d05316a
changeset: 20203:be398d05316a
user: Eduardo Argal Guibert <eduardo.argal <at> openbravo.com>
date: Wed Apr 24 19:32:33 2013 +0200
summary: Fixes bug 23580
diffstat:
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java | 13 +++++----
1 files changed, 7 insertions(+), 6 deletions(-)
diffs (34 lines):
diff -r df632055548f -r be398d05316a
src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java
--- a/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java Wed Apr
24 17:21:50 2013 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportGeneralLedger.java Wed Apr
24 19:32:33 2013 +0200
@@ -266,8 +266,6 @@
discard[0] = "sectionAmount";
BigDecimal previousDebit = BigDecimal.ZERO;
BigDecimal previousCredit = BigDecimal.ZERO;
- BigDecimal previousTotalDr = BigDecimal.ZERO;
- BigDecimal previousTotalCr = BigDecimal.ZERO;
String strAllaccounts = "Y";
if (strcelementvaluefrom != null && !strcelementvaluefrom.equals("")) {
if (strcelementvalueto.equals("")) {
@@ -318,14 +316,17 @@
strOrgFamily, strcBpartnerId, strmProductId, strcProjectId,
strAmtFrom, strAmtTo,
data[0].id, data[0].groupbyid, null, null, null,
data[0].dateacctnumber
+ data[0].factaccttype + data[0].factAcctGroupId +
data[0].factAcctId);
-
dataSubtotal = ReportGeneralLedgerData.select2sum(this, rowNum,
strGroupByText,
strGroupBy, strAllaccounts, strcelementvaluefrom,
strcelementvalueto,
Utility.getContext(this, vars, "#AccessibleOrgTree",
"ReportGeneralLedger"),
Utility.getContext(this, vars, "#User_Client",
"ReportGeneralLedger"),
- strcAcctSchemaId, strDateFrom, toDatePlusOne, strOrgFamily,
strcBpartnerId,
- strmProductId, strcProjectId, strAmtFrom, strAmtTo, null,
null, pgSubtotalLimit,
- oraSubtotalLimit, null, null, data[0].id);
+ strcAcctSchemaId, strDateFrom, toDatePlusOne, strOrgFamily,
+ (strGroupBy.equals("BPartner") ? "('" + data[i].groupbyid +
"')" : strcBpartnerId),
+ (strGroupBy.equals("Product") ? "('" + data[i].groupbyid +
"')" : strmProductId),
+ (strGroupBy.equals("Project") ? "('" + data[i].groupbyid +
"')" : strcProjectId),
+ strAmtFrom, strAmtTo, null, null, null, null, null,
data[0].dateacctnumber
+ + data[0].factaccttype + data[0].factAcctGroupId +
data[0].factAcctId,
+ data[0].id);
log4j.debug("Select2Total. Time in mils: " +
(System.currentTimeMillis() - init));
// Now dataTotal is covered adding debit and credit amounts
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_apr
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
