0040504: Promotion of type Discount per Total Amount are not properly applied in Live Builds

diff --git a/web/org.openbravo.retail.discounts.bytotal/js/preApplyAutomaticDiscountHook.js b/web/org.openbravo.retail.discounts.bytotal/js/preApplyAutomaticDiscountHook.js
--- a/web/org.openbravo.retail.discounts.bytotal/js/preApplyAutomaticDiscountHook.js
+++ b/web/org.openbravo.retail.discounts.bytotal/js/preApplyAutomaticDiscountHook.js
@@ -12,7 +12,10 @@
 OB.UTIL.HookManager.registerHook('OBPOS_PreApplyAutomaticDiscount', function (args, callbacks) {
 
   // Get all by total discounts registered in the application
-  var byTotalDiscountIdList = [];
+  var byTotalDiscountIdList = [],
+      i, previousLines = [],
+      targetDiscountRuleList = [],
+      targetDiscountRuleListIds = [];
   _.each(OB.Model.Discounts.discountRules, function (discountRule, ruleId) {
     if (discountRule.byTotalDiscount) {
       byTotalDiscountIdList.push(ruleId);
@@ -20,10 +23,10 @@
   });
 
   // Get from discount list all by total promotions
-  var targetDiscountRuleList = [];
   args.discountList.forEach(function (discount, index) {
     if (byTotalDiscountIdList.indexOf(discount.get('discountType')) !== -1) {
       targetDiscountRuleList.push(args.discountList.at(index));
+      targetDiscountRuleListIds.push(args.discountList.at(index).id);
     }
   });
 
@@ -37,6 +40,26 @@
     args.discountList.remove(targetDiscount);
     args.discountList.push(targetDiscount);
   });
+
+  // Remove previous bytotal discounts calculations
+  for (i = 0; i < args.receipt.get('lines').length; i++) {
+    var currentLine = args.receipt.get('lines').at(i);
+    if (args.line !== currentLine) {
+      previousLines.push(currentLine);
+    } else {
+      break;
+    }
+  }
+  _.forEach(previousLines, function (previousLine) {
+    var previousByTotals = [];
+    previousByTotals = _.filter(previousLine.get('promotions'), function (promo) {
+      return targetDiscountRuleListIds.indexOf(promo.ruleId) !== -1;
+    });
+    _.forEach(previousByTotals, function (previousByTotal) {
+      args.receipt.removePromotion(previousLine, previousByTotal.rule);
+    });
+  });
+
   OB.UTIL.HookManager.callbackExecutor(args, callbacks);
 
 });
\ No newline at end of file
diff --git a/web/org.openbravo.retail.discounts.bytotal/js/promotion-discounttotal.js b/web/org.openbravo.retail.discounts.bytotal/js/promotion-discounttotal.js
--- a/web/org.openbravo.retail.discounts.bytotal/js/promotion-discounttotal.js
+++ b/web/org.openbravo.retail.discounts.bytotal/js/promotion-discounttotal.js
@@ -31,7 +31,8 @@
           }
           accumdiscount = OB.DEC.add(accumdiscount, discount);
           receipt.addPromotion(l.line, discountRule, {
-            amt: discount
+            amt: discount,
+            forceReplace: true
           });
         });
       }

diff --git a/web/org.openbravo.retail.posterminal/js/model/executor.js b/web/org.openbravo.retail.posterminal/js/model/executor.js
--- a/web/org.openbravo.retail.posterminal/js/model/executor.js
+++ b/web/org.openbravo.retail.posterminal/js/model/executor.js
@@ -223,7 +223,9 @@
     OB.Dal.findUsingCache('discountsCache', OB.Model.Discount, criteria, function (d) {
       OB.UTIL.HookManager.executeHooks('OBPOS_PreApplyAutomaticDiscount', {
         context: me,
-        discountList: d
+        discountList: d,
+        receipt: receipt,
+        line: line
       }, function (args) {
         if (args.cancelation !== true) {
           // Set real _idx value for new list of promotions to apply and save the original _idx