0035363: Product characteristics and product characteritics values are not taking into account upc/ean field

diff -r 2c8cab04b0b6 src/org/openbravo/retail/bestsellers/PCharacteristicBestSellerHQLCriteria.java
--- a/src/org/openbravo/retail/bestsellers/PCharacteristicBestSellerHQLCriteria.java	Tue Nov 08 16:45:13 2016 +0100
+++ b/src/org/openbravo/retail/bestsellers/PCharacteristicBestSellerHQLCriteria.java	Mon Feb 27 12:21:56 2017 +0100
@@ -46,12 +46,12 @@
             + posDetail.getObposTerminaltype().getId()
             + "'and bstptt.obretcoProlProduct = pli "
             + " and bstptt.id is not null"
-            + " and upper(pchv.product.name) like upper('$1') and pli.obretcoProductlist.id='"
+            + " and (upper(pchv.product.name) like upper('$1') or upper(pchv.product.uPCEAN) like upper('$1')) and pli.obretcoProductlist.id='"
             + productList.getId() + "'";
       } else {
         sql = " exists (select 1 from ProductCharacteristicValue as pchv, OBRETCO_Prol_Product pli "
             + "where pchv.product.id=pli.product.id and ch.id = pchv.characteristic.id "
-            + "and pli.bestseller = true and upper(pchv.product.name) like upper('$1') and pli.obretcoProductlist.id='"
+            + "and pli.bestseller = true and (upper(pchv.product.name) like upper('$1') or upper(pchv.product.uPCEAN) like upper('$1')) and pli.obretcoProductlist.id='"
             + productList.getId() + "' ";
       }
     } finally {
diff -r 2c8cab04b0b6 src/org/openbravo/retail/bestsellers/PCharacteristicValueBestSellerHQLCriteria.java
--- a/src/org/openbravo/retail/bestsellers/PCharacteristicValueBestSellerHQLCriteria.java	Tue Nov 08 16:45:13 2016 +0100
+++ b/src/org/openbravo/retail/bestsellers/PCharacteristicValueBestSellerHQLCriteria.java	Mon Feb 27 12:21:56 2017 +0100
@@ -46,7 +46,7 @@
             + posDetail.getObposTerminaltype().getId()
             + "'and bstptt.obretcoProlProduct = pli "
             + " and bstptt.id is not null"
-            + "  and upper(pchv.product.name) like upper('$1') and pli.obretcoProductlist.id='"
+            + "  and (upper(pchv.product.name) like upper('$1') or upper(pchv.product.uPCEAN) like upper('$1')) and pli.obretcoProductlist.id='"
             + productList.getId() + "'";
       } else {
         sql = " exists (select 1 from ProductCharacteristicValue as pchv , OBRETCO_Prol_Product pli "
@@ -55,7 +55,7 @@
             + "           and pli.bestseller = true and pli.obretcoProductlist.id='"
             + productList.getId()
             + "'"
-            + "           and upper(pchv.product.name) like upper('$1') ";
+            + "           and (upper(pchv.product.name) like upper('$1') or upper(pchv.product.uPCEAN) like upper('$1')) ";
 
       }
     } finally {

diff -r 2bfdda380c80 src/org/openbravo/retail/posterminal/PCharacteristicHQLCriteria.java
--- a/src/org/openbravo/retail/posterminal/PCharacteristicHQLCriteria.java	Tue Feb 07 16:47:27 2017 +0100
+++ b/src/org/openbravo/retail/posterminal/PCharacteristicHQLCriteria.java	Mon Feb 27 11:24:12 2017 +0100
@@ -59,7 +59,8 @@
     return " exists (select 1 from ProductCharacteristicValue as pchv , OBRETCO_Prol_Product pli "
         + "where ch.id = pchv.characteristic.id "
         + "and pchv.product.id= pli.product.id  and   pli.obretcoProductlist.id='"
-        + productList.getId() + "' and upper(pchv.product.name) like upper('$1')  ";
+        + productList.getId()
+        + "' and (upper(pchv.product.name) like upper('$1') or upper(pchv.product.uPCEAN) like upper('$1'))  ";
   }
 
   public String getProdCategoryQuery() {
@@ -69,7 +70,7 @@
         + "where ch.id = pchv.characteristic.id "
         + "and pchv.product.id= pli.product.id  and   pli.obretcoProductlist.id='"
         + productList.getId()
-        + "' and upper(pchv.product.name) like upper('$1') and pchv.product.productCategory.id in ( '$2')  ";
+        + "' and (upper(pchv.product.name) like upper('$1') or upper(pchv.product.uPCEAN) like upper('$1')) and pchv.product.productCategory.id in ( '$2')  ";
   }
 
   public String getBestsellers() {
diff -r 2bfdda380c80 src/org/openbravo/retail/posterminal/ProductCharacteristicHQLCriteria.java
--- a/src/org/openbravo/retail/posterminal/ProductCharacteristicHQLCriteria.java	Tue Feb 07 16:47:27 2017 +0100
+++ b/src/org/openbravo/retail/posterminal/ProductCharacteristicHQLCriteria.java	Mon Feb 27 11:24:12 2017 +0100
@@ -61,8 +61,9 @@
     final OBRETCOProductList productList = POSUtils.getProductListByOrgId(orgId);
     return "   exists (select 1 from ProductCharacteristicValue as pchv , OBRETCO_Prol_Product pli"
         + " where pchv.product.id=pli.product.id and cv.characteristic = pchv.characteristic and cv.id = pchv.characteristicValue.id "
-        + " and pli.obretcoProductlist.id='" + productList.getId()
-        + "' and upper(pchv.product.name) like upper('$1') ";
+        + " and pli.obretcoProductlist.id='"
+        + productList.getId()
+        + "' and (upper(pchv.product.name) like upper('$1') or upper(pchv.product.uPCEAN) like upper('$1')) ";
   }
 
   public String getProdCategoryQuery() {
@@ -72,7 +73,7 @@
         + " where pchv.product.id=pli.product.id and cv.characteristic = pchv.characteristic and  cv.id = pchv.characteristicValue.id"
         + " and pli.obretcoProductlist.id='"
         + productList.getId()
-        + "' and upper(pchv.product.name) like upper('$1') and pchv.product.productCategory.id in ('$2') ";
+        + "' and (upper(pchv.product.name) like upper('$1') or upper(pchv.product.uPCEAN) like upper('$1')) and pchv.product.productCategory.id in ('$2') ";
   }
 
   public String getBestsellers() {
@@ -81,7 +82,9 @@
     return "  exists (select 1 from ProductCharacteristicValue as pchv , OBRETCO_Prol_Product pli "
         + " where pchv.product.id=pli.product.id "
         + " and cv.characteristic = pchv.characteristic and cv.id = pchv.characteristicValue.id and pli.bestseller = true and pli.obretcoProductlist.id = '"
-        + productList.getId() + "' " + " and upper(pchv.product.name) like upper('$1') ";
+        + productList.getId()
+        + "' "
+        + " and (upper(pchv.product.name) like upper('$1') or upper(pchv.product.uPCEAN) like upper('$1')) ";
   }
 
   public String getCharacteristics(String params) {