0045538: Ticket with manual discount related services and Save Removed Tickets preference enabled can be imported in 20Q1

From 28d701360cdfc6f85d6a7864dd17f0e022e95f6f Mon Sep 17 00:00:00 2001
From: Rafael Queralta <rafaelcuba81@gmail.com>
Date: Sun, 20 Dec 2020 07:37:48 -0500
Subject: [PATCH] Fixed BUG-45538: Modified "Allow Multiple Instance per Line"
 field display logic to include "User Defined Line Amount" rule

---
 src-db/database/sourcedata/AD_FIELD.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-db/database/sourcedata/AD_FIELD.xml b/src-db/database/sourcedata/AD_FIELD.xml
index 7ab8fd7..fd06624 100644
--- a/src-db/database/sourcedata/AD_FIELD.xml
+++ b/src-db/database/sourcedata/AD_FIELD.xml
@@ -341,7 +341,7 @@ In order to be possible to apply the promotion, it is required to include in the
 <!--A69A8339C73E4FFFAAFB794271709E05-->  <AD_COLUMN_ID><![CDATA[5CA65EA71A6C4EC5816125A8C5E85F19]]></AD_COLUMN_ID>
 <!--A69A8339C73E4FFFAAFB794271709E05-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--A69A8339C73E4FFFAAFB794271709E05-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--A69A8339C73E4FFFAAFB794271709E05-->  <DISPLAYLOGIC><![CDATA[@M_Offer_Type_ID@='D1D193305A6443B09B299259493B272A'|@M_Offer_Type_ID@='7B49D8CC4E084A75B7CB4D85A6A3A578'|@M_Offer_Type_ID@='20E4EC27397344309A2185097392D964'|@M_Offer_Type_ID@='8338556C0FBF45249512DB343FEFD280'|@M_Offer_Type_ID@='00535FB65D9941AE9575546FBAF11B95'|@M_Offer_Type_ID@='096984DC2B944C85A9162C66C37EE7A3'|@M_Offer_Type_ID@='971642418DD24DE5BD860D63EF57D5F6'|@M_Offer_Type_ID@='ADF7E7F91B3A49869FB3F89B8C5A325E']]></DISPLAYLOGIC>
+<!--A69A8339C73E4FFFAAFB794271709E05-->  <DISPLAYLOGIC><![CDATA[@M_Offer_Type_ID@='D1D193305A6443B09B299259493B272A'|@M_Offer_Type_ID@='7B49D8CC4E084A75B7CB4D85A6A3A578'|@M_Offer_Type_ID@='20E4EC27397344309A2185097392D964'|@M_Offer_Type_ID@='8338556C0FBF45249512DB343FEFD280'|@M_Offer_Type_ID@='00535FB65D9941AE9575546FBAF11B95'|@M_Offer_Type_ID@='096984DC2B944C85A9162C66C37EE7A3'|@M_Offer_Type_ID@='971642418DD24DE5BD860D63EF57D5F6'|@M_Offer_Type_ID@='ADF7E7F91B3A49869FB3F89B8C5A325E'|@M_Offer_Type_ID@='F3B0FB45297844549D9E6B5F03B23A82']]></DISPLAYLOGIC>
 <!--A69A8339C73E4FFFAAFB794271709E05-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--A69A8339C73E4FFFAAFB794271709E05-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--A69A8339C73E4FFFAAFB794271709E05-->  <SEQNO><![CDATA[312]]></SEQNO>
-- 
2.25.1

From c7776636e03bfe60815ced4663919e1bde7661df Mon Sep 17 00:00:00 2001
From: Rafael Queralta <rafaelcuba81@gmail.com>
Date: Sun, 20 Dec 2020 07:45:19 -0500
Subject: [PATCH] Fixed BUG-45538: To prevent process controller without finish
 call, OB.UTIL.ProcessController.finish was moved after of
 me.calculateReceipt() call. Also deletedLines list was filtered to avoid
 duplicates lines that generate errors while importing when the order is
 processed. And finally tax id was updated with taxUndo value for related
 service product

---
 .../js/model/order.js                         | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/web/org.openbravo.retail.posterminal/js/model/order.js b/web/org.openbravo.retail.posterminal/js/model/order.js
index 4ee063863..b54f3de09 100644
--- a/web/org.openbravo.retail.posterminal/js/model/order.js
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js
@@ -1091,12 +1091,12 @@
         me.on('calculategross', function() {
           me.off('calculategross');
           if (me.pendingCalculateReceipt) {
-            OB.UTIL.ProcessController.finish('calculateReceipt', execution);
             OB.MobileApp.view.waterfall('calculatedReceipt');
             me.trigger('calculatedReceipt');
             me.pendingCalculateReceipt = false;
             me.calculatingReceipt = false;
             me.calculateReceipt();
+            OB.UTIL.ProcessController.finish('calculateReceipt', execution);
             return;
           } else {
             finalCallbacksAndFinish();
@@ -2264,8 +2264,23 @@
               }
               _.each(linesToDelete, function(line) {
                 // Move to deleted lines
-                var deletedLine = new OrderLine(line.attributes);
-                me.get('deletedLines').push(deletedLine);
+                if (
+                  _.isUndefined(
+                    _.find(me.get('deletedLines'), function(deleteline) {
+                      return deleteline.id === line.id;
+                    })
+                  )
+                ) {
+                  var deletedLine = new OrderLine(line.attributes);
+                  // Sets the tax if it has been deleted
+                  deletedLine.set(
+                    'tax',
+                    deletedLine.get('tax')
+                      ? deletedLine.get('tax')
+                      : deletedLine.get('taxUndo')
+                  );
+                  me.get('deletedLines').push(deletedLine);
+                }
               });
               me.get('lines').remove(linesToDelete);
               cleanReceipt();
-- 
2.25.1