[OpenbravoERP-commits] devel/pi: Fixes issue 34038: All payments of amount Zero will ha...

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/fb555f365d96
changeset: 30327:fb555f365d96
user:      Unai Martirena <unai.martirena <at> openbravo.com>
date:      Tue Sep 27 15:39:11 2016 +0200
summary:   Fixes issue 34038: All payments of amount Zero will have *R* 
concatenated as part of the document number

diffstat:

 src/org/openbravo/event/FINPaymentEventHandler.java |  19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diffs (54 lines):

diff -r e94a1240a358 -r fb555f365d96 
src/org/openbravo/event/FINPaymentEventHandler.java
--- a/src/org/openbravo/event/FINPaymentEventHandler.java       Fri Sep 23 
15:37:24 2016 -0400
+++ b/src/org/openbravo/event/FINPaymentEventHandler.java       Tue Sep 27 
15:39:11 2016 +0200
@@ -35,7 +35,8 @@
     return entities;
   }
 
-  public void onUpdate(@Observes EntityUpdateEvent event) {
+  public void onUpdate(@Observes
+  EntityUpdateEvent event) {
     if (!isValidEvent(event)) {
       return;
     }
@@ -45,12 +46,12 @@
     BigDecimal oldPaymentAmount = (BigDecimal) 
event.getPreviousState(paymentAmountProperty);
     int index = 
payment.getDocumentNo().indexOf(CancelAndReplaceUtils.REVERSE_PREFIX);
     if (payment.getAmount().compareTo(BigDecimal.ZERO) == 0) {
-      if (index == -1 && payment.getUsedCredit().compareTo(BigDecimal.ZERO) == 
0) {
+      if (index == -1) {
         String newDocumentNo = payment.getDocumentNo() + 
CancelAndReplaceUtils.REVERSE_PREFIX;
         setDocumentNoToPayment(payment, event, newDocumentNo);
-      } else if (index > 0 && 
payment.getUsedCredit().compareTo(BigDecimal.ZERO) > 0){
-         String newDocumentNo = payment.getDocumentNo().substring(0, index);
-          setDocumentNoToPayment(payment, event, newDocumentNo);
+      } else if (index > 0) {
+        String newDocumentNo = payment.getDocumentNo().substring(0, index);
+        setDocumentNoToPayment(payment, event, newDocumentNo);
       }
     } else if (oldPaymentAmount.compareTo(BigDecimal.ZERO) == 0) {
       if (index > 0) {
@@ -62,18 +63,20 @@
     // could have payment document numbers starting with "*R*"
   }
 
-  public void onSave(@Observes EntityNewEvent event) {
+  public void onSave(@Observes
+  EntityNewEvent event) {
     if (!isValidEvent(event)) {
       return;
     }
     FIN_Payment payment = (FIN_Payment) event.getTargetInstance();
-    if (payment.getAmount().compareTo(BigDecimal.ZERO) == 0 && 
payment.getUsedCredit().compareTo(BigDecimal.ZERO) == 0) {
+    if (payment.getAmount().compareTo(BigDecimal.ZERO) == 0) {
       String newDocumentNo = payment.getDocumentNo() + 
CancelAndReplaceUtils.REVERSE_PREFIX;
       setDocumentNoToPayment(payment, event, newDocumentNo);
     }
   }
 
-  public void onDelete(@Observes EntityDeleteEvent event) {
+  public void onDelete(@Observes
+  EntityDeleteEvent event) {
     if (!isValidEvent(event)) {
       return;
     }

------------------------------------------------------------------------------
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits