details:   https://code.openbravo.com/erp/devel/pi/rev/b80b24804395
changeset: 22346:b80b24804395
user:      Pandeeswari Ramakrishnan <pandeeswari.ramakrishnan <at> 
openbravo.com>
date:      Wed Mar 05 14:14:21 2014 +0530
summary:   Fixes Issue 24807: NPE when reactivate and delete the payment 
associated with closed order

diffstat:

 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
 |  12 ++++++---
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (22 lines):

diff -r 381047f42270 -r b80b24804395 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
     Wed Mar 05 11:28:14 2014 +0530
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/process/FIN_PaymentProcess.java
     Wed Mar 05 14:14:21 2014 +0530
@@ -872,10 +872,14 @@
                   && BigDecimal.ZERO.compareTo(psd.getWriteoffAmount()) == 0) {
                 paymentDetail.getFINPaymentScheduleDetailList().remove(psd);
                 OBDal.getInstance().getSession().refresh(paymentDetail);
-                psd.getInvoicePaymentSchedule()
-                    
.getFINPaymentScheduleDetailInvoicePaymentScheduleList().remove(psd);
-                
psd.getOrderPaymentSchedule().getFINPaymentScheduleDetailOrderPaymentScheduleList()
-                    .remove(psd);
+                if (psd.getInvoicePaymentSchedule() != null) {
+                  psd.getInvoicePaymentSchedule()
+                      
.getFINPaymentScheduleDetailInvoicePaymentScheduleList().remove(psd);
+                }
+                if (psd.getOrderPaymentSchedule() != null) {
+                  psd.getOrderPaymentSchedule()
+                      
.getFINPaymentScheduleDetailOrderPaymentScheduleList().remove(psd);
+                }
                 OBDal.getInstance().remove(psd);
               }
             }

------------------------------------------------------------------------------
Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce.
With Perforce, you get hassle-free workflows. Merge that actually works. 
Faster operations. Version large binaries.  Built-in WAN optimization and the
freedom to use Git, Perforce or both. Make the move to Perforce.
http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to