0035382: Characteristic treenode information is redundant in remote mode for products

diff --git a/src/org/openbravo/retail/posterminal/master/CharacteristicValue.java b/src/org/openbravo/retail/posterminal/master/CharacteristicValue.java
--- a/src/org/openbravo/retail/posterminal/master/CharacteristicValue.java
+++ b/src/org/openbravo/retail/posterminal/master/CharacteristicValue.java
@@ -60,7 +60,6 @@
     List<String> hqlQueries = new ArrayList<String>();
     HQLPropertyList regularProductsChValueHQLProperties = ModelExtensionUtils
         .getPropertyExtensions(extensions);
-    String assortmentFilter = "";
     String orgId = OBContext.getOBContext().getCurrentOrganization().getId();
     final OBRETCOProductList productList = POSUtils.getProductListByOrgId(orgId);
     boolean isRemote = false;
@@ -75,20 +74,32 @@
       OBContext.restorePreviousMode();
     }
     if (!isRemote) {
-      assortmentFilter = "exists (select 1 from  ProductCharacteristicValue pcv, OBRETCO_Prol_Product assort  "
-          + " where pcv.characteristicValue.id=cv.id "
-          + " and pcv.product.id= assort.product.id "
-          + " and assort.obretcoProductlist.id= '" + productList.getId() + "' ) and ";
+      hqlQueries
+          .add("select"
+              + regularProductsChValueHQLProperties.getHqlSelect()
+              + "from CharacteristicValue cv, ADTreeNode node "
+              + "where cv.characteristic.tree =  node.tree and cv.id = node.node and  $filtersCriteria AND $hqlCriteria "
+              + "and cv.characteristic.obposUseonwebpos = true  and "
+              + "exists (select 1 from  ProductCharacteristicValue pcv, OBRETCO_Prol_Product assort  "
+              + " where pcv.characteristicValue.id=cv.id "
+              + " and pcv.product.id= assort.product.id "
+              + " and assort.obretcoProductlist.id= '"
+              + productList.getId()
+              + "' ) and "
+              + " cv.$naturalOrgCriteria and cv.$readableSimpleClientCriteria and (cv.$incrementalUpdateCriteria) "
+              + "order by cv.name, cv.id");
+
+    } else {
+      hqlQueries
+          .add("select"
+              + regularProductsChValueHQLProperties.getHqlSelect()
+              + "from CharacteristicValue cv "
+              + "where $filtersCriteria AND $hqlCriteria "
+              + "and cv.characteristic.obposUseonwebpos = true  and "
+              + " cv.$naturalOrgCriteria and cv.$readableSimpleClientCriteria and (cv.$incrementalUpdateCriteria) "
+              + "order by cv.name, cv.id");
     }
-    hqlQueries
-        .add("select"
-            + regularProductsChValueHQLProperties.getHqlSelect()
-            + "from CharacteristicValue cv, ADTreeNode node "
-            + "where cv.characteristic.tree =  node.tree and cv.id = node.node and  $filtersCriteria AND $hqlCriteria "
-            + "and cv.characteristic.obposUseonwebpos = true  and "
-            + assortmentFilter
-            + " cv.$naturalOrgCriteria and cv.$readableSimpleClientCriteria and (cv.$incrementalUpdateCriteria) "
-            + "order by cv.name, cv.id");
+
     return hqlQueries;
   }
 }
diff --git a/src/org/openbravo/retail/posterminal/master/CharacteristicValueProperties.java b/src/org/openbravo/retail/posterminal/master/CharacteristicValueProperties.java
--- a/src/org/openbravo/retail/posterminal/master/CharacteristicValueProperties.java
+++ b/src/org/openbravo/retail/posterminal/master/CharacteristicValueProperties.java
@@ -12,6 +12,8 @@
 import java.util.List;
 
 import org.openbravo.client.kernel.ComponentProvider.Qualifier;
+import org.openbravo.dal.core.OBContext;
+import org.openbravo.erpCommon.businessUtility.Preferences;
 import org.openbravo.mobile.core.model.HQLProperty;
 import org.openbravo.mobile.core.model.ModelExtension;
 
@@ -20,17 +22,32 @@
 
   @Override
   public List<HQLProperty> getHQLProperties(Object params) {
-    ArrayList<HQLProperty> list = new ArrayList<HQLProperty>() {
-      private static final long serialVersionUID = 1L;
-      {
-        add(new HQLProperty("cv.id", "id"));
-        add(new HQLProperty("cv.name", "name"));
-        add(new HQLProperty("cv.characteristic.id", "characteristic_id"));
-        add(new HQLProperty("node.reportSet", "parent"));
-        add(new HQLProperty("cv.name", "_identifier"));
-        add(new HQLProperty("cv.active", "active"));
-      }
-    };
+
+    ArrayList<HQLProperty> list = null;
+    try {
+      list = new ArrayList<HQLProperty>() {
+        private static final long serialVersionUID = 1L;
+        {
+
+          add(new HQLProperty("cv.id", "id"));
+          add(new HQLProperty("cv.name", "name"));
+          add(new HQLProperty("cv.characteristic.id", "characteristic_id"));
+          boolean isRemote = false;
+          isRemote = "Y".equals(Preferences.getPreferenceValue("OBPOS_remote.product", true,
+              OBContext.getOBContext().getCurrentClient(), OBContext.getOBContext()
+                  .getCurrentOrganization(), OBContext.getOBContext().getUser(), OBContext
+                  .getOBContext().getRole(), null));
+          if (!isRemote) {
+            add(new HQLProperty("node.reportSet", "parent"));
+
+          }
+          add(new HQLProperty("cv.name", "_identifier"));
+          add(new HQLProperty("cv.active", "active"));
+        }
+      };
+    } catch (org.openbravo.erpCommon.utility.PropertyException e) {
+      e.printStackTrace();
+    }
     return list;
   }