[FIX] order validation fix

itpp-labs · Oct 24, 2017 · 5bc3d39 · 5bc3d39 · gustavovalverde · Oct 24, 2017
1 parent 9d1e9e7
commit 5bc3d39
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/pos_debt_notebook/doc/changelog.rst b/pos_debt_notebook/doc/changelog.rst
@@ -1,3 +1,8 @@
+`4.4.1`
+-------
+- **FIX:** Superfluous paymentlines at client change.
+- **FIX:** Incorrect order validation.
+
 `4.4.0`
 -------
 

diff --git a/pos_debt_notebook/static/src/js/pos.js b/pos_debt_notebook/static/src/js/pos.js
@@ -292,7 +292,7 @@ odoo.define('pos_debt_notebook.pos', function (require) {
                 });
                 return;
             }
-            if (isDebt && currentOrder.get_total_paid() > currentOrder.get_total_with_tax()) {
+            if (this.debt_change_check()) {
                 this.gui.show_popup('error', {
                     'title': _t('Unable to return the change with a debt payment method'),
                     'body': _t('Please enter the exact or lower debt amount than the cost of the order.')
@@ -303,6 +303,18 @@ odoo.define('pos_debt_notebook.pos', function (require) {
             this._super(options);
         },
 
+        debt_change_check: function () {
+            var order = this.pos.get_order(),
+                paymentlines = order.get_paymentlines(),
+                flag = false;
+            for (var i = 0; i < paymentlines.length; i++) {
+                if (paymentlines[i].cashregister.journal.debt && order.get_change(paymentlines[i]) > 0) {
+                    flag = true;
+                }
+            }
+            return flag;
+        },
+
         pay_full_debt: function(){
             var order = this.pos.get_order();
 
@@ -329,6 +341,7 @@ odoo.define('pos_debt_notebook.pos', function (require) {
             });
             newDebtPaymentline.set_amount(order.get_client().debt * -1);
             order.paymentlines.add(newDebtPaymentline);
+
             this.render_paymentlines();
         },