Re: svn commit: r801882 - /ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: svn commit: r801882 - /ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy

Sumit Pandit-3
This fix should also reflect to released version - 9.04.

--
Thanks And Regards
Sumit Pandit
On Aug 7, 2009, at 10:32 AM, [hidden email] wrote:

> Author: apatel
> Date: Fri Aug  7 05:02:27 2009
> New Revision: 801882
>
> URL: http://svn.apache.org/viewvc?rev=801882&view=rev
> Log:
> Adding check to avoid NPE.
>
> Modified:
>    ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/
> actions/payment/ListNotAppliedInvoices.groovy
>
> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-
> INF/actions/payment/ListNotAppliedInvoices.groovy
> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy?rev=801882&r1=801881&r2=801882&view=diff
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/
> actions/payment/ListNotAppliedInvoices.groovy (original)
> +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/
> actions/payment/ListNotAppliedInvoices.groovy Fri Aug  7 05:02:27 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 | Threaded
Open this post in threaded view
|

Re: svn commit: r801882 - /ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy

Vikas Mayur-3
Sumit, This fix is merged with release 09.04 in rev. 801907.

Vikas

On Aug 7, 2009, at 1:29 PM, Sumit Pandit wrote:

> This fix should also reflect to released version - 9.04.
>
> --
> Thanks And Regards
> Sumit Pandit
> On Aug 7, 2009, at 10:32 AM, [hidden email] wrote:
>
>> Author: apatel
>> Date: Fri Aug  7 05:02:27 2009
>> New Revision: 801882
>>
>> URL: http://svn.apache.org/viewvc?rev=801882&view=rev
>> Log:
>> Adding check to avoid NPE.
>>
>> Modified:
>>   ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/
>> actions/payment/ListNotAppliedInvoices.groovy
>>
>> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-
>> INF/actions/payment/ListNotAppliedInvoices.groovy
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy?rev=801882&r1=801881&r2=801882&view=diff
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =====================================================================
>> --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/
>> actions/payment/ListNotAppliedInvoices.groovy (original)
>> +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/
>> actions/payment/ListNotAppliedInvoices.groovy Fri Aug  7 05:02:27  
>> 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 ->
>>
>>
>


smime.p7s (3K) Download Attachment