0025674: Impossible to do a return

diff --git a/web/org.openbravo.retail.returns/js/hookGroupedProductPreCreateLine.js b/web/org.openbravo.retail.returns/js/hookGroupedProductPreCreateLine.js
--- a/web/org.openbravo.retail.returns/js/hookGroupedProductPreCreateLine.js
+++ b/web/org.openbravo.retail.returns/js/hookGroupedProductPreCreateLine.js
@@ -15,6 +15,17 @@
   if (OB.MobileApp.model.hookManager) {
 
     OB.MobileApp.model.hookManager.registerHook('OBPOS_GroupedProductPreCreateLine', function (args, callbacks) {
+      args.line = args.allLines.find(function (l) {
+        if (l.get('product').id === args.p.id && (l.get('qty') > 0 || _.isUndefined(l.get('originalOrderLineId')))) {
+          affectedByPack = l.isAffectedByPack();
+          if (!affectedByPack) {
+            return true;
+          } else if ((args.options && args.options.packId === affectedByPack.ruleId) || !(args.options && args.options.packId)) {
+            return true;
+          }
+        }
+      });
+
       if (!_.isUndefined(args.line) && !_.isUndefined(args.line.get('originalOrderLineId'))) {
         args.cancelOperation = true;
         args.receipt.createLine(args.p, args.qty, args.options, args.attrs);

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
@@ -816,6 +816,7 @@
           OB.MobileApp.model.hookManager.executeHooks('OBPOS_GroupedProductPreCreateLine', {
             receipt: this,
             line: line,
+            allLines: this.get('lines'),
             p: p,
             qty: qty,
             options: options,
@@ -827,8 +828,6 @@
             if (args.line) {
               args.receipt.addUnit(args.line, args.qty);
               args.line.trigger('selected', args.line);
-            } else if (args.receipt.get('orderType') === 1) {
-              OB.UTIL.showError(OB.I18N.getLabel('OBPOS_AddProductReturn'));
             } else {
               args.receipt.createLine(args.p, args.qty, args.options, args.attrs);
             }
@@ -1234,7 +1233,7 @@
         }
         this.set('orderType', orderType); // 0: Sales order, 1: Return order, 2: Layaway, 3: Void Layaway
         if (orderType !== 3) { //Void this Layaway, do not need to save
-          if (!(options && !OB.UTIL.isNullOrUndefined(options.saveOrder) && options.saveOrder === false)){
+          if (!(options && !OB.UTIL.isNullOrUndefined(options.saveOrder) && options.saveOrder === false)) {
             this.save();
           }
         } else {
@@ -1244,7 +1243,7 @@
           this.get('payments').reset();
         }
         // remove promotions
-        if (!(options && !OB.UTIL.isNullOrUndefined(options.applyPromotions) && options.applyPromotions === false)){
+        if (!(options && !OB.UTIL.isNullOrUndefined(options.applyPromotions) && options.applyPromotions === false)) {
           OB.Model.Discounts.applyPromotions(this);
         }
       }