details:   https://code.openbravo.com/erp/devel/pi/rev/dcd5145e40b9
changeset: 21921:dcd5145e40b9
user:      David Miguelez <david.miguelez <at> openbravo.com>
date:      Tue Feb 04 17:44:22 2014 +0100
summary:   Fixes Issue 25651. Fixes wrong code position.

diffstat:

 src/org/openbravo/erpCommon/ad_forms/AcctServer.java |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (27 lines):

diff -r c9a1f46b3f1f -r dcd5145e40b9 
src/org/openbravo/erpCommon/ad_forms/AcctServer.java
--- a/src/org/openbravo/erpCommon/ad_forms/AcctServer.java      Wed Feb 05 
11:01:19 2014 +0530
+++ b/src/org/openbravo/erpCommon/ad_forms/AcctServer.java      Tue Feb 04 
17:44:22 2014 +0100
@@ -2852,6 +2852,11 @@
 
     HashMap<String, BigDecimal> amountAndWriteOff = new HashMap<String, 
BigDecimal>();
 
+    // Default return values
+    amountAndWriteOff.put("amount", 
paymentDetails.get(currentPaymentDetailIndex).getAmount());
+    amountAndWriteOff.put("writeoff", 
paymentDetails.get(currentPaymentDetailIndex)
+        .getWriteoffAmount());
+
     // If the Payment Detail has either an Invoice or an Order associated to it
     if (psi != null || pso != null) {
       // If the Payment Detail has no Order associated to it, or it has an 
Invoice associated and is
@@ -2883,11 +2888,6 @@
       }
     }
 
-    // In any other case
-    amountAndWriteOff.put("amount", 
paymentDetails.get(currentPaymentDetailIndex).getAmount());
-    amountAndWriteOff.put("writeoff", 
paymentDetails.get(currentPaymentDetailIndex)
-        .getWriteoffAmount());
-
     return amountAndWriteOff;
 
   }

------------------------------------------------------------------------------
Managing the Performance of Cloud-Based Applications
Take advantage of what the Cloud has to offer - Avoid Common Pitfalls.
Read the Whitepaper.
http://pubads.g.doubleclick.net/gampad/clk?id=121051231&iu=/4140/ostg.clktrk
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to