svn commit: r1533740 - in /ofbiz/branches/release11.04: ./ applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy

Author: jleroux
Date: Sat Oct 19 12:13:29 2013
New Revision: 1533740

URL: http://svn.apache.org/r1533740
Log:
"Applied fix from trunk for revision: 1529418" I previously refactored PartyFinancialHistory.groovy at r1528144, r1528146, r1528149, r1528298
------------------------------------------------------------------------
r1529418 | jleroux | 2013-10-05 11:18:09 +0200 (sam. 05 oct. 2013) | 3 lignes

Fixes an issue reported by Robert G. ([hidden email]) on user ML. I created <<Error in PartyFinancialHistory.groovy calculation of the "totalToBeReceived" / "totalToBePayed" >> https://issues.apache.org/jira/browse/OFBIZ-5339 for that

I previously refactored PartyFinancialHistory.groovy at r1528144, r1528146, r1528149, r1528298
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release11.04/   (props changed)
    ofbiz/branches/release11.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy

Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1528144,1528146,1528149,1528298,1529418

Modified: ofbiz/branches/release11.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy?rev=1533740&r1=1533739&r2=1533740&view=diff
==============================================================================
--- ofbiz/branches/release11.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (original)
+++ ofbiz/branches/release11.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy Sat Oct 19 12:13:29 2013
@@ -37,10 +37,10 @@ if (!actualCurrencyUomId) {
 }
 findOpts = new EntityFindOptions(true, EntityFindOptions.TYPE_SCROLL_INSENSITIVE, EntityFindOptions.CONCUR_READ_ONLY, true);
 //get total/unapplied/applied invoices separated by sales/purch amount:
-totalInvSaApplied         = BigDecimal.ZERO;
-totalInvSaNotApplied     = BigDecimal.ZERO;
-totalInvPuApplied         = BigDecimal.ZERO;
-totalInvPuNotApplied     = BigDecimal.ZERO;
+totalInvSaApplied = BigDecimal.ZERO;
+totalInvSaNotApplied = BigDecimal.ZERO;
+totalInvPuApplied = BigDecimal.ZERO;
+totalInvPuNotApplied = BigDecimal.ZERO;
 
 invExprs =
     EntityCondition.makeCondition([
@@ -78,10 +78,10 @@ while (invoice = invIterator.next()) {
 invIterator.close();
 
 //get total/unapplied/applied payment in/out total amount:
-totalPayInApplied         = BigDecimal.ZERO;
-totalPayInNotApplied     = BigDecimal.ZERO;
-totalPayOutApplied         = BigDecimal.ZERO;
-totalPayOutNotApplied     = BigDecimal.ZERO;
+totalPayInApplied = BigDecimal.ZERO;
+totalPayInNotApplied = BigDecimal.ZERO;
+totalPayOutApplied = BigDecimal.ZERO;
+totalPayOutNotApplied = BigDecimal.ZERO;
 
 payExprs =
     EntityCondition.makeCondition([
@@ -115,14 +115,17 @@ while (payment = payIterator.next()) {
     }
 }
 payIterator.close();
-context.finanSummary = FastMap.newInstance();
-context.finanSummary.totalSalesInvoice         = totalInvSaApplied.add(totalInvSaNotApplied);
-context.finanSummary.totalPurchaseInvoice     = totalInvPuApplied.add(totalInvPuNotApplied);
-context.finanSummary.totalPaymentsIn         = totalPayInApplied.add(totalPayInNotApplied);
-context.finanSummary.totalPaymentsOut         = totalPayOutApplied.add(totalPayOutNotApplied);
+
+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 = totalInvSaApplied.add(totalInvSaNotApplied).subtract(totalInvPuApplied.add(totalInvPuNotApplied)).subtract(totalPayInApplied.add(totalPayInNotApplied).add(totalPayOutApplied.add(totalPayOutNotApplied)));
+
+transferAmount = totalSalesInvoice.subtract(totalPurchaseInvoice).subtract(totalPaymentsIn).subtract(totalPaymentsOut);
+
 if (transferAmount.signum() == -1) { // negative?
     context.finanSummary.totalToBeReceived = transferAmount.negate();
 } else {