0038231: Product Master Data Loading is very slow having configured org.openbravo.financial.multitaxcategory module

diff --git a/src/org/openbravo/retail/posterminal/master/ProductProperties.java b/src/org/openbravo/retail/posterminal/master/ProductProperties.java
--- a/src/org/openbravo/retail/posterminal/master/ProductProperties.java
+++ b/src/org/openbravo/retail/posterminal/master/ProductProperties.java
@@ -20,7 +20,7 @@
 import org.hibernate.dialect.function.StandardSQLFunction;
 import org.hibernate.impl.SessionFactoryImpl;
 import org.hibernate.impl.SessionImpl;
-import org.hibernate.type.StringType;
+import org.hibernate.type.IntegerType;
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.model.Entity;
 import org.openbravo.base.model.ModelProvider;
@@ -193,17 +193,17 @@
       // Build Product Tax Category select clause
       final Dialect dialect = ((SessionFactoryImpl) ((SessionImpl) OBDal.getInstance().getSession())
           .getSessionFactory()).getDialect();
-      Map<String, SQLFunction> function = dialect.getFunctions();
-      if (!function.containsKey("c_get_product_taxcategory")) {
-        dialect.getFunctions().put("c_get_product_taxcategory",
-            new StandardSQLFunction("c_get_product_taxcategory", new StringType()));
+      Map<String, SQLFunction> functions = dialect.getFunctions();
+      if (!functions.containsKey("ad_isorgincluded")) {
+        dialect.getFunctions().put("ad_isorgincluded",
+            new StandardSQLFunction("ad_isorgincluded", new IntegerType()));
       }
-      StringBuffer taxCategoryQry = new StringBuffer();
-      taxCategoryQry.append("c_get_product_taxcategory(product.id, '");
-      taxCategoryQry.append(posDetail.getOrganization().getId());
-      // Date, shipfrom and shipto as null
-      taxCategoryQry.append("', null, null, null)");
-      final String strTaxCategoryQry = taxCategoryQry.toString();
+      final String strTaxCategoryQry = "COALESCE((SELECT opt1.taxCategory.id FROM OBFMTC_Product_TaxCategory opt1 " //
+          + "WHERE opt1.product.id = product.id " //
+          + "AND ad_isorgincluded(product.organization.id, opt1.organization.id, product.client.id) = (" //
+          + "SELECT MIN(ad_isorgincluded(product.organization.id, opt2.organization.id, product.client.id)) " //
+          + "FROM OBFMTC_Product_TaxCategory opt2 WHERE opt2.product.id = product.id)), product.taxCategory.id)"; //
+
       list.add(new HQLProperty(strTaxCategoryQry, "taxCategory"));
 
     } catch (PropertyException e) {