0032797: field "Days till next due date" is wrong

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1461929237 -19800
#      Fri Apr 29 16:57:17 2016 +0530
# Node ID a4a221fa30135bd2b18edfce2b10cc35652abb56
# Parent  d8d09cfa2213e8b2449e69365d7a5cfd0836f540
Related to issue 32797 : Update Invoice Due days if there are no payments

Invoice due days has to be updated, it there are no payments/paid by credit

diff -r d8d09cfa2213 -r a4a221fa3013 src/org/openbravo/retail/posterminal/OrderLoader.java
--- a/src/org/openbravo/retail/posterminal/OrderLoader.java	Fri Apr 29 15:32:25 2016 +0530
+++ b/src/org/openbravo/retail/posterminal/OrderLoader.java	Fri Apr 29 16:57:17 2016 +0530
@@ -1755,7 +1755,10 @@
           writeoffAmt = writeoffAmt.subtract(tempWriteoffAmt);
         }
       }
-      if (invoice != null && (creditpaidLayaway || fullypaidLayaway)) {
+
+      boolean checkPaidOnCreditChecked = (jsonorder.has("paidOnCredit") && jsonorder
+          .getBoolean("paidOnCredit"));
+      if (invoice != null && (creditpaidLayaway || fullypaidLayaway || checkPaidOnCreditChecked)) {
         for (int j = 0; j < paymentSchedule.getFINPaymentScheduleDetailOrderPaymentScheduleList()
             .size(); j++) {
           if (paymentSchedule.getFINPaymentScheduleDetailOrderPaymentScheduleList().get(j)
@@ -1772,6 +1775,7 @@
         invoice.setTotalPaid(invoice.getGrandTotalAmount().subtract(amountPaidWithCredit));
         invoice.setOutstandingAmount(amountPaidWithCredit);
         invoice.setDueAmount(amountPaidWithCredit);
+        invoice.setDaysTillDue(FIN_Utility.getDaysToDue(paymentScheduleInvoice.getDueDate()));
         invoice.setPaymentComplete(amountPaidWithCredit.compareTo(BigDecimal.ZERO) == 0);
         paymentScheduleInvoice.setOutstandingAmount(amountPaidWithCredit);
         paymentScheduleInvoice.setPaidAmount(invoice.getGrandTotalAmount().subtract(

# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1462181676 -19800
#      Mon May 02 15:04:36 2016 +0530
# Node ID 35b18df35d1b073a2bc8654df261a8a6bdf69735
# Parent  6ae2f4589a7c266418939a4052c9dffa7a6bb7a6
Related to issue 32797 : Update Invoice Due days if there are no payments

Invoice due days has to be updated, it there are no payments/paid by credit

diff -r 6ae2f4589a7c -r 35b18df35d1b src/org/openbravo/retail/posterminal/OrderLoader.java
--- a/src/org/openbravo/retail/posterminal/OrderLoader.java	Thu Jun 18 13:22:45 2015 +0000
+++ b/src/org/openbravo/retail/posterminal/OrderLoader.java	Mon May 02 15:04:36 2016 +0530
@@ -1373,6 +1373,11 @@
           writeoffAmt = writeoffAmt.subtract(tempWriteoffAmt);
         }
       }
+      boolean isPaidOnCredit = (jsonorder.has("paidOnCredit") && jsonorder
+          .getBoolean("paidOnCredit"));
+      if (isPaidOnCredit && invoice != null && paymentScheduleInvoice != null) {
+        invoice.setDaysTillDue(FIN_Utility.getDaysToDue(paymentScheduleInvoice.getDueDate()));
+      }
       if (invoice != null && fullpayLayaway) {
         for (int j = 0; j < paymentSchedule.getFINPaymentScheduleDetailOrderPaymentScheduleList()
             .size(); j++) {