Author: mor
Date: Fri Aug  7 08:32:58 2009
New Revision: 801907

URL: http://svn.apache.org/viewvc?rev=801907&view=rev
Log:
Applied fix from trunk for revision: 801882 
 Adding check to avoid NPE.

Modified:
    
ofbiz/branches/release09.04/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy

Modified: 
ofbiz/branches/release09.04/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy
URL: 
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy?rev=801907&r1=801906&r2=801907&view=diff
==============================================================================
--- 
ofbiz/branches/release09.04/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy
 (original)
+++ 
ofbiz/branches/release09.04/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy
 Fri Aug  7 08:32:58 2009
@@ -65,7 +65,7 @@
         invoicesList = [];  // to pass back to the screeen list of unapplied 
invoices
         paymentApplied = PaymentWorker.getPaymentApplied(payment);
         paymentToApply = 
payment.getBigDecimal("amount").setScale(decimals,rounding).subtract(paymentApplied);
-        if (actual) {
+        if (actual && payment.actualCurrencyAmount) {
             paymentToApply = 
payment.getBigDecimal("actualCurrencyAmount").setScale(decimals,rounding).subtract(paymentApplied);
         }
         invoices.each { invoice ->


Reply via email to