svn commit: r1003466 - /ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy

[ha...@apache.org]

Author: hansbak
Date: Fri Oct  1 10:26:57 2010
New Revision: 1003466

URL: http://svn.apache.org/viewvc?rev=1003466&view=rev
Log:

1. In BalanceSheet.groovy file, change balance value of “Contra Asset Account Class” to “debit amount – credit amount”
2. In BalanceSheet.groovy file, add “Total Accumulated Depreciation” , “Total Assets” and “Equities” to footer

Modified:
    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy

Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy?rev=1003466&r1=1003465&r2=1003466&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy Fri Oct  1 10:26:57 2010
@@ -291,7 +291,7 @@ transactionTotals.each { transactionTota
     BigDecimal debitAmount = (BigDecimal)accountMap.get("D");
     BigDecimal creditAmount = (BigDecimal)accountMap.get("C");
     // contra assets are accounts of class CREDIT: the balance is given by credits minus debits
-    BigDecimal balance = creditAmount.subtract(debitAmount);
+    BigDecimal balance = debitAmount.subtract(creditAmount);
     accountMap.put("balance", balance);
     transactionTotalsMap.put(transactionTotal.glAccountId, accountMap);
 }
@@ -303,7 +303,9 @@ accountBalanceList.each { accountBalance
 context.assetAccountBalanceList.addAll(accountBalanceList);
 context.assetAccountBalanceList.add(UtilMisc.toMap("accountName", "TOTAL ACCUMULATED DEPRECIATION", "balance", balanceTotal));
 context.contraAssetBalanceTotal = balanceTotal;
-balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingLongTermAssetsAtCost", "balance", (context.longtermAssetBalanceTotal - context.contraAssetBalanceTotal)));
+//balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingLongTermAssetsAtCost", "balance", (context.longtermAssetBalanceTotal - context.contraAssetBalanceTotal)));
+balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingTotalAccumulatedDepreciation", "balance", balanceTotal));
+balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingTotalAssets", "balance", (context.currentAssetBalanceTotal + context.longtermAssetBalanceTotal + balanceTotal)));
 
 // LIABILITY
 // account balances
@@ -421,6 +423,7 @@ context.equityAccountBalanceList.add(Uti
 context.equityBalanceTotal = balanceTotal;
 
 context.liabilityEquityBalanceTotal = context.liabilityBalanceTotal + context.equityBalanceTotal
+balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingEquities", "balance", context.equityBalanceTotal));
 balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingTotalLiabilitiesAndEquities", "balance", context.liabilityEquityBalanceTotal));
 
-context.balanceTotalList = balanceTotalList;
+context.balanceTotalList = balanceTotalList;
\ No newline at end of file