Author: jacopoc
Date: Wed Dec 16 07:13:34 2009
New Revision: 891135
URL: http://svn.apache.org/viewvc?rev=891135&view=rev
Log:
Fix by Sumit Pandit for opening balances of cash flow statement.
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy?rev=891135&r1=891134&r2=891135&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy
Wed Dec 16 07:13:34 2009
@@ -102,19 +102,19 @@
accountMap.D = BigDecimal.ZERO;
accountMap.C = BigDecimal.ZERO;
accountMap.balance = BigDecimal.ZERO;
+ }
+ if (accountMap.debitCreditFlag && accountMap.amount) {
+ accountMap.remove("debitCreditFlag");
+ accountMap.remove("amount");
+ }
+ if (transactionTotal.debitCreditFlag == "C") {
+ accountMap.C =
((BigDecimal)accountMap.get("C")).add(transactionTotal.amount);
+ accountMap.balance =
(accountMap.balance).subtract(transactionTotal.amount);
} else {
- if (accountMap.debitCreditFlag && accountMap.amount) {
- accountMap.remove("debitCreditFlag");
- accountMap.remove("amount");
- }
- if (transactionTotal.debitCreditFlag == "C") {
- accountMap.C =
((BigDecimal)accountMap.get("C")).add(transactionTotal.amount);
- accountMap.balance =
(accountMap.balance).subtract(transactionTotal.amount);
- } else {
- accountMap.D =
((BigDecimal)accountMap.get("D")).add(transactionTotal.amount);
- accountMap.balance =
(accountMap.balance).add(transactionTotal.amount);
- }
+ accountMap.D =
((BigDecimal)accountMap.get("D")).add(transactionTotal.amount);
+ accountMap.balance = (accountMap.balance).add(transactionTotal.amount);
}
+
transactionTotalsMap.put(transactionTotal.glAccountId, accountMap);
}
glAccountIdList = [];
