Attached Files | mobileCore.diff [^] (4,098 bytes) 2015-06-26 11:53 [Show Content] [Hide Content]diff --git a/web/org.openbravo.mobile.core/source/retail/component/ob-retail-searchproductcharacteristic.js b/web/org.openbravo.mobile.core/source/retail/component/ob-retail-searchproductcharacteristic.js
--- a/web/org.openbravo.mobile.core/source/retail/component/ob-retail-searchproductcharacteristic.js
+++ b/web/org.openbravo.mobile.core/source/retail/component/ob-retail-searchproductcharacteristic.js
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2012-2014 Openbravo SLU
+ * All portions are Copyright (C) 2012-2015 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -739,7 +739,7 @@
}, this);
OB.Dal.find(OB.Model.ProductCategory, null, successCallbackCategories, errorCallback, this);
- OB.Dal.query(OB.Model.ProductCharacteristic, 'select distinct(characteristic_id), _identifier from m_product_ch order by UPPER(_identifier) asc', [], successCallbackProductCh, errorCallback, this);
+ OB.Dal.query(OB.Model.ProductCharacteristic, 'select distinct(characteristic_id), _identifier from m_product_ch where obposFilteronwebpos = "true" order by UPPER(_identifier) asc', [], successCallbackProductCh, errorCallback, this);
},
receiptChanged: function () {
this.receipt.on('clear', function () {
@@ -823,7 +823,7 @@
for (i = 1; i < me.model.get('filter').length; i++) {
filterWhereClause = filterWhereClause + ' or prod_ch.characteristic_id in (' + "'" + me.model.get('filter')[i].characteristic_id + "'" + ')';
}
- OB.Dal.query(OB.Model.ProductCharacteristic, 'select distinct(characteristic_id), _identifier from m_product_ch as prod_ch where 1=1' + filterWhereClause + ' order by UPPER(_identifier) asc', [], function (dataProdCh) {
+ OB.Dal.query(OB.Model.ProductCharacteristic, 'select distinct(characteristic_id), _identifier from m_product_ch as prod_ch where obposFilteronwebpos = "true" and 1=1' + filterWhereClause + ' order by UPPER(_identifier) asc', [], function (dataProdCh) {
if (dataProdCh && dataProdCh.length > 0) {
for (i = 0; i < dataProdCh.length; i++) {
dataProdCh.models[i].set('filtering', true);
@@ -896,11 +896,11 @@
}
if (!inEvent.skipProductCharacteristic) {
if (this.model.get('filter').length > 0) {
- OB.Dal.query(OB.Model.ProductCharacteristic, 'select distinct(characteristic_id), _identifier from m_product_ch as prod_ch where exists (select * from m_product as product where 1=1 ' + filterWhereClause + ' and prod_ch.m_product = product.m_product_id) order by UPPER(_identifier) asc', [], successCallbackProductCh, errorCallback, this);
+ OB.Dal.query(OB.Model.ProductCharacteristic, 'select distinct(characteristic_id), _identifier from m_product_ch as prod_ch where exists (select * from m_product as product where 1=1 ' + filterWhereClause + ' and prod_ch.m_product = product.m_product_id) and obposFilteronwebpos = "true" order by UPPER(_identifier) asc', [], successCallbackProductCh, errorCallback, this);
} else {
- OB.Dal.query(OB.Model.ProductCharacteristic, 'select distinct(characteristic_id), _identifier from m_product_ch as prod_ch where exists (select * from m_product as product' + this.whereClause + filterWhereClause + ' and prod_ch.m_product = product.m_product_id) order by UPPER(_identifier) asc', customParams, successCallbackProductCh, errorCallback, this);
+ OB.Dal.query(OB.Model.ProductCharacteristic, 'select distinct(characteristic_id), _identifier from m_product_ch as prod_ch where exists (select * from m_product as product' + this.whereClause + filterWhereClause + ' and prod_ch.m_product = product.m_product_id) and obposFilteronwebpos = "true" order by UPPER(_identifier) asc', customParams, successCallbackProductCh, errorCallback, this);
}
}
}
-});
\ No newline at end of file
+});
posterminal.diff [^] (10,941 bytes) 2015-06-26 11:53 [Show Content] [Hide Content]diff --git a/src-db/database/model/modifiedTables/M_CHARACTERISTIC.xml b/src-db/database/model/modifiedTables/M_CHARACTERISTIC.xml
new file mode 100644
--- /dev/null
+++ b/src-db/database/model/modifiedTables/M_CHARACTERISTIC.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+ <database name="MODIFIED TABLE M_CHARACTERISTIC">
+ <table name="M_CHARACTERISTIC" primaryKey="M_CHARACTERISTIC_KEY">
+ <column name="EM_OBPOS_FILTERONWEBPOS" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+ <default><![CDATA[Y]]></default>
+ <onCreateDefault><![CDATA['Y']]></onCreateDefault>
+ </column>
+ <check name="EM_OBPOS_FILTERONWEBPOS_CHECK"><![CDATA[EM_OBPOS_FILTERONWEBPOS IN ('Y', 'N')]]></check>
+ </table>
+ </database>
diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml
+++ b/src-db/database/sourcedata/AD_COLUMN.xml
@@ -3004,6 +3004,42 @@
<!--46370E0A4715482287843215D944F310--> <EM_OBUIAPP_PROCESS_ID><![CDATA[8CA536FCF9334FEB9C1A469CFC270346]]></EM_OBUIAPP_PROCESS_ID>
<!--46370E0A4715482287843215D944F310--></AD_COLUMN>
+<!--46D1ED5041614C7C90D3532B2D06467A--><AD_COLUMN>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <AD_COLUMN_ID><![CDATA[46D1ED5041614C7C90D3532B2D06467A]]></AD_COLUMN_ID>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <NAME><![CDATA[EM_Obpos_Filteronwebpos]]></NAME>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <DESCRIPTION><![CDATA[Show the filter of this Product Characteristic on WebPOS]]></DESCRIPTION>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <HELP><![CDATA[Show the filter of this Product Characteristic on WebPOS]]></HELP>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <COLUMNNAME><![CDATA[EM_Obpos_Filteronwebpos]]></COLUMNNAME>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <AD_TABLE_ID><![CDATA[91C26DEA4B3D4C05B4F277D009220872]]></AD_TABLE_ID>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <SEQNO><![CDATA[180]]></SEQNO>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <AD_ELEMENT_ID><![CDATA[1E72DF8B748044249655A34DF43E9104]]></AD_ELEMENT_ID>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <POSITION><![CDATA[14]]></POSITION>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--46D1ED5041614C7C90D3532B2D06467A--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--46D1ED5041614C7C90D3532B2D06467A--></AD_COLUMN>
+
<!--47D0B7DC253C40A8B2D94D5243E5B996--><AD_COLUMN>
<!--47D0B7DC253C40A8B2D94D5243E5B996--> <AD_COLUMN_ID><![CDATA[47D0B7DC253C40A8B2D94D5243E5B996]]></AD_COLUMN_ID>
<!--47D0B7DC253C40A8B2D94D5243E5B996--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_ELEMENT.xml b/src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml
@@ -156,6 +156,20 @@
<!--1E5C1F5D43FF4ABE8ED353EB1BC04B60--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
<!--1E5C1F5D43FF4ABE8ED353EB1BC04B60--></AD_ELEMENT>
+<!--1E72DF8B748044249655A34DF43E9104--><AD_ELEMENT>
+<!--1E72DF8B748044249655A34DF43E9104--> <AD_ELEMENT_ID><![CDATA[1E72DF8B748044249655A34DF43E9104]]></AD_ELEMENT_ID>
+<!--1E72DF8B748044249655A34DF43E9104--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1E72DF8B748044249655A34DF43E9104--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1E72DF8B748044249655A34DF43E9104--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1E72DF8B748044249655A34DF43E9104--> <COLUMNNAME><![CDATA[EM_Obpos_Filteronwebpos]]></COLUMNNAME>
+<!--1E72DF8B748044249655A34DF43E9104--> <NAME><![CDATA[Filter on WebPOS]]></NAME>
+<!--1E72DF8B748044249655A34DF43E9104--> <PRINTNAME><![CDATA[Filter on WebPOS]]></PRINTNAME>
+<!--1E72DF8B748044249655A34DF43E9104--> <DESCRIPTION><![CDATA[Show the filter of this Product Characteristic on WebPOS]]></DESCRIPTION>
+<!--1E72DF8B748044249655A34DF43E9104--> <HELP><![CDATA[Show the filter of this Product Characteristic on WebPOS]]></HELP>
+<!--1E72DF8B748044249655A34DF43E9104--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--1E72DF8B748044249655A34DF43E9104--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--1E72DF8B748044249655A34DF43E9104--></AD_ELEMENT>
+
<!--21C6A21A85304F5B888D055BFC57DA52--><AD_ELEMENT>
<!--21C6A21A85304F5B888D055BFC57DA52--> <AD_ELEMENT_ID><![CDATA[21C6A21A85304F5B888D055BFC57DA52]]></AD_ELEMENT_ID>
<!--21C6A21A85304F5B888D055BFC57DA52--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_FIELD.xml b/src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml
+++ b/src-db/database/sourcedata/AD_FIELD.xml
@@ -198,6 +198,34 @@
<!--0449283D04764658A9CBC65BBB4ACD93--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--0449283D04764658A9CBC65BBB4ACD93--></AD_FIELD>
+<!--063F106C81E64782BDC88D55E983D282--><AD_FIELD>
+<!--063F106C81E64782BDC88D55E983D282--> <AD_FIELD_ID><![CDATA[063F106C81E64782BDC88D55E983D282]]></AD_FIELD_ID>
+<!--063F106C81E64782BDC88D55E983D282--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--063F106C81E64782BDC88D55E983D282--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--063F106C81E64782BDC88D55E983D282--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--063F106C81E64782BDC88D55E983D282--> <NAME><![CDATA[Filter on WebPOS]]></NAME>
+<!--063F106C81E64782BDC88D55E983D282--> <DESCRIPTION><![CDATA[Show the filter of this Product Characteristic on WebPOS]]></DESCRIPTION>
+<!--063F106C81E64782BDC88D55E983D282--> <HELP><![CDATA[Show the filter of this Product Characteristic on WebPOS]]></HELP>
+<!--063F106C81E64782BDC88D55E983D282--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--063F106C81E64782BDC88D55E983D282--> <AD_TAB_ID><![CDATA[A661A0A05DCD4650BCB14B010C87F0AA]]></AD_TAB_ID>
+<!--063F106C81E64782BDC88D55E983D282--> <AD_COLUMN_ID><![CDATA[46D1ED5041614C7C90D3532B2D06467A]]></AD_COLUMN_ID>
+<!--063F106C81E64782BDC88D55E983D282--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--063F106C81E64782BDC88D55E983D282--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--063F106C81E64782BDC88D55E983D282--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--063F106C81E64782BDC88D55E983D282--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--063F106C81E64782BDC88D55E983D282--> <SEQNO><![CDATA[55]]></SEQNO>
+<!--063F106C81E64782BDC88D55E983D282--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--063F106C81E64782BDC88D55E983D282--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--063F106C81E64782BDC88D55E983D282--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--063F106C81E64782BDC88D55E983D282--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--063F106C81E64782BDC88D55E983D282--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--063F106C81E64782BDC88D55E983D282--> <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--063F106C81E64782BDC88D55E983D282--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--063F106C81E64782BDC88D55E983D282--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--063F106C81E64782BDC88D55E983D282--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--063F106C81E64782BDC88D55E983D282--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--063F106C81E64782BDC88D55E983D282--></AD_FIELD>
+
<!--06EFA280DC5E49D29CF0F2E93B124181--><AD_FIELD>
<!--06EFA280DC5E49D29CF0F2E93B124181--> <AD_FIELD_ID><![CDATA[06EFA280DC5E49D29CF0F2E93B124181]]></AD_FIELD_ID>
<!--06EFA280DC5E49D29CF0F2E93B124181--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src/org/openbravo/retail/posterminal/master/ProductCharacteristicProperties.java b/src/org/openbravo/retail/posterminal/master/ProductCharacteristicProperties.java
--- a/src/org/openbravo/retail/posterminal/master/ProductCharacteristicProperties.java
+++ b/src/org/openbravo/retail/posterminal/master/ProductCharacteristicProperties.java
@@ -21,6 +21,7 @@
add(new HQLProperty("pcv.characteristic.name", "characteristic"));
add(new HQLProperty("pcv.characteristicValue.id", "ch_value_id"));
add(new HQLProperty("pcv.characteristicValue.name", "ch_value"));
+ add(new HQLProperty("pcv.characteristic.obposFilteronwebpos", "obposFilteronwebpos"));
add(new HQLProperty("pcv.characteristic.name", "_identifier"));
add(new HQLProperty("pcv.characteristic.active", "active"));
}
diff --git a/web/org.openbravo.retail.posterminal/js/model/productcharacteristic.js b/web/org.openbravo.retail.posterminal/js/model/productcharacteristic.js
--- a/web/org.openbravo.retail.posterminal/js/model/productcharacteristic.js
+++ b/web/org.openbravo.retail.posterminal/js/model/productcharacteristic.js
@@ -48,7 +48,11 @@
name: '_identifier',
column: '_identifier',
type: 'TEXT'
+ }, {
+ name: 'obposFilteronwebpos',
+ column: 'obposFilteronwebpos',
+ type: 'TEXT'
}]);
OB.Data.Registry.registerModel(ProductCharacteristic);
-}());
\ No newline at end of file
+}());
|