Author: jleroux
Date: Tue Oct 1 17:01:34 2013
New Revision: 1528149
URL: http://svn.apache.org/r1528149
Log:
While at it removes FastMap and simplifies code. I resisted to remove trailing
semicolons...
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
Modified:
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy?rev=1528149&r1=1528148&r2=1528149&view=diff
==============================================================================
---
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
(original)
+++
ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
Tue Oct 1 17:01:34 2013
@@ -115,22 +115,17 @@ while (payment = payIterator.next()) {
}
}
payIterator.close();
-totalSalesInvoice = totalInvSaApplied.add(totalInvSaNotApplied);
-totalPurchaseInvoice = totalInvPuApplied.add(totalInvPuNotApplied);
-totalPaymentsIn = totalPayInApplied.add(totalPayInNotApplied);
-totalPaymentsOut = totalPayOutApplied.add(totalPayOutNotApplied);
-totalInvoiceNotApplied = totalInvSaNotApplied.subtract(totalInvPuNotApplied);
-totalPaymentNotApplied = totalPayInNotApplied.subtract(totalPayOutNotApplied);
-context.finanSummary = FastMap.newInstance();
-context.finanSummary.totalSalesInvoice = totalSalesInvoice;
-context.finanSummary.totalPurchaseInvoice = totalPurchaseInvoice;
-context.finanSummary.totalPaymentsIn = totalPaymentsIn;
-context.finanSummary.totalPaymentsOut = totalPaymentsOut;
-context.finanSummary.totalInvoiceNotApplied = totalInvoiceNotApplied;
-context.finanSummary.totalPaymentNotApplied = totalPaymentNotApplied;
+context.finanSummary = [:];
+context.finanSummary.totalSalesInvoice = totalSalesInvoice =
totalInvSaApplied.add(totalInvSaNotApplied);
+context.finanSummary.totalPurchaseInvoice = totalPurchaseInvoice =
totalInvPuApplied.add(totalInvPuNotApplied);
+context.finanSummary.totalPaymentsIn = totalPaymentsIn =
totalPayInApplied.add(totalPayInNotApplied);
+context.finanSummary.totalPaymentsOut = totalPaymentsOut =
totalPayOutApplied.add(totalPayOutNotApplied);
+context.finanSummary.totalInvoiceNotApplied = =
totalInvSaNotApplied.subtract(totalInvPuNotApplied);
+context.finanSummary.totalPaymentNotApplied =
totalPayInNotApplied.subtract(totalPayOutNotApplied);
transferAmount =
totalSalesInvoice.subtract(totalPurchaseInvoice).subtract(totalPaymentsIn).add(totalPaymentsOut));
+
if (transferAmount.signum() == -1) { // negative?
context.finanSummary.totalToBeReceived = transferAmount.negate();
} else {
