0048068: Wrong User Defined Line Amount discount after create a Sales Order from Quotation

diff --git a/web/org.openbravo.retail.discounts/js/discountsengine/common/rules/manual-promotions-discount.js b/web/org.openbravo.retail.discounts/js/discountsengine/common/rules/manual-promotions-discount.js
index 17a889c..1d819fa 100644
--- a/web/org.openbravo.retail.discounts/js/discountsengine/common/rules/manual-promotions-discount.js
+++ b/web/org.openbravo.retail.discounts/js/discountsengine/common/rules/manual-promotions-discount.js
@@ -285,7 +285,11 @@
           }
           return false;
         });
-        if (foundLine) {
+        if (
+          foundLine &&
+          this.getTotalLinePrice(foundLine) >=
+            this.discountImpl.obdiscLineFinalgross
+        ) {
           participantLines.push(foundLine);
         }
       });
diff --git a/web/org.openbravo.retail.discounts/js/promotion-manual.js b/web/org.openbravo.retail.discounts/js/promotion-manual.js
index 5aebcd1..e417102 100644
--- a/web/org.openbravo.retail.discounts/js/promotion-manual.js
+++ b/web/org.openbravo.retail.discounts/js/promotion-manual.js
@@ -132,14 +132,7 @@
             ? amount
             : promotion.definition.userAmt;
         }
-        if (!OB.UTIL.isNullOrUndefined(amount)) {
-          var finalAmount = OB.DEC.sub(line.getTotalLine(), amount);
-          if (finalAmount > 0) {
-            promotion.definition.userAmt = finalAmount;
-          } else {
-            promotion.definition.userAmt = line.getTotalLine();
-          }
-        }
+        promotion.definition.userAmt = amount;
       }
       add(receipt, line, promotion);
     },

diff --git a/web/org.openbravo.retail.posterminal/js/discountsengine/pos/pos-discounts.js b/web/org.openbravo.retail.posterminal/js/discountsengine/pos/pos-discounts.js
index 56217daf8..36e9a9a1e 100644
--- a/web/org.openbravo.retail.posterminal/js/discountsengine/pos/pos-discounts.js
+++ b/web/org.openbravo.retail.posterminal/js/discountsengine/pos/pos-discounts.js
@@ -107,9 +107,20 @@
                 manualPromoObj.obdiscPercentage = manualPromoObj.userAmt;
               } else if (
                 manualPromoObj.discountType ===
-                'F3B0FB45297844549D9E6B5F03B23A82'
+                  'F3B0FB45297844549D9E6B5F03B23A82' &&
+                !manualPromoObj.obdiscLineFinalgross
               ) {
-                manualPromoObj.obdiscLineFinalgross = manualPromoObj.userAmt;
+                manualPromoObj.obdiscLineFinalgross = line
+                  .get('promotions')
+                  .reduce((memo, promo) => {
+                    if ((promo.lineNo || 1) <= (manualPromoObj.lineNo || 1)) {
+                      return OB.DEC.sub(
+                        memo,
+                        promo.actualAmt || promo.amt || 0
+                      );
+                    }
+                    return memo;
+                  }, line.get('gross'));
               }
               manualPromoObj.id = manualPromoObj.ruleId;
               manualPromoObj.products = [];