0034380: [SERQA 2064] CustomerAddrCreationHook always receive location as null.

diff --git a/src/org/openbravo/retail/posterminal/CustomerAddrLoader.java b/src/org/openbravo/retail/posterminal/CustomerAddrLoader.java
--- a/src/org/openbravo/retail/posterminal/CustomerAddrLoader.java
+++ b/src/org/openbravo/retail/posterminal/CustomerAddrLoader.java
@@ -69,7 +69,7 @@
           log.warn(Utility.messageBD(new DalConnectionProvider(false), "OBPOS_outdatedbpl",
               OBContext.getOBContext().getLanguage().getLanguage()));
         }
-        location = editBPartnerAddr(customer, location, jsonCustomerAddr);
+        editBPartnerAddr(customer, location, jsonCustomerAddr);
       }
 
       executeAddrHooks(customerAddrCreations, jsonCustomerAddr, customer, location);
@@ -95,14 +95,88 @@
 
   private Location createBPartnerAddr(BusinessPartner customer, JSONObject jsonCustomerAddr)
       throws JSONException {
-    try {
-      Entity locationEntity = ModelProvider.getInstance().getEntity(Location.class);
-      Entity baseLocationEntity = ModelProvider.getInstance().getEntity(
-          org.openbravo.model.common.geography.Location.class);
-      final org.openbravo.model.common.geography.Location rootLocation = OBProvider.getInstance()
-          .get(org.openbravo.model.common.geography.Location.class);
+    Entity locationEntity = ModelProvider.getInstance().getEntity(Location.class);
+    Entity baseLocationEntity = ModelProvider.getInstance().getEntity(
+        org.openbravo.model.common.geography.Location.class);
+    final org.openbravo.model.common.geography.Location rootLocation = OBProvider.getInstance()
+        .get(org.openbravo.model.common.geography.Location.class);
 
-      JSONPropertyToEntity.fillBobFromJSON(baseLocationEntity, rootLocation, jsonCustomerAddr);
+    JSONPropertyToEntity.fillBobFromJSON(baseLocationEntity, rootLocation, jsonCustomerAddr);
+
+    if (jsonCustomerAddr.has("name") && jsonCustomerAddr.getString("name") != null) {
+      if (jsonCustomerAddr.getString("name").equals("")) {
+        rootLocation.setAddressLine1(null);
+      } else {
+        rootLocation.setAddressLine1(jsonCustomerAddr.getString("name"));
+      }
+    }
+
+    if (jsonCustomerAddr.has("countryId")) {
+      rootLocation.setCountry(OBDal.getInstance().get(Country.class,
+          jsonCustomerAddr.getString("countryId")));
+    } else {
+      String errorMessage = "Country ID is a mandatory field to create a new customer address from Web Pos";
+      log.error(errorMessage);
+      throw new OBException(errorMessage, null);
+    }
+
+    rootLocation.setPostalCode(jsonCustomerAddr.getString("postalCode"));
+    rootLocation.setCityName(jsonCustomerAddr.getString("cityName"));
+    OBDal.getInstance().save(rootLocation);
+
+    Location newLocation = OBProvider.getInstance().get(Location.class);
+
+    JSONPropertyToEntity.fillBobFromJSON(locationEntity, newLocation, jsonCustomerAddr);
+
+    if (jsonCustomerAddr.has("id")) {
+      newLocation.setId(jsonCustomerAddr.getString("id"));
+    } else {
+      String errorMessage = "Business partner Location ID is a mandatory field to create a new customer address from Web Pos";
+      log.error(errorMessage);
+      throw new OBException(errorMessage, null);
+    }
+    if (jsonCustomerAddr.has("name") && jsonCustomerAddr.getString("name") != null) {
+      if (!jsonCustomerAddr.getString("name").equals("")) {
+        newLocation.setName(jsonCustomerAddr.getString("name"));
+      } else {
+        String posibleName = jsonCustomerAddr.getString("customerName")
+            + jsonCustomerAddr.getString("id").trim();
+        if (posibleName.length() > 59) {
+          posibleName = posibleName.substring(0, 59);
+        }
+        newLocation.setName(posibleName);
+      }
+    } else {
+      String errorMessage = "Business partner Location Name is a mandatory field to create a new customer address from Web Pos";
+      log.error(errorMessage);
+      throw new OBException(errorMessage, null);
+    }
+    if (jsonCustomerAddr.getBoolean("isBillTo")) {
+      newLocation.setInvoiceToAddress(true);
+    } else {
+      newLocation.setInvoiceToAddress(false);
+    }
+    if (jsonCustomerAddr.getBoolean("isShipTo")) {
+      newLocation.setShipToAddress(true);
+    } else {
+      newLocation.setShipToAddress(false);
+    }
+    // don't set phone of location, the phone is set in contact
+    newLocation.setPhone(null);
+
+    newLocation.setBusinessPartner(customer);
+    newLocation.setLocationAddress(rootLocation);
+    newLocation.setNewOBObject(true);
+    OBDal.getInstance().save(newLocation);
+    return newLocation;
+
+  }
+
+  private void editBPartnerAddr(BusinessPartner customer, Location location,
+      JSONObject jsonCustomerAddr) throws JSONException {
+    if (location != null) {
+      final org.openbravo.model.common.geography.Location rootLocation = location
+          .getLocationAddress();
 
       if (jsonCustomerAddr.has("name") && jsonCustomerAddr.getString("name") != null) {
         if (jsonCustomerAddr.getString("name").equals("")) {
@@ -111,114 +185,30 @@
           rootLocation.setAddressLine1(jsonCustomerAddr.getString("name"));
         }
       }
-
-      if (jsonCustomerAddr.has("countryId")) {
-        rootLocation.setCountry(OBDal.getInstance().get(Country.class,
-            jsonCustomerAddr.getString("countryId")));
-      } else {
-        String errorMessage = "Country ID is a mandatory field to create a new customer address from Web Pos";
-        log.error(errorMessage);
-        throw new OBException(errorMessage, null);
-      }
-
       rootLocation.setPostalCode(jsonCustomerAddr.getString("postalCode"));
       rootLocation.setCityName(jsonCustomerAddr.getString("cityName"));
-      OBDal.getInstance().save(rootLocation);
-
-      Location newLocation = OBProvider.getInstance().get(Location.class);
-
-      JSONPropertyToEntity.fillBobFromJSON(locationEntity, newLocation, jsonCustomerAddr);
-
-      if (jsonCustomerAddr.has("id")) {
-        newLocation.setId(jsonCustomerAddr.getString("id"));
+      rootLocation.setCountry(OBDal.getInstance().get(Country.class,
+          jsonCustomerAddr.getString("countryId")));
+      if (jsonCustomerAddr.getBoolean("isBillTo")) {
+        location.setInvoiceToAddress(true);
       } else {
-        String errorMessage = "Business partner Location ID is a mandatory field to create a new customer address from Web Pos";
-        log.error(errorMessage);
-        throw new OBException(errorMessage, null);
-      }
-      if (jsonCustomerAddr.has("name") && jsonCustomerAddr.getString("name") != null) {
-        if (!jsonCustomerAddr.getString("name").equals("")) {
-          newLocation.setName(jsonCustomerAddr.getString("name"));
-        } else {
-          String posibleName = jsonCustomerAddr.getString("customerName")
-              + jsonCustomerAddr.getString("id").trim();
-          if (posibleName.length() > 59) {
-            posibleName = posibleName.substring(0, 59);
-          }
-          newLocation.setName(posibleName);
-        }
-      } else {
-        String errorMessage = "Business partner Location Name is a mandatory field to create a new customer address from Web Pos";
-        log.error(errorMessage);
-        throw new OBException(errorMessage, null);
-      }
-      if (jsonCustomerAddr.getBoolean("isBillTo")) {
-        newLocation.setInvoiceToAddress(true);
-      } else {
-        newLocation.setInvoiceToAddress(false);
+        location.setInvoiceToAddress(false);
       }
       if (jsonCustomerAddr.getBoolean("isShipTo")) {
-        newLocation.setShipToAddress(true);
+        location.setShipToAddress(true);
       } else {
-        newLocation.setShipToAddress(false);
+        location.setShipToAddress(false);
       }
-      // don't set phone of location, the phone is set in contact
-      newLocation.setPhone(null);
+      Entity baseLocationEntity = ModelProvider.getInstance().getEntity(
+          org.openbravo.model.common.geography.Location.class);
+      JSONPropertyToEntity.fillBobFromJSON(baseLocationEntity, rootLocation, jsonCustomerAddr);
 
-      newLocation.setBusinessPartner(customer);
-      newLocation.setLocationAddress(rootLocation);
-      newLocation.setNewOBObject(true);
-      OBDal.getInstance().save(newLocation);
+      Entity bpLocationEntity = ModelProvider.getInstance().getEntity(Location.class);
+      JSONPropertyToEntity.fillBobFromJSON(bpLocationEntity, location, jsonCustomerAddr);
 
-    } catch (final Exception e) {
-      log.error("Exception while creating BPartner Address", e);
+      OBDal.getInstance().save(rootLocation);
+      OBDal.getInstance().save(location);
     }
-
-    return null;
-  }
-
-  private Location editBPartnerAddr(BusinessPartner customer, Location location,
-      JSONObject jsonCustomerAddr) throws JSONException {
-    try {
-      if (location != null) {
-        final org.openbravo.model.common.geography.Location rootLocation = location
-            .getLocationAddress();
-
-        if (jsonCustomerAddr.has("name") && jsonCustomerAddr.getString("name") != null) {
-          if (jsonCustomerAddr.getString("name").equals("")) {
-            rootLocation.setAddressLine1(null);
-          } else {
-            rootLocation.setAddressLine1(jsonCustomerAddr.getString("name"));
-          }
-        }
-        rootLocation.setPostalCode(jsonCustomerAddr.getString("postalCode"));
-        rootLocation.setCityName(jsonCustomerAddr.getString("cityName"));
-        rootLocation.setCountry(OBDal.getInstance().get(Country.class,
-            jsonCustomerAddr.getString("countryId")));
-        if (jsonCustomerAddr.getBoolean("isBillTo")) {
-          location.setInvoiceToAddress(true);
-        } else {
-          location.setInvoiceToAddress(false);
-        }
-        if (jsonCustomerAddr.getBoolean("isShipTo")) {
-          location.setShipToAddress(true);
-        } else {
-          location.setShipToAddress(false);
-        }
-        Entity baseLocationEntity = ModelProvider.getInstance().getEntity(
-            org.openbravo.model.common.geography.Location.class);
-        JSONPropertyToEntity.fillBobFromJSON(baseLocationEntity, rootLocation, jsonCustomerAddr);
-
-        Entity bpLocationEntity = ModelProvider.getInstance().getEntity(Location.class);
-        JSONPropertyToEntity.fillBobFromJSON(bpLocationEntity, location, jsonCustomerAddr);
-
-        OBDal.getInstance().save(rootLocation);
-        OBDal.getInstance().save(location);
-      }
-    } catch (final Exception e) {
-      log.error("Exception while updating BPartner Address", e);
-    }
-    return null;
   }
 
   @Override