svn commit: r1730469 - in /ofbiz/branches/release15.12: ./ applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy

Author: jleroux
Date: Mon Feb 15 09:08:22 2016
New Revision: 1730469

URL: http://svn.apache.org/viewvc?rev=1730469&view=rev
Log:
"Applied fix from trunk for revision: 1730456"
------------------------------------------------------------------------
r1730456 | hansbak | 2016-02-15 07:33:00 +0100 (lun. 15 févr. 2016) | 1 ligne

https://issues.apache.org/jira/browse/OFBIZ-6845: On the balance sheet, it display incorrect value on the total of long-term asset.
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release15.12/   (props changed)
    ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 15 09:08:22 2016
@@ -9,4 +9,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456

Modified: ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy?rev=1730469&r1=1730468&r2=1730469&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy (original)
+++ ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy Mon Feb 15 09:08:22 2016
@@ -238,7 +238,7 @@ transactionTotals = [];
 balanceTotal = BigDecimal.ZERO;
 List longtermAssetAndExprs = mainAndExprs as LinkedList;
 longtermAssetAndExprs.add(EntityCondition.makeCondition("glAccountClassId", EntityOperator.IN, longtermAssetAccountClassIds));
-transactionTotals = select("glAccountId", "accountName", "accountCode", "debitCreditFlag", "amount").from("AcctgTransEntrySums").orderBy("glAccountId").queryList();
+transactionTotals = select("glAccountId", "accountName", "accountCode", "debitCreditFlag", "amount").from("AcctgTransEntrySums").where(longtermAssetAndExprs).orderBy("glAccountId").queryList();
 transactionTotalsMap = [:];
 transactionTotalsMap.putAll(longtermAssetOpeningBalances);
 transactionTotals.each { transactionTotal ->