0032368: Reactivation of Quotations does not recheck stock

diff --git a/web/org.openbravo.retail.stockvalidation/js/modals.js b/web/org.openbravo.retail.stockvalidation/js/modals.js
--- a/web/org.openbravo.retail.stockvalidation/js/modals.js
+++ b/web/org.openbravo.retail.stockvalidation/js/modals.js
@@ -13,63 +13,69 @@
 enyo.kind({
   name: 'OBPSSV.UI.dummyControl',
   showing: false,
+  isOrderFromQuotation: false,
+  updateFromQuotation: function (isFromQuotation) {
+    this.isOrderFromQuotation = isFromQuotation;
+  },
   init: function (model) {
     var me = this;
     this.model = model;
 
     function executeCallToServer(changedModel) {
-      var serverCall = new OB.DS.Process('org.openbravo.retail.stockvalidation.StockChecker');
-      var statusMessage = OB.UTIL.showStatus(OB.I18N.getLabel('OBPOSSV_GettingStockFromServer'));
-      OB.UTIL.showLoading(true);
-      serverCall.exec({
-        orderLine: changedModel,
-        organization: OB.POS.modelterminal.get('terminal').organization
-      }, function (data, message) {
-        statusMessage.hide();
-        OB.UTIL.showLoading(false);
-        if (data.allowSell === false) {
-          if (OB.MobileApp.model.get('obpossv_negativeStockAllowed')) {
-            OB.UTIL.showConfirmation.display(OB.I18N.getLabel('OBPOSSV_modalHeader'), OB.I18N.getLabel('OBPOSSV_NoEnoughStockInfo', [data.qty, changedModel.get('qty')]), [{
-              label: OB.I18N.getLabel('OBPOSSV_LblProceed'),
-              action: function () {
-                return true;
-              }
-            }, {
-              label: OB.I18N.getLabel('OBMOBC_LblCancel')
-            }], {
-              onHideFunction: function (popup) {
-                if (me.model.get('order').get('undo')) {
-                  me.model.get('order').get('undo').undo();
-                } else {
-                  if (data.qty <= 0) {
-                    me.model.get('order').deleteLine(changedModel);
+      if (!me.isOrderFromQuotation) {
+        var serverCall = new OB.DS.Process('org.openbravo.retail.stockvalidation.StockChecker');
+        var statusMessage = OB.UTIL.showStatus(OB.I18N.getLabel('OBPOSSV_GettingStockFromServer'));
+        OB.UTIL.showLoading(true);
+        serverCall.exec({
+          orderLine: changedModel,
+          organization: OB.POS.modelterminal.get('terminal').organization
+        }, function (data, message) {
+          statusMessage.hide();
+          OB.UTIL.showLoading(false);
+          if (data.allowSell === false) {
+            if (OB.MobileApp.model.get('obpossv_negativeStockAllowed')) {
+              OB.UTIL.showConfirmation.display(OB.I18N.getLabel('OBPOSSV_modalHeader'), OB.I18N.getLabel('OBPOSSV_NoEnoughStockInfo', [data.qty, changedModel.get('qty')]), [{
+                label: OB.I18N.getLabel('OBPOSSV_LblProceed'),
+                action: function () {
+                  return true;
+                }
+              }, {
+                label: OB.I18N.getLabel('OBMOBC_LblCancel')
+              }], {
+                onHideFunction: function (popup) {
+                  if (me.model.get('order').get('undo')) {
+                    me.model.get('order').get('undo').undo();
                   } else {
-                    changedModel.set('qty', data.qty);
+                    if (data.qty <= 0) {
+                      me.model.get('order').deleteLine(changedModel);
+                    } else {
+                      changedModel.set('qty', data.qty);
+                    }
+                  }
+                },
+                style: 'background-color: #EBA001'
+              });
+            } else {
+              OB.UTIL.showConfirmation.display(OB.I18N.getLabel('OBPOSSV_modalHeader'), OB.I18N.getLabel('OBPOSSV_NoEnoughStock', [data.qty, changedModel.get('qty')]), null, {
+                onHideFunction: function (popup) {
+                  if (me.model.get('order').get('undo')) {
+                    me.model.get('order').get('undo').undo();
+                  } else {
+                    if (data.qty <= 0) {
+                      me.model.get('order').deleteLine(changedModel);
+                    } else {
+                      changedModel.set('qty', data.qty);
+                    }
                   }
                 }
-              },
-              style: 'background-color: #EBA001'
-            });
-          } else {
-            OB.UTIL.showConfirmation.display(OB.I18N.getLabel('OBPOSSV_modalHeader'), OB.I18N.getLabel('OBPOSSV_NoEnoughStock', [data.qty, changedModel.get('qty')]), null, {
-              onHideFunction: function (popup) {
-                if (me.model.get('order').get('undo')) {
-                  me.model.get('order').get('undo').undo();
-                } else {
-                  if (data.qty <= 0) {
-                    me.model.get('order').deleteLine(changedModel);
-                  } else {
-                    changedModel.set('qty', data.qty);
-                  }
-                }
-              }
-            });
+              });
+            }
           }
-        }
-      }, function (error) {
-        statusMessage.hide();
-        OB.UTIL.showError(OB.I18N.getLabel('OBPOSSV_ErrorGettingStockFromServer'));
-      });
+        }, function (error) {
+          statusMessage.hide();
+          OB.UTIL.showError(OB.I18N.getLabel('OBPOSSV_ErrorGettingStockFromServer'));
+        });
+      }
     }
 
     function executeCallToServerForNewOrderFromQuotation(data) {
@@ -109,7 +115,7 @@
                       me.model.get('order').deleteLine(me.model.get('order').get('lines').at(curLine.index));
                     } else {
                       me.model.get('order').get('lines').at(curLine.index).set('qty', curLine.availableQty, {
-                        silent: true
+                        silent: false
                       });
                     }
                   }, this);
@@ -131,7 +137,7 @@
                       me.model.get('order').deleteLine(me.model.get('order').get('lines').at(curLine.index));
                     } else {
                       me.model.get('order').get('lines').at(curLine.index).set('qty', curLine.availableQty, {
-                        silent: true
+                        silent: false
                       });
                     }
                   }, this);
@@ -140,7 +146,9 @@
             }
           }
         }
+        me.updateFromQuotation(false);
       }, function (error) {
+        me.updateFromQuotation(false);
         statusMessage.hide();
         OB.UTIL.showError(OB.I18N.getLabel('OBPOSSV_ErrorGettingStockFromServer'));
       });
@@ -169,7 +177,7 @@
     }, this);
 
     this.model.get('order').on('orderCreatedFromQuotation', function () {
-
+      me.updateFromQuotation(true);
       if (OB.POS.modelterminal.get('connectedToERP')) {
         var dataToSend = [];
         _.each(this.model.get('order').get('lines').models, function (curLine, index) {
@@ -182,6 +190,7 @@
         }, this);
         executeCallToServerForNewOrderFromQuotation(dataToSend);
       } else {
+        me.updateFromQuotation(false);
         OB.UTIL.showWarning(OB.I18N.getLabel('OBPOSSV_CannotCheckOffline'));
       }
     }, this);