0029779: Allow a discount and promotion to be defined to be used at webpos,backend or both

Description

Add a combo on the discounts and promotion window to be able to define it to be used on webpos, backend or in both cases.

For that the m_promotion_calculate functions is needed to be modified to exclude the promotions not defined to be applied on the backend.

On the webpos only the discounts that applied for webpos or backend are download to the local database.

Steps To Reproduce

n/a

Proposed Solution

The combo promotion does not work well with the diff attached.
That will raise and error if the combo has not been defined on the backend to be used on webpos (or both)

Tags

Contribution

Attached Files

core3.diff [^] (47,702 bytes) 2015-05-05 16:15 [Show Content] [Hide Content]

diff -ru openbravo_orig/src-db/database/model/functions/M_PROMOTION_CALCULATE.xml openbravo/src-db/database/model/functions/M_PROMOTION_CALCULATE.xml
--- openbravo_orig/src-db/database/model/functions/M_PROMOTION_CALCULATE.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/model/functions/M_PROMOTION_CALCULATE.xml	2015-03-02 10:53:48.959932167 +0100
@@ -312,6 +312,7 @@
             AND m_isparent_ch_value(V.M_CH_VALUE_ID, C.M_CH_VALUE_ID, C.M_CHARACTERISTIC_ID) <> -1
           ))
           )
+	AND M_OFFER.loadInBackoffice = 'Y'
         ORDER BY PRIORITY,
           M_OFFER_ID
         )
diff -ru openbravo_orig/src-db/database/model/tables/AD_MODULE_INSTALL.xml openbravo/src-db/database/model/tables/AD_MODULE_INSTALL.xml
--- openbravo_orig/src-db/database/model/tables/AD_MODULE_INSTALL.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/model/tables/AD_MODULE_INSTALL.xml	2015-03-02 10:53:43.879932204 +0100
@@ -172,8 +172,8 @@
       <check name="AD_MODULE_INS_APPLYCFG_CHK"><![CDATA[ISCONFIGSCRIPTAPPLIED IN ('Y', 'N')]]></check>
       <check name="AD_MODULE_INS_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="AD_MODULE_INS_ISREGISTERED_CHK"><![CDATA[ISREGISTERED IN ('Y', 'N')]]></check>
-      <check name="AD_MODULE_INS_TYPE_CHK"><![CDATA[TYPE IN ('M', 'P', 'T')]]></check>
       <check name="AD_MODULE_INSTALL_FFT_CHK"><![CDATA[ISTRIALALLOWED IN ('Y', 'N')]]></check>
       <check name="AD_MODULE_INSTALL_ISDEFAUL_CHK"><![CDATA[(ISDEFAULT = 'N') OR ((ISDEFAULT = 'Y') AND (ISINDEVELOPMENT = 'Y'))]]></check>
+      <check name="AD_MODULE_INS_TYPE_CHK"><![CDATA[TYPE IN ('M', 'P', 'T')]]></check>
     </table>
   </database>
diff -ru openbravo_orig/src-db/database/model/tables/M_OFFER.xml openbravo/src-db/database/model/tables/M_OFFER.xml
--- openbravo_orig/src-db/database/model/tables/M_OFFER.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/model/tables/M_OFFER.xml	2015-03-02 10:53:46.587932185 +0100
@@ -121,6 +121,14 @@
         <default><![CDATA[Y]]></default>
         <onCreateDefault><![CDATA['Y']]></onCreateDefault>
       </column>
+      <column name="LOADINWEBPOS" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="LOADINBACKOFFICE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="M_OFFER_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_AUXILIARINPUT.xml openbravo/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
--- openbravo_orig/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	2015-03-02 10:54:22.503931920 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--6--><AD_AUXILIARINPUT>
 <!--6-->  <AD_AUXILIARINPUT_ID><![CDATA[6]]></AD_AUXILIARINPUT_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_CALLOUT.xml openbravo/src-db/database/sourcedata/AD_CALLOUT.xml
--- openbravo_orig/src-db/database/sourcedata/AD_CALLOUT.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_CALLOUT.xml	2015-03-02 10:54:23.527931912 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--102--><AD_CALLOUT>
 <!--102-->  <AD_CALLOUT_ID><![CDATA[102]]></AD_CALLOUT_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_COLUMN.xml openbravo/src-db/database/sourcedata/AD_COLUMN.xml
--- openbravo_orig/src-db/database/sourcedata/AD_COLUMN.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_COLUMN.xml	2015-03-02 10:55:06.771931594 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--100--><AD_COLUMN>
 <!--100-->  <AD_COLUMN_ID><![CDATA[100]]></AD_COLUMN_ID>
@@ -332171,6 +332171,40 @@
 <!--E644E732A207448EAB7CBE80D616AB6F-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--E644E732A207448EAB7CBE80D616AB6F--></AD_COLUMN>
 
+<!--E64EF53C053041328AACD10E18732B2F--><AD_COLUMN>
+<!--E64EF53C053041328AACD10E18732B2F-->  <AD_COLUMN_ID><![CDATA[E64EF53C053041328AACD10E18732B2F]]></AD_COLUMN_ID>
+<!--E64EF53C053041328AACD10E18732B2F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E64EF53C053041328AACD10E18732B2F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E64EF53C053041328AACD10E18732B2F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E64EF53C053041328AACD10E18732B2F-->  <NAME><![CDATA[Load in Web POS]]></NAME>
+<!--E64EF53C053041328AACD10E18732B2F-->  <COLUMNNAME><![CDATA[Loadinwebpos]]></COLUMNNAME>
+<!--E64EF53C053041328AACD10E18732B2F-->  <AD_TABLE_ID><![CDATA[800062]]></AD_TABLE_ID>
+<!--E64EF53C053041328AACD10E18732B2F-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--E64EF53C053041328AACD10E18732B2F-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--E64EF53C053041328AACD10E18732B2F-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--E64EF53C053041328AACD10E18732B2F-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--E64EF53C053041328AACD10E18732B2F-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--E64EF53C053041328AACD10E18732B2F-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--E64EF53C053041328AACD10E18732B2F-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--E64EF53C053041328AACD10E18732B2F-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--E64EF53C053041328AACD10E18732B2F-->  <SEQNO><![CDATA[560]]></SEQNO>
+<!--E64EF53C053041328AACD10E18732B2F-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--E64EF53C053041328AACD10E18732B2F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E64EF53C053041328AACD10E18732B2F-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--E64EF53C053041328AACD10E18732B2F-->  <AD_ELEMENT_ID><![CDATA[8F12ECC4FEC54B1D84AD08F4BFE77990]]></AD_ELEMENT_ID>
+<!--E64EF53C053041328AACD10E18732B2F-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--E64EF53C053041328AACD10E18732B2F-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--E64EF53C053041328AACD10E18732B2F-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--E64EF53C053041328AACD10E18732B2F-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--E64EF53C053041328AACD10E18732B2F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E64EF53C053041328AACD10E18732B2F-->  <POSITION><![CDATA[61]]></POSITION>
+<!--E64EF53C053041328AACD10E18732B2F-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--E64EF53C053041328AACD10E18732B2F-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--E64EF53C053041328AACD10E18732B2F-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--E64EF53C053041328AACD10E18732B2F-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--E64EF53C053041328AACD10E18732B2F-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--E64EF53C053041328AACD10E18732B2F--></AD_COLUMN>
+
 <!--E65B23843227486A99BAC4C2074C258C--><AD_COLUMN>
 <!--E65B23843227486A99BAC4C2074C258C-->  <AD_COLUMN_ID><![CDATA[E65B23843227486A99BAC4C2074C258C]]></AD_COLUMN_ID>
 <!--E65B23843227486A99BAC4C2074C258C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -334015,7 +334049,7 @@
 <!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--EDA2301E6E14420BBA6E6D35589B0824-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--EDA2301E6E14420BBA6E6D35589B0824-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--EDA2301E6E14420BBA6E6D35589B0824-->  <POSITION><![CDATA[43]]></POSITION>
+<!--EDA2301E6E14420BBA6E6D35589B0824-->  <POSITION><![CDATA[30]]></POSITION>
 <!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--EDA2301E6E14420BBA6E6D35589B0824-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--EDA2301E6E14420BBA6E6D35589B0824-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -336407,6 +336441,40 @@
 <!--F8318C7FBD7A4692A6B2F6D4D4413F94-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--F8318C7FBD7A4692A6B2F6D4D4413F94--></AD_COLUMN>
 
+<!--F867DC522EB146FA9BB5298830B66BC2--><AD_COLUMN>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <AD_COLUMN_ID><![CDATA[F867DC522EB146FA9BB5298830B66BC2]]></AD_COLUMN_ID>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <NAME><![CDATA[Load In Backoffice]]></NAME>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <COLUMNNAME><![CDATA[Loadinbackoffice]]></COLUMNNAME>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <AD_TABLE_ID><![CDATA[800062]]></AD_TABLE_ID>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <SEQNO><![CDATA[570]]></SEQNO>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <AD_ELEMENT_ID><![CDATA[87D6CF097F154203A66CC61F4E8389D2]]></AD_ELEMENT_ID>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <POSITION><![CDATA[62]]></POSITION>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--F867DC522EB146FA9BB5298830B66BC2-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--F867DC522EB146FA9BB5298830B66BC2--></AD_COLUMN>
+
 <!--F88552B627E048CCA995BEED4756BC9E--><AD_COLUMN>
 <!--F88552B627E048CCA995BEED4756BC9E-->  <AD_COLUMN_ID><![CDATA[F88552B627E048CCA995BEED4756BC9E]]></AD_COLUMN_ID>
 <!--F88552B627E048CCA995BEED4756BC9E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_DATASET_COLUMN.xml openbravo/src-db/database/sourcedata/AD_DATASET_COLUMN.xml
--- openbravo_orig/src-db/database/sourcedata/AD_DATASET_COLUMN.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_DATASET_COLUMN.xml	2015-03-02 10:54:24.855931903 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--00F9F94AA5D811DD9010001B388C61A4--><AD_DATASET_COLUMN>
 <!--00F9F94AA5D811DD9010001B388C61A4-->  <AD_DATASET_COLUMN_ID><![CDATA[00F9F94AA5D811DD9010001B388C61A4]]></AD_DATASET_COLUMN_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_DATASET_TABLE.xml openbravo/src-db/database/sourcedata/AD_DATASET_TABLE.xml
--- openbravo_orig/src-db/database/sourcedata/AD_DATASET_TABLE.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_DATASET_TABLE.xml	2015-03-02 10:54:23.387931913 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--0004648349C24CBB8BDE8127BBE35C99--><AD_DATASET_TABLE>
 <!--0004648349C24CBB8BDE8127BBE35C99-->  <AD_DATASET_TABLE_ID><![CDATA[0004648349C24CBB8BDE8127BBE35C99]]></AD_DATASET_TABLE_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_DATASET.xml openbravo/src-db/database/sourcedata/AD_DATASET.xml
--- openbravo_orig/src-db/database/sourcedata/AD_DATASET.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_DATASET.xml	2015-03-02 10:55:09.899931571 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--0--><AD_DATASET>
 <!--0-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_DIMENSION_MAPPING.xml openbravo/src-db/database/sourcedata/AD_DIMENSION_MAPPING.xml
--- openbravo_orig/src-db/database/sourcedata/AD_DIMENSION_MAPPING.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_DIMENSION_MAPPING.xml	2015-03-02 10:55:51.595931264 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--0019F8D373E848388A3B8D553B00F702--><AD_DIMENSION_MAPPING>
 <!--0019F8D373E848388A3B8D553B00F702-->  <AD_DIMENSION_MAPPING_ID><![CDATA[0019F8D373E848388A3B8D553B00F702]]></AD_DIMENSION_MAPPING_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_ELEMENT.xml openbravo/src-db/database/sourcedata/AD_ELEMENT.xml
--- openbravo_orig/src-db/database/sourcedata/AD_ELEMENT.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_ELEMENT.xml	2015-03-02 10:54:17.367931958 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--102--><AD_ELEMENT>
 <!--102-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
@@ -28472,6 +28472,18 @@
 <!--87C35496422E4C7CB9AE1C517E320017-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--87C35496422E4C7CB9AE1C517E320017--></AD_ELEMENT>
 
+<!--87D6CF097F154203A66CC61F4E8389D2--><AD_ELEMENT>
+<!--87D6CF097F154203A66CC61F4E8389D2-->  <AD_ELEMENT_ID><![CDATA[87D6CF097F154203A66CC61F4E8389D2]]></AD_ELEMENT_ID>
+<!--87D6CF097F154203A66CC61F4E8389D2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--87D6CF097F154203A66CC61F4E8389D2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--87D6CF097F154203A66CC61F4E8389D2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--87D6CF097F154203A66CC61F4E8389D2-->  <COLUMNNAME><![CDATA[Loadinbackoffice]]></COLUMNNAME>
+<!--87D6CF097F154203A66CC61F4E8389D2-->  <NAME><![CDATA[Load In Backoffice]]></NAME>
+<!--87D6CF097F154203A66CC61F4E8389D2-->  <PRINTNAME><![CDATA[Load In Backoffice]]></PRINTNAME>
+<!--87D6CF097F154203A66CC61F4E8389D2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--87D6CF097F154203A66CC61F4E8389D2-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--87D6CF097F154203A66CC61F4E8389D2--></AD_ELEMENT>
+
 <!--88D36EF860DA4C67B19D5F19EFECFE15--><AD_ELEMENT>
 <!--88D36EF860DA4C67B19D5F19EFECFE15-->  <AD_ELEMENT_ID><![CDATA[88D36EF860DA4C67B19D5F19EFECFE15]]></AD_ELEMENT_ID>
 <!--88D36EF860DA4C67B19D5F19EFECFE15-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -28835,6 +28847,18 @@
 <!--8EFF165C3DF64FBCBE8D7A30069FA976-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--8EFF165C3DF64FBCBE8D7A30069FA976--></AD_ELEMENT>
 
+<!--8F12ECC4FEC54B1D84AD08F4BFE77990--><AD_ELEMENT>
+<!--8F12ECC4FEC54B1D84AD08F4BFE77990-->  <AD_ELEMENT_ID><![CDATA[8F12ECC4FEC54B1D84AD08F4BFE77990]]></AD_ELEMENT_ID>
+<!--8F12ECC4FEC54B1D84AD08F4BFE77990-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8F12ECC4FEC54B1D84AD08F4BFE77990-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8F12ECC4FEC54B1D84AD08F4BFE77990-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8F12ECC4FEC54B1D84AD08F4BFE77990-->  <COLUMNNAME><![CDATA[Loadinwebpos]]></COLUMNNAME>
+<!--8F12ECC4FEC54B1D84AD08F4BFE77990-->  <NAME><![CDATA[Load in Web POS]]></NAME>
+<!--8F12ECC4FEC54B1D84AD08F4BFE77990-->  <PRINTNAME><![CDATA[Load in Web POS]]></PRINTNAME>
+<!--8F12ECC4FEC54B1D84AD08F4BFE77990-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8F12ECC4FEC54B1D84AD08F4BFE77990-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--8F12ECC4FEC54B1D84AD08F4BFE77990--></AD_ELEMENT>
+
 <!--8F16AEFC996311DD812A001D09C4A2FE--><AD_ELEMENT>
 <!--8F16AEFC996311DD812A001D09C4A2FE-->  <AD_ELEMENT_ID><![CDATA[8F16AEFC996311DD812A001D09C4A2FE]]></AD_ELEMENT_ID>
 <!--8F16AEFC996311DD812A001D09C4A2FE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_EP_PROCEDURES.xml openbravo/src-db/database/sourcedata/AD_EP_PROCEDURES.xml
--- openbravo_orig/src-db/database/sourcedata/AD_EP_PROCEDURES.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_EP_PROCEDURES.xml	2015-03-02 10:54:18.459931950 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--5EA5277A83DE47FA8775B1EAA725223D--><AD_EP_PROCEDURES>
 <!--5EA5277A83DE47FA8775B1EAA725223D-->  <AD_EP_PROCEDURES_ID><![CDATA[5EA5277A83DE47FA8775B1EAA725223D]]></AD_EP_PROCEDURES_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_EXTENSION_POINTS.xml openbravo/src-db/database/sourcedata/AD_EXTENSION_POINTS.xml
--- openbravo_orig/src-db/database/sourcedata/AD_EXTENSION_POINTS.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_EXTENSION_POINTS.xml	2015-03-02 10:55:06.799931594 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--1117A5F3D17F4B7E85B41838C9F31DE4--><AD_EXTENSION_POINTS>
 <!--1117A5F3D17F4B7E85B41838C9F31DE4-->  <AD_EXTENSION_POINTS_ID><![CDATA[1117A5F3D17F4B7E85B41838C9F31DE4]]></AD_EXTENSION_POINTS_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_FIELDGROUP.xml openbravo/src-db/database/sourcedata/AD_FIELDGROUP.xml
--- openbravo_orig/src-db/database/sourcedata/AD_FIELDGROUP.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_FIELDGROUP.xml	2015-03-02 10:55:06.959931592 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--101--><AD_FIELDGROUP>
 <!--101-->  <AD_FIELDGROUP_ID><![CDATA[101]]></AD_FIELDGROUP_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_FIELD.xml openbravo/src-db/database/sourcedata/AD_FIELD.xml
--- openbravo_orig/src-db/database/sourcedata/AD_FIELD.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_FIELD.xml	2015-03-02 10:55:46.131931304 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--100--><AD_FIELD>
 <!--100-->  <AD_FIELD_ID><![CDATA[100]]></AD_FIELD_ID>
@@ -196502,6 +196502,32 @@
 <!--33E41750E61E4B739B85A7DDD6E21110-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--33E41750E61E4B739B85A7DDD6E21110--></AD_FIELD>
 
+<!--33F2C6A85F94469C9E57A4259498A37D--><AD_FIELD>
+<!--33F2C6A85F94469C9E57A4259498A37D-->  <AD_FIELD_ID><![CDATA[33F2C6A85F94469C9E57A4259498A37D]]></AD_FIELD_ID>
+<!--33F2C6A85F94469C9E57A4259498A37D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--33F2C6A85F94469C9E57A4259498A37D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--33F2C6A85F94469C9E57A4259498A37D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--33F2C6A85F94469C9E57A4259498A37D-->  <NAME><![CDATA[Load in Web POS]]></NAME>
+<!--33F2C6A85F94469C9E57A4259498A37D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--33F2C6A85F94469C9E57A4259498A37D-->  <AD_TAB_ID><![CDATA[800079]]></AD_TAB_ID>
+<!--33F2C6A85F94469C9E57A4259498A37D-->  <AD_COLUMN_ID><![CDATA[E64EF53C053041328AACD10E18732B2F]]></AD_COLUMN_ID>
+<!--33F2C6A85F94469C9E57A4259498A37D-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--33F2C6A85F94469C9E57A4259498A37D-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--33F2C6A85F94469C9E57A4259498A37D-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--33F2C6A85F94469C9E57A4259498A37D-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--33F2C6A85F94469C9E57A4259498A37D-->  <SEQNO><![CDATA[156]]></SEQNO>
+<!--33F2C6A85F94469C9E57A4259498A37D-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--33F2C6A85F94469C9E57A4259498A37D-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--33F2C6A85F94469C9E57A4259498A37D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--33F2C6A85F94469C9E57A4259498A37D-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--33F2C6A85F94469C9E57A4259498A37D-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--33F2C6A85F94469C9E57A4259498A37D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--33F2C6A85F94469C9E57A4259498A37D-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--33F2C6A85F94469C9E57A4259498A37D-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--33F2C6A85F94469C9E57A4259498A37D-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--33F2C6A85F94469C9E57A4259498A37D-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--33F2C6A85F94469C9E57A4259498A37D--></AD_FIELD>
+
 <!--33FFFA438D234488A3DA3DD5114ED2FE--><AD_FIELD>
 <!--33FFFA438D234488A3DA3DD5114ED2FE-->  <AD_FIELD_ID><![CDATA[33FFFA438D234488A3DA3DD5114ED2FE]]></AD_FIELD_ID>
 <!--33FFFA438D234488A3DA3DD5114ED2FE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -241188,6 +241214,32 @@
 <!--848D0AEDC2144823BCC89F4EB55E8863-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--848D0AEDC2144823BCC89F4EB55E8863--></AD_FIELD>
 
+<!--84A617968E6B4146B50BB537C81E99BB--><AD_FIELD>
+<!--84A617968E6B4146B50BB537C81E99BB-->  <AD_FIELD_ID><![CDATA[84A617968E6B4146B50BB537C81E99BB]]></AD_FIELD_ID>
+<!--84A617968E6B4146B50BB537C81E99BB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--84A617968E6B4146B50BB537C81E99BB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--84A617968E6B4146B50BB537C81E99BB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--84A617968E6B4146B50BB537C81E99BB-->  <NAME><![CDATA[Load In Backoffice]]></NAME>
+<!--84A617968E6B4146B50BB537C81E99BB-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--84A617968E6B4146B50BB537C81E99BB-->  <AD_TAB_ID><![CDATA[800079]]></AD_TAB_ID>
+<!--84A617968E6B4146B50BB537C81E99BB-->  <AD_COLUMN_ID><![CDATA[F867DC522EB146FA9BB5298830B66BC2]]></AD_COLUMN_ID>
+<!--84A617968E6B4146B50BB537C81E99BB-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--84A617968E6B4146B50BB537C81E99BB-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--84A617968E6B4146B50BB537C81E99BB-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--84A617968E6B4146B50BB537C81E99BB-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--84A617968E6B4146B50BB537C81E99BB-->  <SEQNO><![CDATA[157]]></SEQNO>
+<!--84A617968E6B4146B50BB537C81E99BB-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--84A617968E6B4146B50BB537C81E99BB-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--84A617968E6B4146B50BB537C81E99BB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--84A617968E6B4146B50BB537C81E99BB-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--84A617968E6B4146B50BB537C81E99BB-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--84A617968E6B4146B50BB537C81E99BB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--84A617968E6B4146B50BB537C81E99BB-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--84A617968E6B4146B50BB537C81E99BB-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--84A617968E6B4146B50BB537C81E99BB-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--84A617968E6B4146B50BB537C81E99BB-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--84A617968E6B4146B50BB537C81E99BB--></AD_FIELD>
+
 <!--84AB9CCCF757445B8E03756EB8BE513D--><AD_FIELD>
 <!--84AB9CCCF757445B8E03756EB8BE513D-->  <AD_FIELD_ID><![CDATA[84AB9CCCF757445B8E03756EB8BE513D]]></AD_FIELD_ID>
 <!--84AB9CCCF757445B8E03756EB8BE513D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_FORM.xml openbravo/src-db/database/sourcedata/AD_FORM.xml
--- openbravo_orig/src-db/database/sourcedata/AD_FORM.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_FORM.xml	2015-03-02 10:55:50.619931271 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--100--><AD_FORM>
 <!--100-->  <AD_FORM_ID><![CDATA[100]]></AD_FORM_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_MENU.xml openbravo/src-db/database/sourcedata/AD_MENU.xml
--- openbravo_orig/src-db/database/sourcedata/AD_MENU.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_MENU.xml	2015-03-02 10:54:17.843931954 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--102--><AD_MENU>
 <!--102-->  <AD_MENU_ID><![CDATA[102]]></AD_MENU_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_MESSAGE.xml openbravo/src-db/database/sourcedata/AD_MESSAGE.xml
--- openbravo_orig/src-db/database/sourcedata/AD_MESSAGE.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_MESSAGE.xml	2015-03-02 10:54:21.087931930 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--101--><AD_MESSAGE>
 <!--101-->  <AD_MESSAGE_ID><![CDATA[101]]></AD_MESSAGE_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml openbravo/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
--- openbravo_orig/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	2015-03-02 10:54:25.843931895 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--1524--><AD_MODEL_OBJECT_MAPPING>
 <!--1524-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[1524]]></AD_MODEL_OBJECT_MAPPING_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_MODEL_OBJECT_PARA.xml openbravo/src-db/database/sourcedata/AD_MODEL_OBJECT_PARA.xml
--- openbravo_orig/src-db/database/sourcedata/AD_MODEL_OBJECT_PARA.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_MODEL_OBJECT_PARA.xml	2015-03-02 10:55:46.171931304 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--19E4495DEA8B482ABC0042327F303BBE--><AD_MODEL_OBJECT_PARA>
 <!--19E4495DEA8B482ABC0042327F303BBE-->  <AD_MODEL_OBJECT_PARA_ID><![CDATA[19E4495DEA8B482ABC0042327F303BBE]]></AD_MODEL_OBJECT_PARA_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_MODEL_OBJECT.xml openbravo/src-db/database/sourcedata/AD_MODEL_OBJECT.xml
--- openbravo_orig/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	2015-03-02 10:54:25.351931899 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--576--><AD_MODEL_OBJECT>
 <!--576-->  <AD_MODEL_OBJECT_ID><![CDATA[576]]></AD_MODEL_OBJECT_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_MODULE_DBPREFIX.xml openbravo/src-db/database/sourcedata/AD_MODULE_DBPREFIX.xml
--- openbravo_orig/src-db/database/sourcedata/AD_MODULE_DBPREFIX.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_MODULE_DBPREFIX.xml	2015-03-02 10:54:23.551931912 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--00834104948711DDA17E001B388C61A4--><AD_MODULE_DBPREFIX>
 <!--00834104948711DDA17E001B388C61A4-->  <AD_MODULE_DBPREFIX_ID><![CDATA[00834104948711DDA17E001B388C61A4]]></AD_MODULE_DBPREFIX_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_MODULE.xml openbravo/src-db/database/sourcedata/AD_MODULE.xml
--- openbravo_orig/src-db/database/sourcedata/AD_MODULE.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_MODULE.xml	2015-03-02 10:55:07.023931592 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--0--><AD_MODULE>
 <!--0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -21,8 +21,8 @@
 <!--0-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--0-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
-<!--0-->  <REFERENCEDATAINFO><![CDATA[Standard document types for orders, invoices, etc. and settings]]></REFERENCEDATAINFO>
 <!--0-->  <UPDATEINFO><![CDATA[http://wiki.openbravo.com/wiki/Release_Notes/3.0PR15Q1.1]]></UPDATEINFO>
+<!--0-->  <REFERENCEDATAINFO><![CDATA[Standard document types for orders, invoices, etc. and settings]]></REFERENCEDATAINFO>
 <!--0-->  <VERSION_LABEL><![CDATA[PR15Q1.1]]></VERSION_LABEL>
 <!--0-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_PACKAGE.xml openbravo/src-db/database/sourcedata/AD_PACKAGE.xml
--- openbravo_orig/src-db/database/sourcedata/AD_PACKAGE.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_PACKAGE.xml	2015-03-02 10:55:06.879931593 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--5A3ED54AB1C84B84E040007F01006125--><AD_PACKAGE>
 <!--5A3ED54AB1C84B84E040007F01006125-->  <AD_PACKAGE_ID><![CDATA[5A3ED54AB1C84B84E040007F01006125]]></AD_PACKAGE_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_PREFERENCE.xml openbravo/src-db/database/sourcedata/AD_PREFERENCE.xml
--- openbravo_orig/src-db/database/sourcedata/AD_PREFERENCE.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_PREFERENCE.xml	2015-03-02 10:54:21.299931929 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--3C42AC69917D411999A63E214B4A1E77--><AD_PREFERENCE>
 <!--3C42AC69917D411999A63E214B4A1E77-->  <AD_PREFERENCE_ID><![CDATA[3C42AC69917D411999A63E214B4A1E77]]></AD_PREFERENCE_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_PROCESS_PARA.xml openbravo/src-db/database/sourcedata/AD_PROCESS_PARA.xml
--- openbravo_orig/src-db/database/sourcedata/AD_PROCESS_PARA.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_PROCESS_PARA.xml	2015-03-02 10:54:18.403931950 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--123--><AD_PROCESS_PARA>
 <!--123-->  <AD_PROCESS_PARA_ID><![CDATA[123]]></AD_PROCESS_PARA_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_PROCESS.xml openbravo/src-db/database/sourcedata/AD_PROCESS.xml
--- openbravo_orig/src-db/database/sourcedata/AD_PROCESS.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_PROCESS.xml	2015-03-02 10:54:13.839931984 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--100--><AD_PROCESS>
 <!--100-->  <AD_PROCESS_ID><![CDATA[100]]></AD_PROCESS_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_REFERENCE.xml openbravo/src-db/database/sourcedata/AD_REFERENCE.xml
--- openbravo_orig/src-db/database/sourcedata/AD_REFERENCE.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_REFERENCE.xml	2015-03-02 10:54:21.971931924 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--1--><AD_REFERENCE>
 <!--1-->  <AD_REFERENCE_ID><![CDATA[1]]></AD_REFERENCE_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_REF_LIST.xml openbravo/src-db/database/sourcedata/AD_REF_LIST.xml
--- openbravo_orig/src-db/database/sourcedata/AD_REF_LIST.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_REF_LIST.xml	2015-03-02 10:54:24.811931903 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--51--><AD_REF_LIST>
 <!--51-->  <AD_REF_LIST_ID><![CDATA[51]]></AD_REF_LIST_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_REF_SEARCH_COLUMN.xml openbravo/src-db/database/sourcedata/AD_REF_SEARCH_COLUMN.xml
--- openbravo_orig/src-db/database/sourcedata/AD_REF_SEARCH_COLUMN.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_REF_SEARCH_COLUMN.xml	2015-03-02 10:55:07.015931592 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--800000--><AD_REF_SEARCH_COLUMN>
 <!--800000-->  <AD_REF_SEARCH_COLUMN_ID><![CDATA[800000]]></AD_REF_SEARCH_COLUMN_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_REF_SEARCH.xml openbravo/src-db/database/sourcedata/AD_REF_SEARCH.xml
--- openbravo_orig/src-db/database/sourcedata/AD_REF_SEARCH.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_REF_SEARCH.xml	2015-03-02 10:55:06.895931593 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--800000--><AD_REF_SEARCH>
 <!--800000-->  <AD_REF_SEARCH_ID><![CDATA[800000]]></AD_REF_SEARCH_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_REF_TABLE.xml openbravo/src-db/database/sourcedata/AD_REF_TABLE.xml
--- openbravo_orig/src-db/database/sourcedata/AD_REF_TABLE.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_REF_TABLE.xml	2015-03-02 10:55:07.179931591 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--1--><AD_REF_TABLE>
 <!--1-->  <AD_REFERENCE_ID><![CDATA[1]]></AD_REFERENCE_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_REF_TREE_FIELD.xml openbravo/src-db/database/sourcedata/AD_REF_TREE_FIELD.xml
--- openbravo_orig/src-db/database/sourcedata/AD_REF_TREE_FIELD.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_REF_TREE_FIELD.xml	2015-03-02 10:54:17.851931954 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--01982CD5659A4E76A0781FBE4FA3CFC7--><AD_REF_TREE_FIELD>
 <!--01982CD5659A4E76A0781FBE4FA3CFC7-->  <AD_REF_TREE_FIELD_ID><![CDATA[01982CD5659A4E76A0781FBE4FA3CFC7]]></AD_REF_TREE_FIELD_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_REF_TREE.xml openbravo/src-db/database/sourcedata/AD_REF_TREE.xml
--- openbravo_orig/src-db/database/sourcedata/AD_REF_TREE.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_REF_TREE.xml	2015-03-02 10:55:47.499931294 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--95582A51651D415993D0FD3B64C8E861--><AD_REF_TREE>
 <!--95582A51651D415993D0FD3B64C8E861-->  <AD_REF_TREE_ID><![CDATA[95582A51651D415993D0FD3B64C8E861]]></AD_REF_TREE_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_TABLE_TREE.xml openbravo/src-db/database/sourcedata/AD_TABLE_TREE.xml
--- openbravo_orig/src-db/database/sourcedata/AD_TABLE_TREE.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_TABLE_TREE.xml	2015-03-02 10:54:18.459931950 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--21E9F7EED1F24E95B0F4F21CF87AF995--><AD_TABLE_TREE>
 <!--21E9F7EED1F24E95B0F4F21CF87AF995-->  <AD_TABLE_TREE_ID><![CDATA[21E9F7EED1F24E95B0F4F21CF87AF995]]></AD_TABLE_TREE_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_TABLE.xml openbravo/src-db/database/sourcedata/AD_TABLE.xml
--- openbravo_orig/src-db/database/sourcedata/AD_TABLE.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_TABLE.xml	2015-03-02 10:55:47.491931294 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--100--><AD_TABLE>
 <!--100-->  <AD_TABLE_ID><![CDATA[100]]></AD_TABLE_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_TAB.xml openbravo/src-db/database/sourcedata/AD_TAB.xml
--- openbravo_orig/src-db/database/sourcedata/AD_TAB.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_TAB.xml	2015-03-02 10:55:09.887931571 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--100--><AD_TAB>
 <!--100-->  <AD_TAB_ID><![CDATA[100]]></AD_TAB_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_TEXTINTERFACES.xml openbravo/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- openbravo_orig/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	2015-03-02 10:55:49.791931277 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--800007--><AD_TEXTINTERFACES>
 <!--800007-->  <AD_TEXTINTERFACES_ID><![CDATA[800007]]></AD_TEXTINTERFACES_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_TREENODE.xml openbravo/src-db/database/sourcedata/AD_TREENODE.xml
--- openbravo_orig/src-db/database/sourcedata/AD_TREENODE.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_TREENODE.xml	2015-03-02 10:55:50.295931273 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--001EA1E7A8EF95D4E050007F01000509--><AD_TREENODE>
 <!--001EA1E7A8EF95D4E050007F01000509-->  <AD_TREENODE_ID><![CDATA[001EA1E7A8EF95D4E050007F01000509]]></AD_TREENODE_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_VAL_RULE.xml openbravo/src-db/database/sourcedata/AD_VAL_RULE.xml
--- openbravo_orig/src-db/database/sourcedata/AD_VAL_RULE.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_VAL_RULE.xml	2015-03-02 10:55:50.583931271 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--100--><AD_VAL_RULE>
 <!--100-->  <AD_VAL_RULE_ID><![CDATA[100]]></AD_VAL_RULE_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/AD_WINDOW.xml openbravo/src-db/database/sourcedata/AD_WINDOW.xml
--- openbravo_orig/src-db/database/sourcedata/AD_WINDOW.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/AD_WINDOW.xml	2015-03-02 10:55:50.991931268 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--100--><AD_WINDOW>
 <!--100-->  <AD_WINDOW_ID><![CDATA[100]]></AD_WINDOW_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/M_OFFER_TYPE.xml openbravo/src-db/database/sourcedata/M_OFFER_TYPE.xml
--- openbravo_orig/src-db/database/sourcedata/M_OFFER_TYPE.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/M_OFFER_TYPE.xml	2015-03-02 10:55:07.019931592 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--5D4BAF6BB86D4D2C9ED3D5A6FC051579--><M_OFFER_TYPE>
 <!--5D4BAF6BB86D4D2C9ED3D5A6FC051579-->  <M_OFFER_TYPE_ID><![CDATA[5D4BAF6BB86D4D2C9ED3D5A6FC051579]]></M_OFFER_TYPE_ID>
@@ -8,6 +8,7 @@
 <!--5D4BAF6BB86D4D2C9ED3D5A6FC051579-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5D4BAF6BB86D4D2C9ED3D5A6FC051579-->  <NAME><![CDATA[Price Adjustment]]></NAME>
 <!--5D4BAF6BB86D4D2C9ED3D5A6FC051579-->  <PL_ORDER_IMPLEMENTOR><![CDATA[M_Promotion_Adjustment]]></PL_ORDER_IMPLEMENTOR>
+<!--5D4BAF6BB86D4D2C9ED3D5A6FC051579-->  <EM_OBPOS_ISCATEGORY><![CDATA[N]]></EM_OBPOS_ISCATEGORY>
 <!--5D4BAF6BB86D4D2C9ED3D5A6FC051579--></M_OFFER_TYPE>
 
 </data>
diff -ru openbravo_orig/src-db/database/sourcedata/OBCLKER_TEMPLATE.xml openbravo/src-db/database/sourcedata/OBCLKER_TEMPLATE.xml
--- openbravo_orig/src-db/database/sourcedata/OBCLKER_TEMPLATE.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/OBCLKER_TEMPLATE.xml	2015-03-02 10:55:07.183931591 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--74451C30650946FC855FCFDB4577070C--><OBCLKER_TEMPLATE>
 <!--74451C30650946FC855FCFDB4577070C-->  <OBCLKER_TEMPLATE_ID><![CDATA[74451C30650946FC855FCFDB4577070C]]></OBCLKER_TEMPLATE_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml openbravo/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml
--- openbravo_orig/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml	2015-03-02 10:55:47.507931294 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--5689322B3F104A19A15ACDB331052991--><OBCLKER_UIDEFINITION>
 <!--5689322B3F104A19A15ACDB331052991-->  <OBCLKER_UIDEFINITION_ID><![CDATA[5689322B3F104A19A15ACDB331052991]]></OBCLKER_UIDEFINITION_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml openbravo/src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml
--- openbravo_orig/src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/OBCQL_QUERY_COLUMN.xml	2015-03-02 10:55:06.807931594 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--084D1B44C2D84B9B8002AE1F9E31EFE2--><OBCQL_QUERY_COLUMN>
 <!--084D1B44C2D84B9B8002AE1F9E31EFE2-->  <OBCQL_QUERY_COLUMN_ID><![CDATA[084D1B44C2D84B9B8002AE1F9E31EFE2]]></OBCQL_QUERY_COLUMN_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml openbravo/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml
--- openbravo_orig/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/OBCQL_WIDGET_QUERY.xml	2015-03-02 10:55:51.599931264 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--11D052605994493E905FF9A45591D84D--><OBCQL_WIDGET_QUERY>
 <!--11D052605994493E905FF9A45591D84D-->  <OBCQL_WIDGET_QUERY_ID><![CDATA[11D052605994493E905FF9A45591D84D]]></OBCQL_WIDGET_QUERY_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml openbravo/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml
--- openbravo_orig/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml	2015-03-02 10:55:50.299931273 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--7EE694CFF8B94B4C9B9CE69C9D292CC4--><OBKMO_WIDGET_CLASS>
 <!--7EE694CFF8B94B4C9B9CE69C9D292CC4-->  <OBKMO_WIDGET_CLASS_ID><![CDATA[7EE694CFF8B94B4C9B9CE69C9D292CC4]]></OBKMO_WIDGET_CLASS_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/OBSERDS_DATASOURCE.xml openbravo/src-db/database/sourcedata/OBSERDS_DATASOURCE.xml
--- openbravo_orig/src-db/database/sourcedata/OBSERDS_DATASOURCE.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/OBSERDS_DATASOURCE.xml	2015-03-02 10:54:13.107931989 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--2B21809CD7E3464FBFBD5FD60DFC3959--><OBSERDS_DATASOURCE>
 <!--2B21809CD7E3464FBFBD5FD60DFC3959-->  <OBSERDS_DATASOURCE_ID><![CDATA[2B21809CD7E3464FBFBD5FD60DFC3959]]></OBSERDS_DATASOURCE_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml openbravo/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
--- openbravo_orig/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	2015-03-02 10:55:51.803931262 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--0777BB0E12EC4D4498EEA16B4C3AE832--><OBUIAPP_PARAMETER>
 <!--0777BB0E12EC4D4498EEA16B4C3AE832-->  <OBUIAPP_PARAMETER_ID><![CDATA[0777BB0E12EC4D4498EEA16B4C3AE832]]></OBUIAPP_PARAMETER_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/OBUIAPP_PROCESS.xml openbravo/src-db/database/sourcedata/OBUIAPP_PROCESS.xml
--- openbravo_orig/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	2015-03-02 10:55:51.679931263 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--24E052E6FEB64295B64E683B5196230B--><OBUIAPP_PROCESS>
 <!--24E052E6FEB64295B64E683B5196230B-->  <OBUIAPP_PROCESS_ID><![CDATA[24E052E6FEB64295B64E683B5196230B]]></OBUIAPP_PROCESS_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml openbravo/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml
--- openbravo_orig/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml	2015-03-02 10:55:50.315931273 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--01BCFD5FDA7D44129E852F8BCE0E5E36--><OBUIAPP_REF_WINDOW>
 <!--01BCFD5FDA7D44129E852F8BCE0E5E36-->  <OBUIAPP_REF_WINDOW_ID><![CDATA[01BCFD5FDA7D44129E852F8BCE0E5E36]]></OBUIAPP_REF_WINDOW_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml openbravo/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
--- openbravo_orig/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	2015-03-02 10:55:07.731931587 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--00A942C8977A49CFA72A36A7E5ED3613--><OBUISEL_SELECTOR_FIELD>
 <!--00A942C8977A49CFA72A36A7E5ED3613-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[00A942C8977A49CFA72A36A7E5ED3613]]></OBUISEL_SELECTOR_FIELD_ID>
diff -ru openbravo_orig/src-db/database/sourcedata/OBUISEL_SELECTOR.xml openbravo/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
--- openbravo_orig/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	2015-02-27 10:09:59.000000000 +0100
+++ openbravo/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	2015-03-02 10:54:13.095931989 +0100
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--00A9109E64DD404CA95719D20A9BBBF0--><OBUISEL_SELECTOR>
 <!--00A9109E64DD404CA95719D20A9BBBF0-->  <OBUISEL_SELECTOR_ID><![CDATA[00A9109E64DD404CA95719D20A9BBBF0]]></OBUISEL_SELECTOR_ID>
@@ -866,7 +866,7 @@
 and e.active = 'Y'
 and plv.active = 'Y'
   and @additional_filters@]]></HQL>
-<!--EB3C41F0973A4EDA91E475833792A6D4-->  <ENTITY_ALIAS><![CDATA[e]]></ENTITY_ALIAS>
+<!--EB3C41F0973A4EDA91E475833792A6D4-->  <ENTITY_ALIAS><![CDATA[pp]]></ENTITY_ALIAS>
 <!--EB3C41F0973A4EDA91E475833792A6D4-->  <CUSTOM_QUERY><![CDATA[Y]]></CUSTOM_QUERY>
 <!--EB3C41F0973A4EDA91E475833792A6D4--></OBUISEL_SELECTOR>

retail1.diff [^] (888 bytes) 2015-05-05 16:16 [Show Content] [Hide Content]

diff -ru openbravo_orig/modules/org.openbravo.retail.posterminal/src/org/openbravo/retail/posterminal/master/Discount.java openbravo/modules/org.openbravo.retail.posterminal/src/org/openbravo/retail/posterminal/master/Discount.java
--- openbravo_orig/modules/org.openbravo.retail.posterminal/src/org/openbravo/retail/posterminal/master/Discount.java	2015-02-18 10:03:16.000000000 +0100
+++ openbravo/modules/org.openbravo.retail.posterminal/src/org/openbravo/retail/posterminal/master/Discount.java	2015-03-02 11:01:34.779928735 +0100
@@ -92,6 +92,8 @@
     hql += "          and o.organization.id ='" + orgId + "')) ";
     hql += "    ) ";
 
+    hql += "and p.loadInWebPOS = true ";
+
     // Rules with currency can be only applied if the price list has the same currency
     try {
       // Hack: currency is defined in discounts module, check if it is present not to fail the query

Relationships [ Relation Graph ] [ Dependency Graph ]

Notes
There are no notes attached to this issue.

Issue History
Date Modified	Username	Field	Change
2015-05-05 16:15	egoitz	New Issue
2015-05-05 16:15	egoitz	Assigned To	=> Retail
2015-05-05 16:15	egoitz	File Added: core3.diff
2015-05-05 16:15	egoitz	Triggers an Emergency Pack	=> No
2015-05-05 16:16	egoitz	File Added: retail1.diff
2015-05-05 16:16	egoitz	Tag Attached: Contribution
2015-05-05 16:52	heccam	Issue Monitored: heccam