# HG changeset patch
# User Mario Castello <mario.castello@peoplewalking.com>
# Date 1475503133 21600
#      lun oct 03 07:58:53 2016 -0600
# Node ID 501426293e01fba2e8d1eeaf15d6df3d5fe4edec
# Parent  030b6351be9367d361105ef83d823ad764f36f7c
Fixed issue 34155: SkipSave the receipt when is loaded from multiorderlist

diff --git a/web/org.openbravo.retail.posterminal/js/components/modalmultiorders.js b/web/org.openbravo.retail.posterminal/js/components/modalmultiorders.js
--- a/web/org.openbravo.retail.posterminal/js/components/modalmultiorders.js
+++ b/web/org.openbravo.retail.posterminal/js/components/modalmultiorders.js
@@ -367,7 +367,6 @@
               order.set('belongsToMultiOrder', true);
               order.calculateReceipt(function () {
                 selectedMultiOrders.push(order);
-                order.save();
                 if (selectedMultiOrders.length === checkedMultiOrders.length) {
                   me.doSelectMultiOrders({
                     value: selectedMultiOrders
diff --git a/web/org.openbravo.retail.posterminal/js/model/order.js b/web/org.openbravo.retail.posterminal/js/model/order.js
--- a/web/org.openbravo.retail.posterminal/js/model/order.js
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js
@@ -591,7 +591,7 @@
           });
 
           me.adjustPayment();
-          if (save) {
+          if (save && !me.get('belongsToMultiOrder')) {
             me.save(function () {
               // Reset the flag that protects reentrant invocations to calculateGross().
               // And if there is pending any execution of calculateGross(), do it and do not continue.
@@ -608,6 +608,8 @@
           } else {
             me.calculatingGross = false;
             me.calculatingReceipt = false;
+            me.trigger('calculategross');
+            me.trigger('saveCurrent');
           }
           };