0039419: Improve the performance of ProductCharacteristicValue query

diff --git a/src/org/openbravo/retail/posterminal/master/ProductCharacteristicValue.java b/src/org/openbravo/retail/posterminal/master/ProductCharacteristicValue.java
--- a/src/org/openbravo/retail/posterminal/master/ProductCharacteristicValue.java
+++ b/src/org/openbravo/retail/posterminal/master/ProductCharacteristicValue.java
@@ -93,20 +93,23 @@
         .add("select "
             + regularProductsCharacteristicHQLProperties.getHqlSelect()
             + "from ProductCharacteristicValue pcv "
-            + "inner join pcv.product.oBRETCOProlProductList opp "
-            + "inner join pcv.product.pricingProductPriceList ppp "
+            + "inner join pcv.characteristic characteristic "
+            + "inner join pcv.characteristicValue characteristicValue "
+            + "inner join pcv.product product "
+            + "inner join product.oBRETCOProlProductList opp "
+            + "inner join product.pricingProductPriceList ppp "
             + "where opp.obretcoProductlist.id= :productListId "
             + "and ppp.priceListVersion.id= :priceListVersionId "
-            + "and pcv.characteristicValue.characteristic.obposUseonwebpos = true "
+            + "and characteristic.obposUseonwebpos = true "
             + "and pcv.$filtersCriteria AND pcv.$hqlCriteria "
             + "and pcv.$naturalOrgCriteria and pcv.$readableSimpleClientCriteria "
             + ((lastUpdated != null) ? "and (opp.$incrementalUpdateCriteria OR ppp.$incrementalUpdateCriteria OR "
-                + "pcv.$incrementalUpdateCriteria OR pcv.characteristic.$incrementalUpdateCriteria OR "
-                + "pcv.characteristicValue.$incrementalUpdateCriteria) "
+                + "pcv.$incrementalUpdateCriteria OR characteristic.$incrementalUpdateCriteria OR "
+                + "characteristicValue.$incrementalUpdateCriteria) "
                 : "and (opp.$incrementalUpdateCriteria AND ppp.$incrementalUpdateCriteria AND "
-                    + "pcv.$incrementalUpdateCriteria AND pcv.characteristic.$incrementalUpdateCriteria AND "
-                    + "pcv.characteristicValue.$incrementalUpdateCriteria) ")
-            + "and pcv.characteristic.active = 'Y' " + "order by pcv.id");
+                    + "pcv.$incrementalUpdateCriteria AND characteristic.$incrementalUpdateCriteria AND "
+                    + "characteristicValue.$incrementalUpdateCriteria) ")
+            + "and characteristic.active = 'Y' " + "order by pcv.id");
     return hqlQueries;
   }
 }
diff --git a/src/org/openbravo/retail/posterminal/master/ProductCharacteristicValueProperties.java b/src/org/openbravo/retail/posterminal/master/ProductCharacteristicValueProperties.java
--- a/src/org/openbravo/retail/posterminal/master/ProductCharacteristicValueProperties.java
+++ b/src/org/openbravo/retail/posterminal/master/ProductCharacteristicValueProperties.java
@@ -24,12 +24,12 @@
       private static final long serialVersionUID = 1L;
       {
         add(new HQLProperty("pcv.id", "id"));
-        add(new HQLProperty("pcv.product.id", "product"));
-        add(new HQLProperty("pcv.characteristic.id", "characteristic"));
-        add(new HQLProperty("pcv.characteristicValue.id", "characteristicValue"));
-        add(new HQLProperty("pcv.characteristic.name", "_identifier"));
-        add(new HQLProperty("pcv.characteristic.active", "active"));
-        add(new HQLProperty("pcv.characteristic.obposFilteronwebpos", "obposFilteronwebpos"));
+        add(new HQLProperty("product.id", "product"));
+        add(new HQLProperty("characteristic.id", "characteristic"));
+        add(new HQLProperty("characteristic.name", "_identifier"));
+        add(new HQLProperty("characteristic.active", "active"));
+        add(new HQLProperty("characteristic.obposFilteronwebpos", "obposFilteronwebpos"));
+        add(new HQLProperty("characteristicValue.id", "characteristicValue"));
       }
     };
     return list;