0047503: Rounding for a second currency generating a wrong behaviour in WEBPOS

From cda84d7a6e503d2c157dd9fe477965bb4abd7489 Mon Sep 17 00:00:00 2001
From: Rafael Queralta <rafaelcuba81@gmail.com>
Date: Tue, 17 Aug 2021 11:40:48 -0400
Subject: [PATCH] Fixed BUG-47503: Take into account mulrate value to calculate
 the pendingAmt

---
 web/org.openbravo.retail.posterminal/js/model/order.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/web/org.openbravo.retail.posterminal/js/model/order.js b/web/org.openbravo.retail.posterminal/js/model/order.js
index 220d78186..645effbb2 100644
--- a/web/org.openbravo.retail.posterminal/js/model/order.js
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js
@@ -7684,8 +7684,13 @@
         OB.MobileApp.model.paymentnames[payment.get('kind')].paymentRounding &&
         !payment.get('isReversePayment')
       ) {
-        var paymentStatus = this.getPaymentStatus(),
-          roundingAmount = OB.DEC.sub(
+        var paymentStatus = this.getPaymentStatus();
+        paymentStatus.pendingAmt = OB.DEC.mul(
+          paymentStatus.pendingAmt,
+          payment.get("mulrate")
+        );
+  
+        var  roundingAmount = OB.DEC.sub(
             paymentStatus.pendingAmt,
             payment.get('amount')
           ),
-- 
2.28.0

diff --git a/web/org.openbravo.retail.posterminal/js/model/order.js b/web/org.openbravo.retail.posterminal/js/model/order.js
index 645effbb2..63036ac96 100644
--- a/web/org.openbravo.retail.posterminal/js/model/order.js
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js
@@ -7684,10 +7684,11 @@
         OB.MobileApp.model.paymentnames[payment.get('kind')].paymentRounding &&
         !payment.get('isReversePayment')
       ) {
-        var paymentStatus = this.getPaymentStatus();
+        var paymentStatus = this.getPaymentStatus(),
+        precision = this.getPrecision(payment);
         paymentStatus.pendingAmt = OB.DEC.mul(
           paymentStatus.pendingAmt,
-          payment.get("mulrate")
+          payment.get("mulrate"), precision
         );

         var  roundingAmount = OB.DEC.sub(
@@ -7700,7 +7701,6 @@
             ],
           amountDifference = null,
           paymentLine = null,
-          precision = this.getPrecision(payment),
           multiplyBy = paymentStatus.isReturn
             ? terminalPayment.paymentRounding.returnRoundingMultiple
             : terminalPayment.paymentRounding.saleRoundingMultiple,
@@ -7744,13 +7744,13 @@
             if (paymentDifference !== 0) {
               amountDifference = OB.DEC.sub(
                 multiplyBy,
-                OB.DEC.div(paymentDifference, pow)
+                OB.DEC.div(paymentDifference, pow, precision)
               );
-              roundingAmount = OB.DEC.mul(amountDifference, -1);
+              roundingAmount = OB.DEC.mul(amountDifference, -1, precision);
               if (payment.get('amount') < paymentStatus.pendingAmt) {
                 amountDifference = OB.DEC.add(
                   amountDifference,
-                  OB.DEC.div(paymentDifference, pow)
+                  OB.DEC.div(paymentDifference, pow, precision), precision
                 );
               }
             }
@@ -7764,12 +7764,12 @@
             paymentDifference !== 0 &&
             payment.get('amount') >= paymentStatus.pendingAmt
           ) {
-            roundingAmount = OB.DEC.div(paymentDifference, pow);
+            roundingAmount = OB.DEC.div(paymentDifference, pow, precision);
             //Substract the rounding amount when the payment totally paid the receipt
             if (payment.get('amount') === paymentStatus.pendingAmt) {
               payment.set(
                 'amount',
-                OB.DEC.sub(payment.get('amount'), roundingAmount)
+                OB.DEC.sub(payment.get('amount'), roundingAmount, precision)
               );
             }
           }

diff --git a/web/org.openbravo.retail.posterminal/js/model/order.js b/web/org.openbravo.retail.posterminal/js/model/order.js
index 42fdd3889..aac8a613e 100644
--- a/web/org.openbravo.retail.posterminal/js/model/order.js
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js
@@ -7718,7 +7718,7 @@

         //If receipt total amount is less than equal rounding multiple in Sales/Return
         //no rounding payment line is created
-        if (OB.DEC.abs(paymentStatus.totalAmt) <= multiplyBy) {
+        if (OB.DEC.abs(OB.DEC.mul(paymentStatus.totalAmt, payment.get('mulrate'), precision)) <= multiplyBy) {
           return;
         }
         //If receipt is totally paid the last payment paid amount is used to compute the

From e744a6d558cfb3fc167541f4b8929dc291c4a847 Mon Sep 17 00:00:00 2001
From: Rafael Queralta <rafaelcuba81@gmail.com>
Date: Tue, 31 Aug 2021 14:08:23 -0400
Subject: [PATCH] fix/0047503: Rounding for a second currency generating a
 wrong behaviour in WEBPOS

---
 web/org.openbravo.retail.posterminal/js/model/order.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/org.openbravo.retail.posterminal/js/model/order.js b/web/org.openbravo.retail.posterminal/js/model/order.js
index 66748e325..23993863e 100644
--- a/web/org.openbravo.retail.posterminal/js/model/order.js
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js
@@ -7724,7 +7724,7 @@
               paymentStatus.totalAmt,
               payment.get('mulrate'),
               precision
-            )
+            ), precision
           ) <= multiplyBy
         ) {
           return;
@@ -7741,7 +7741,7 @@
         // (the payment totally paid the receipt or create an overpayment with a rounding difference))
         if (
           roundingEnabled &&
-          ((roundingAmount !== 0 && OB.DEC.abs(roundingAmount) < multiplyBy) ||
+          ((roundingAmount !== 0 && OB.DEC.abs(roundingAmount, precision) < multiplyBy) ||
             (payment.get('paid') !== 0 &&
               paymentDifference !== 0 &&
               paymentStatus.pendingAmt < multiplyBy) ||
@@ -7753,7 +7753,7 @@
             if (paymentDifference !== 0) {
               amountDifference = OB.DEC.sub(
                 multiplyBy,
-                OB.DEC.div(paymentDifference, pow, precision)
+                OB.DEC.div(paymentDifference, pow, precision), precision
               );
               roundingAmount = OB.DEC.mul(amountDifference, -1, precision);
               if (payment.get('amount') < paymentStatus.pendingAmt) {
@@ -7767,7 +7767,7 @@
             if (payment.get('amount') <= paymentStatus.pendingAmt) {
               payment.set(
                 'amount',
-                OB.DEC.add(payment.get('amount'), amountDifference)
+                OB.DEC.add(payment.get('amount'), amountDifference, precision)
               );
             }
           } else if (
-- 
2.28.0

From 78233d259449982f99082e04fc5666b78c4ed484 Mon Sep 17 00:00:00 2001
From: Rafael Queralta <rafaelcuba81@gmail.com>
Date: Wed, 1 Sep 2021 15:59:26 -0400
Subject: [PATCH] fix/47503: Check if paymetrounding added was UP or Down type

---
 web/org.openbravo.retail.posterminal/js/model/order.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/org.openbravo.retail.posterminal/js/model/order.js b/web/org.openbravo.retail.posterminal/js/model/order.js
index 75fdc734c..090cef7de 100644
--- a/web/org.openbravo.retail.posterminal/js/model/order.js
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js
@@ -1399,7 +1399,7 @@
           if (
             loadedFromBackend ||
             !isNegative ||
-            payment.get('isReversePayment')
+            payment.get('isReversePayment') || payment.get('amount') >= 0
           ) {
             paymentsAmount = OB.DEC.add(
               paymentsAmount,
-- 
2.28.0

diff --git a/web/org.openbravo.retail.posterminal/js/model/order.js b/web/org.openbravo.retail.posterminal/js/model/order.js
index d7a57a47b..b556da435 100644
--- a/web/org.openbravo.retail.posterminal/js/model/order.js
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js
@@ -1395,12 +1395,16 @@
             processedPaymentsAmount,
             payment.get('origAmount')
           );
+        } else if(payment.get('paymentRounding') && payment.get('amount') < 0){
+          paymentsAmount = OB.DEC.sub(
+            paymentsAmount,
+            payment.get('origAmount')
+          );
         } else {
           if (
             loadedFromBackend ||
             !isNegative ||
-            payment.get('isReversePayment') ||
-            payment.get('amount') >= 0
+            payment.get('isReversePayment')
           ) {
             paymentsAmount = OB.DEC.add(
               paymentsAmount,

From 6ff91471cd5ba8a8b8f0b312a36c22a33053a124 Mon Sep 17 00:00:00 2001
From: Rafael Queralta <rafaelcuba81@gmail.com>
Date: Fri, 3 Sep 2021 13:09:10 -0400
Subject: [PATCH] [PATCH] fix/47503: Getting the absolute value of originAmount
 property

---
 web/org.openbravo.retail.posterminal/js/model/order.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/org.openbravo.retail.posterminal/js/model/order.js b/web/org.openbravo.retail.posterminal/js/model/order.js
index 6003b7b5f..6d0508d4b 100644
--- a/web/org.openbravo.retail.posterminal/js/model/order.js
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js
@@ -1401,7 +1401,8 @@
         ) {
           paymentsAmount = OB.DEC.sub(
             paymentsAmount,
-            payment.get('origAmount')
+            OB.DEC.abs(payment.get('origAmount'),
+            payment.get('precision'))
           );
         } else {
           if (
-- 
2.28.0