0034416: [SER-QA 2020] Quantity issue while "Remove" a product added to line and while "Undo" a deleted product

# HG changeset patch
# User Prakash M <prakash@qualiantech.com>
# Date 1478590970 -19800
#      Tue Nov 08 13:12:50 2016 +0530
# Node ID e9027679ef1a0e538a0e58aad4c48699f8cc0f6c
# Parent  8d0565a66b78c26f3720a2e182abf0dc95c8fbc2
Fixed Quantity Issue while Remove/Undo

diff --git a/web/org.openbravo.retail.posterminal/js/components/order.js b/web/org.openbravo.retail.posterminal/js/components/order.js
--- a/web/org.openbravo.retail.posterminal/js/components/order.js
+++ b/web/org.openbravo.retail.posterminal/js/components/order.js
@@ -1239,10 +1239,16 @@
       var lineToDelete = model,
           removedId = model.get('id'),
           serviceLinesToCheck = [],
-          text, linesToDelete, relations;
+          text, linesToDelete, relations, deletedQty;
+
+      if (OB.MobileApp.model.hasPermission('OBPOS_remove_ticket', true) && model.has('obposQtyDeleted') && model.get('obposQtyDeleted') > 0) {
+        deletedQty = model.get('obposQtyDeleted');
+      } else {
+        deletedQty = model.get('qty');
+      }
 
       if (!me.order.get('undo')) {
-        text = OB.I18N.getLabel('OBPOS_DeleteLine') + ': ' + model.get('qty') + ' x ' + model.get('product').get('_identifier');
+        text = OB.I18N.getLabel('OBPOS_DeleteLine') + ': ' + deletedQty + ' x ' + model.get('product').get('_identifier');
         linesToDelete = [model];
         relations = [];
         me.order.setUndo('DeleteLine', {
@@ -1258,9 +1264,9 @@
         linesToDelete.push(model);
         text = me.order.get('undo').text;
         if (text) {
-          text += ', ' + model.get('qty') + ' x ' + model.get('product').get('_identifier');
+          text += ', ' + deletedQty + ' x ' + model.get('product').get('_identifier');
         } else {
-          text = OB.I18N.getLabel('OBPOS_DeleteLine') + ': ' + model.get('qty') + ' x ' + model.get('product').get('_identifier');
+          text = OB.I18N.getLabel('OBPOS_DeleteLine') + ': ' + deletedQty + ' x ' + model.get('product').get('_identifier');
         }
         relations = me.order.get('undo').relations;
         if (!relations) {
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
@@ -1373,6 +1373,10 @@
               });
 
               lines.forEach(function (line) {
+                if (OB.MobileApp.model.hasPermission('OBPOS_remove_ticket', true) && line.has('obposQtyDeleted') && line.get('obposQtyDeleted') > 0) {
+                  line.set('qty', line.get('obposQtyDeleted'));
+                  line.set('obposQtyDeleted', 0);
+                }
                 me.removeDeleteLine(line);
                 me.get('lines').add(line, {
                   at: line.get('undoPosition')