# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1574685438 -19800
#      Mon Nov 25 18:07:18 2019 +0530
# Node ID 6a07e574e6d035ae2fba2633b676dd8a19cc3bce
# Parent  64dc1f28d90a527b6bd67c162695deddc388dc4b
Related to issue 42386 : Location should be updated when changing Cutstomer/Location

Backed out changeset: e05daa1f3802

diff -r 64dc1f28d90a -r 6a07e574e6d0 web/org.openbravo.retail.posterminal/js/model/order.js
--- a/web/org.openbravo.retail.posterminal/js/model/order.js	Mon Nov 25 12:04:40 2019 +0530
+++ b/web/org.openbravo.retail.posterminal/js/model/order.js	Mon Nov 25 18:07:18 2019 +0530
@@ -5532,13 +5532,13 @@
         var saveBP = function() {
           if (
             !businessPartner.get('locId') ||
-            !businessPartner.get('shipLocId') ||
-            businessPartner.get('forceRemote')
+            !businessPartner.get('shipLocId')
           ) {
             businessPartner.loadBPLocations(
               null,
               null,
               function(shipping, billing, locations) {
+                businessPartner.set('locations', locations);
                 businessPartner.set(
                   'locationModel',
                   shipping ? shipping : billing
@@ -5588,7 +5588,7 @@
             if (callback) {
               callback();
             }
-          } else {
+          } else if (businessPartner.get(lid)) {
             OB.Dal.get(
               OB.Model.BPLocation,
               businessPartner.get(lid),
@@ -5617,6 +5617,10 @@
                 }
               }
             );
+          } else {
+            if (callback) {
+              callback();
+            }
           }
         };
 
@@ -5634,6 +5638,7 @@
             null,
             null,
             function(shipping, billing, locations) {
+              businessPartner.set('locations', locations);
               businessPartner.set(
                 'locationModel',
                 shipping ? shipping : billing
diff -r 64dc1f28d90a -r 6a07e574e6d0 web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js	Mon Nov 25 12:04:40 2019 +0530
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js	Mon Nov 25 18:07:18 2019 +0530
@@ -1279,30 +1279,6 @@
             });
             return true;
           }
-          if (
-            OB.MobileApp.model.hasPermission('OBPOS_remote.customer', true) &&
-            OB.MobileApp.model.get('connectedToERP')
-          ) {
-            eventBP.set('forceRemote', true);
-            if (OB.UTIL.isNullOrUndefined(eventBP.get('locId'))) {
-              eventBP.set(
-                'locId',
-                component.model
-                  .get('order')
-                  .get('bp')
-                  .get('locId')
-              );
-            }
-            if (OB.UTIL.isNullOrUndefined(eventBP.get('shipLocId'))) {
-              eventBP.set(
-                'shipLocId',
-                component.model
-                  .get('order')
-                  .get('bp')
-                  .get('shipLocId')
-              );
-            }
-          }
           component.model.get('order').setBPandBPLoc(eventBP, false, true);
           component.model.get('orderList').saveCurrent();
         } else {