0029874: Group the products of the receipt by its qty (positive with positive and negative with negative)

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
@@ -869,7 +869,7 @@
             line = options.line;
           } else {
             line = this.get('lines').find(function (l) {
-              if (l.get('product').id === p.id && l.get('qty') > 0) {
+              if (l.get('product').id === p.id && ((l.get('qty') > 0 && qty > 0) || (l.get('qty') < 0 && qty < 0))) {
                 affectedByPack = l.isAffectedByPack();
                 if (!affectedByPack) {
                   return true;

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
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2013 Openbravo S.L.U.
+ * Copyright (C) 2013-2015 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -13,19 +13,6 @@
 (function () {
 
   OB.UTIL.HookManager.registerHook('OBPOS_GroupedProductPreCreateLine', function (args, callbacks) {
-    if (OB.UTIL.isNullOrUndefined(args.line) && !OB.UTIL.isNullOrUndefined(args.allLines)) {
-      args.line = args.allLines.find(function (l) {
-        var affectedByPack = null;
-        if (l.get('product').id === args.p.id && (l.get('qty') > 0 || OB.UTIL.isNullOrUndefined(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 (!OB.UTIL.isNullOrUndefined(args.line) && !OB.UTIL.isNullOrUndefined(args.line.get('originalOrderLineId'))) {
       args.cancelOperation = true;

diff --git a/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/receipts/LinesPositiveAndNegative.java b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/receipts/LinesPositiveAndNegative.java
new file mode 100644
--- /dev/null
+++ b/src-test/org/openbravo/test/mobile/retail/pack/selenium/tests/receipts/LinesPositiveAndNegative.java
@@ -0,0 +1,43 @@
+/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo S.L.U.
+ * All portions are Copyright (C) 2015 Openbravo S.L.U.
+ * All Rights Reserved.
+ * Contributor(s):
+ ************************************************************************
+ */
+
+package org.openbravo.test.mobile.retail.pack.selenium.tests.receipts;
+
+import org.junit.Test;
+import org.openbravo.test.mobile.common.selenium.javascript.TestId;
+import org.openbravo.test.mobile.common.selenium.terminals.WebPOSTerminalHelper;
+
+public class LinesPositiveAndNegative extends WebPOSTerminalHelper {
+
+  @Test
+  public void test() {
+    tap(TestId.BUTTON_BROWSE);
+    tap(TestId.BUTTON_CATEGORY_BACKPACKSANDTRAVEL);
+    tap(TestId.BUTTON_PRODUCT_BACKPACKSANDTRAVEL_WHISTLE);
+    tap(TestId.BUTTON_EDIT_RETURNLINE);
+    tap(TestId.BUTTON_BROWSE);
+    tap(TestId.BUTTON_CATEGORY_BACKPACKSANDTRAVEL);
+    tap(TestId.BUTTON_PRODUCT_BACKPACKSANDTRAVEL_WHISTLE);
+    verify(TestId.LABEL_RECEIPT_ROW1_QTY, "-1");
+    verify(TestId.LABEL_RECEIPT_ROW2_QTY, "1");
+    tap(TestId.BUTTON_DELETERECEIPT);
+    tap(TestId.BUTTON_DELETERECEIPT_CONFIRM);
+  }
+
+}