0041370: Problems with the 'Can/cannot be delivered' property

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
@@ -4255,7 +4255,9 @@
           line.unset('invoicedQuantity');
           line.unset('grossUnitPrice');
           line.unset('lineGrossAmount');
-          line.set('obposCanbedelivered', true);
+          if (!line.get('obposCanbedelivered') && line.get('deliveredQuantity') === line.get('qty')) {
+            line.set('obposCanbedelivered', true);
+          }
           line.set('obposIspaid', false);
         });
 
diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/editline.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/editline.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/editline.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/editline.js
@@ -536,9 +536,10 @@
       this.hideDeliveryButton = !OB.MobileApp.model.get('terminal').terminalType.calculateprepayments || this.receipt.get('isFullyDelivered') || selectedServices.length ? true : false;
       this.hideDeliveryLabel = !OB.MobileApp.model.get('terminal').terminalType.calculateprepayments || this.receipt.get('isFullyDelivered') || selectedServices.length === this.selectedModels.length ? true : false;
       if (this.selectedModels.length > 1) {
-        var selectedLinesToDeliver = _.filter(this.selectedModels, function (line) {
-          return line.get('obposCanbedelivered') && line.get('deliveredQuantity') < line.get('qty');
-        });
+        var canBeDeliveredLine = this.selectedModels[0].get('obposCanbedelivered'),
+            selectedLinesToDeliver = _.filter(this.selectedModels, function (line) {
+            return line.get('obposCanbedelivered') === canBeDeliveredLine && !line.getDeliveredQuantity();
+          });
         this.hideDeliveryButton = this.hideDeliveryButton ? true : selectedLinesToDeliver.length && selectedLinesToDeliver.length < this.selectedModels.length;
         if (this.hideDeliveryButton) {
           this.$.actionButtonsContainer.$.canDeliver.hide();
@@ -551,7 +552,7 @@
           }
         }
       } else if (this.selectedModels.length === 1) {
-        if (this.hideDeliveryButton || this.selectedModels[0].get('deliveredQuantity') < this.selectedModels[0].get('qty')) {
+        if (this.hideDeliveryButton || this.selectedModels[0].getDeliveredQuantity()) {
           this.$.actionButtonsContainer.$.canDeliver.hide();
         } else {
           this.$.actionButtonsContainer.$.canDeliver.show();

# HG changeset patch
# User Rafael Queralta <rafaelcuba81@gmail.com>
# Date 1563445224 14400
#      Thu Jul 18 06:20:24 2019 -0400
# Node ID 7b38614fa1c9e6e16df1dc020b39dc846fea0eab
# Parent  f80a06d906df94ff150f494e3d4c513c8a64da14
Fixed issue 41370: Problems with the 'Can/cannot be delivered' property

- Adapt the behavior Set/Unset Delivery button in single selection or multi
selection

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
@@ -6081,7 +6081,12 @@
             line.unset('invoicedQuantity');
             line.unset('grossUnitPrice');
             line.unset('lineGrossAmount');
-            line.set('obposCanbedelivered', true);
+            if (
+              !line.set('obposCanbedelivered') &&
+              line.get('deliveredQuantity') === line.get('qty')
+            ) {
+              line.set('obposCanbedelivered', true);
+            }
             line.set('obposIspaid', false);
             line.set('documentType', me.get('documentType'));
           });
diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/editline.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/editline.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/editline.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/editline.js
@@ -618,15 +618,17 @@
           ? true
           : false;
       if (this.selectedModels.length > 1) {
-        var selectedLinesToDeliver = _.filter(this.selectedModels, function(
-          line
-        ) {
-          return (
-            (line.get('obposCanbedelivered') &&
-              line.get('deliveredQuantity') < line.get('qty')) ||
-            OB.UTIL.isCrossStoreLine(line)
-          );
-        });
+        var canBeDeliveredLine = this.selectedModels[0].get(
+            'obposCanbedelivered'
+          ),
+          selectedLinesToDeliver = _.filter(this.selectedModels, function(
+            line
+          ) {
+            return (
+              line.get('obposCanbedelivered') === canBeDeliveredLine &&
+              !line.getDeliveredQuantity()
+            );
+          });
         this.hideDeliveryButton = this.hideDeliveryButton
           ? true
           : selectedLinesToDeliver.length &&
@@ -648,9 +650,7 @@
       } else if (this.selectedModels.length === 1) {
         if (
           this.hideDeliveryButton ||
-          this.selectedModels[0].get('deliveredQuantity') <
-            this.selectedModels[0].get('qty') ||
-          OB.UTIL.isCrossStoreLine(this.selectedModels[0])
+          this.selectedModels[0].getDeliveredQuantity()
         ) {
           this.$.actionButtonsContainer.$.canDeliver.hide();
         } else {