# HG changeset patch
# User Shivanand Madiwalar <shivanand.madiwalar@promantia.com>
# Date 1474974772 -19800
#      Tue Sep 27 16:42:52 2016 +0530
# Node ID d20cf4b3ce3a7ccf7e70499b0dcd80692b4e1034
# Parent  97c95e2c63c9c9b72f43085bf624a58c6b32a41d
Related To Issue 33990 :-ve line gross price in the sales Order when product attribute grouped and scaled are true.

Treat product as non-grouped when the attributes of product grouped&scaled are checked .

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
@@ -3214,7 +3214,8 @@
             return line;
           }
         });
-        if (lineToMerge && lineToMerge.get('product').get('groupProduct')) {
+        //When it Comes To Technically , Consider The Product As Non-Grouped When scaled and groupproduct Are Checked 
+        if (lineToMerge && lineToMerge.get('product').get('groupProduct') && !(lineToMerge.get('product').get('groupProduct') && lineToMerge.get('product').get('obposScale'))) {
           lineToMerge.set({
             qty: lineToMerge.get('qty') + l.get('qty')
           }, {
@@ -3241,6 +3242,9 @@
           if (!l.get('product').get('groupProduct')) {
             promo.doNotMerge = true;
           }
+          if (l.get('product').get('groupProduct') && l.get('product').get('obposScale')) {
+            promo.doNotMerge = true;
+          }
         });
         //copy lines from virtual ticket to original ticket when they have promotions which avoid us to merge lines
         if (_.find(l.get('promotions'), function (promo) {