0037585: Performance problem in BPLocation query during the incremental refresh

diff --git a/src/org/openbravo/retail/posterminal/master/BPLocation.java b/src/org/openbravo/retail/posterminal/master/BPLocation.java
--- a/src/org/openbravo/retail/posterminal/master/BPLocation.java
+++ b/src/org/openbravo/retail/posterminal/master/BPLocation.java
@@ -57,11 +57,10 @@
     HQLPropertyList regularBPLocationHQLProperties = ModelExtensionUtils
         .getPropertyExtensions(extensions);
     String hql = "select" + regularBPLocationHQLProperties.getHqlSelect()
-        + "from BusinessPartnerLocation AS bploc " + "where exists (" + "SELECT "
-        + "bp.id FROM BusinessPartner AS bp " + "WHERE $filtersCriteria AND "
-        + "bp.customer = true AND " + "bp.priceList IS NOT NULL AND "
-        + "bploc.businessPartner.id = bp.id) AND " + "(bploc.$incrementalUpdateCriteria" + operator
-        + "bploc.businessPartner.$incrementalUpdateCriteria) ";
+        + "from BusinessPartnerLocation AS bploc " + "join bploc.businessPartner AS bp "
+        + "where $filtersCriteria AND " + "bp.customer = true AND "
+        + "bp.priceList IS NOT NULL AND " + "(bploc.$incrementalUpdateCriteria" + operator
+        + "bp.$incrementalUpdateCriteria) ";
     if (lastUpdated != null) {
       hql += " OR (bploc.locationAddress.$incrementalUpdateCriteria) ";
     }
diff --git a/src/org/openbravo/retail/posterminal/master/BPLocationProperties.java b/src/org/openbravo/retail/posterminal/master/BPLocationProperties.java
--- a/src/org/openbravo/retail/posterminal/master/BPLocationProperties.java
+++ b/src/org/openbravo/retail/posterminal/master/BPLocationProperties.java
@@ -25,7 +25,7 @@
       private static final long serialVersionUID = 1L;
       {
         add(new HQLProperty("bploc.id", "id"));
-        add(new HQLProperty("bploc.businessPartner.id", "bpartner"));
+        add(new HQLProperty("bp.id", "bpartner"));
         add(new HQLProperty(
             "COALESCE(bploc.locationAddress.addressLine1, bploc.locationAddress.addressLine2, bploc.locationAddress.postalCode, bploc.locationAddress.cityName, bploc.name)",
             "name"));
@@ -45,8 +45,7 @@
             "COALESCE(bploc.locationAddress.addressLine1, bploc.locationAddress.addressLine2, bploc.locationAddress.postalCode, bploc.locationAddress.cityName)",
             "_identifier"));
         add(new HQLProperty(
-            "(case when bploc.active = 'Y' and bploc.businessPartner.active = 'Y' then true else false end)",
-            "active"));
+            "(case when bploc.active = 'Y' and bp.active = 'Y' then true else false end)", "active"));
         String curDbms = OBPropertiesProvider.getInstance().getOpenbravoProperties()
             .getProperty("bbdd.rdbms");
         if (curDbms.equals("POSTGRE")) {