0032609: Generic products are not shown in Browse tab

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
@@ -94,7 +94,8 @@
           add(new HQLProperty("ppp.algorithm", "algorithm"));
         }
         add(new HQLProperty(
-            "case when product.active = 'Y' then pli.active else product.active end", "active"));
+            "case when product.active = 'Y' and pli.active is not null then pli.active else product.active end",
+            "active"));
       }
     });
 
diff --git a/web/org.openbravo.retail.posterminal/js/components/renderproduct.js b/web/org.openbravo.retail.posterminal/js/components/renderproduct.js
--- a/web/org.openbravo.retail.posterminal/js/components/renderproduct.js
+++ b/web/org.openbravo.retail.posterminal/js/components/renderproduct.js
@@ -1,6 +1,6 @@
 /*
  ************************************************************************************
- * Copyright (C) 2012-2015 Openbravo S.L.U.
+ * Copyright (C) 2012-2016 Openbravo S.L.U.
  * Licensed under the Openbravo Commercial License version 1.0
  * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
  * or in the legal folder of this module distribution.
@@ -68,7 +68,7 @@
     style: 'clear:both;'
   }, {
     name: 'generic',
-    style: 'float: right; width: 20%; text-align: right; font-style: italic; color: grey; padding: 15px; font-weight: bold;',
+    style: 'float: right; width: 30%; text-align: right; font-style: italic; color: grey; font-weight: bold;',
     showing: false
   }, {
     style: 'clear:both;'

diff --git a/web/org.openbravo.mobile.core/source/data/ob-dal.js b/web/org.openbravo.mobile.core/source/data/ob-dal.js
--- a/web/org.openbravo.mobile.core/source/data/ob-dal.js
+++ b/web/org.openbravo.mobile.core/source/data/ob-dal.js
@@ -1441,7 +1441,7 @@
         values.push(_idx);
         if (incremental) {
           updateRecord(tx, model, values, item.active);
-        } else if (_.isUndefined(item.active) || (item.active && item.active === true)) {
+        } else if (OB.UTIL.isNullOrUndefined(item.active) || (item.active && item.active === true)) {
           tx.executeSql(insertStatement, values, null, handleError);
         }
         _idx++;