Update to 3.0PR18Q1 3.0PR18Q1
authorRM packaging bot <staff.rm@openbravo.com>
Wed, 21 Feb 2018 11:03:41 +0000
changeset 790 7481d3c7190f
parent 789 ca59136ab09f
child 791 26a730bf2956
Update to 3.0PR18Q1
java/reference/java.japi.gz
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.application/src-db/database/model/triggers/OBUIAPP_UIPERS_MOD_TRG.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.myob/src-db/database/model/triggers/OBKMO_WIDGET_REFERENCE_MOD_TRG.xml
model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_DATASET.xml
model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/src-db/database/model/excludeFilter.xml
model/src-db/database/model/functions/AD_COLUMN_IDENTIFIER_REF_SQL.xml
model/src-db/database/model/functions/AD_TABLE_IMPORT.xml
model/src-db/database/model/functions/AD_TAB_IMPORT.xml
model/src-db/database/model/functions/AD_UPDATE_TABLE_IDENTIFIER.xml
model/src-db/database/model/functions/C_ORDER_POST1.xml
model/src-db/database/model/functions/MA_PRODUCTION_COST.xml
model/src-db/database/model/functions/M_PROMOTION_CALCULATE.xml
model/src-db/database/model/functions/M_REQUISITION_CREATEPO.xml
model/src-db/database/model/postscript-PostgreSql.sql
model/src-db/database/model/prescript-PostgreSql.sql
model/src-db/database/model/prescript-systemuser-PostgreSql.sql
model/src-db/database/model/tables/C_INVOICELINE.xml
model/src-db/database/model/tables/C_ORDER.xml
model/src-db/database/model/tables/M_ATTRIBUTESETINSTANCE.xml
model/src-db/database/model/tables/M_COSTING.xml
model/src-db/database/model/tables/M_INOUT.xml
model/src-db/database/model/tables/M_MATCHPO.xml
model/src-db/database/model/tables/M_MOVEMENTLINE.xml
model/src-db/database/model/tables/M_REFINVENTORY.xml
model/src-db/database/model/tables/M_REFINVENTORY_TYPE.xml
model/src-db/database/model/tables/M_STORAGE_DETAIL.xml
model/src-db/database/model/triggers/AD_AUXILIARINPUT_MOD_TRG.xml
model/src-db/database/model/triggers/AD_CALLOUT_MOD_TRG.xml
model/src-db/database/model/triggers/AD_COLUMN_MOD_TRG.xml
model/src-db/database/model/triggers/AD_DATASET_MOD_TRG.xml
model/src-db/database/model/triggers/AD_ELEMENT_MOD_TRG.xml
model/src-db/database/model/triggers/AD_FIELDGROUP_MOD_TRG.xml
model/src-db/database/model/triggers/AD_FIELD_MOD_TRG.xml
model/src-db/database/model/triggers/AD_FORM_MOD_TRG.xml
model/src-db/database/model/triggers/AD_MENU_MOD_TRG.xml
model/src-db/database/model/triggers/AD_MESSAGE_MOD_TRG.xml
model/src-db/database/model/triggers/AD_MODULE_DBPREFIX_MOD_TRG.xml
model/src-db/database/model/triggers/AD_MODULE_DBPREFIX_TRG.xml
model/src-db/database/model/triggers/AD_MODULE_DEPENDENCY_MOD_TRG.xml
model/src-db/database/model/triggers/AD_PACKAGE_MOD_TRG.xml
model/src-db/database/model/triggers/AD_PREFERENCE_MOD_TRG.xml
model/src-db/database/model/triggers/AD_PROCESS_GROUP_LIST_MOD_TRG.xml
model/src-db/database/model/triggers/AD_PROCESS_GROUP_MOD_TRG.xml
model/src-db/database/model/triggers/AD_PROCESS_MOD_TRG.xml
model/src-db/database/model/triggers/AD_REFERENCE_MOD_TRG.xml
model/src-db/database/model/triggers/AD_REF_SEARCH_COLUMN_MOD_TRG.xml
model/src-db/database/model/triggers/AD_REF_SEARCH_MOD_TRG.xml
model/src-db/database/model/triggers/AD_REF_TABLE_MOD_TRG.xml
model/src-db/database/model/triggers/AD_TABLE_MOD_TRG.xml
model/src-db/database/model/triggers/AD_TABLE_NAVIGATION_MOD_TRG.xml
model/src-db/database/model/triggers/AD_TAB_MOD_TRG.xml
model/src-db/database/model/triggers/AD_TEXTINTERFACES_MOD_TRG.xml
model/src-db/database/model/triggers/AD_VAL_RULE_MOD_TRG.xml
model/src-db/database/model/triggers/AD_WINDOW_MOD_TRG.xml
model/src-db/database/model/views/M_RM_RECEIPT_PICK_EDIT.xml
model/src-db/database/sourcedata/AD_CALLOUT.xml
model/src-db/database/sourcedata/AD_COLUMN.xml
model/src-db/database/sourcedata/AD_ELEMENT.xml
model/src-db/database/sourcedata/AD_FIELD.xml
model/src-db/database/sourcedata/AD_MENU.xml
model/src-db/database/sourcedata/AD_MESSAGE.xml
model/src-db/database/sourcedata/AD_MODEL_OBJECT.xml
model/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
model/src-db/database/sourcedata/AD_MODULE.xml
model/src-db/database/sourcedata/AD_PREFERENCE.xml
model/src-db/database/sourcedata/AD_PROCESS.xml
model/src-db/database/sourcedata/AD_REFERENCE.xml
model/src-db/database/sourcedata/AD_TAB.xml
model/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
model/src-db/database/sourcedata/AD_TREENODE.xml
model/src-db/database/sourcedata/AD_WINDOW.xml
model/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
model/src-db/database/sourcedata/OBUIAPP_PROCESS.xml
model/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml
model/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
model/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
Binary file java/reference/java.japi.gz has changed
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -6,7 +6,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.32857]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.33184]]></VERSION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements.
 If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP>
@@ -25,7 +25,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <UPDATEINFO><![CDATA[Fixed issue with document sequence numbers reset in case of applying dataset second time.
 Fixed issue 15305.]]></UPDATEINFO>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <REFERENCEDATAINFO><![CDATA[Document types and default algorithm for bank statement auto matching]]></REFERENCEDATAINFO>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION_LABEL><![CDATA[PR17Q4]]></VERSION_LABEL>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--A918E3331C404B889D69AA9BFAFB23AC--></AD_MODULE>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -7,7 +7,7 @@
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.32857]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--B97FC854C6DD41E692161585645A900F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--B97FC854C6DD41E692161585645A900F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--B97FC854C6DD41E692161585645A900F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.32857]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
 <!--B97FC854C6DD41E692161585645A900F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -6,7 +6,7 @@
 <!--8A098711BB324335A19833286BDB093D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--8A098711BB324335A19833286BDB093D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8A098711BB324335A19833286BDB093D-->  <NAME><![CDATA[Apache External Connection Pool]]></NAME>
-<!--8A098711BB324335A19833286BDB093D-->  <VERSION><![CDATA[1.0.32857]]></VERSION>
+<!--8A098711BB324335A19833286BDB093D-->  <VERSION><![CDATA[1.0.33184]]></VERSION>
 <!--8A098711BB324335A19833286BDB093D-->  <DESCRIPTION><![CDATA[Apache External Connection Pool]]></DESCRIPTION>
 <!--8A098711BB324335A19833286BDB093D-->  <HELP><![CDATA[This module implements the Apache JDBC Connection Pool (http://wiki.openbravo.com/wiki/Modules:Apache_JDBC_Connection_Pool).]]></HELP>
 <!--8A098711BB324335A19833286BDB093D-->  <TYPE><![CDATA[M]]></TYPE>
@@ -20,7 +20,7 @@
 <!--8A098711BB324335A19833286BDB093D-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--8A098711BB324335A19833286BDB093D-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--8A098711BB324335A19833286BDB093D-->  <UPDATEINFO><![CDATA[fixed issue #26663: configuration is read from servlet context]]></UPDATEINFO>
-<!--8A098711BB324335A19833286BDB093D-->  <VERSION_LABEL><![CDATA[PR17Q4]]></VERSION_LABEL>
+<!--8A098711BB324335A19833286BDB093D-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
 <!--8A098711BB324335A19833286BDB093D-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--8A098711BB324335A19833286BDB093D-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--8A098711BB324335A19833286BDB093D--></AD_MODULE>
--- a/model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -7,7 +7,7 @@
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <AD_MODULE_ID><![CDATA[8A098711BB324335A19833286BDB093D]]></AD_MODULE_ID>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--1467C397BC5F4999A5606F39CD6FF8A4-->  <STARTVERSION><![CDATA[2.1.32857]]></STARTVERSION>
+<!--1467C397BC5F4999A5606F39CD6FF8A4-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -6,7 +6,7 @@
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <NAME><![CDATA[JBoss Weld]]></NAME>
-<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.32857]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.33184]]></VERSION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL>
@@ -22,7 +22,7 @@
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <UPDATEINFO><![CDATA[Bug fixing.]]></UPDATEINFO>
-<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION_LABEL><![CDATA[PR17Q4]]></VERSION_LABEL>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--C70732EA90A14EC0916078B85CC33D2D--></AD_MODULE>
--- a/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -7,7 +7,7 @@
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.32857]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.client.application/src-db/database/model/triggers/OBUIAPP_UIPERS_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.client.application/src-db/database/model/triggers/OBUIAPP_UIPERS_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  currentID  VARCHAR2(32);
   currentModuleID  VARCHAR2(32);
   vAux NUMBER;
 BEGIN
@@ -50,10 +49,8 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    currentID := :new.OBUIAPP_UIPERSONALIZATION_ID;
     currentModuleID := :new.AD_Module_ID;
   ELSE
-    currentID := :old.OBUIAPP_UIPERSONALIZATION_ID;
     currentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -336,6 +336,18 @@
 <!--16EF30EF95D94CB2A93129015A363315-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--16EF30EF95D94CB2A93129015A363315--></AD_MESSAGE>
 
+<!--1A0108DBD48D4F3496569E662C7475CE--><AD_MESSAGE>
+<!--1A0108DBD48D4F3496569E662C7475CE-->  <AD_MESSAGE_ID><![CDATA[1A0108DBD48D4F3496569E662C7475CE]]></AD_MESSAGE_ID>
+<!--1A0108DBD48D4F3496569E662C7475CE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1A0108DBD48D4F3496569E662C7475CE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1A0108DBD48D4F3496569E662C7475CE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1A0108DBD48D4F3496569E662C7475CE-->  <VALUE><![CDATA[OBUIAPP_TooManyResults]]></VALUE>
+<!--1A0108DBD48D4F3496569E662C7475CE-->  <MSGTEXT><![CDATA[Your search returned too many results. Please refine your search terms.]]></MSGTEXT>
+<!--1A0108DBD48D4F3496569E662C7475CE-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--1A0108DBD48D4F3496569E662C7475CE-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--1A0108DBD48D4F3496569E662C7475CE-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--1A0108DBD48D4F3496569E662C7475CE--></AD_MESSAGE>
+
 <!--1B783EC678E644E385778D2D7D25A97B--><AD_MESSAGE>
 <!--1B783EC678E644E385778D2D7D25A97B-->  <AD_MESSAGE_ID><![CDATA[1B783EC678E644E385778D2D7D25A97B]]></AD_MESSAGE_ID>
 <!--1B783EC678E644E385778D2D7D25A97B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -5008,7 +5020,7 @@
 <!--FF80818132D550210132D55C83410044-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF80818132D550210132D55C83410044-->  <VALUE><![CDATA[OBUIAPP_Image_Error_WRONGFORMAT]]></VALUE>
 <!--FF80818132D550210132D55C83410044-->  <MSGTEXT><![CDATA[Unsupported file format.
-Supported file formats are JPG, PNG, GIF and BMP.]]></MSGTEXT>
+Supported file formats are JPG, PNG, GIF, BMP and SVG.]]></MSGTEXT>
 <!--FF80818132D550210132D55C83410044-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
 <!--FF80818132D550210132D55C83410044-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--FF80818132D550210132D55C83410044-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -6,7 +6,7 @@
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <NAME><![CDATA[User Interface Application]]></NAME>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.32857]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.33184]]></VERSION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL>
@@ -22,7 +22,7 @@
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <UPDATEINFO><![CDATA[Styling bugfixing]]></UPDATEINFO>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION_LABEL><![CDATA[PR17Q4]]></VERSION_LABEL>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--9BA0836A3CD74EE4AB48753A47211BCC--></AD_MODULE>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -7,7 +7,7 @@
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.32857]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--60A170212F36499D83B8AD38D01F46B3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.32857]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--60A170212F36499D83B8AD38D01F46B3-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.32857]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--824D60CB352E4099B1D8C903CA139DAE-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.32857]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.33184]]></STARTVERSION>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--E8FD820AFE3D4FE08C02FC47769026AD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -6,7 +6,7 @@
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <NAME><![CDATA[HTML Widget]]></NAME>
-<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.32857]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.33184]]></VERSION>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <DESCRIPTION><![CDATA[Provides the HTML Widget superclass that allows to create widget classes that embed the html code.]]></DESCRIPTION>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HELP><![CDATA[With this module you can define your own widget classes just setting up your own html code or the html code provided by third parties.]]></HELP>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <URL><![CDATA[http://forge.openbravo.com/projects/htmlwidget]]></URL>
@@ -21,7 +21,7 @@
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION_LABEL><![CDATA[PR17Q4]]></VERSION_LABEL>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--D393BE6F22BB44B7B728259B34FC795A--></AD_MODULE>
--- a/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -7,7 +7,7 @@
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.32857]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -6,7 +6,7 @@
 <!--4B828F4D03264080AA1D2057B13F613C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <NAME><![CDATA[User Interface Client Kernel]]></NAME>
-<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.32857]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.33184]]></VERSION>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <DESCRIPTION><![CDATA[Provides framework functionality for the Openbravo User Interface]]></DESCRIPTION>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <HELP><![CDATA[The user interface client kernel is a generation framework for generating client (browser) components used in Openbravo. Its components are mainly used by other modules to provide customizable and extendable user interfaces.]]></HELP>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravoclientkernel]]></URL>
@@ -22,7 +22,7 @@
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <UPDATEINFO><![CDATA[Bug fix for issue 15289]]></UPDATEINFO>
-<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION_LABEL><![CDATA[PR17Q4]]></VERSION_LABEL>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--4B828F4D03264080AA1D2057B13F613C--></AD_MODULE>
--- a/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -7,7 +7,7 @@
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.32857]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.32857]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.33184]]></STARTVERSION>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.32857]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.33184]]></STARTVERSION>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.client.myob/src-db/database/model/triggers/OBKMO_WIDGET_REFERENCE_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.client.myob/src-db/database/model/triggers/OBKMO_WIDGET_REFERENCE_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  currentID  VARCHAR2(32);
   currentModuleID  VARCHAR2(32);
     
 BEGIN
@@ -37,10 +36,8 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    currentID := :new.AD_Reference_ID;
     currentModuleID := :NEW.AD_Reference_ID;
   ELSE
-    currentID := :old.AD_Reference_ID;
     currentModuleID := :old.AD_Reference_ID;
   END IF;
   
--- a/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -6,7 +6,7 @@
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <NAME><![CDATA[Workspace & Widgets]]></NAME>
-<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.32857]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.33184]]></VERSION>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <DESCRIPTION><![CDATA[Workspace & Widgets]]></DESCRIPTION>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <HELP><![CDATA[Provides the infrastructure of workspace tab (formerly My Openbravo)]]></HELP>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <URL><![CDATA[http://forge.openbravo.com/projects/myopenbravo]]></URL>
@@ -23,7 +23,7 @@
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <UPDATEINFO><![CDATA[Styling bugfixing]]></UPDATEINFO>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <REFERENCEDATAINFO><![CDATA[Provides the infrastructure of workspace tab]]></REFERENCEDATAINFO>
-<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION_LABEL><![CDATA[PR17Q4]]></VERSION_LABEL>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--2758CD25B2704AF6BBAD10365FC82C06--></AD_MODULE>
--- a/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -7,7 +7,7 @@
 <!--15F51F03882F444CAB6593B4566DC929-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.32857]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
 <!--15F51F03882F444CAB6593B4566DC929-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--15F51F03882F444CAB6593B4566DC929-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--15F51F03882F444CAB6593B4566DC929-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.32857]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--E71B28FC949D481D9F59C17D01E46EF9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -6,7 +6,7 @@
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <NAME><![CDATA[Query/List Widget]]></NAME>
-<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.32857]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.33184]]></VERSION>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <DESCRIPTION><![CDATA[Provides the Query/List superclass widget that allows to create widget classes that prints a grid of data based on a query.]]></DESCRIPTION>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HELP><![CDATA[With this module you can define your own widget classes that just with simple Application Dictionary shows a grid of data based on a HQL Query.]]></HELP>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <URL><![CDATA[http://forge.openbravo.com/projects/querylistwidget]]></URL>
@@ -21,7 +21,7 @@
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION_LABEL><![CDATA[PR17Q4]]></VERSION_LABEL>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC--></AD_MODULE>
--- a/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -7,7 +7,7 @@
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.32857]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--26558497C31140BFAB067BA4BC47D799-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -6,7 +6,7 @@
 <!--FF8080812D842086012D844F3CC0003E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D844F3CC0003E-->  <NAME><![CDATA[Widgets Collection]]></NAME>
-<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.32857]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.33184]]></VERSION>
 <!--FF8080812D842086012D844F3CC0003E-->  <DESCRIPTION><![CDATA[Collection of Workspace Widgets]]></DESCRIPTION>
 <!--FF8080812D842086012D844F3CC0003E-->  <HELP><![CDATA[Collection of Workspace Widgets]]></HELP>
 <!--FF8080812D842086012D844F3CC0003E-->  <URL><![CDATA[http://forge.openbravo.com/projects/widgetscollection]]></URL>
@@ -22,7 +22,7 @@
 <!--FF8080812D842086012D844F3CC0003E-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--FF8080812D842086012D844F3CC0003E-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--FF8080812D842086012D844F3CC0003E-->  <UPDATEINFO><![CDATA[Added Currency Converter. Added Google Docs]]></UPDATEINFO>
-<!--FF8080812D842086012D844F3CC0003E-->  <VERSION_LABEL><![CDATA[PR17Q4]]></VERSION_LABEL>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--FF8080812D842086012D844F3CC0003E--></AD_MODULE>
--- a/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -7,7 +7,7 @@
 <!--FF8080812D842086012D845002070046-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D845002070046-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
 <!--FF8080812D842086012D845002070046-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.32857]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
 <!--FF8080812D842086012D845002070046-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080812D842086012D845002070046-->  <DEPENDANT_MODULE_NAME><![CDATA[Workspace & Widgets]]></DEPENDANT_MODULE_NAME>
 <!--FF8080812D842086012D845002070046-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -6,7 +6,7 @@
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <NAME><![CDATA[Payment Report]]></NAME>
-<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.32857]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.33184]]></VERSION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <DESCRIPTION><![CDATA[Payment Report]]></DESCRIPTION>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <URL><![CDATA[http://forge.openbravo.com/projects/paymentreport]]></URL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <TYPE><![CDATA[M]]></TYPE>
@@ -22,7 +22,7 @@
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION_LABEL><![CDATA[PR17Q4]]></VERSION_LABEL>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--2A5EE903D7974AC298C0504FBC4501A7--></AD_MODULE>
--- a/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -7,7 +7,7 @@
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.32857]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -6,7 +6,7 @@
 <!--3A3A943684D64DEF9EC39F588A656848-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <NAME><![CDATA[Orders Awaiting Delivery]]></NAME>
-<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.32857]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.33184]]></VERSION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <DESCRIPTION><![CDATA[Report displaying sales orders not shipped.]]></DESCRIPTION>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <URL><![CDATA[http://forge.openbravo.com/projects/ordersawaitingdlivery]]></URL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <TYPE><![CDATA[M]]></TYPE>
@@ -19,7 +19,7 @@
 <!--3A3A943684D64DEF9EC39F588A656848-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION_LABEL><![CDATA[PR17Q4]]></VERSION_LABEL>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--3A3A943684D64DEF9EC39F588A656848--></AD_MODULE>
--- a/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -7,7 +7,7 @@
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_MODULE_ID>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.32857]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -6,7 +6,7 @@
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <NAME><![CDATA[JSON Datasource]]></NAME>
-<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.32857]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.33184]]></VERSION>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <DESCRIPTION><![CDATA[Provides data source CRUD functionality using JSON as the data format]]></DESCRIPTION>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <HELP><![CDATA[This module implements the datasource concept. Datasources play a central role in Smartclient applications. The datasource module automatically creates a datasource for each Openbravo entity. In addition custom data source implementations can be defined.]]></HELP>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <URL><![CDATA[http://forge.openbravo.com/projects/datasourceservice]]></URL>
@@ -22,7 +22,7 @@
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0]]></UPDATEINFO>
-<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION_LABEL><![CDATA[PR17Q4]]></VERSION_LABEL>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4--></AD_MODULE>
--- a/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -7,7 +7,7 @@
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.32857]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.33184]]></STARTVERSION>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.32857]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.33184]]></STARTVERSION>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.32857]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--4FCE95802A854F7E8623AFF7C33D13EE-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--54AF8B39C55E4E7496902893ECD82786-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.32857]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--54AF8B39C55E4E7496902893ECD82786-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.32857]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.33184]]></STARTVERSION>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--D03C56D8A4E14F45A5466350E05C631F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -6,7 +6,7 @@
 <!--FF8080813129ADA401312CA1222A0005-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813129ADA401312CA1222A0005-->  <NAME><![CDATA[Integration with Google APIs]]></NAME>
-<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.32857]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.33184]]></VERSION>
 <!--FF8080813129ADA401312CA1222A0005-->  <DESCRIPTION><![CDATA[Integration with Google APIs]]></DESCRIPTION>
 <!--FF8080813129ADA401312CA1222A0005-->  <TYPE><![CDATA[M]]></TYPE>
 <!--FF8080813129ADA401312CA1222A0005-->  <LICENSE><![CDATA[Licensed under the Openbravo Public License Version 1.1.
@@ -19,7 +19,7 @@
 <!--FF8080813129ADA401312CA1222A0005-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--FF8080813129ADA401312CA1222A0005-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--FF8080813129ADA401312CA1222A0005-->  <VERSION_LABEL><![CDATA[PR17Q4]]></VERSION_LABEL>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--FF8080813129ADA401312CA1222A0005--></AD_MODULE>
--- a/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -7,7 +7,7 @@
 <!--FF8080813141B198013141BA0F7D0012-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141BA0F7D0012-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
 <!--FF8080813141B198013141BA0F7D0012-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.32857]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.33184]]></STARTVERSION>
 <!--FF8080813141B198013141BA0F7D0012-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813141B198013141BA0F7D0012-->  <DEPENDANT_MODULE_NAME><![CDATA[OpenID Service Integration]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813141B198013141BA0F7D0012-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--FF8080813151AEE1013151C4ACE6001B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.32857]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813151AEE1013151C4ACE6001B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -6,7 +6,7 @@
 <!--FF8080813141B198013141B86DD70003-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080813141B198013141B86DD70003-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141B86DD70003-->  <NAME><![CDATA[OpenID Service Integration]]></NAME>
-<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.32857]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.33184]]></VERSION>
 <!--FF8080813141B198013141B86DD70003-->  <DESCRIPTION><![CDATA[OpenID Service Integration]]></DESCRIPTION>
 <!--FF8080813141B198013141B86DD70003-->  <TYPE><![CDATA[M]]></TYPE>
 <!--FF8080813141B198013141B86DD70003-->  <LICENSE><![CDATA[Licensed under the Openbravo Public License Version 1.1.
@@ -19,7 +19,7 @@
 <!--FF8080813141B198013141B86DD70003-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--FF8080813141B198013141B86DD70003-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--FF8080813141B198013141B86DD70003-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--FF8080813141B198013141B86DD70003-->  <VERSION_LABEL><![CDATA[PR17Q4]]></VERSION_LABEL>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
 <!--FF8080813141B198013141B86DD70003-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--FF8080813141B198013141B86DD70003-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--FF8080813141B198013141B86DD70003--></AD_MODULE>
--- a/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -7,7 +7,7 @@
 <!--FF8080813141B198013141B8B21B0006-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141B8B21B0006-->  <AD_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_MODULE_ID>
 <!--FF8080813141B198013141B8B21B0006-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.32857]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
 <!--FF8080813141B198013141B8B21B0006-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813141B198013141B8B21B0006-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -6,7 +6,7 @@
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <NAME><![CDATA[JSON REST Webservice]]></NAME>
-<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.32857]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.33184]]></VERSION>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <DESCRIPTION><![CDATA[Provides a JSON REST webservice for CRUD service requests]]></DESCRIPTION>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <HELP><![CDATA[Provides a JSON REST webservice for CRUD service requests. Both the servlet implementation (receiving HTTP REST requests in JSON) as the backend processing are provided.]]></HELP>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravojsonrest]]></URL>
@@ -22,7 +22,7 @@
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0]]></UPDATEINFO>
-<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION_LABEL><![CDATA[PR17Q4]]></VERSION_LABEL>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1--></AD_MODULE>
--- a/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -7,7 +7,7 @@
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <AD_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_MODULE_ID>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.32857]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -6,7 +6,7 @@
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <NAME><![CDATA[User Interface Selector]]></NAME>
-<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.32857]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.33184]]></VERSION>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <DESCRIPTION><![CDATA[Provides a selector with a suggestion box and popup grid window]]></DESCRIPTION>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <HELP><![CDATA[The Openbravo selector provides new selector functionality which is used inside of existing Openbravo forms. The selector is mainly used for supporting foreign key references in the user interface. The selector combines both suggestion box behavior with a popup grid.]]></HELP>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <URL><![CDATA[http://forge.openbravo.com/projects/selector]]></URL>
@@ -22,7 +22,7 @@
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0]]></UPDATEINFO>
-<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION_LABEL><![CDATA[PR17Q4]]></VERSION_LABEL>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--5EB4F15C80684ACA904756BDC12ADBE5--></AD_MODULE>
--- a/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -7,7 +7,7 @@
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.32857]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.33184]]></STARTVERSION>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.32857]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--6DDE7B1A70174242AF82B5022FB89279-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.32857]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--94F9CD2CB5EF4467A67475C786C984A7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.32857]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.33184]]></STARTVERSION>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--C8DAC574B88649D08C9468521B343F12-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C8DAC574B88649D08C9468521B343F12-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--C8DAC574B88649D08C9468521B343F12-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.32857]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
 <!--C8DAC574B88649D08C9468521B343F12-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--C8DAC574B88649D08C9468521B343F12-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--C8DAC574B88649D08C9468521B343F12-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.32857]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--F14EB17946BE4724A46F80CB1A47EC70-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -6,7 +6,7 @@
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <NAME><![CDATA[2.50 to 3.00 Compatibility Skin]]></NAME>
-<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.32857]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.33184]]></VERSION>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <DESCRIPTION><![CDATA[Skin module to proper visualization of classic windows inside the MDI interface]]></DESCRIPTION>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HELP><![CDATA[With this skin module the classic windows styles will display in a way more coherent with the new 3.00 styles]]></HELP>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <URL><![CDATA[www.openbravo.com]]></URL>
@@ -23,7 +23,7 @@
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION_LABEL><![CDATA[PR17Q4]]></VERSION_LABEL>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--96998CBC42744B3DBEE28AC8095C9335--></AD_MODULE>
--- a/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -7,7 +7,7 @@
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <AD_MODULE_ID><![CDATA[96998CBC42744B3DBEE28AC8095C9335]]></AD_MODULE_ID>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.32857]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -6,7 +6,7 @@
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <NAME><![CDATA[Smartclient]]></NAME>
-<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.32857]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.33184]]></VERSION>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <DESCRIPTION><![CDATA[SmartClient libraries for use within Openbravo]]></DESCRIPTION>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <HELP><![CDATA[This module contains the SmartClient libraries for usage by other modules. It also contains some simple test pages to validate that SmartClient is working correctly. Also contains generic Openbravo SmartClient components]]></HELP>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <URL><![CDATA[http://forge.openbravo.com/projects/obsmartclient]]></URL>
@@ -23,7 +23,7 @@
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <UPDATEINFO><![CDATA[Bug fixing & new development for 3.0
 Updated to new SmartClient 8.3d 26-May-2012]]></UPDATEINFO>
-<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION_LABEL><![CDATA[PR17Q4]]></VERSION_LABEL>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9--></AD_MODULE>
--- a/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -7,7 +7,7 @@
 <!--086331E18477496B8AC74D2CFEBD1307-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.32857]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--DC5D4EF450244482BD2B458DAA496333-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.32857]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--DC5D4EF450244482BD2B458DAA496333-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.32857]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.33184]]></STARTVERSION>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--F2AF15C0AF5540E393D96BE506E20648-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -6,7 +6,7 @@
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <NAME><![CDATA[Log Clean Up Utility]]></NAME>
-<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION><![CDATA[1.0.32857]]></VERSION>
+<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION><![CDATA[1.0.33184]]></VERSION>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <DESCRIPTION><![CDATA[Log Clean Up Utility]]></DESCRIPTION>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <HELP><![CDATA[Utility to periodically cleanup log tables]]></HELP>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <URL><![CDATA[http://centralrepository.openbravo.com/heartbeat-server/org.openbravo.forge.ui/ForgeProjectDetail?projectId=7DC25E3B7ADE426CAD71E7804B95C1BF]]></URL>
@@ -21,7 +21,7 @@
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
-<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION_LABEL><![CDATA[PR17Q4]]></VERSION_LABEL>
+<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--8A34B301DC524EA3A07513DF9F42CC90--></AD_MODULE>
--- a/model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -7,7 +7,7 @@
 <!--86EBD30DEB8045508185B457896C9F6D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <AD_MODULE_ID><![CDATA[8A34B301DC524EA3A07513DF9F42CC90]]></AD_MODULE_ID>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--86EBD30DEB8045508185B457896C9F6D-->  <STARTVERSION><![CDATA[2.1.32857]]></STARTVERSION>
+<!--86EBD30DEB8045508185B457896C9F6D-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_DATASET.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_DATASET.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -12,7 +12,7 @@
 <!--49446AB3B19D4DD2AD0320D171EC2760-->  <EXPORT><![CDATA[N]]></EXPORT>
 <!--49446AB3B19D4DD2AD0320D171EC2760-->  <ACCESSLEVEL><![CDATA[6]]></ACCESSLEVEL>
 <!--49446AB3B19D4DD2AD0320D171EC2760-->  <EXPORTALLOWED><![CDATA[Y]]></EXPORTALLOWED>
-<!--49446AB3B19D4DD2AD0320D171EC2760-->  <CHECKSUM><![CDATA[204546209368682899496776916815840853745]]></CHECKSUM>
+<!--49446AB3B19D4DD2AD0320D171EC2760-->  <CHECKSUM><![CDATA[202663778136100076641772867762474140402]]></CHECKSUM>
 <!--49446AB3B19D4DD2AD0320D171EC2760-->  <ISDEFAULTVALUESDATASET><![CDATA[N]]></ISDEFAULTVALUESDATASET>
 <!--49446AB3B19D4DD2AD0320D171EC2760--></AD_DATASET>
 
--- a/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -6,7 +6,7 @@
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <NAME><![CDATA[Standard Roles]]></NAME>
-<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.32857]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.33184]]></VERSION>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <DESCRIPTION><![CDATA[Pre-configured collection of standard ERP roles]]></DESCRIPTION>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <HELP><![CDATA[This dataset contains the following roles with their access to corresponding Openbravo entities - windows, reports, actions.
 * Employee - Any person of the enterprise
@@ -28,7 +28,7 @@
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <REFERENCEDATAINFO><![CDATA[Pre-configured collection of standard ERP roles]]></REFERENCEDATAINFO>
-<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION_LABEL><![CDATA[PR17Q4]]></VERSION_LABEL>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61--></AD_MODULE>
--- a/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -7,7 +7,7 @@
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.32857]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--30F966407A6F4E15965821BAEE34D25B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.32857]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--30F966407A6F4E15965821BAEE34D25B-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--F93CE30003B24F8F8886510B0065EECC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <AD_DEPENDENT_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_DEPENDENT_MODULE_ID>
-<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.32857]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.33184]]></STARTVERSION>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <DEPENDANT_MODULE_NAME><![CDATA[Orders Awaiting Delivery]]></DEPENDANT_MODULE_NAME>
 <!--F93CE30003B24F8F8886510B0065EECC-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -6,7 +6,7 @@
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <NAME><![CDATA[Openbravo 3.0 Framework]]></NAME>
-<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.32857]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.33184]]></VERSION>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <DESCRIPTION><![CDATA[Openbravo 3.0 Framework]]></DESCRIPTION>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <HELP><![CDATA[Contains all the components required to run the Openbravo 3.0 framework]]></HELP>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <URL><![CDATA[http://forge.openbravo.com/projects/openbravov30framework]]></URL>
@@ -24,7 +24,7 @@
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <UPDATEINFO><![CDATA[minor bugfix release to include latest client.application 2.0.1, client.myob 2.0.2 and client.kernel 2.0.1]]></UPDATEINFO>
-<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION_LABEL><![CDATA[PR17Q4]]></VERSION_LABEL>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--7E48CDD73B7E493A8BED4F7253E7C989--></AD_MODULE>
--- a/model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -7,7 +7,7 @@
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.32857]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <DEPENDANT_MODULE_NAME><![CDATA[My Openbravo Tab]]></DEPENDANT_MODULE_NAME>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--025B181F63CA47B48A920F6983242390-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--025B181F63CA47B48A920F6983242390-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--025B181F63CA47B48A920F6983242390-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.32857]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
 <!--025B181F63CA47B48A920F6983242390-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--025B181F63CA47B48A920F6983242390-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--025B181F63CA47B48A920F6983242390-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.32857]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Application]]></DEPENDANT_MODULE_NAME>
 <!--054B4FEAF919478AA3FF27098A46D1D6-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_DEPENDENT_MODULE_ID>
-<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.32857]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.33184]]></STARTVERSION>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <DEPENDANT_MODULE_NAME><![CDATA[Query/List Widget]]></DEPENDANT_MODULE_NAME>
 <!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--224754C3EF674C93B0D468F47BAAB824-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.32857]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME>
 <!--224754C3EF674C93B0D468F47BAAB824-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--5B72D24032DD4879A950194139D961B6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5B72D24032DD4879A950194139D961B6-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--5B72D24032DD4879A950194139D961B6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.32857]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
 <!--5B72D24032DD4879A950194139D961B6-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--5B72D24032DD4879A950194139D961B6-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME>
 <!--5B72D24032DD4879A950194139D961B6-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -91,7 +91,7 @@
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <AD_DEPENDENT_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_DEPENDENT_MODULE_ID>
-<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.32857]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.33184]]></STARTVERSION>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <DEPENDANT_MODULE_NAME><![CDATA[HTML Widget]]></DEPENDANT_MODULE_NAME>
 <!--8730CA6A4224439D82E0DD31B3806E36-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -105,7 +105,7 @@
 <!--98C47FF058F8413B8A2B26036061446E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--98C47FF058F8413B8A2B26036061446E-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--98C47FF058F8413B8A2B26036061446E-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.32857]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.33184]]></STARTVERSION>
 <!--98C47FF058F8413B8A2B26036061446E-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--98C47FF058F8413B8A2B26036061446E-->  <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
 <!--98C47FF058F8413B8A2B26036061446E-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -119,7 +119,7 @@
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <AD_DEPENDENT_MODULE_ID><![CDATA[96998CBC42744B3DBEE28AC8095C9335]]></AD_DEPENDENT_MODULE_ID>
-<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.32857]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.33184]]></STARTVERSION>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <DEPENDANT_MODULE_NAME><![CDATA[2.50 to 3.00 Compatibility Skin]]></DEPENDANT_MODULE_NAME>
 <!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -133,7 +133,7 @@
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID>
-<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.32857]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME>
 <!--A9CB99330AF34944877F889DD8A0AB3C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -147,7 +147,7 @@
 <!--E72A053A403C4A98A189C105B850ADB0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.32857]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.33184]]></STARTVERSION>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <DEPENDANT_MODULE_NAME><![CDATA[JBoss Weld]]></DEPENDANT_MODULE_NAME>
 <!--E72A053A403C4A98A189C105B850ADB0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -161,7 +161,7 @@
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_DEPENDENT_MODULE_ID>
-<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.32857]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.33184]]></STARTVERSION>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -6,7 +6,7 @@
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <NAME><![CDATA[Openbravo 3.0]]></NAME>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.32857]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.33184]]></VERSION>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <DESCRIPTION><![CDATA[Openbravo 3.0 distribution template]]></DESCRIPTION>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HELP><![CDATA[Openbravo 3.0 is a collection (distribution) of modules. This template is a container of all the modules and configuration changes that compose Openbravo 3.0.]]></HELP>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <URL><![CDATA[http://forge.openbravo.com/projects/vthree]]></URL>
@@ -20,7 +20,7 @@
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[PR17Q4]]></VERSION_LABEL>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--0138E7A89B5E4DC3932462252801FFBC--></AD_MODULE>
--- a/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -7,7 +7,7 @@
 <!--48D556894CE54CF998DC97882E904CBD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--48D556894CE54CF998DC97882E904CBD-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--48D556894CE54CF998DC97882E904CBD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[8A098711BB324335A19833286BDB093D]]></AD_DEPENDENT_MODULE_ID>
-<!--48D556894CE54CF998DC97882E904CBD-->  <STARTVERSION><![CDATA[1.0.32857]]></STARTVERSION>
+<!--48D556894CE54CF998DC97882E904CBD-->  <STARTVERSION><![CDATA[1.0.33184]]></STARTVERSION>
 <!--48D556894CE54CF998DC97882E904CBD-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--48D556894CE54CF998DC97882E904CBD-->  <DEPENDANT_MODULE_NAME><![CDATA[Apache External Connection Pool]]></DEPENDANT_MODULE_NAME>
 <!--48D556894CE54CF998DC97882E904CBD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -21,7 +21,7 @@
 <!--4D11E3A70650475381139522373CD191-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4D11E3A70650475381139522373CD191-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--4D11E3A70650475381139522373CD191-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.32857]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.33184]]></STARTVERSION>
 <!--4D11E3A70650475381139522373CD191-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--4D11E3A70650475381139522373CD191-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--4D11E3A70650475381139522373CD191-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,7 @@
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_DEPENDENT_MODULE_ID>
-<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.32857]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <DEPENDANT_MODULE_NAME><![CDATA[Payment Report]]></DEPENDANT_MODULE_NAME>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,7 @@
 <!--60834727BB114764ACEF019F40A34562-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--60834727BB114764ACEF019F40A34562-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--60834727BB114764ACEF019F40A34562-->  <AD_DEPENDENT_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_DEPENDENT_MODULE_ID>
-<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.32857]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.33184]]></STARTVERSION>
 <!--60834727BB114764ACEF019F40A34562-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--60834727BB114764ACEF019F40A34562-->  <DEPENDANT_MODULE_NAME><![CDATA[Orders Awaiting Delivery]]></DEPENDANT_MODULE_NAME>
 <!--60834727BB114764ACEF019F40A34562-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,7 @@
 <!--8418885E97D643138B6D907671351E3D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8418885E97D643138B6D907671351E3D-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--8418885E97D643138B6D907671351E3D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_DEPENDENT_MODULE_ID>
-<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.32857]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
 <!--8418885E97D643138B6D907671351E3D-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--8418885E97D643138B6D907671351E3D-->  <DEPENDANT_MODULE_NAME><![CDATA[Standard Roles]]></DEPENDANT_MODULE_NAME>
 <!--8418885E97D643138B6D907671351E3D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,7 @@
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.32857]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MINOR]]></DEPENDENCY_ENFORCEMENT>
@@ -91,7 +91,7 @@
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.32857]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.33184]]></STARTVERSION>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <DEPENDANT_MODULE_NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></DEPENDANT_MODULE_NAME>
 <!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -105,7 +105,7 @@
 <!--FEF6E40F244A4061B7C62CB755663712-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <AD_DEPENDENT_MODULE_ID><![CDATA[8A34B301DC524EA3A07513DF9F42CC90]]></AD_DEPENDENT_MODULE_ID>
-<!--FEF6E40F244A4061B7C62CB755663712-->  <STARTVERSION><![CDATA[1.0.32857]]></STARTVERSION>
+<!--FEF6E40F244A4061B7C62CB755663712-->  <STARTVERSION><![CDATA[1.0.33184]]></STARTVERSION>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <DEPENDANT_MODULE_NAME><![CDATA[Log Clean Up Utility]]></DEPENDANT_MODULE_NAME>
 <!--FEF6E40F244A4061B7C62CB755663712-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -119,7 +119,7 @@
 <!--FF8080813189932B013189B45B59003A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813189932B013189B45B59003A-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8080813189932B013189B45B59003A-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.32857]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.33184]]></STARTVERSION>
 <!--FF8080813189932B013189B45B59003A-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDANT_MODULE_NAME><![CDATA[OpenID Service Integration]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -133,7 +133,7 @@
 <!--FF8080813189932B013189B4C00F003D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813189932B013189B4C00F003D-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8080813189932B013189B4C00F003D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.32857]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.33184]]></STARTVERSION>
 <!--FF8080813189932B013189B4C00F003D-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8080813189932B013189B4C00F003D-->  <DEPENDANT_MODULE_NAME><![CDATA[Integration with Google APIs]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813189932B013189B4C00F003D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -147,7 +147,7 @@
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.32857]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.33184]]></STARTVERSION>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDANT_MODULE_NAME><![CDATA[Widgets Collection]]></DEPENDANT_MODULE_NAME>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/src-db/database/model/excludeFilter.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/excludeFilter.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -95,4 +95,5 @@
     <excludedFunction name="WORD_SIMILARITY_COMMUTATOR_OP"/>
 
     <excludedFunction name="OBEQUALS"/>
+    <excludedFunction name="UUID\_%"/> <!-- PostgreSQL uuid functions -->
   </vector>
--- a/model/src-db/database/model/functions/AD_COLUMN_IDENTIFIER_REF_SQL.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/functions/AD_COLUMN_IDENTIFIER_REF_SQL.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -42,7 +42,6 @@
   v_NewColumnName     VARCHAR2(60) ;
   v_NewReference      VARCHAR2(32);
   v_NewReferenceValue VARCHAR2(32);
-  v_KeyReference      VARCHAR2(32);
   v_firstColumn       BOOLEAN:=TRUE;
   END_PROCESS         BOOLEAN:=FALSE;
 BEGIN
@@ -54,14 +53,12 @@
   ELSIF p_Reference_ID='18' THEN -- TABLE
     SELECT ad_table.tablename,
       c1.columnname as keyName,
-      c1.ad_reference_id,
       c2.columnname as displayName,
       isvaluedisplayed,
       c2.AD_REFERENCE_ID,
       c2.AD_REFERENCE_VALUE_ID
     INTO v_TableDir,
       v_FieldValue,
-      v_KeyReference,
       v_FieldDisplay,
       v_DisplayValue,
       v_NewReference,
--- a/model/src-db/database/model/functions/AD_TABLE_IMPORT.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/functions/AD_TABLE_IMPORT.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -38,7 +38,6 @@
   v_Message VARCHAR2(2000):='';
   v_Result NUMBER:=1; -- 0=failure
   v_Record_ID VARCHAR2(32);
-  v_AD_User_ID VARCHAR2(32):='0';
   v_module_table_id varchar2(32);
   v_module_id varchar2(32);
   db_prefix varchar2(30);
@@ -68,7 +67,6 @@
     v_LastColumnName VARCHAR2(40) ;
     v_varchar2 VARCHAR2(32767) ;
     v_FieldLength NUMBER(10) ;
-    v_Client_ID VARCHAR2(32);
     v_Aux NUMBER;
     v_missingColumns boolean;
     v_CorrectType CHAR(1):='Y';
@@ -90,8 +88,6 @@
         )
       LOOP
         v_Record_ID:=Cur_Parameter.Record_ID;
-        v_AD_User_ID:=Cur_Parameter.AD_User_ID;
-        v_Client_ID:=Cur_Parameter.AD_CLIENT_ID;
       END LOOP; -- Get Parameter
     ELSE
       v_Record_ID:=p_AD_Table_ID;
--- a/model/src-db/database/model/functions/AD_TAB_IMPORT.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/functions/AD_TAB_IMPORT.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -38,7 +38,6 @@
   v_Message VARCHAR2(2000):='';
   v_Result NUMBER:=1; -- 0=failure
   v_Record_ID VARCHAR2(32);
-  v_AD_User_ID VARCHAR2(32):='0';
   v_module_id varchar2(32);
   v_fieldModule varchar2(32);
   v_Aux NUMBER;
@@ -63,7 +62,6 @@
     v_sortNo NUMBER(10) ;
     v_LastColumnName VARCHAR2(40) ;
     v_DisplayLength NUMBER(10) ;
-    v_Client_ID VARCHAR2(32);
     v_IgnoreInWad CHAR(1):='N';
   BEGIN
     IF(p_PInstance_ID IS NOT NULL) THEN
@@ -83,8 +81,6 @@
         )
       LOOP
         v_Record_ID:=Cur_Parameter.Record_ID;
-        v_AD_User_ID:=Cur_Parameter.AD_User_ID;
-        v_Client_ID:=Cur_Parameter.AD_CLIENT_ID;
       END LOOP; -- Get Parameter
     ELSE
       v_Record_ID:=p_AD_Tab_ID;
--- a/model/src-db/database/model/functions/AD_UPDATE_TABLE_IDENTIFIER.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/functions/AD_UPDATE_TABLE_IDENTIFIER.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -26,12 +26,9 @@
   v_ResultStr VARCHAR2(2000):='';
   v_Message VARCHAR2(2000):='';
   v_Result NUMBER:=1; -- 0=failure
-  v_Record_ID VARCHAR2(32);
-  v_AD_User_ID VARCHAR2(32);
   v_count NUMBER:=0;
   -- Parameter
   TYPE RECORD IS REF CURSOR;
-    Cur_Parameter RECORD;
     v_sql VARCHAR2(4000):='';
     Cur_Tables RECORD;
   BEGIN
@@ -40,26 +37,6 @@
       DBMS_OUTPUT.PUT_LINE('AD_Update_Table_Identifier - Processing ' || p_PInstance_ID) ;
       v_ResultStr:='PInstanceNotFound';
       AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'Y', NULL, NULL) ;
-      -- Get Parameters
-      v_ResultStr:='ReadingParameters';
-      FOR Cur_Parameter IN
-        (SELECT i.Record_ID, i.AD_User_ID, p.ParameterName, p.P_String, p.P_Number, p.P_Date
-        FROM AD_PINSTANCE i
-        LEFT JOIN AD_PINSTANCE_PARA p
-          ON i.AD_PInstance_ID=p.AD_PInstance_ID
-        WHERE i.AD_PInstance_ID=p_PInstance_ID
-        ORDER BY p.SeqNo
-        )
-      LOOP
-        v_Record_ID:=Cur_Parameter.Record_ID;
-        v_AD_User_ID:=Cur_Parameter.AD_User_ID;
-        -- IF (Cur_Parameter.ParameterName = 'xx') THEN
-        --  p_xx := Cur_Parameter.P_String;
-        --  DBMS_OUTPUT.PUT_LINE('  xx=' || p_xx);
-        -- ELSE
-        --  DBMS_OUTPUT.PUT_LINE('*** Unknown Parameter=' || Cur_Parameter.ParameterName);
-        --  END IF;
-      END LOOP; -- Get Parameter
     END IF;
   BEGIN --BODY
     v_ResultStr:='ExecutingUpdates';
--- a/model/src-db/database/model/functions/C_ORDER_POST1.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/functions/C_ORDER_POST1.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -1603,6 +1603,18 @@
           UPDATE C_ORDER  SET DocStatus='VO'  WHERE C_Order_ID=v_Record_ID;
         END IF;
       END IF;
+      
+      -- If there is at least one line with different Quantity Ordered than Quantity Delivered, set the IsDelivered flag as N
+      -- By default this flag is already N for new Orders, this can happen when the Order has been cloned from another one
+      -- that has been already delivered, and then the lines information has changed
+      IF (ToDeliver <> 0) THEN
+        UPDATE C_ORDER
+        SET IsDelivered='N',
+            Updated=now(),
+            UpdatedBy=v_User
+        WHERE C_Order_ID=v_Record_ID;
+      END IF;
+
       -- We are done with standard sales orders
       IF (v_DocSubTypeSO = 'RM' OR v_isreturndoctype = 'Y') THEN
 
--- a/model/src-db/database/model/functions/MA_PRODUCTION_COST.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/functions/MA_PRODUCTION_COST.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -360,7 +360,12 @@
         v_ProductionCost := v_ProductionCost + COALESCE(v_ProductionCost_Tmp,0);
         v_ProductionCost_Tmp := 0;
 
-        FOR Cur_ProductionLine IN (SELECT pl.*, p.VALUE
+        FOR Cur_ProductionLine IN (SELECT pl.*, p.VALUE,
+                                     (SELECT count(1)
+                                      FROM m_productionline pl2 JOIN m_productionplan pp on pl2.m_productionplan_id = pp.m_productionplan_id
+                                      WHERE productiontype = '-'
+                                        AND pl2.m_product_id = pl.m_product_id
+                                        AND pp.m_production_id = p_production_id) AS isWip
                                    FROM M_PRODUCTIONLINE pl, M_PRODUCT p
                                    WHERE M_ProductionPlan_ID = Cur_ProductionPlan.M_ProductionPlan_ID
                                      AND pl.M_Product_ID = p.M_Product_ID
@@ -438,23 +443,27 @@
               AND ISPRODUCTION='Y';
 
             --Insert cost per unit.
-            IF (v_iscostmigrated = 'Y') THEN
-              --Do nothing
+            IF (v_iscostmigrated = 'Y' AND Cur_ProductionLine.isWip = 0) THEN
+              -- The product is not consumed in the same work effort so m_costing will be updated/created by the costing server
+              -- If it is WIP then we need to update the cost of the product so the production run that consumes it it is
+              -- Taking into account the new production cost.
               v_ResultStr := 'new engine in use';
             ELSIF (v_count2 = 0) THEN
               v_ResultStr := 'new cost';
-              Ad_Sequence_Next('M_Costing', Cur_ProductionLine.AD_ORG_ID, v_NextNo);
+              v_nextNo := get_Uuid();
               --First time
               INSERT INTO M_COSTING (M_COSTING_ID, CREATED, CREATEDBY, UPDATED, UPDATEDBY, AD_CLIENT_ID,
                             AD_ORG_ID, M_PRODUCT_ID, DATETO, DATEFROM, ISMANUAL,
                             M_PRODUCTIONLINE_ID, QTY,
                             PRICE,
-                            COST, ISPERMANENT, ISPRODUCTION, COSTTYPE)
+                            COST, ISPERMANENT, ISPRODUCTION,
+                            COSTTYPE)
                      VALUES (v_NextNo,now(), p_User_ID, now(), p_User_ID, Cur_ProductionLine.AD_CLIENT_ID,
                             Cur_ProductionLine.AD_ORG_ID, Cur_ProductionLine.M_PRODUCT_ID, TO_DATE('31-12-9999','DD-MM-YYYY'), v_CostingDate, 'N',
                             Cur_ProductionLine.M_PRODUCTIONLINE_ID, Cur_ProductionLine.MOVEMENTQTY,
                             ROUND(v_Cost/Cur_ProductionLine.MOVEMENTQTY,4),
-                            (CASE (Cur_ProductionLine.MOVEMENTQTY) WHEN 0 THEN 0 ELSE ROUND(v_Cost/Cur_ProductionLine.MOVEMENTQTY,4) END), 'N', 'Y', 'AV');
+                            (CASE (Cur_ProductionLine.MOVEMENTQTY) WHEN 0 THEN 0 ELSE ROUND(v_Cost/Cur_ProductionLine.MOVEMENTQTY,4) END), 'N', 'Y',
+                            CASE v_iscostmigrated WHEN 'Y' THEN 'AVA' ELSE 'AV' END);
             ELSE
               v_ResultStr := 'update cost';
               --Check if costing is correct, there must be only one cost
@@ -507,13 +516,15 @@
                             M_PRODUCTIONLINE_ID, QTY,
                             PRICE,
                             COST,
-                            ISPERMANENT, ISPRODUCTION, COSTTYPE)
+                            ISPERMANENT, ISPRODUCTION,
+                            COSTTYPE)
                        VALUES (v_NextNo,now(), p_User_ID, now(), p_User_ID, Cur_ProductionLine.AD_CLIENT_ID,
                             Cur_ProductionLine.AD_ORG_ID, Cur_ProductionLine.M_PRODUCT_ID, v_DateTo, v_CostingDate, 'N',
                             Cur_ProductionLine.M_PRODUCTIONLINE_ID, Cur_ProductionLine.MOVEMENTQTY,
                             ROUND(v_Cost/Cur_ProductionLine.MOVEMENTQTY,4),
                             (CASE (v_Qty+Cur_ProductionLine.MOVEMENTQTY) WHEN 0 THEN 0 ELSE ROUND(((v_Qty*v_CostOld)+(v_Cost))/(v_Qty+Cur_ProductionLine.MOVEMENTQTY),4)END),
-                                'N', 'Y', 'AV');
+                                'N', 'Y',
+                            CASE v_iscostmigrated WHEN 'Y' THEN 'AVA' ELSE 'AV' END);
               ELSIF (v_count2 = 0) THEN
                 SELECT COALESCE(MIN(DATEFROM), TO_DATE('31-12-9999','DD-MM-YYYY')) INTO v_DateTo
                 FROM M_COSTING
@@ -537,13 +548,15 @@
                             M_PRODUCTIONLINE_ID, QTY,
                             PRICE,
                             COST,
-                            ISPERMANENT, ISPRODUCTION, COSTTYPE)
+                            ISPERMANENT, ISPRODUCTION,
+                            COSTTYPE)
                        VALUES (v_NextNo,now(), p_User_ID, now(), p_User_ID, Cur_ProductionLine.AD_CLIENT_ID,
                             Cur_ProductionLine.AD_ORG_ID, Cur_ProductionLine.M_PRODUCT_ID, v_DateTo, v_CostingDate, 'N',
                             Cur_ProductionLine.M_PRODUCTIONLINE_ID, Cur_ProductionLine.MOVEMENTQTY,
                             ROUND(v_Cost/Cur_ProductionLine.MOVEMENTQTY,4),
                             (CASE (v_Qty+Cur_ProductionLine.MOVEMENTQTY) WHEN 0 THEN 0 ELSE ROUND(((v_Qty*v_CostOld)+(v_Cost))/(v_Qty+Cur_ProductionLine.MOVEMENTQTY),4)END),
-                              'N', 'Y', 'AV');
+                              'N', 'Y',
+                            CASE v_iscostmigrated WHEN 'Y' THEN 'AVA' ELSE 'AV' END);
 
               ELSE
                 --If for productiondate there are more than one calculated costs
--- a/model/src-db/database/model/functions/M_PROMOTION_CALCULATE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/functions/M_PROMOTION_CALCULATE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -22,7 +22,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-2016 Openbravo SLU
+* All portions are Copyright (C) 2012-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -214,16 +214,19 @@
           AND t.M_Offer_Type_ID = M_Offer.M_Offer_Type_ID
           AND ((PRICELIST_SELECTION='Y' AND NOT EXISTS (SELECT 1 FROM M_OFFER_PRICELIST
              WHERE M_OFFER_ID=M_OFFER.M_OFFER_ID
-             AND M_PRICELIST_ID = v_priceList))
+             AND M_PRICELIST_ID = v_priceList
+             AND ISACTIVE = 'Y'))
            OR (PRICELIST_SELECTION='N' AND EXISTS(SELECT 1 FROM M_OFFER_PRICELIST
               WHERE M_OFFER_ID = M_OFFER.M_OFFER_ID
-              AND M_PRICELIST_ID = v_priceList)))
+              AND M_PRICELIST_ID = v_priceList
+              AND ISACTIVE = 'Y')))
           AND((BPARTNER_SELECTION = 'Y'
           AND NOT EXISTS
           (SELECT 1
           FROM M_OFFER_BPARTNER
           WHERE M_OFFER_ID = M_OFFER.M_OFFER_ID
             AND C_BPARTNER_ID = v_partner
+            AND ISACTIVE = 'Y'
           ))
           OR(BPARTNER_SELECTION = 'N'
           AND EXISTS
@@ -231,6 +234,7 @@
           FROM M_OFFER_BPARTNER
           WHERE M_OFFER_ID = M_OFFER.M_OFFER_ID
             AND C_BPARTNER_ID = v_partner
+            AND ISACTIVE = 'Y'
           )))
           AND((BP_GROUP_SELECTION = 'Y'
           AND NOT EXISTS
@@ -240,6 +244,7 @@
           WHERE OB.M_OFFER_ID = M_OFFER.M_OFFER_ID
             AND B.C_BPARTNER_ID = v_partner
             AND OB.C_BP_GROUP_ID = B.C_BP_GROUP_ID
+            AND OB.ISACTIVE = 'Y'
           ))
           OR(BP_GROUP_SELECTION = 'N'
           AND EXISTS
@@ -249,6 +254,7 @@
           WHERE OB.M_OFFER_ID = M_OFFER.M_OFFER_ID
             AND B.C_BPARTNER_ID = v_partner
             AND OB.C_BP_GROUP_ID = B.C_BP_GROUP_ID
+            AND OB.ISACTIVE = 'Y'
           )))
           AND((PRODUCT_SELECTION = 'Y'
           AND NOT EXISTS
@@ -256,6 +262,7 @@
           FROM M_OFFER_PRODUCT
           WHERE M_OFFER_ID = M_OFFER.M_OFFER_ID
             AND M_PRODUCT_ID = Cur_Order.M_Product_ID
+            AND ISACTIVE = 'Y'
           ))
           OR(PRODUCT_SELECTION = 'N'
           AND EXISTS
@@ -263,6 +270,7 @@
           FROM M_OFFER_PRODUCT
           WHERE M_OFFER_ID = M_OFFER.M_OFFER_ID
             AND M_PRODUCT_ID = Cur_Order.M_Product_ID
+            AND ISACTIVE = 'Y'
           )))
           AND((PROD_CAT_SELECTION = 'Y'
           AND NOT EXISTS
@@ -272,6 +280,7 @@
           WHERE OP.M_OFFER_ID = M_OFFER.M_OFFER_ID
             AND P.M_PRODUCT_ID = Cur_Order.M_Product_ID
             AND OP.M_PRODUCT_CATEGORY_ID = P.M_PRODUCT_CATEGORY_ID
+            AND OP.ISACTIVE = 'Y'
           ))
           OR(PROD_CAT_SELECTION = 'N'
           AND EXISTS
@@ -281,6 +290,7 @@
           WHERE OP.M_OFFER_ID = M_OFFER.M_OFFER_ID
             AND P.M_PRODUCT_ID = Cur_Order.M_Product_ID
             AND OP.M_PRODUCT_CATEGORY_ID = P.M_PRODUCT_CATEGORY_ID
+            AND OP.ISACTIVE = 'Y'
           )))
           AND ((ORG_SELECTION = 'Y'
           AND NOT EXISTS
@@ -288,6 +298,7 @@
           FROM M_OFFER_ORGANIZATION O
           WHERE O.M_OFFER_ID = M_OFFER.M_OFFER_ID
             AND O.AD_ORG_ID = Cur_Order.AD_Org_ID
+            AND O.ISACTIVE = 'Y'
           ))
           OR(ORG_SELECTION = 'N'
           AND EXISTS
@@ -295,6 +306,7 @@
           FROM M_OFFER_ORGANIZATION O
           WHERE O.M_OFFER_ID = M_OFFER.M_OFFER_ID
             AND O.AD_ORG_ID = Cur_Order.AD_Org_ID
+            AND O.ISACTIVE = 'Y'
           )))
           AND ((CHARACTERISTICS_SELECTION = 'Y'
           AND NOT EXISTS
@@ -303,6 +315,7 @@
           WHERE C.M_OFFER_ID = M_OFFER.M_OFFER_ID
             AND V.M_PRODUCT_ID = Cur_Order.M_Product_ID
             AND m_isparent_ch_value(V.M_CH_VALUE_ID, C.M_CH_VALUE_ID, C.M_CHARACTERISTIC_ID) <> -1
+            AND C.ISACTIVE = 'Y'
           ))
           OR(CHARACTERISTICS_SELECTION = 'N'
           AND EXISTS
@@ -311,6 +324,7 @@
           WHERE C.M_OFFER_ID = M_OFFER.M_OFFER_ID
             AND V.M_PRODUCT_ID = Cur_Order.M_Product_ID
             AND m_isparent_ch_value(V.M_CH_VALUE_ID, C.M_CH_VALUE_ID, C.M_CHARACTERISTIC_ID) <> -1
+            AND C.ISACTIVE = 'Y'
           ))
           )
         ORDER BY PRIORITY,
--- a/model/src-db/database/model/functions/M_REQUISITION_CREATEPO.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/functions/M_REQUISITION_CREATEPO.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -311,7 +311,7 @@
           M_ATTRIBUTESETINSTANCE_ID,
           M_WAREHOUSE_ID, C_UOM_ID, QTYORDERED, C_CURRENCY_ID,
           PRICELIST, PRICEACTUAL, PRICELIMIT,
-          PRICESTD, LINENETAMT, DISCOUNT,
+          PRICESTD, LINENETAMT, DISCOUNT, GROSSPRICESTD,
           C_TAX_ID, M_PRODUCT_UOM_ID, QUANTITYORDER, GROSS_UNIT_PRICE, LINE_GROSS_AMOUNT,
           C_AUM, AUMQTY
       ) VALUES (
@@ -322,7 +322,7 @@
           Cur_Lines.M_AttributeSetInstance_ID,
           p_Warehouse_ID, Cur_Lines.C_UOM_ID, Cur_Lines.QTY - Cur_Lines.ORDEREDQTY, v_Currency_ID,
           v_PriceList, v_PriceActual, v_PriceLimit,
-          v_PriceStd, v_LineNetAmt,v_Discount,
+          v_PriceStd, v_LineNetAmt, v_Discount, v_gross_unit_price,
           v_Tax_ID, Cur_Lines.M_Product_UOM_ID, Cur_Lines.QuantityOrder, v_gross_unit_price, v_line_gross_amount,
           v_Aum, v_AumQty
       );
--- a/model/src-db/database/model/postscript-PostgreSql.sql	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/postscript-PostgreSql.sql	Wed Feb 21 11:03:41 2018 +0000
@@ -272,12 +272,6 @@
   LANGUAGE 'plpgsql' VOLATILE
 /-- END
 
-CREATE OR REPLACE FUNCTION uuid_generate_v4()
-RETURNS uuid
-AS '$libdir/uuid-ossp', 'uuid_generate_v4'
-VOLATILE STRICT LANGUAGE C;
-/-- END
-
 -- Inserts an alert recipient for available updates
 -- See issue:  https://issues.openbravo.com/view.php?id=11743
 CREATE OR REPLACE FUNCTION pg_temp.insert_recipient()
--- a/model/src-db/database/model/prescript-PostgreSql.sql	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/prescript-PostgreSql.sql	Wed Feb 21 11:03:41 2018 +0000
@@ -1179,13 +1179,6 @@
 DROP FUNCTION drop_view (varchar)
 /-- END
 
-
-CREATE OR REPLACE FUNCTION uuid_generate_v4()
-RETURNS uuid
-AS '$libdir/uuid-ossp', 'uuid_generate_v4'
-VOLATILE STRICT LANGUAGE C;
-/-- END
-
 CREATE OR REPLACE FUNCTION get_uuid()
   RETURNS varchar AS
 $BODY$ DECLARE
@@ -1533,10 +1526,6 @@
   LANGUAGE plpgsql IMMUTABLE
 /-- END
 
--- INSTALL PG_TRGM EXTENSION
-CREATE EXTENSION IF NOT EXISTS "pg_trgm"
-/-- END
-
 CREATE OR REPLACE FUNCTION obequals(
     p_number_a numeric,
     p_number_b numeric)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/prescript-systemuser-PostgreSql.sql	Wed Feb 21 11:03:41 2018 +0000
@@ -0,0 +1,18 @@
+-- In previous versions of Openbravo uuid_generate_v4 was created manually not enabling the uuid-ossp
+-- extension. If that is the case we need to drop it before creating the extension to avoid errors.
+DO $$DECLARE
+  v_exists NUMERIC;
+
+BEGIN
+  SELECT count(1) INTO v_exists FROM pg_extension WHERE extname = 'uuid-ossp';
+  IF (v_exists = 0) THEN
+    DROP FUNCTION IF EXISTS uuid_generate_v4();
+  END IF;
+END$$;
+/-- END
+
+CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
+/-- END
+
+CREATE EXTENSION IF NOT EXISTS "pg_trgm";
+/-- END
--- a/model/src-db/database/model/tables/C_INVOICELINE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/tables/C_INVOICELINE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -304,6 +304,10 @@
       <foreign-key foreignTable="USER2" name="C_INVOICELINE_USER2">
         <reference local="USER2_ID" foreign="USER2_ID"/>
       </foreign-key>
+      <index name="C_INVOICELINE_BOMPARENT_IDX" unique="false">
+        <index-column name="BOM_PARENT_ID"/>
+        <whereClause><![CDATA[BOM_PARENT_ID IS NOT NULL]]></whereClause>
+      </index>
       <index name="C_INVOICELINE_INOUTLINE" unique="false">
         <index-column name="M_INOUTLINE_ID"/>
         <whereClause><![CDATA[M_INOUTLINE_ID IS NOT NULL]]></whereClause>
--- a/model/src-db/database/model/tables/C_ORDER.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/tables/C_ORDER.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -494,6 +494,10 @@
       <index name="C_ORDER_POSTED" unique="false">
         <index-column name="POSTED"/>
       </index>
+      <index name="C_ORDER_QUOTATION_IDX" unique="false">
+        <index-column name="QUOTATION_ID"/>
+        <whereClause><![CDATA[QUOTATION_ID IS NOT NULL]]></whereClause>
+      </index>
       <index name="C_ORDER_UPDATED" unique="false">
         <index-column name="UPDATED"/>
       </index>
--- a/model/src-db/database/model/tables/M_ATTRIBUTESETINSTANCE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/tables/M_ATTRIBUTESETINSTANCE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -65,17 +65,6 @@
         <default/>
         <onCreateDefault/>
       </column>
-      <column name="M_REFINVENTORY_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <column name="PARENT_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <foreign-key foreignTable="M_REFINVENTORY" name="M_ATTRIBUTESETI_TANCE_M_REFINV">
-        <reference local="M_REFINVENTORY_ID" foreign="M_REFINVENTORY_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_CLIENT" name="M_ATTRIBUTESETINSTANCE_AD_CLIE">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -88,14 +77,6 @@
       <foreign-key foreignTable="M_LOT" name="M_ATTRIBUTESETINSTANCE_M_LOT">
         <reference local="M_LOT_ID" foreign="M_LOT_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="M_ATTRIBUTESETINSTANCE" name="M_ATTRIBUTESETINSTANCE_PARENT">
-        <reference local="PARENT_ATTRIBUTESETINSTANCE_ID" foreign="M_ATTRIBUTESETINSTANCE_ID"/>
-      </foreign-key>
-      <index name="M_ATTRIBUTESETINST_REFINV_IX" unique="false">
-        <index-column name="M_REFINVENTORY_ID"/>
-        <whereClause><![CDATA[M_REFINVENTORY_ID IS NOT NULL]]></whereClause>
-      </index>
-      <check name="M_ATTRIBUTESETINST_REFINV_CH"><![CDATA[M_REFINVENTORY_ID IS NULL OR M_REFINVENTORY_ID IS NOT NULL AND PARENT_ATTRIBUTESETINSTANCE_ID IS NOT NULL]]></check>
       <check name="M_ATTRIBUTESETINSTANCE_ISA_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="M_ATTRIBUTESETINSTANCE_ISL_CHK"><![CDATA[ISLOCKED IN ('Y', 'N')]]></check>
     </table>
--- a/model/src-db/database/model/tables/M_COSTING.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/tables/M_COSTING.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -136,6 +136,10 @@
       <foreign-key foreignTable="M_PRODUCTIONLINE" name="M_PRODUCTIONLINE_MCOSTING">
         <reference local="M_PRODUCTIONLINE_ID" foreign="M_PRODUCTIONLINE_ID"/>
       </foreign-key>
+      <index name="M_COSTING_INVOICELINE_IDX" unique="false">
+        <index-column name="C_INVOICELINE_ID"/>
+        <whereClause><![CDATA[C_INVOICELINE_ID IS NOT NULL]]></whereClause>
+      </index>
       <index name="M_COSTING_M_PRODUCT_ID" unique="false">
         <index-column name="M_PRODUCT_ID"/>
       </index>
--- a/model/src-db/database/model/tables/M_INOUT.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/tables/M_INOUT.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -340,6 +340,10 @@
         <index-column name="DOCUMENTNO"/>
         <index-column name="M_INOUT_ID"/>
       </index>
+      <index name="M_INOUT_INVOICE_IDX" unique="false">
+        <index-column name="C_INVOICE_ID"/>
+        <whereClause><![CDATA[C_INVOICE_ID IS NOT NULL]]></whereClause>
+      </index>
       <index name="M_INOUT_MOVEMENTDATE_ID" unique="false">
         <index-column name="MOVEMENTDATE"/>
         <index-column name="M_INOUT_ID"/>
--- a/model/src-db/database/model/tables/M_MATCHPO.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/tables/M_MATCHPO.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -91,13 +91,16 @@
         <index-column name="M_INOUTLINE_ID"/>
         <whereClause><![CDATA[M_INOUTLINE_ID IS NOT NULL]]></whereClause>
       </index>
+      <index name="M_MATCHPO_INVOICELINE_IDX" unique="false">
+        <index-column name="C_INVOICELINE_ID"/>
+        <whereClause><![CDATA[C_INVOICELINE_ID IS NOT NULL]]></whereClause>
+      </index>
       <index name="M_MATCHPO_POSTED" unique="false">
         <index-column name="POSTED"/>
       </index>
       <index name="M_MATCHPO_SHIP" unique="false">
         <index-column name="C_ORDERLINE_ID"/>
         <index-column name="M_INOUTLINE_ID"/>
-        <whereClause><![CDATA[M_INOUTLINE_ID IS NOT NULL]]></whereClause>
       </index>
       <check name="M_MATCHPO_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="M_MATCHPO_PROCESSED_CHECK"><![CDATA[PROCESSED IN ('Y', 'N')]]></check>
--- a/model/src-db/database/model/tables/M_MOVEMENTLINE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/tables/M_MOVEMENTLINE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -89,19 +89,12 @@
         <default/>
         <onCreateDefault/>
       </column>
-      <column name="M_ATTRIBUTESETINSTANCETO_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
       <foreign-key foreignTable="AD_CLIENT" name="M_MOVEMENTLINE_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="M_MOVEMENTLINE_AD_ORG">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="M_ATTRIBUTESETINSTANCE" name="M_MOVEMENTLINE_ATTRIBUTESETTO">
-        <reference local="M_ATTRIBUTESETINSTANCETO_ID" foreign="M_ATTRIBUTESETINSTANCE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_UOM" name="M_MOVEMENTLINE_C_AUM">
         <reference local="C_AUM" foreign="C_UOM_ID"/>
       </foreign-key>
--- a/model/src-db/database/model/tables/M_REFINVENTORY.xml	Thu Feb 15 17:22:53 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-<?xml version="1.0"?>
-  <database name="TABLE M_REFINVENTORY">
-    <table name="M_REFINVENTORY" primaryKey="M_REFINVENTORY_KEY">
-      <column name="M_REFINVENTORY_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
-        <default><![CDATA[Y]]></default>
-        <onCreateDefault/>
-      </column>
-      <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
-        <default><![CDATA[SYSDATE]]></default>
-        <onCreateDefault/>
-      </column>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
-        <default><![CDATA[SYSDATE]]></default>
-        <onCreateDefault/>
-      </column>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <column name="M_REFINVENTORY_TYPE_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <column name="VALUE" primaryKey="false" required="true" type="NVARCHAR" size="30" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <column name="BOX" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
-        <default><![CDATA[N]]></default>
-        <onCreateDefault/>
-      </column>
-      <column name="UNBOX" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
-        <default><![CDATA[N]]></default>
-        <onCreateDefault/>
-      </column>
-      <foreign-key foreignTable="AD_CLIENT" name="M_REFINVENTORY_AD_CLIENT">
-        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="AD_ORG" name="M_REFINVENTORY_AD_ORG">
-        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="M_REFINVENTORY_TYPE" name="M_REFINVENTORY_TYPE">
-        <reference local="M_REFINVENTORY_TYPE_ID" foreign="M_REFINVENTORY_TYPE_ID"/>
-      </foreign-key>
-      <unique name="M_REFINVENTORY_VALUE_UN">
-        <unique-column name="VALUE"/>
-        <unique-column name="M_REFINVENTORY_TYPE_ID"/>
-        <unique-column name="AD_CLIENT_ID"/>
-      </unique>
-      <check name="M_REFINV_ISACTIVE_CH"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
-    </table>
-  </database>
--- a/model/src-db/database/model/tables/M_REFINVENTORY_TYPE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-  <database name="TABLE M_REFINVENTORY_TYPE">
-    <table name="M_REFINVENTORY_TYPE" primaryKey="M_REFINVENTORY_TYPE_KEY">
-      <column name="M_REFINVENTORY_TYPE_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
-        <default><![CDATA[Y]]></default>
-        <onCreateDefault/>
-      </column>
-      <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
-        <default><![CDATA[SYSDATE]]></default>
-        <onCreateDefault/>
-      </column>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
-        <default><![CDATA[SYSDATE]]></default>
-        <onCreateDefault/>
-      </column>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <column name="NAME" primaryKey="false" required="true" type="NVARCHAR" size="60" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <column name="ISSHARED" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
-        <default><![CDATA[Y]]></default>
-        <onCreateDefault/>
-      </column>
-      <column name="AD_SEQUENCE_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
-      <foreign-key foreignTable="AD_CLIENT" name="M_REFINVTYPE_CLIENT">
-        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="AD_ORG" name="M_REFINVTYPE_ORG">
-        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="AD_SEQUENCE" name="M_REFINVTYPE_SEQUENCE">
-        <reference local="AD_SEQUENCE_ID" foreign="AD_SEQUENCE_ID"/>
-      </foreign-key>
-      <check name="M_REFINVTYPE_ISACTIVE_CH"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
-      <check name="M_REFINVTYPE_ISSHARED_CH"><![CDATA[ISSHARED IN ('Y', 'N')]]></check>
-    </table>
-  </database>
--- a/model/src-db/database/model/tables/M_STORAGE_DETAIL.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/tables/M_STORAGE_DETAIL.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -81,10 +81,6 @@
         <default><![CDATA[0]]></default>
         <onCreateDefault/>
       </column>
-      <column name="M_REFINVENTORY_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
-        <default/>
-        <onCreateDefault/>
-      </column>
       <foreign-key foreignTable="AD_CLIENT" name="M_STORAGE_DETAIL_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -106,9 +102,6 @@
       <foreign-key foreignTable="M_PRODUCT_UOM" name="M_STORAGE_DETAIL_M_PRODUCT_UOM">
         <reference local="M_PRODUCT_UOM_ID" foreign="M_PRODUCT_UOM_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="M_REFINVENTORY" name="M_STORAGE_DETAIL_M_REFINV">
-        <reference local="M_REFINVENTORY_ID" foreign="M_REFINVENTORY_ID"/>
-      </foreign-key>
       <index name="M_STORAGE_DETAIL_LOCATOR" unique="false">
         <index-column name="M_LOCATOR_ID"/>
       </index>
@@ -124,9 +117,6 @@
       <index name="M_STORAGEDET_QTYORDERONHAND" unique="false">
         <index-column name="QTYORDERONHAND"/>
       </index>
-      <index name="M_STORAGEDET_REFINVENTORY" unique="false">
-        <index-column name="M_REFINVENTORY_ID"/>
-      </index>
       <unique name="M_STORAGE_DETAIL_UN">
         <unique-column name="M_PRODUCT_ID"/>
         <unique-column name="M_LOCATOR_ID"/>
--- a/model/src-db/database/model/triggers/AD_AUXILIARINPUT_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_AUXILIARINPUT_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
   vAux NUMBER;
     
@@ -52,10 +51,8 @@
   END IF;
   
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.Ad_Auxiliarinput_Id;
     cuerrentModuleID := :new.AD_Module_ID;
   ELSE
-    cuerrentID := :old.Ad_Auxiliarinput_Id;
     cuerrentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/AD_CALLOUT_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_CALLOUT_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
   vAux NUMBER;
     
@@ -52,10 +51,8 @@
   END IF;
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.AD_Callout_ID;
     cuerrentModuleID := :new.AD_Module_ID;
   ELSE
-    cuerrentID := :old.AD_Callout_ID;
     cuerrentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/AD_COLUMN_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_COLUMN_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -22,7 +22,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
   vAux NUMBER;
     
@@ -53,10 +52,8 @@
   END IF;
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.AD_Column_ID;
     cuerrentModuleID := :new.AD_Module_ID;
   ELSE
-    cuerrentID := :old.AD_Column_ID;
     cuerrentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/AD_DATASET_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_DATASET_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
   vAux NUMBER;
     
@@ -51,10 +50,8 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.AD_Dataset_ID;
     cuerrentModuleID := :new.AD_Module_ID;
   ELSE
-    cuerrentID := :old.AD_Dataset_ID;
     cuerrentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/AD_ELEMENT_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_ELEMENT_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
   vAux NUMBER;
     
@@ -51,10 +50,8 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.AD_Element_ID;
     cuerrentModuleID := :new.AD_Module_ID;
   ELSE
-    cuerrentID := :old.AD_Element_ID;
     cuerrentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/AD_FIELDGROUP_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_FIELDGROUP_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
   vAux NUMBER;
     
@@ -51,10 +50,8 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.AD_FieldGroup_ID;
     cuerrentModuleID := :new.AD_Module_ID;
   ELSE
-    cuerrentID := :old.AD_FieldGroup_ID;
     cuerrentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/AD_FIELD_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_FIELD_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
   vAux NUMBER;
     
@@ -51,10 +50,8 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.AD_Field_ID;
     cuerrentModuleID := :new.AD_Module_ID;
   ELSE
-    cuerrentID := :old.AD_Field_ID;
     cuerrentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/AD_FORM_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_FORM_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
   vAux NUMBER;
     
@@ -52,10 +51,8 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.AD_Form_ID;
     cuerrentModuleID := :new.AD_Module_ID;
   ELSE
-    cuerrentID := :old.AD_Form_ID;
     cuerrentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/AD_MENU_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_MENU_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
   vAux NUMBER;
     
@@ -51,10 +50,8 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.AD_Menu_ID;
     cuerrentModuleID := :new.AD_Module_ID;
   ELSE
-    cuerrentID := :old.AD_Menu_ID;
     cuerrentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/AD_MESSAGE_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_MESSAGE_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
   vAux NUMBER;
     
@@ -51,10 +50,8 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.AD_Message_ID;
     cuerrentModuleID := :new.AD_Module_ID;
   ELSE
-    cuerrentID := :old.AD_Message_ID;
     cuerrentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/AD_MODULE_DBPREFIX_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_MODULE_DBPREFIX_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
   vAux NUMBER;
     
@@ -51,10 +50,8 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.AD_Module_Dbprefix_ID;
     cuerrentModuleID := :new.AD_Module_ID;
   ELSE
-    cuerrentID := :old.AD_Module_Dbprefix_ID;
     cuerrentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/AD_MODULE_DBPREFIX_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_MODULE_DBPREFIX_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -22,7 +22,6 @@
   v_isregistered char(1);
   v_old_name varchar(60);
   v_type varchar2(60);
-  startsWithLetter boolean;
     
 BEGIN
     
@@ -49,7 +48,6 @@
    END IF;
    --Check DB_Prefix
    IF INSERTING OR UPDATING THEN
-     startsWithLetter := false;
      FOR I IN 1..LENGTH(:new.name) LOOP
        v_char := substr(:new.name,i,1);
        IF NOT ((ascii(v_char) between ascii('A') and ascii('Z')) 
--- a/model/src-db/database/model/triggers/AD_MODULE_DEPENDENCY_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_MODULE_DEPENDENCY_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
     
 BEGIN
@@ -37,10 +36,8 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.AD_Module_Dependency_ID;
     cuerrentModuleID := :new.AD_Module_ID;
   ELSE
-    cuerrentID := :old.AD_Module_Dependency_ID;
     cuerrentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/AD_PACKAGE_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_PACKAGE_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
   vAux NUMBER;  
     
@@ -51,10 +50,8 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.AD_Package_ID;
     cuerrentModuleID := :new.AD_Module_ID;
   ELSE
-    cuerrentID := :old.AD_Package_ID;
     cuerrentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/AD_PREFERENCE_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_PREFERENCE_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  currentID  VARCHAR2(32);
   currentModuleID  VARCHAR2(32);
   vAux NUMBER;
 BEGIN
@@ -73,10 +72,8 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    currentID := :new.AD_Preference_ID;
     currentModuleID := :new.AD_Module_ID;
   ELSE
-    currentID := :old.AD_Preference_ID;
     currentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/AD_PROCESS_GROUP_LIST_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_PROCESS_GROUP_LIST_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  currentID  VARCHAR2(32);
   currentModuleID  VARCHAR2(32);
   vAux NUMBER;
 BEGIN
@@ -50,10 +49,8 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    currentID := :new.AD_Process_Group_list_ID;
     currentModuleID := :new.AD_Module_ID;
   ELSE
-    currentID := :old.AD_Process_Group_list_ID;
     currentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/AD_PROCESS_GROUP_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_PROCESS_GROUP_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  currentID  VARCHAR2(32);
   currentModuleID  VARCHAR2(32);
   vAux NUMBER;
 BEGIN
@@ -50,10 +49,8 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    currentID := :new.AD_Process_Group_ID;
     currentModuleID := :new.AD_Module_ID;
   ELSE
-    currentID := :old.AD_Process_Group_ID;
     currentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/AD_PROCESS_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_PROCESS_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
   vAux NUMBER;
     
@@ -52,10 +51,8 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.AD_Process_ID;
     cuerrentModuleID := :new.AD_Module_ID;
   ELSE
-    cuerrentID := :old.AD_Process_ID;
     cuerrentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/AD_REFERENCE_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_REFERENCE_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
   vAux NUMBER;
     
@@ -52,10 +51,8 @@
   END IF;
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.AD_Reference_ID;
     cuerrentModuleID := :new.AD_Module_ID;
   ELSE
-    cuerrentID := :old.AD_Reference_ID;
     cuerrentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/AD_REF_SEARCH_COLUMN_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_REF_SEARCH_COLUMN_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
     
 BEGIN
@@ -37,10 +36,8 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.AD_Ref_Search_Column_ID;
     cuerrentModuleID := :new.AD_Ref_Search_ID;
   ELSE
-    cuerrentID := :old.AD_Ref_Search_Column_ID;
     cuerrentModuleID := :OLD.AD_Ref_Search_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/AD_REF_SEARCH_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_REF_SEARCH_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
     
 BEGIN
@@ -37,10 +36,8 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.AD_Ref_Search_ID;
     cuerrentModuleID := :new.AD_Reference_ID;
   ELSE
-    cuerrentID := :old.AD_Ref_Search_ID;
     cuerrentModuleID := :old.AD_Reference_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/AD_REF_TABLE_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_REF_TABLE_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
     
 BEGIN
@@ -37,10 +36,8 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.AD_Reference_ID;
     cuerrentModuleID := :NEW.AD_Reference_ID;
   ELSE
-    cuerrentID := :old.AD_Reference_ID;
     cuerrentModuleID := :old.AD_Reference_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/AD_TABLE_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_TABLE_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
   vAux NUMBER;
     
@@ -52,10 +51,8 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.AD_Table_ID;
     cuerrentModuleID := :new.AD_Package_ID;
   ELSE
-    cuerrentID := :old.AD_Table_ID;
     cuerrentModuleID := :old.AD_Package_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/AD_TABLE_NAVIGATION_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_TABLE_NAVIGATION_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  currentID  VARCHAR2(32);
   currentModuleID  VARCHAR2(32);
   vAux NUMBER;
     
@@ -52,10 +51,8 @@
   END IF;
      
   IF (UPDATING OR INSERTING) THEN
-    currentID := :new.AD_Table_Navigation_ID;
     currentModuleID := :new.AD_Module_ID;
   ELSE
-    currentID := :old.AD_Table_Navigation_ID;
     currentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/AD_TAB_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_TAB_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
   vAux NUMBER;
     
@@ -51,10 +50,8 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.AD_Tab_ID;
     cuerrentModuleID := :new.AD_Module_ID;
   ELSE
-    cuerrentID := :old.AD_Tab_ID;
     cuerrentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/AD_TEXTINTERFACES_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_TEXTINTERFACES_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
   vAux NUMBER;
     
@@ -51,10 +50,8 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.AD_Textinterfaces_ID;
     cuerrentModuleID := :new.AD_Module_ID;
   ELSE
-    cuerrentID := :old.AD_Textinterfaces_ID;
     cuerrentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/AD_VAL_RULE_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_VAL_RULE_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
   vAux NUMBER;
     
@@ -52,10 +51,8 @@
      AND Type = 'T';
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.AD_Val_Rule_ID;
     cuerrentModuleID := :new.AD_Module_ID;
   ELSE
-    cuerrentID := :old.AD_Val_Rule_ID;
     cuerrentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/model/src-db/database/model/triggers/AD_WINDOW_MOD_TRG.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/triggers/AD_WINDOW_MOD_TRG.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -21,7 +21,6 @@
 ************************************************************************/
   devTemplate NUMBER;
   devModule   CHAR(1);
-  cuerrentID  VARCHAR2(32);
   cuerrentModuleID  VARCHAR2(32);
   vAux NUMBER;
     
@@ -52,10 +51,8 @@
   END IF;
      
   IF (UPDATING OR INSERTING) THEN
-    cuerrentID := :new.AD_Window_ID;
     cuerrentModuleID := :new.AD_Module_ID;
   ELSE
-    cuerrentID := :old.AD_Window_ID;
     cuerrentModuleID := :old.AD_Module_ID;
   END IF;
   
--- a/model/src-db/database/model/views/M_RM_RECEIPT_PICK_EDIT.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/model/views/M_RM_RECEIPT_PICK_EDIT.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
   <database name="VIEW M_RM_RECEIPT_PICK_EDIT">
-    <view name="M_RM_RECEIPT_PICK_EDIT"><![CDATA[SELECT ol.c_orderline_id AS m_rm_receipt_pick_edit_id, ol.ad_client_id, COALESCE(iol.ad_org_id, ol.ad_org_id) AS ad_org_id, ol.isactive, ol.created, ol.createdby, COALESCE(iol.updated, ol.updated) AS updated, ol.updatedby, iol.m_inout_id, CASE WHEN iol.m_inoutline_id IS NOT NULL THEN 'Y' ELSE 'N' END AS ob_selected, ol.c_orderline_id, ol.m_product_id, ol.c_uom_id, ol.m_attributesetinstance_id, (-1) * ol.qtyordered AS returned, (-1) * CASE WHEN uom_pref.property IS NOT NULL AND ol.c_uom_id IS NOT NULL THEN m_get_converted_aumqty(ol.m_product_id, ol.qtyordered - ol.qtydelivered, ol.c_aum) ELSE ol.qtyordered - ol.qtydelivered END AS pendingqty, (-1) * COALESCE(iol.aumqty, iol.movementqty) AS receivingqty, iol.m_condition_goods_id, iol.m_locator_id, o.documentno AS returnorderno, o.issotrx, ol.line, iol.m_inoutline_id, ol.c_aum, (-1) * ol.aumqty AS aumqty, (-1) * CASE WHEN uom_pref.property IS NOT NULL AND ol.c_uom_id IS NOT NULL THEN ol.qtyordered - ol.qtydelivered ELSE m_get_converted_aumqty(ol.m_product_id, ol.qtyordered - ol.qtydelivered, ol.c_aum) END AS pendingaumqty, CASE WHEN iol.m_inoutline_id IS NULL THEN COALESCE(ol.c_aum, ol.c_uom_id) ELSE COALESCE(iol.c_aum, iol.c_uom_id) END AS returneduom FROM c_orderline ol JOIN c_order o ON o.c_order_id = ol.c_order_id JOIN m_product p ON ol.m_product_id = p.m_product_id JOIN c_doctype dt ON dt.c_doctype_id = o.c_doctypetarget_id AND dt.isreturn = 'Y' LEFT JOIN (SELECT il2.m_inoutline_id, il2.ad_client_id, il2.ad_org_id, il2.isactive, il2.created, il2.createdby, il2.updated, il2.updatedby, il2.line, il2.description, il2.m_inout_id, il2.c_orderline_id, il2.m_locator_id, il2.m_product_id, il2.c_uom_id, il2.movementqty, il2.isinvoiced, il2.m_attributesetinstance_id, il2.isdescription, il2.quantityorder, il2.m_product_uom_id, il2.m_condition_goods_id, il2.c_aum, il2.aumqty FROM m_inoutline il2 JOIN m_inout i2 ON il2.m_inout_id = i2.m_inout_id AND i2.processed = 'N') iol ON iol.c_orderline_id = ol.c_orderline_id LEFT JOIN (SELECT pref.property FROM ad_preference pref WHERE pref.property = 'UomManagement' AND to_char(pref.value) = 'Y' AND pref.ad_client_id = '0' AND pref.ad_org_id = '0' AND pref.visibleat_client_id IS NULL AND pref.visibleat_org_id IS NULL AND pref.visibleat_role_id IS NULL AND pref.ad_user_id IS NULL) uom_pref ON 1 = 1 WHERE (ol.qtyordered - ol.qtydelivered) <> 0 AND o.docstatus = 'CO']]></view>
+    <view name="M_RM_RECEIPT_PICK_EDIT"><![CDATA[SELECT ol.c_orderline_id AS m_rm_receipt_pick_edit_id, ol.ad_client_id, COALESCE(iol.ad_org_id, ol.ad_org_id) AS ad_org_id, ol.isactive, ol.created, ol.createdby, COALESCE(iol.updated, ol.updated) AS updated, ol.updatedby, iol.m_inout_id, CASE WHEN iol.m_inoutline_id IS NOT NULL THEN 'Y' ELSE 'N' END AS ob_selected, ol.c_orderline_id, ol.m_product_id, ol.c_uom_id, ol.m_attributesetinstance_id, (-1) * ol.qtyordered AS returned, (-1) * CASE WHEN uom_pref.property IS NOT NULL AND ol.c_uom_id IS NOT NULL THEN m_get_converted_aumqty(ol.m_product_id, ol.qtyordered - ol.qtydelivered, ol.c_aum) ELSE ol.qtyordered - ol.qtydelivered END AS pendingqty, (-1) * COALESCE(iol.aumqty, iol.movementqty) AS receivingqty, iol.m_condition_goods_id, iol.m_locator_id, o.documentno AS returnorderno, o.issotrx, ol.line, iol.m_inoutline_id, ol.c_aum, (-1) * ol.aumqty AS aumqty, (-1) * CASE WHEN uom_pref.property IS NOT NULL AND ol.c_uom_id IS NOT NULL THEN ol.qtyordered - ol.qtydelivered ELSE m_get_converted_aumqty(ol.m_product_id, ol.qtyordered - ol.qtydelivered, ol.c_aum) END AS pendingaumqty, CASE WHEN iol.m_inoutline_id IS NULL THEN COALESCE(ol.c_aum, ol.c_uom_id) ELSE COALESCE(iol.c_aum, iol.c_uom_id) END AS returneduom, o.c_bpartner_id FROM c_orderline ol JOIN c_order o ON o.c_order_id = ol.c_order_id JOIN m_product p ON ol.m_product_id = p.m_product_id JOIN c_doctype dt ON dt.c_doctype_id = o.c_doctypetarget_id AND dt.isreturn = 'Y' LEFT JOIN (SELECT il2.m_inoutline_id, il2.ad_client_id, il2.ad_org_id, il2.isactive, il2.created, il2.createdby, il2.updated, il2.updatedby, il2.line, il2.description, il2.m_inout_id, il2.c_orderline_id, il2.m_locator_id, il2.m_product_id, il2.c_uom_id, il2.movementqty, il2.isinvoiced, il2.m_attributesetinstance_id, il2.isdescription, il2.quantityorder, il2.m_product_uom_id, il2.m_condition_goods_id, il2.c_aum, il2.aumqty FROM m_inoutline il2 JOIN m_inout i2 ON il2.m_inout_id = i2.m_inout_id AND i2.processed = 'N') iol ON iol.c_orderline_id = ol.c_orderline_id LEFT JOIN (SELECT pref.property FROM ad_preference pref WHERE pref.property = 'UomManagement' AND to_char(pref.value) = 'Y' AND pref.ad_client_id = '0' AND pref.ad_org_id = '0' AND pref.visibleat_client_id IS NULL AND pref.visibleat_org_id IS NULL AND pref.visibleat_role_id IS NULL AND pref.ad_user_id IS NULL) uom_pref ON 1 = 1 WHERE (ol.qtyordered - ol.qtydelivered) <> 0 AND o.docstatus = 'CO']]></view>
   </database>
--- a/model/src-db/database/sourcedata/AD_CALLOUT.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/sourcedata/AD_CALLOUT.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -1042,6 +1042,16 @@
 <!--6D209ED20216469B826243233BD68A6A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6D209ED20216469B826243233BD68A6A--></AD_CALLOUT>
 
+<!--6E27FFD536114A78BD1C14A6DFB3C786--><AD_CALLOUT>
+<!--6E27FFD536114A78BD1C14A6DFB3C786-->  <AD_CALLOUT_ID><![CDATA[6E27FFD536114A78BD1C14A6DFB3C786]]></AD_CALLOUT_ID>
+<!--6E27FFD536114A78BD1C14A6DFB3C786-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6E27FFD536114A78BD1C14A6DFB3C786-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6E27FFD536114A78BD1C14A6DFB3C786-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6E27FFD536114A78BD1C14A6DFB3C786-->  <NAME><![CDATA[SL_Currency_StdPrecision]]></NAME>
+<!--6E27FFD536114A78BD1C14A6DFB3C786-->  <DESCRIPTION><![CDATA[Validates the currency standar precision is correct according standars specified by ISO 4217 Currency codes. If the new standard precision is higher than standard ISO then a warning is showed.]]></DESCRIPTION>
+<!--6E27FFD536114A78BD1C14A6DFB3C786-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6E27FFD536114A78BD1C14A6DFB3C786--></AD_CALLOUT>
+
 <!--76EB5EC472534C0C897FBD25089EA351--><AD_CALLOUT>
 <!--76EB5EC472534C0C897FBD25089EA351-->  <AD_CALLOUT_ID><![CDATA[76EB5EC472534C0C897FBD25089EA351]]></AD_CALLOUT_ID>
 <!--76EB5EC472534C0C897FBD25089EA351-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_COLUMN.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/sourcedata/AD_COLUMN.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -6700,6 +6700,7 @@
 <!--459-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--459-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--459-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--459-->  <AD_CALLOUT_ID><![CDATA[6E27FFD536114A78BD1C14A6DFB3C786]]></AD_CALLOUT_ID>
 <!--459-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--459-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--459-->  <POSITION><![CDATA[12]]></POSITION>
@@ -63320,8 +63321,8 @@
 <!--3591-->  <HELP><![CDATA[The Locator ID indicates where in a Warehouse a product is located.]]></HELP>
 <!--3591-->  <COLUMNNAME><![CDATA[M_Locator_ID]]></COLUMNNAME>
 <!--3591-->  <AD_TABLE_ID><![CDATA[324]]></AD_TABLE_ID>
-<!--3591-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
-<!--3591-->  <AD_REFERENCE_VALUE_ID><![CDATA[31]]></AD_REFERENCE_VALUE_ID>
+<!--3591-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--3591-->  <AD_REFERENCE_VALUE_ID><![CDATA[8B85C08F7B3847C8A61E51EAAE87CE61]]></AD_REFERENCE_VALUE_ID>
 <!--3591-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
 <!--3591-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--3591-->  <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -63359,8 +63360,8 @@
 <!--3592-->  <HELP><![CDATA[The Locator To indicates the location where the inventory is being moved to.]]></HELP>
 <!--3592-->  <COLUMNNAME><![CDATA[M_LocatorTo_ID]]></COLUMNNAME>
 <!--3592-->  <AD_TABLE_ID><![CDATA[324]]></AD_TABLE_ID>
-<!--3592-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
-<!--3592-->  <AD_REFERENCE_VALUE_ID><![CDATA[31]]></AD_REFERENCE_VALUE_ID>
+<!--3592-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--3592-->  <AD_REFERENCE_VALUE_ID><![CDATA[8B85C08F7B3847C8A61E51EAAE87CE61]]></AD_REFERENCE_VALUE_ID>
 <!--3592-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
 <!--3592-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--3592-->  <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -220002,7 +220003,6 @@
 <!--803711-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--803711-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
 <!--803711-->  <AD_ELEMENT_ID><![CDATA[800818]]></AD_ELEMENT_ID>
-<!--803711-->  <AD_PROCESS_ID><![CDATA[800165]]></AD_PROCESS_ID>
 <!--803711-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--803711-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--803711-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -220017,6 +220017,7 @@
 <!--803711-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
 <!--803711-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
 <!--803711-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--803711-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[8B81D80B06364566B87853FEECAB5DE0]]></EM_OBUIAPP_PROCESS_ID>
 <!--803711--></AD_COLUMN>
 
 <!--803712--><AD_COLUMN>
@@ -228993,9 +228994,10 @@
 <!--1002100037-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
 <!--1002100037-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
 <!--1002100037-->  <AD_TABLE_ID><![CDATA[1002100002]]></AD_TABLE_ID>
-<!--1002100037-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--1002100037-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--1002100037-->  <AD_REFERENCE_VALUE_ID><![CDATA[EE3A1FFA879945C88957F4401BF15C0B]]></AD_REFERENCE_VALUE_ID>
 <!--1002100037-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
-<!--1002100037-->  <DEFAULTVALUE><![CDATA[@#AD_Org_ID@]]></DEFAULTVALUE>
+<!--1002100037-->  <DEFAULTVALUE><![CDATA[@SQL=select ad_get_org_le_bu(@AD_Org_ID@,'LE') from dual]]></DEFAULTVALUE>
 <!--1002100037-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--1002100037-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--1002100037-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
@@ -256868,6 +256870,45 @@
 <!--2CA46C14D66F4B7AA6550531F6D329E7-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--2CA46C14D66F4B7AA6550531F6D329E7--></AD_COLUMN>
 
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4--><AD_COLUMN>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <AD_COLUMN_ID><![CDATA[2CB6F5E1AE1543B5B7F740A0D6D918D4]]></AD_COLUMN_ID>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <NAME><![CDATA[Business Partner]]></NAME>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <DESCRIPTION><![CDATA[Anyone who takes part in daily business operations by acting as a customer, employee, etc.]]></DESCRIPTION>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <HELP><![CDATA[A Business Partner is anyone with whom you transact.  This can include a customer, vendor, employee or any combination of these.]]></HELP>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <COLUMNNAME><![CDATA[C_Bpartner_ID]]></COLUMNNAME>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <AD_TABLE_ID><![CDATA[09C5EA393D0D41CEBB522DEC67534574]]></AD_TABLE_ID>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <AD_REFERENCE_VALUE_ID><![CDATA[800057]]></AD_REFERENCE_VALUE_ID>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <SEQNO><![CDATA[320]]></SEQNO>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <AD_ELEMENT_ID><![CDATA[187]]></AD_ELEMENT_ID>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <POSITION><![CDATA[28]]></POSITION>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--2CB6F5E1AE1543B5B7F740A0D6D918D4--></AD_COLUMN>
+
 <!--2CC98C761A3F460BB9D88F4E43DD3588--><AD_COLUMN>
 <!--2CC98C761A3F460BB9D88F4E43DD3588-->  <AD_COLUMN_ID><![CDATA[2CC98C761A3F460BB9D88F4E43DD3588]]></AD_COLUMN_ID>
 <!--2CC98C761A3F460BB9D88F4E43DD3588-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -259347,7 +259388,8 @@
 <!--35DF1D3CE32C43A397D9F00279FF11F7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--35DF1D3CE32C43A397D9F00279FF11F7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--35DF1D3CE32C43A397D9F00279FF11F7-->  <NAME><![CDATA[Image Size Values Action]]></NAME>
-<!--35DF1D3CE32C43A397D9F00279FF11F7-->  <HELP><![CDATA[Action or restriction that will be performed in the uploaded image size using "Image Width" and "Image Height" values.]]></HELP>
+<!--35DF1D3CE32C43A397D9F00279FF11F7-->  <HELP><![CDATA[Action or restriction that will be performed in the uploaded image size using "Image Width" and "Image Height" values.
+It does not apply to scalable vector graphics (svg).]]></HELP>
 <!--35DF1D3CE32C43A397D9F00279FF11F7-->  <COLUMNNAME><![CDATA[Imagesizevaluesaction]]></COLUMNNAME>
 <!--35DF1D3CE32C43A397D9F00279FF11F7-->  <AD_TABLE_ID><![CDATA[101]]></AD_TABLE_ID>
 <!--35DF1D3CE32C43A397D9F00279FF11F7-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
@@ -261048,7 +261090,7 @@
 <!--3AE052A78717426CBCB4F828CC76A87E-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--3AE052A78717426CBCB4F828CC76A87E-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--3AE052A78717426CBCB4F828CC76A87E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--3AE052A78717426CBCB4F828CC76A87E-->  <POSITION><![CDATA[28]]></POSITION>
+<!--3AE052A78717426CBCB4F828CC76A87E-->  <POSITION><![CDATA[27]]></POSITION>
 <!--3AE052A78717426CBCB4F828CC76A87E-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--3AE052A78717426CBCB4F828CC76A87E-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--3AE052A78717426CBCB4F828CC76A87E-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -365186,7 +365228,8 @@
 <!--D5ED3D4580B3471087EE59081FE7B013-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--D5ED3D4580B3471087EE59081FE7B013-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D5ED3D4580B3471087EE59081FE7B013-->  <NAME><![CDATA[Entity Alias]]></NAME>
-<!--D5ED3D4580B3471087EE59081FE7B013-->  <HELP><![CDATA[In case that the the table has an alias in the HQL it is mandatory to set it on this field. This alias is used to add some mandatory filters on the Where clause replacing the @additional_filters@ string. Some examples of added filters are: client, organization and active flag.]]></HELP>
+<!--D5ED3D4580B3471087EE59081FE7B013-->  <DESCRIPTION><![CDATA[The left part definition of a column in an HQL query.]]></DESCRIPTION>
+<!--D5ED3D4580B3471087EE59081FE7B013-->  <HELP><![CDATA[The left part definition of a column in an HQL query.]]></HELP>
 <!--D5ED3D4580B3471087EE59081FE7B013-->  <COLUMNNAME><![CDATA[Entity_Alias]]></COLUMNNAME>
 <!--D5ED3D4580B3471087EE59081FE7B013-->  <AD_TABLE_ID><![CDATA[101]]></AD_TABLE_ID>
 <!--D5ED3D4580B3471087EE59081FE7B013-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
@@ -365200,7 +365243,7 @@
 <!--D5ED3D4580B3471087EE59081FE7B013-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--D5ED3D4580B3471087EE59081FE7B013-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--D5ED3D4580B3471087EE59081FE7B013-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--D5ED3D4580B3471087EE59081FE7B013-->  <AD_ELEMENT_ID><![CDATA[40F3E79F963841DCBFFFCA8D1E60ACCC]]></AD_ELEMENT_ID>
+<!--D5ED3D4580B3471087EE59081FE7B013-->  <AD_ELEMENT_ID><![CDATA[4DC50C2EA7734E1FAE621BB4C7A68F03]]></AD_ELEMENT_ID>
 <!--D5ED3D4580B3471087EE59081FE7B013-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--D5ED3D4580B3471087EE59081FE7B013-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--D5ED3D4580B3471087EE59081FE7B013-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
--- a/model/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/sourcedata/AD_ELEMENT.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -18946,8 +18946,8 @@
 <!--800818-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--800818-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--800818-->  <COLUMNNAME><![CDATA[CopyFromPO]]></COLUMNNAME>
-<!--800818-->  <NAME><![CDATA[Copy from PO]]></NAME>
-<!--800818-->  <PRINTNAME><![CDATA[Copy from PO]]></PRINTNAME>
+<!--800818-->  <NAME><![CDATA[Copy from Orders]]></NAME>
+<!--800818-->  <PRINTNAME><![CDATA[Copy from Orders]]></PRINTNAME>
 <!--800818-->  <DESCRIPTION><![CDATA[Copy lines from orders]]></DESCRIPTION>
 <!--800818-->  <HELP><![CDATA[Copy lines from orders]]></HELP>
 <!--800818-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -22330,7 +22330,8 @@
 <!--2D45E13155A24BA682410D34AD4A8E07-->  <COLUMNNAME><![CDATA[Imagesizevaluesaction]]></COLUMNNAME>
 <!--2D45E13155A24BA682410D34AD4A8E07-->  <NAME><![CDATA[Image Size Values Action]]></NAME>
 <!--2D45E13155A24BA682410D34AD4A8E07-->  <PRINTNAME><![CDATA[Image Size Values Action]]></PRINTNAME>
-<!--2D45E13155A24BA682410D34AD4A8E07-->  <HELP><![CDATA[Action or restriction that will be performed in the uploaded image size using "Image Width" and "Image Height" values.]]></HELP>
+<!--2D45E13155A24BA682410D34AD4A8E07-->  <HELP><![CDATA[Action or restriction that will be performed in the uploaded image size using "Image Width" and "Image Height" values.
+It does not apply to scalable vector graphics (svg).]]></HELP>
 <!--2D45E13155A24BA682410D34AD4A8E07-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2D45E13155A24BA682410D34AD4A8E07-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--2D45E13155A24BA682410D34AD4A8E07--></AD_ELEMENT>
@@ -23525,6 +23526,8 @@
 <!--4DC50C2EA7734E1FAE621BB4C7A68F03-->  <COLUMNNAME><![CDATA[Clause_Left_Part]]></COLUMNNAME>
 <!--4DC50C2EA7734E1FAE621BB4C7A68F03-->  <NAME><![CDATA[Clause Left Part]]></NAME>
 <!--4DC50C2EA7734E1FAE621BB4C7A68F03-->  <PRINTNAME><![CDATA[Clause Left Part]]></PRINTNAME>
+<!--4DC50C2EA7734E1FAE621BB4C7A68F03-->  <DESCRIPTION><![CDATA[The left part definition of a column in an HQL query.]]></DESCRIPTION>
+<!--4DC50C2EA7734E1FAE621BB4C7A68F03-->  <HELP><![CDATA[The left part definition of a column in an HQL query.]]></HELP>
 <!--4DC50C2EA7734E1FAE621BB4C7A68F03-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4DC50C2EA7734E1FAE621BB4C7A68F03-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--4DC50C2EA7734E1FAE621BB4C7A68F03--></AD_ELEMENT>
--- a/model/src-db/database/sourcedata/AD_FIELD.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/sourcedata/AD_FIELD.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -160922,9 +160922,9 @@
 <!--804079-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--804079-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--804079-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--804079-->  <NAME><![CDATA[Copy from Order]]></NAME>
-<!--804079-->  <DESCRIPTION><![CDATA[Copy From Order]]></DESCRIPTION>
-<!--804079-->  <HELP><![CDATA[Copies lines from Order]]></HELP>
+<!--804079-->  <NAME><![CDATA[Copy from Orders]]></NAME>
+<!--804079-->  <DESCRIPTION><![CDATA[Copy lines from orders]]></DESCRIPTION>
+<!--804079-->  <HELP><![CDATA[Copy lines from orders]]></HELP>
 <!--804079-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--804079-->  <AD_TAB_ID><![CDATA[186]]></AD_TAB_ID>
 <!--804079-->  <AD_COLUMN_ID><![CDATA[803711]]></AD_COLUMN_ID>
@@ -163130,9 +163130,9 @@
 <!--804197-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--804197-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--804197-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--804197-->  <NAME><![CDATA[Copy from Order]]></NAME>
-<!--804197-->  <DESCRIPTION><![CDATA[Copy From Order]]></DESCRIPTION>
-<!--804197-->  <HELP><![CDATA[Copies lines from Order]]></HELP>
+<!--804197-->  <NAME><![CDATA[Copy from Orders]]></NAME>
+<!--804197-->  <DESCRIPTION><![CDATA[Copy lines from orders]]></DESCRIPTION>
+<!--804197-->  <HELP><![CDATA[Copy lines from orders]]></HELP>
 <!--804197-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--804197-->  <AD_TAB_ID><![CDATA[294]]></AD_TAB_ID>
 <!--804197-->  <AD_COLUMN_ID><![CDATA[803711]]></AD_COLUMN_ID>
@@ -188821,6 +188821,35 @@
 <!--1A4B8B9E94B348BD9D45B50916B136D1-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--1A4B8B9E94B348BD9D45B50916B136D1--></AD_FIELD>
 
+<!--1A7E7754760F4141BEBC64FACC44BA5F--><AD_FIELD>
+<!--1A7E7754760F4141BEBC64FACC44BA5F-->  <AD_FIELD_ID><![CDATA[1A7E7754760F4141BEBC64FACC44BA5F]]></AD_FIELD_ID>
+<!--1A7E7754760F4141BEBC64FACC44BA5F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1A7E7754760F4141BEBC64FACC44BA5F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1A7E7754760F4141BEBC64FACC44BA5F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1A7E7754760F4141BEBC64FACC44BA5F-->  <NAME><![CDATA[Document No.]]></NAME>
+<!--1A7E7754760F4141BEBC64FACC44BA5F-->  <DESCRIPTION><![CDATA[An often automatically generated identifier for all documents.]]></DESCRIPTION>
+<!--1A7E7754760F4141BEBC64FACC44BA5F-->  <HELP><![CDATA[The document number is usually automatically generated by the system and determined by the document type of the document. If the document is not saved, the preliminary number is displayed in "<>". If the document type of your document has no automatic document sequence defined, the field will be empty when creating a new document. This is for documents which usually have an external number (like vendor invoice).  If you leave the field empty, the system will generate a document number for you. The document sequence used for this fallback number is defined in the "Document Sequence" window with the name "DocumentNo_<TableName>", where TableName is the actual name of the table inside the database (e.g. C_Order).]]></HELP>
+<!--1A7E7754760F4141BEBC64FACC44BA5F-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--1A7E7754760F4141BEBC64FACC44BA5F-->  <AD_TAB_ID><![CDATA[3ACD18ADFBA8406086852B071250C481]]></AD_TAB_ID>
+<!--1A7E7754760F4141BEBC64FACC44BA5F-->  <AD_COLUMN_ID><![CDATA[2169]]></AD_COLUMN_ID>
+<!--1A7E7754760F4141BEBC64FACC44BA5F-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--1A7E7754760F4141BEBC64FACC44BA5F-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--1A7E7754760F4141BEBC64FACC44BA5F-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--1A7E7754760F4141BEBC64FACC44BA5F-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--1A7E7754760F4141BEBC64FACC44BA5F-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--1A7E7754760F4141BEBC64FACC44BA5F-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--1A7E7754760F4141BEBC64FACC44BA5F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--1A7E7754760F4141BEBC64FACC44BA5F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--1A7E7754760F4141BEBC64FACC44BA5F-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--1A7E7754760F4141BEBC64FACC44BA5F-->  <ISFIRSTFOCUSEDFIELD><![CDATA[Y]]></ISFIRSTFOCUSEDFIELD>
+<!--1A7E7754760F4141BEBC64FACC44BA5F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1A7E7754760F4141BEBC64FACC44BA5F-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
+<!--1A7E7754760F4141BEBC64FACC44BA5F-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--1A7E7754760F4141BEBC64FACC44BA5F-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--1A7E7754760F4141BEBC64FACC44BA5F-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--1A7E7754760F4141BEBC64FACC44BA5F-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--1A7E7754760F4141BEBC64FACC44BA5F--></AD_FIELD>
+
 <!--1A888FD11A224DC082B662BB2878F6D7--><AD_FIELD>
 <!--1A888FD11A224DC082B662BB2878F6D7-->  <AD_FIELD_ID><![CDATA[1A888FD11A224DC082B662BB2878F6D7]]></AD_FIELD_ID>
 <!--1A888FD11A224DC082B662BB2878F6D7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -210137,6 +210166,35 @@
 <!--4E277C7DCF1A4440B81AB9D7D12FCE53-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--4E277C7DCF1A4440B81AB9D7D12FCE53--></AD_FIELD>
 
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA--><AD_FIELD>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA-->  <AD_FIELD_ID><![CDATA[4E59727F6CB347A0AEB03CDA2CE06ADA]]></AD_FIELD_ID>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA-->  <NAME><![CDATA[Business Partner]]></NAME>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA-->  <DESCRIPTION><![CDATA[Anyone who takes part in daily business operations by acting as a customer, employee, etc.]]></DESCRIPTION>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA-->  <HELP><![CDATA[A Business Partner is anyone with whom you transact.  This can include a customer, vendor, employee or any combination of these.]]></HELP>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA-->  <AD_TAB_ID><![CDATA[3ACD18ADFBA8406086852B071250C481]]></AD_TAB_ID>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA-->  <AD_COLUMN_ID><![CDATA[2762]]></AD_COLUMN_ID>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA-->  <GRID_SEQNO><![CDATA[20]]></GRID_SEQNO>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--4E59727F6CB347A0AEB03CDA2CE06ADA--></AD_FIELD>
+
 <!--4E5C4EF2F9484386A404C59C355CAA6D--><AD_FIELD>
 <!--4E5C4EF2F9484386A404C59C355CAA6D-->  <AD_FIELD_ID><![CDATA[4E5C4EF2F9484386A404C59C355CAA6D]]></AD_FIELD_ID>
 <!--4E5C4EF2F9484386A404C59C355CAA6D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -229511,6 +229569,35 @@
 <!--65D7F7E31AA04567ADD28D21F76BB241-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--65D7F7E31AA04567ADD28D21F76BB241--></AD_FIELD>
 
+<!--65FE05E3909C457F9B58D482EF64E739--><AD_FIELD>
+<!--65FE05E3909C457F9B58D482EF64E739-->  <AD_FIELD_ID><![CDATA[65FE05E3909C457F9B58D482EF64E739]]></AD_FIELD_ID>
+<!--65FE05E3909C457F9B58D482EF64E739-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--65FE05E3909C457F9B58D482EF64E739-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--65FE05E3909C457F9B58D482EF64E739-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--65FE05E3909C457F9B58D482EF64E739-->  <NAME><![CDATA[Order Date]]></NAME>
+<!--65FE05E3909C457F9B58D482EF64E739-->  <DESCRIPTION><![CDATA[The time listed on the order.]]></DESCRIPTION>
+<!--65FE05E3909C457F9B58D482EF64E739-->  <HELP><![CDATA[Indicates the Date an item was ordered.]]></HELP>
+<!--65FE05E3909C457F9B58D482EF64E739-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--65FE05E3909C457F9B58D482EF64E739-->  <AD_TAB_ID><![CDATA[3ACD18ADFBA8406086852B071250C481]]></AD_TAB_ID>
+<!--65FE05E3909C457F9B58D482EF64E739-->  <AD_COLUMN_ID><![CDATA[2181]]></AD_COLUMN_ID>
+<!--65FE05E3909C457F9B58D482EF64E739-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--65FE05E3909C457F9B58D482EF64E739-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--65FE05E3909C457F9B58D482EF64E739-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--65FE05E3909C457F9B58D482EF64E739-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--65FE05E3909C457F9B58D482EF64E739-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--65FE05E3909C457F9B58D482EF64E739-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--65FE05E3909C457F9B58D482EF64E739-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--65FE05E3909C457F9B58D482EF64E739-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--65FE05E3909C457F9B58D482EF64E739-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--65FE05E3909C457F9B58D482EF64E739-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--65FE05E3909C457F9B58D482EF64E739-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--65FE05E3909C457F9B58D482EF64E739-->  <GRID_SEQNO><![CDATA[30]]></GRID_SEQNO>
+<!--65FE05E3909C457F9B58D482EF64E739-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--65FE05E3909C457F9B58D482EF64E739-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--65FE05E3909C457F9B58D482EF64E739-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--65FE05E3909C457F9B58D482EF64E739-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--65FE05E3909C457F9B58D482EF64E739--></AD_FIELD>
+
 <!--65FEC104441E48EF979F1C5D53A7A1E3--><AD_FIELD>
 <!--65FEC104441E48EF979F1C5D53A7A1E3-->  <AD_FIELD_ID><![CDATA[65FEC104441E48EF979F1C5D53A7A1E3]]></AD_FIELD_ID>
 <!--65FEC104441E48EF979F1C5D53A7A1E3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -230177,7 +230264,8 @@
 <!--683CE5A4EB304226BA7F66866A4FE632-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--683CE5A4EB304226BA7F66866A4FE632-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--683CE5A4EB304226BA7F66866A4FE632-->  <NAME><![CDATA[Image Size Values Action]]></NAME>
-<!--683CE5A4EB304226BA7F66866A4FE632-->  <HELP><![CDATA[Action or restriction that will be performed in the uploaded image size using "Image Width" and "Image Height" values.]]></HELP>
+<!--683CE5A4EB304226BA7F66866A4FE632-->  <HELP><![CDATA[Action or restriction that will be performed in the uploaded image size using "Image Width" and "Image Height" values.
+It does not apply to scalable vector graphics (svg).]]></HELP>
 <!--683CE5A4EB304226BA7F66866A4FE632-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--683CE5A4EB304226BA7F66866A4FE632-->  <AD_TAB_ID><![CDATA[101]]></AD_TAB_ID>
 <!--683CE5A4EB304226BA7F66866A4FE632-->  <AD_COLUMN_ID><![CDATA[35DF1D3CE32C43A397D9F00279FF11F7]]></AD_COLUMN_ID>
@@ -234491,6 +234579,35 @@
 <!--71B972711CC545E1933EFD1EA87E3C07-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--71B972711CC545E1933EFD1EA87E3C07--></AD_FIELD>
 
+<!--71D550E2D7BE4070A4F62A62958A942B--><AD_FIELD>
+<!--71D550E2D7BE4070A4F62A62958A942B-->  <AD_FIELD_ID><![CDATA[71D550E2D7BE4070A4F62A62958A942B]]></AD_FIELD_ID>
+<!--71D550E2D7BE4070A4F62A62958A942B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--71D550E2D7BE4070A4F62A62958A942B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--71D550E2D7BE4070A4F62A62958A942B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--71D550E2D7BE4070A4F62A62958A942B-->  <NAME><![CDATA[Currency]]></NAME>
+<!--71D550E2D7BE4070A4F62A62958A942B-->  <DESCRIPTION><![CDATA[An accepted medium of monetary exchange that may vary across countries.]]></DESCRIPTION>
+<!--71D550E2D7BE4070A4F62A62958A942B-->  <HELP><![CDATA[Indicates the currency to be used when processing this document.]]></HELP>
+<!--71D550E2D7BE4070A4F62A62958A942B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--71D550E2D7BE4070A4F62A62958A942B-->  <AD_TAB_ID><![CDATA[3ACD18ADFBA8406086852B071250C481]]></AD_TAB_ID>
+<!--71D550E2D7BE4070A4F62A62958A942B-->  <AD_COLUMN_ID><![CDATA[2191]]></AD_COLUMN_ID>
+<!--71D550E2D7BE4070A4F62A62958A942B-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--71D550E2D7BE4070A4F62A62958A942B-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--71D550E2D7BE4070A4F62A62958A942B-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--71D550E2D7BE4070A4F62A62958A942B-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--71D550E2D7BE4070A4F62A62958A942B-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--71D550E2D7BE4070A4F62A62958A942B-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--71D550E2D7BE4070A4F62A62958A942B-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--71D550E2D7BE4070A4F62A62958A942B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--71D550E2D7BE4070A4F62A62958A942B-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--71D550E2D7BE4070A4F62A62958A942B-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--71D550E2D7BE4070A4F62A62958A942B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--71D550E2D7BE4070A4F62A62958A942B-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
+<!--71D550E2D7BE4070A4F62A62958A942B-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--71D550E2D7BE4070A4F62A62958A942B-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--71D550E2D7BE4070A4F62A62958A942B-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--71D550E2D7BE4070A4F62A62958A942B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--71D550E2D7BE4070A4F62A62958A942B--></AD_FIELD>
+
 <!--71E2F3E0575042F4B77601B1C8F6EC20--><AD_FIELD>
 <!--71E2F3E0575042F4B77601B1C8F6EC20-->  <AD_FIELD_ID><![CDATA[71E2F3E0575042F4B77601B1C8F6EC20]]></AD_FIELD_ID>
 <!--71E2F3E0575042F4B77601B1C8F6EC20-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -254511,6 +254628,35 @@
 <!--8DECD7E1CEA648988EBA9942C151C7C5-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--8DECD7E1CEA648988EBA9942C151C7C5--></AD_FIELD>
 
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551--><AD_FIELD>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551-->  <AD_FIELD_ID><![CDATA[8E2D1E69A2E144FC807CFDBB5DDAF551]]></AD_FIELD_ID>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551-->  <NAME><![CDATA[Order Reference]]></NAME>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551-->  <DESCRIPTION><![CDATA[A reference or document order number as listed in business partner application.]]></DESCRIPTION>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551-->  <HELP><![CDATA[This can be used to input a reference for this specific transaction. For example, a Purchase Order number can be input on a Sales Order for easier reference.]]></HELP>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551-->  <AD_TAB_ID><![CDATA[3ACD18ADFBA8406086852B071250C481]]></AD_TAB_ID>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551-->  <AD_COLUMN_ID><![CDATA[3045]]></AD_COLUMN_ID>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--8E2D1E69A2E144FC807CFDBB5DDAF551--></AD_FIELD>
+
 <!--8E5332A41BD54926A2E922E2DB1D9F3A--><AD_FIELD>
 <!--8E5332A41BD54926A2E922E2DB1D9F3A-->  <AD_FIELD_ID><![CDATA[8E5332A41BD54926A2E922E2DB1D9F3A]]></AD_FIELD_ID>
 <!--8E5332A41BD54926A2E922E2DB1D9F3A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -267066,9 +267212,9 @@
 <!--A93C4CD021434B43AE8C562E72224EF6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--A93C4CD021434B43AE8C562E72224EF6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A93C4CD021434B43AE8C562E72224EF6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--A93C4CD021434B43AE8C562E72224EF6-->  <NAME><![CDATA[Copy from Order]]></NAME>
-<!--A93C4CD021434B43AE8C562E72224EF6-->  <DESCRIPTION><![CDATA[Copy From Order]]></DESCRIPTION>
-<!--A93C4CD021434B43AE8C562E72224EF6-->  <HELP><![CDATA[Copies lines from Order]]></HELP>
+<!--A93C4CD021434B43AE8C562E72224EF6-->  <NAME><![CDATA[Copy from Orders]]></NAME>
+<!--A93C4CD021434B43AE8C562E72224EF6-->  <DESCRIPTION><![CDATA[Copy lines from orders]]></DESCRIPTION>
+<!--A93C4CD021434B43AE8C562E72224EF6-->  <HELP><![CDATA[Copy lines from orders]]></HELP>
 <!--A93C4CD021434B43AE8C562E72224EF6-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--A93C4CD021434B43AE8C562E72224EF6-->  <AD_TAB_ID><![CDATA[F87F1EB7EB404F1F916EBAFAD1A0A334]]></AD_TAB_ID>
 <!--A93C4CD021434B43AE8C562E72224EF6-->  <AD_COLUMN_ID><![CDATA[803711]]></AD_COLUMN_ID>
@@ -268287,6 +268433,36 @@
 <!--AC8984CFDCC44E43BDADB2630586ABAF-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--AC8984CFDCC44E43BDADB2630586ABAF--></AD_FIELD>
 
+<!--AC971A2C03994083B80832D794ABB769--><AD_FIELD>
+<!--AC971A2C03994083B80832D794ABB769-->  <AD_FIELD_ID><![CDATA[AC971A2C03994083B80832D794ABB769]]></AD_FIELD_ID>
+<!--AC971A2C03994083B80832D794ABB769-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AC971A2C03994083B80832D794ABB769-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AC971A2C03994083B80832D794ABB769-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AC971A2C03994083B80832D794ABB769-->  <NAME><![CDATA[Sales Transaction]]></NAME>
+<!--AC971A2C03994083B80832D794ABB769-->  <DESCRIPTION><![CDATA[An indication that a transfer of goods and money between business partners is occurring.]]></DESCRIPTION>
+<!--AC971A2C03994083B80832D794ABB769-->  <HELP><![CDATA[The Sales Transaction checkbox indicates if this item is a Sales Transaction.]]></HELP>
+<!--AC971A2C03994083B80832D794ABB769-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--AC971A2C03994083B80832D794ABB769-->  <AD_TAB_ID><![CDATA[3ACD18ADFBA8406086852B071250C481]]></AD_TAB_ID>
+<!--AC971A2C03994083B80832D794ABB769-->  <AD_COLUMN_ID><![CDATA[3718]]></AD_COLUMN_ID>
+<!--AC971A2C03994083B80832D794ABB769-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--AC971A2C03994083B80832D794ABB769-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--AC971A2C03994083B80832D794ABB769-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--AC971A2C03994083B80832D794ABB769-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--AC971A2C03994083B80832D794ABB769-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--AC971A2C03994083B80832D794ABB769-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--AC971A2C03994083B80832D794ABB769-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--AC971A2C03994083B80832D794ABB769-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--AC971A2C03994083B80832D794ABB769-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--AC971A2C03994083B80832D794ABB769-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--AC971A2C03994083B80832D794ABB769-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--AC971A2C03994083B80832D794ABB769-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
+<!--AC971A2C03994083B80832D794ABB769-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--AC971A2C03994083B80832D794ABB769-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--AC971A2C03994083B80832D794ABB769-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--AC971A2C03994083B80832D794ABB769-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--AC971A2C03994083B80832D794ABB769-->  <EM_OBUIAPP_DEFAULT_EXPRESSION><![CDATA[OB.getFilterExpression("org.openbravo.common.actionhandler.copyfromorderprocess.CopyFromOrdersProcessFilterExpression")]]></EM_OBUIAPP_DEFAULT_EXPRESSION>
+<!--AC971A2C03994083B80832D794ABB769--></AD_FIELD>
+
 <!--ACC53B5DDE244929B6B2C6F695DA6A26--><AD_FIELD>
 <!--ACC53B5DDE244929B6B2C6F695DA6A26-->  <AD_FIELD_ID><![CDATA[ACC53B5DDE244929B6B2C6F695DA6A26]]></AD_FIELD_ID>
 <!--ACC53B5DDE244929B6B2C6F695DA6A26-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -280339,6 +280515,35 @@
 <!--B6F3521A22794522A069169223413038-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--B6F3521A22794522A069169223413038--></AD_FIELD>
 
+<!--B6FD9241B1544C249BB4DD2AD1EBA891--><AD_FIELD>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891-->  <AD_FIELD_ID><![CDATA[B6FD9241B1544C249BB4DD2AD1EBA891]]></AD_FIELD_ID>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891-->  <NAME><![CDATA[Description]]></NAME>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891-->  <DESCRIPTION><![CDATA[A space to write additional related information.]]></DESCRIPTION>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891-->  <HELP><![CDATA[A description is limited to 255 characters.]]></HELP>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891-->  <AD_TAB_ID><![CDATA[3ACD18ADFBA8406086852B071250C481]]></AD_TAB_ID>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891-->  <AD_COLUMN_ID><![CDATA[2174]]></AD_COLUMN_ID>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--B6FD9241B1544C249BB4DD2AD1EBA891--></AD_FIELD>
+
 <!--B6FDD9D068CC4FDAB29F887AC6462736--><AD_FIELD>
 <!--B6FDD9D068CC4FDAB29F887AC6462736-->  <AD_FIELD_ID><![CDATA[B6FDD9D068CC4FDAB29F887AC6462736]]></AD_FIELD_ID>
 <!--B6FDD9D068CC4FDAB29F887AC6462736-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -292791,7 +292996,7 @@
 <!--CE626BBC5EB58638E040007F01001502-->  <AD_COLUMN_ID><![CDATA[CE612A71B701D54AE040007F01001500]]></AD_COLUMN_ID>
 <!--CE626BBC5EB58638E040007F01001502-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--CE626BBC5EB58638E040007F01001502-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--CE626BBC5EB58638E040007F01001502-->  <DISPLAYLOGIC><![CDATA[@StockReservations@!'' & @processed@='Y' & @qtyordered@!@qtydelivered@]]></DISPLAYLOGIC>
+<!--CE626BBC5EB58638E040007F01001502-->  <DISPLAYLOGIC><![CDATA[@StockReservations@!'' & @processed@='Y' & @qtyordered@!@qtydelivered@ & @DocStatus@!'CL']]></DISPLAYLOGIC>
 <!--CE626BBC5EB58638E040007F01001502-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--CE626BBC5EB58638E040007F01001502-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--CE626BBC5EB58638E040007F01001502-->  <SEQNO><![CDATA[300]]></SEQNO>
@@ -295142,6 +295347,35 @@
 <!--D1551130292C4CD38C949BBF399A37A5-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--D1551130292C4CD38C949BBF399A37A5--></AD_FIELD>
 
+<!--D1602458E7564C0496614E288FE964B0--><AD_FIELD>
+<!--D1602458E7564C0496614E288FE964B0-->  <AD_FIELD_ID><![CDATA[D1602458E7564C0496614E288FE964B0]]></AD_FIELD_ID>
+<!--D1602458E7564C0496614E288FE964B0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D1602458E7564C0496614E288FE964B0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D1602458E7564C0496614E288FE964B0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D1602458E7564C0496614E288FE964B0-->  <NAME><![CDATA[Total Gross Amount]]></NAME>
+<!--D1602458E7564C0496614E288FE964B0-->  <DESCRIPTION><![CDATA[The final monetary amount (including taxes) charge listed in a document.]]></DESCRIPTION>
+<!--D1602458E7564C0496614E288FE964B0-->  <HELP><![CDATA[The Grand Total displays the total amount including Tax and Freight in document currency]]></HELP>
+<!--D1602458E7564C0496614E288FE964B0-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--D1602458E7564C0496614E288FE964B0-->  <AD_TAB_ID><![CDATA[3ACD18ADFBA8406086852B071250C481]]></AD_TAB_ID>
+<!--D1602458E7564C0496614E288FE964B0-->  <AD_COLUMN_ID><![CDATA[2201]]></AD_COLUMN_ID>
+<!--D1602458E7564C0496614E288FE964B0-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--D1602458E7564C0496614E288FE964B0-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--D1602458E7564C0496614E288FE964B0-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--D1602458E7564C0496614E288FE964B0-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--D1602458E7564C0496614E288FE964B0-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--D1602458E7564C0496614E288FE964B0-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--D1602458E7564C0496614E288FE964B0-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--D1602458E7564C0496614E288FE964B0-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D1602458E7564C0496614E288FE964B0-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--D1602458E7564C0496614E288FE964B0-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--D1602458E7564C0496614E288FE964B0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D1602458E7564C0496614E288FE964B0-->  <GRID_SEQNO><![CDATA[50]]></GRID_SEQNO>
+<!--D1602458E7564C0496614E288FE964B0-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--D1602458E7564C0496614E288FE964B0-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--D1602458E7564C0496614E288FE964B0-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--D1602458E7564C0496614E288FE964B0-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--D1602458E7564C0496614E288FE964B0--></AD_FIELD>
+
 <!--D165311612564E8CAC703D261108CD0B--><AD_FIELD>
 <!--D165311612564E8CAC703D261108CD0B-->  <AD_FIELD_ID><![CDATA[D165311612564E8CAC703D261108CD0B]]></AD_FIELD_ID>
 <!--D165311612564E8CAC703D261108CD0B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -295773,6 +296007,35 @@
 <!--D37395F28EDB4F619EA7970A5E2C0F3F-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--D37395F28EDB4F619EA7970A5E2C0F3F--></AD_FIELD>
 
+<!--D3758708EC3E4B0EB682057C1F5F57A0--><AD_FIELD>
+<!--D3758708EC3E4B0EB682057C1F5F57A0-->  <AD_FIELD_ID><![CDATA[D3758708EC3E4B0EB682057C1F5F57A0]]></AD_FIELD_ID>
+<!--D3758708EC3E4B0EB682057C1F5F57A0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D3758708EC3E4B0EB682057C1F5F57A0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D3758708EC3E4B0EB682057C1F5F57A0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D3758708EC3E4B0EB682057C1F5F57A0-->  <NAME><![CDATA[Organization]]></NAME>
+<!--D3758708EC3E4B0EB682057C1F5F57A0-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--D3758708EC3E4B0EB682057C1F5F57A0-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--D3758708EC3E4B0EB682057C1F5F57A0-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--D3758708EC3E4B0EB682057C1F5F57A0-->  <AD_TAB_ID><![CDATA[3ACD18ADFBA8406086852B071250C481]]></AD_TAB_ID>
+<!--D3758708EC3E4B0EB682057C1F5F57A0-->  <AD_COLUMN_ID><![CDATA[2163]]></AD_COLUMN_ID>
+<!--D3758708EC3E4B0EB682057C1F5F57A0-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--D3758708EC3E4B0EB682057C1F5F57A0-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--D3758708EC3E4B0EB682057C1F5F57A0-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--D3758708EC3E4B0EB682057C1F5F57A0-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--D3758708EC3E4B0EB682057C1F5F57A0-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--D3758708EC3E4B0EB682057C1F5F57A0-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--D3758708EC3E4B0EB682057C1F5F57A0-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--D3758708EC3E4B0EB682057C1F5F57A0-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D3758708EC3E4B0EB682057C1F5F57A0-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--D3758708EC3E4B0EB682057C1F5F57A0-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--D3758708EC3E4B0EB682057C1F5F57A0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D3758708EC3E4B0EB682057C1F5F57A0-->  <GRID_SEQNO><![CDATA[10]]></GRID_SEQNO>
+<!--D3758708EC3E4B0EB682057C1F5F57A0-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--D3758708EC3E4B0EB682057C1F5F57A0-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--D3758708EC3E4B0EB682057C1F5F57A0-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--D3758708EC3E4B0EB682057C1F5F57A0-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--D3758708EC3E4B0EB682057C1F5F57A0--></AD_FIELD>
+
 <!--D37B7DB66FA04203BE71833669F293E1--><AD_FIELD>
 <!--D37B7DB66FA04203BE71833669F293E1-->  <AD_FIELD_ID><![CDATA[D37B7DB66FA04203BE71833669F293E1]]></AD_FIELD_ID>
 <!--D37B7DB66FA04203BE71833669F293E1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -313761,8 +314024,9 @@
 <!--FA4B874823A445DBA4D5C94E4817CD35-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--FA4B874823A445DBA4D5C94E4817CD35-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FA4B874823A445DBA4D5C94E4817CD35-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FA4B874823A445DBA4D5C94E4817CD35-->  <NAME><![CDATA[Entity Alias]]></NAME>
-<!--FA4B874823A445DBA4D5C94E4817CD35-->  <HELP><![CDATA[In case that the the table has an alias in the HQL it is mandatory to set it on this field. This alias is used to add some mandatory filters on the Where clause replacing the @additional_filters@ string. Some examples of added filters are: client, organization and active flag.]]></HELP>
+<!--FA4B874823A445DBA4D5C94E4817CD35-->  <NAME><![CDATA[Clause Left Part]]></NAME>
+<!--FA4B874823A445DBA4D5C94E4817CD35-->  <DESCRIPTION><![CDATA[The left part definition of a column in an HQL query.]]></DESCRIPTION>
+<!--FA4B874823A445DBA4D5C94E4817CD35-->  <HELP><![CDATA[The left part definition of a column in an HQL query.]]></HELP>
 <!--FA4B874823A445DBA4D5C94E4817CD35-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--FA4B874823A445DBA4D5C94E4817CD35-->  <AD_TAB_ID><![CDATA[101]]></AD_TAB_ID>
 <!--FA4B874823A445DBA4D5C94E4817CD35-->  <AD_COLUMN_ID><![CDATA[D5ED3D4580B3471087EE59081FE7B013]]></AD_COLUMN_ID>
--- a/model/src-db/database/sourcedata/AD_MENU.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/sourcedata/AD_MENU.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -4363,6 +4363,20 @@
 <!--800288-->  <OPENLINKINBROWSER><![CDATA[N]]></OPENLINKINBROWSER>
 <!--800288--></AD_MENU>
 
+<!--800289--><AD_MENU>
+<!--800289-->  <AD_MENU_ID><![CDATA[800289]]></AD_MENU_ID>
+<!--800289-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--800289-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--800289-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--800289-->  <NAME><![CDATA[Cash Flow Statement]]></NAME>
+<!--800289-->  <DESCRIPTION><![CDATA[Cash Flow Statement]]></DESCRIPTION>
+<!--800289-->  <ISSUMMARY><![CDATA[N]]></ISSUMMARY>
+<!--800289-->  <ACTION><![CDATA[R]]></ACTION>
+<!--800289-->  <AD_PROCESS_ID><![CDATA[800206]]></AD_PROCESS_ID>
+<!--800289-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--800289-->  <OPENLINKINBROWSER><![CDATA[N]]></OPENLINKINBROWSER>
+<!--800289--></AD_MENU>
+
 <!--800290--><AD_MENU>
 <!--800290-->  <AD_MENU_ID><![CDATA[800290]]></AD_MENU_ID>
 <!--800290-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -4708,6 +4722,20 @@
 <!--22FA719BCA6D47BE9F226057718308FA-->  <OPENLINKINBROWSER><![CDATA[N]]></OPENLINKINBROWSER>
 <!--22FA719BCA6D47BE9F226057718308FA--></AD_MENU>
 
+<!--2345D54C6D044A999C7FDD5C504008A6--><AD_MENU>
+<!--2345D54C6D044A999C7FDD5C504008A6-->  <AD_MENU_ID><![CDATA[2345D54C6D044A999C7FDD5C504008A6]]></AD_MENU_ID>
+<!--2345D54C6D044A999C7FDD5C504008A6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2345D54C6D044A999C7FDD5C504008A6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2345D54C6D044A999C7FDD5C504008A6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2345D54C6D044A999C7FDD5C504008A6-->  <NAME><![CDATA[Update Audit Trail Infrastructure]]></NAME>
+<!--2345D54C6D044A999C7FDD5C504008A6-->  <DESCRIPTION><![CDATA[Update Audit Trail Infrastructure]]></DESCRIPTION>
+<!--2345D54C6D044A999C7FDD5C504008A6-->  <ISSUMMARY><![CDATA[N]]></ISSUMMARY>
+<!--2345D54C6D044A999C7FDD5C504008A6-->  <ACTION><![CDATA[P]]></ACTION>
+<!--2345D54C6D044A999C7FDD5C504008A6-->  <AD_PROCESS_ID><![CDATA[58763832F5F3485CAD33B8B9FCD6C640]]></AD_PROCESS_ID>
+<!--2345D54C6D044A999C7FDD5C504008A6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2345D54C6D044A999C7FDD5C504008A6-->  <OPENLINKINBROWSER><![CDATA[N]]></OPENLINKINBROWSER>
+<!--2345D54C6D044A999C7FDD5C504008A6--></AD_MENU>
+
 <!--241C75FEC4C243BC8E71A4F358157F2D--><AD_MENU>
 <!--241C75FEC4C243BC8E71A4F358157F2D-->  <AD_MENU_ID><![CDATA[241C75FEC4C243BC8E71A4F358157F2D]]></AD_MENU_ID>
 <!--241C75FEC4C243BC8E71A4F358157F2D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_MESSAGE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -299,7 +299,7 @@
 <!--125-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--125-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--125-->  <VALUE><![CDATA[Openbravo]]></VALUE>
-<!--125-->  <MSGTEXT><![CDATA[© 2001-2017 Openbravo, S.L.U.]]></MSGTEXT>
+<!--125-->  <MSGTEXT><![CDATA[© 2001-2018 Openbravo, S.L.U.]]></MSGTEXT>
 <!--125-->  <MSGTIP><![CDATA[http://www.openbravo.com]]></MSGTIP>
 <!--125-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--125-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -17971,6 +17971,18 @@
 <!--2C9BE7698E31458E966E9CFBF91A35BF-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--2C9BE7698E31458E966E9CFBF91A35BF--></AD_MESSAGE>
 
+<!--2CA65D80319E449E98A000D4CCF6E768--><AD_MESSAGE>
+<!--2CA65D80319E449E98A000D4CCF6E768-->  <AD_MESSAGE_ID><![CDATA[2CA65D80319E449E98A000D4CCF6E768]]></AD_MESSAGE_ID>
+<!--2CA65D80319E449E98A000D4CCF6E768-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2CA65D80319E449E98A000D4CCF6E768-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2CA65D80319E449E98A000D4CCF6E768-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2CA65D80319E449E98A000D4CCF6E768-->  <VALUE><![CDATA[CurrencyStdPrecisionHigherThanISOSpec]]></VALUE>
+<!--2CA65D80319E449E98A000D4CCF6E768-->  <MSGTEXT><![CDATA[The current standard precision: %s is higher than currency precision defined on ISO 4217 specification: %s for: %s currency]]></MSGTEXT>
+<!--2CA65D80319E449E98A000D4CCF6E768-->  <MSGTYPE><![CDATA[W]]></MSGTYPE>
+<!--2CA65D80319E449E98A000D4CCF6E768-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2CA65D80319E449E98A000D4CCF6E768-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--2CA65D80319E449E98A000D4CCF6E768--></AD_MESSAGE>
+
 <!--2CB71A652AB845D3A8A6477359C66451--><AD_MESSAGE>
 <!--2CB71A652AB845D3A8A6477359C66451-->  <AD_MESSAGE_ID><![CDATA[2CB71A652AB845D3A8A6477359C66451]]></AD_MESSAGE_ID>
 <!--2CB71A652AB845D3A8A6477359C66451-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -19549,6 +19561,18 @@
 <!--492C1E7969764AD1BE52DCB41278B5BC-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--492C1E7969764AD1BE52DCB41278B5BC--></AD_MESSAGE>
 
+<!--4A301EB2665946D08F55B09D4A030F06--><AD_MESSAGE>
+<!--4A301EB2665946D08F55B09D4A030F06-->  <AD_MESSAGE_ID><![CDATA[4A301EB2665946D08F55B09D4A030F06]]></AD_MESSAGE_ID>
+<!--4A301EB2665946D08F55B09D4A030F06-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4A301EB2665946D08F55B09D4A030F06-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4A301EB2665946D08F55B09D4A030F06-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4A301EB2665946D08F55B09D4A030F06-->  <VALUE><![CDATA[CurrencyStdPrecisionNegative]]></VALUE>
+<!--4A301EB2665946D08F55B09D4A030F06-->  <MSGTEXT><![CDATA[Standard precision can not be a negative value. It has been change to 2 as the default value]]></MSGTEXT>
+<!--4A301EB2665946D08F55B09D4A030F06-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--4A301EB2665946D08F55B09D4A030F06-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4A301EB2665946D08F55B09D4A030F06-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--4A301EB2665946D08F55B09D4A030F06--></AD_MESSAGE>
+
 <!--4A82705B500347DB93524E0EBAFAA4FA--><AD_MESSAGE>
 <!--4A82705B500347DB93524E0EBAFAA4FA-->  <AD_MESSAGE_ID><![CDATA[4A82705B500347DB93524E0EBAFAA4FA]]></AD_MESSAGE_ID>
 <!--4A82705B500347DB93524E0EBAFAA4FA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21383,6 +21407,18 @@
 <!--716A7D748A9C9ED8E040007F01015931-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--716A7D748A9C9ED8E040007F01015931--></AD_MESSAGE>
 
+<!--71755E370E6F4AB185E9AC5CB573CAB0--><AD_MESSAGE>
+<!--71755E370E6F4AB185E9AC5CB573CAB0-->  <AD_MESSAGE_ID><![CDATA[71755E370E6F4AB185E9AC5CB573CAB0]]></AD_MESSAGE_ID>
+<!--71755E370E6F4AB185E9AC5CB573CAB0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--71755E370E6F4AB185E9AC5CB573CAB0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--71755E370E6F4AB185E9AC5CB573CAB0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--71755E370E6F4AB185E9AC5CB573CAB0-->  <VALUE><![CDATA[ReportsExecutionsLimit]]></VALUE>
+<!--71755E370E6F4AB185E9AC5CB573CAB0-->  <MSGTEXT><![CDATA[Report execution limit (%d) has been reached]]></MSGTEXT>
+<!--71755E370E6F4AB185E9AC5CB573CAB0-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--71755E370E6F4AB185E9AC5CB573CAB0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--71755E370E6F4AB185E9AC5CB573CAB0-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--71755E370E6F4AB185E9AC5CB573CAB0--></AD_MESSAGE>
+
 <!--71C5D55B1EE14B2DA165D44220963D84--><AD_MESSAGE>
 <!--71C5D55B1EE14B2DA165D44220963D84-->  <AD_MESSAGE_ID><![CDATA[71C5D55B1EE14B2DA165D44220963D84]]></AD_MESSAGE_ID>
 <!--71C5D55B1EE14B2DA165D44220963D84-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21576,6 +21612,18 @@
 <!--750BD7EF580544768D8DEC762753A24D-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--750BD7EF580544768D8DEC762753A24D--></AD_MESSAGE>
 
+<!--751B5CDC5E974D068360BE1AB88C0B55--><AD_MESSAGE>
+<!--751B5CDC5E974D068360BE1AB88C0B55-->  <AD_MESSAGE_ID><![CDATA[751B5CDC5E974D068360BE1AB88C0B55]]></AD_MESSAGE_ID>
+<!--751B5CDC5E974D068360BE1AB88C0B55-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--751B5CDC5E974D068360BE1AB88C0B55-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--751B5CDC5E974D068360BE1AB88C0B55-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--751B5CDC5E974D068360BE1AB88C0B55-->  <VALUE><![CDATA[ReportsUserExecutionsLimit]]></VALUE>
+<!--751B5CDC5E974D068360BE1AB88C0B55-->  <MSGTEXT><![CDATA[Report execution limit (%d) has been reached for user %s]]></MSGTEXT>
+<!--751B5CDC5E974D068360BE1AB88C0B55-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--751B5CDC5E974D068360BE1AB88C0B55-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--751B5CDC5E974D068360BE1AB88C0B55-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--751B5CDC5E974D068360BE1AB88C0B55--></AD_MESSAGE>
+
 <!--76044028A6A54026900ABC05910E2216--><AD_MESSAGE>
 <!--76044028A6A54026900ABC05910E2216-->  <AD_MESSAGE_ID><![CDATA[76044028A6A54026900ABC05910E2216]]></AD_MESSAGE_ID>
 <!--76044028A6A54026900ABC05910E2216-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -24959,6 +25007,18 @@
 <!--B9EE1302AB724B3FA76024DB096412EE-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--B9EE1302AB724B3FA76024DB096412EE--></AD_MESSAGE>
 
+<!--BA441304B034494E8C11CA1E4BF10A4F--><AD_MESSAGE>
+<!--BA441304B034494E8C11CA1E4BF10A4F-->  <AD_MESSAGE_ID><![CDATA[BA441304B034494E8C11CA1E4BF10A4F]]></AD_MESSAGE_ID>
+<!--BA441304B034494E8C11CA1E4BF10A4F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BA441304B034494E8C11CA1E4BF10A4F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BA441304B034494E8C11CA1E4BF10A4F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BA441304B034494E8C11CA1E4BF10A4F-->  <VALUE><![CDATA[CopyFromOrdersError]]></VALUE>
+<!--BA441304B034494E8C11CA1E4BF10A4F-->  <MSGTEXT><![CDATA[An error has occurred while copying the lines from an Order ]]></MSGTEXT>
+<!--BA441304B034494E8C11CA1E4BF10A4F-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--BA441304B034494E8C11CA1E4BF10A4F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--BA441304B034494E8C11CA1E4BF10A4F-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--BA441304B034494E8C11CA1E4BF10A4F--></AD_MESSAGE>
+
 <!--BA67D141662B401C86DEE35102A9ABA7--><AD_MESSAGE>
 <!--BA67D141662B401C86DEE35102A9ABA7-->  <AD_MESSAGE_ID><![CDATA[BA67D141662B401C86DEE35102A9ABA7]]></AD_MESSAGE_ID>
 <!--BA67D141662B401C86DEE35102A9ABA7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -26271,6 +26331,18 @@
 <!--D5274238436B46D29AB9F56DDE94D66D-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--D5274238436B46D29AB9F56DDE94D66D--></AD_MESSAGE>
 
+<!--D569EF93986749B4A794EDC1A0D5CEE5--><AD_MESSAGE>
+<!--D569EF93986749B4A794EDC1A0D5CEE5-->  <AD_MESSAGE_ID><![CDATA[D569EF93986749B4A794EDC1A0D5CEE5]]></AD_MESSAGE_ID>
+<!--D569EF93986749B4A794EDC1A0D5CEE5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D569EF93986749B4A794EDC1A0D5CEE5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D569EF93986749B4A794EDC1A0D5CEE5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D569EF93986749B4A794EDC1A0D5CEE5-->  <VALUE><![CDATA[ClosedReservation]]></VALUE>
+<!--D569EF93986749B4A794EDC1A0D5CEE5-->  <MSGTEXT><![CDATA[The related reservation is closed ]]></MSGTEXT>
+<!--D569EF93986749B4A794EDC1A0D5CEE5-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--D569EF93986749B4A794EDC1A0D5CEE5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D569EF93986749B4A794EDC1A0D5CEE5-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--D569EF93986749B4A794EDC1A0D5CEE5--></AD_MESSAGE>
+
 <!--D58A82FD33BA4CE98D3059C140B24491--><AD_MESSAGE>
 <!--D58A82FD33BA4CE98D3059C140B24491-->  <AD_MESSAGE_ID><![CDATA[D58A82FD33BA4CE98D3059C140B24491]]></AD_MESSAGE_ID>
 <!--D58A82FD33BA4CE98D3059C140B24491-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -2437,6 +2437,18 @@
 <!--801969-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
 <!--801969--></AD_MODEL_OBJECT>
 
+<!--804366--><AD_MODEL_OBJECT>
+<!--804366-->  <AD_MODEL_OBJECT_ID><![CDATA[804366]]></AD_MODEL_OBJECT_ID>
+<!--804366-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--804366-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--804366-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--804366-->  <ACTION><![CDATA[R]]></ACTION>
+<!--804366-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_reports.ReportCashFlow]]></CLASSNAME>
+<!--804366-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
+<!--804366-->  <AD_PROCESS_ID><![CDATA[800206]]></AD_PROCESS_ID>
+<!--804366-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--804366--></AD_MODEL_OBJECT>
+
 <!--804367--><AD_MODEL_OBJECT>
 <!--804367-->  <AD_MODEL_OBJECT_ID><![CDATA[804367]]></AD_MODEL_OBJECT_ID>
 <!--804367-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2894,6 +2906,19 @@
 <!--046B5835076D48EFA73A1E0FF4721C7F-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
 <!--046B5835076D48EFA73A1E0FF4721C7F--></AD_MODEL_OBJECT>
 
+<!--07D1EFA8EFFC4562AA6742360A6F86DA--><AD_MODEL_OBJECT>
+<!--07D1EFA8EFFC4562AA6742360A6F86DA-->  <AD_MODEL_OBJECT_ID><![CDATA[07D1EFA8EFFC4562AA6742360A6F86DA]]></AD_MODEL_OBJECT_ID>
+<!--07D1EFA8EFFC4562AA6742360A6F86DA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--07D1EFA8EFFC4562AA6742360A6F86DA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--07D1EFA8EFFC4562AA6742360A6F86DA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--07D1EFA8EFFC4562AA6742360A6F86DA-->  <ACTION><![CDATA[M]]></ACTION>
+<!--07D1EFA8EFFC4562AA6742360A6F86DA-->  <CLASSNAME><![CDATA[org.apache.axis.transport.http.AdminServlet]]></CLASSNAME>
+<!--07D1EFA8EFFC4562AA6742360A6F86DA-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
+<!--07D1EFA8EFFC4562AA6742360A6F86DA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--07D1EFA8EFFC4562AA6742360A6F86DA-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--07D1EFA8EFFC4562AA6742360A6F86DA-->  <LOADONSTARTUP><![CDATA[100]]></LOADONSTARTUP>
+<!--07D1EFA8EFFC4562AA6742360A6F86DA--></AD_MODEL_OBJECT>
+
 <!--0953D901E5D34279B9431B3DB8D93BED--><AD_MODEL_OBJECT>
 <!--0953D901E5D34279B9431B3DB8D93BED-->  <AD_MODEL_OBJECT_ID><![CDATA[0953D901E5D34279B9431B3DB8D93BED]]></AD_MODEL_OBJECT_ID>
 <!--0953D901E5D34279B9431B3DB8D93BED-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3347,6 +3372,18 @@
 <!--405CB5D0FE124E4BBB9A6DC13A9F28EA-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
 <!--405CB5D0FE124E4BBB9A6DC13A9F28EA--></AD_MODEL_OBJECT>
 
+<!--40C9C50E51CF446C83AF1F4562D93FD3--><AD_MODEL_OBJECT>
+<!--40C9C50E51CF446C83AF1F4562D93FD3-->  <AD_MODEL_OBJECT_ID><![CDATA[40C9C50E51CF446C83AF1F4562D93FD3]]></AD_MODEL_OBJECT_ID>
+<!--40C9C50E51CF446C83AF1F4562D93FD3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--40C9C50E51CF446C83AF1F4562D93FD3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--40C9C50E51CF446C83AF1F4562D93FD3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--40C9C50E51CF446C83AF1F4562D93FD3-->  <ACTION><![CDATA[P]]></ACTION>
+<!--40C9C50E51CF446C83AF1F4562D93FD3-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_process.UpdateAuditTrail]]></CLASSNAME>
+<!--40C9C50E51CF446C83AF1F4562D93FD3-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
+<!--40C9C50E51CF446C83AF1F4562D93FD3-->  <AD_PROCESS_ID><![CDATA[58763832F5F3485CAD33B8B9FCD6C640]]></AD_PROCESS_ID>
+<!--40C9C50E51CF446C83AF1F4562D93FD3-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
+<!--40C9C50E51CF446C83AF1F4562D93FD3--></AD_MODEL_OBJECT>
+
 <!--411E148DD9524C6784F353977B2FC6E4--><AD_MODEL_OBJECT>
 <!--411E148DD9524C6784F353977B2FC6E4-->  <AD_MODEL_OBJECT_ID><![CDATA[411E148DD9524C6784F353977B2FC6E4]]></AD_MODEL_OBJECT_ID>
 <!--411E148DD9524C6784F353977B2FC6E4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -4177,6 +4214,18 @@
 <!--A0DC35D75E03464E98927A7AFA384705-->  <OBJECT_TYPE><![CDATA[P]]></OBJECT_TYPE>
 <!--A0DC35D75E03464E98927A7AFA384705--></AD_MODEL_OBJECT>
 
+<!--A5B089BB520641BDBD9685FA924DAD4F--><AD_MODEL_OBJECT>
+<!--A5B089BB520641BDBD9685FA924DAD4F-->  <AD_MODEL_OBJECT_ID><![CDATA[A5B089BB520641BDBD9685FA924DAD4F]]></AD_MODEL_OBJECT_ID>
+<!--A5B089BB520641BDBD9685FA924DAD4F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A5B089BB520641BDBD9685FA924DAD4F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A5B089BB520641BDBD9685FA924DAD4F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A5B089BB520641BDBD9685FA924DAD4F-->  <ACTION><![CDATA[C]]></ACTION>
+<!--A5B089BB520641BDBD9685FA924DAD4F-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_callouts.SL_Currency_StdPrecision]]></CLASSNAME>
+<!--A5B089BB520641BDBD9685FA924DAD4F-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
+<!--A5B089BB520641BDBD9685FA924DAD4F-->  <AD_CALLOUT_ID><![CDATA[6E27FFD536114A78BD1C14A6DFB3C786]]></AD_CALLOUT_ID>
+<!--A5B089BB520641BDBD9685FA924DAD4F-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--A5B089BB520641BDBD9685FA924DAD4F--></AD_MODEL_OBJECT>
+
 <!--A5F45F6DE7234EB1B64791BDD2923B7B--><AD_MODEL_OBJECT>
 <!--A5F45F6DE7234EB1B64791BDD2923B7B-->  <AD_MODEL_OBJECT_ID><![CDATA[A5F45F6DE7234EB1B64791BDD2923B7B]]></AD_MODEL_OBJECT_ID>
 <!--A5F45F6DE7234EB1B64791BDD2923B7B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -2610,6 +2610,16 @@
 <!--808495-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--808495--></AD_MODEL_OBJECT_MAPPING>
 
+<!--808497--><AD_MODEL_OBJECT_MAPPING>
+<!--808497-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[808497]]></AD_MODEL_OBJECT_MAPPING_ID>
+<!--808497-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--808497-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--808497-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--808497-->  <AD_MODEL_OBJECT_ID><![CDATA[804366]]></AD_MODEL_OBJECT_ID>
+<!--808497-->  <MAPPINGNAME><![CDATA[/ad_reports/ReportCashFlowPopUp.html]]></MAPPINGNAME>
+<!--808497-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
+<!--808497--></AD_MODEL_OBJECT_MAPPING>
+
 <!--808498--><AD_MODEL_OBJECT_MAPPING>
 <!--808498-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[808498]]></AD_MODEL_OBJECT_MAPPING_ID>
 <!--808498-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2840,6 +2850,26 @@
 <!--1000500037-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--1000500037--></AD_MODEL_OBJECT_MAPPING>
 
+<!--1000600000--><AD_MODEL_OBJECT_MAPPING>
+<!--1000600000-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[1000600000]]></AD_MODEL_OBJECT_MAPPING_ID>
+<!--1000600000-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1000600000-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1000600000-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1000600000-->  <AD_MODEL_OBJECT_ID><![CDATA[804366]]></AD_MODEL_OBJECT_ID>
+<!--1000600000-->  <MAPPINGNAME><![CDATA[/ad_reports/ReportCashFlowReload.html]]></MAPPINGNAME>
+<!--1000600000-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
+<!--1000600000--></AD_MODEL_OBJECT_MAPPING>
+
+<!--1000600001--><AD_MODEL_OBJECT_MAPPING>
+<!--1000600001-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[1000600001]]></AD_MODEL_OBJECT_MAPPING_ID>
+<!--1000600001-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1000600001-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1000600001-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1000600001-->  <AD_MODEL_OBJECT_ID><![CDATA[804366]]></AD_MODEL_OBJECT_ID>
+<!--1000600001-->  <MAPPINGNAME><![CDATA[/ad_reports/ReportCashFlow.html]]></MAPPINGNAME>
+<!--1000600001-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
+<!--1000600001--></AD_MODEL_OBJECT_MAPPING>
+
 <!--1002100080--><AD_MODEL_OBJECT_MAPPING>
 <!--1002100080-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[1002100080]]></AD_MODEL_OBJECT_MAPPING_ID>
 <!--1002100080-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_MODULE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/sourcedata/AD_MODULE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -6,7 +6,7 @@
 <!--0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0-->  <NAME><![CDATA[Core]]></NAME>
-<!--0-->  <VERSION><![CDATA[3.0.32857]]></VERSION>
+<!--0-->  <VERSION><![CDATA[3.0.33184]]></VERSION>
 <!--0-->  <DESCRIPTION><![CDATA[Core module is the base one]]></DESCRIPTION>
 <!--0-->  <HELP><![CDATA[Core module is the base one, all developments in core are included as part of the standard Openbravo ERP.]]></HELP>
 <!--0-->  <URL><![CDATA[www.openbravo.com]]></URL>
@@ -22,7 +22,7 @@
 <!--0-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--0-->  <HASREFERENCEDATA><![CDATA[Y]]></HASREFERENCEDATA>
 <!--0-->  <REFERENCEDATAINFO><![CDATA[Standard document types for orders, invoices, etc. and settings]]></REFERENCEDATAINFO>
-<!--0-->  <VERSION_LABEL><![CDATA[PR17Q4]]></VERSION_LABEL>
+<!--0-->  <VERSION_LABEL><![CDATA[PR18Q1]]></VERSION_LABEL>
 <!--0-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--0--></AD_MODULE>
--- a/model/src-db/database/sourcedata/AD_PREFERENCE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/sourcedata/AD_PREFERENCE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -24,6 +24,17 @@
 <!--9B4A5EB695FDA841E040A8C0E1077381-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--9B4A5EB695FDA841E040A8C0E1077381--></AD_PREFERENCE>
 
+<!--D8BA2E4D3073410D8ABA9CC5BEC1B7D0--><AD_PREFERENCE>
+<!--D8BA2E4D3073410D8ABA9CC5BEC1B7D0-->  <AD_PREFERENCE_ID><![CDATA[D8BA2E4D3073410D8ABA9CC5BEC1B7D0]]></AD_PREFERENCE_ID>
+<!--D8BA2E4D3073410D8ABA9CC5BEC1B7D0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D8BA2E4D3073410D8ABA9CC5BEC1B7D0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D8BA2E4D3073410D8ABA9CC5BEC1B7D0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D8BA2E4D3073410D8ABA9CC5BEC1B7D0-->  <ATTRIBUTE><![CDATA[ReportsUserExecutionsLimit]]></ATTRIBUTE>
+<!--D8BA2E4D3073410D8ABA9CC5BEC1B7D0-->  <VALUE><![CDATA[0]]></VALUE>
+<!--D8BA2E4D3073410D8ABA9CC5BEC1B7D0-->  <ISPROPERTYLIST><![CDATA[N]]></ISPROPERTYLIST>
+<!--D8BA2E4D3073410D8ABA9CC5BEC1B7D0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D8BA2E4D3073410D8ABA9CC5BEC1B7D0--></AD_PREFERENCE>
+
 <!--D965E00387CB434DAD78493B417AFD37--><AD_PREFERENCE>
 <!--D965E00387CB434DAD78493B417AFD37-->  <AD_PREFERENCE_ID><![CDATA[D965E00387CB434DAD78493B417AFD37]]></AD_PREFERENCE_ID>
 <!--D965E00387CB434DAD78493B417AFD37-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -35,4 +46,15 @@
 <!--D965E00387CB434DAD78493B417AFD37-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--D965E00387CB434DAD78493B417AFD37--></AD_PREFERENCE>
 
+<!--F44893EDBDA84C6BAF99A1F8550E5044--><AD_PREFERENCE>
+<!--F44893EDBDA84C6BAF99A1F8550E5044-->  <AD_PREFERENCE_ID><![CDATA[F44893EDBDA84C6BAF99A1F8550E5044]]></AD_PREFERENCE_ID>
+<!--F44893EDBDA84C6BAF99A1F8550E5044-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F44893EDBDA84C6BAF99A1F8550E5044-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F44893EDBDA84C6BAF99A1F8550E5044-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F44893EDBDA84C6BAF99A1F8550E5044-->  <ATTRIBUTE><![CDATA[ReportsExecutionsLimit]]></ATTRIBUTE>
+<!--F44893EDBDA84C6BAF99A1F8550E5044-->  <VALUE><![CDATA[0]]></VALUE>
+<!--F44893EDBDA84C6BAF99A1F8550E5044-->  <ISPROPERTYLIST><![CDATA[N]]></ISPROPERTYLIST>
+<!--F44893EDBDA84C6BAF99A1F8550E5044-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F44893EDBDA84C6BAF99A1F8550E5044--></AD_PREFERENCE>
+
 </data>
--- a/model/src-db/database/sourcedata/AD_PROCESS.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/sourcedata/AD_PROCESS.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -5559,6 +5559,30 @@
 <!--800205-->  <ISKILLABLE><![CDATA[N]]></ISKILLABLE>
 <!--800205--></AD_PROCESS>
 
+<!--800206--><AD_PROCESS>
+<!--800206-->  <AD_PROCESS_ID><![CDATA[800206]]></AD_PROCESS_ID>
+<!--800206-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--800206-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--800206-->  <ISACTIVE><![CDATA[N]]></ISACTIVE>
+<!--800206-->  <VALUE><![CDATA[CashFlowStatement]]></VALUE>
+<!--800206-->  <NAME><![CDATA[Cash Flow Statement]]></NAME>
+<!--800206-->  <DESCRIPTION><![CDATA[Cash Flow Statement]]></DESCRIPTION>
+<!--800206-->  <HELP><![CDATA[Cash Flow Statement]]></HELP>
+<!--800206-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
+<!--800206-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
+<!--800206-->  <ISREPORT><![CDATA[Y]]></ISREPORT>
+<!--800206-->  <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
+<!--800206-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
+<!--800206-->  <ISJASPER><![CDATA[N]]></ISJASPER>
+<!--800206-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
+<!--800206-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--800206-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
+<!--800206-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
+<!--800206-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--800206-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
+<!--800206-->  <ISKILLABLE><![CDATA[N]]></ISKILLABLE>
+<!--800206--></AD_PROCESS>
+
 <!--800207--><AD_PROCESS>
 <!--800207-->  <AD_PROCESS_ID><![CDATA[800207]]></AD_PROCESS_ID>
 <!--800207-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -6294,6 +6318,33 @@
 <!--58591E3E0F7648E4A09058E037CE49FC-->  <ISKILLABLE><![CDATA[N]]></ISKILLABLE>
 <!--58591E3E0F7648E4A09058E037CE49FC--></AD_PROCESS>
 
+<!--58763832F5F3485CAD33B8B9FCD6C640--><AD_PROCESS>
+<!--58763832F5F3485CAD33B8B9FCD6C640-->  <AD_PROCESS_ID><![CDATA[58763832F5F3485CAD33B8B9FCD6C640]]></AD_PROCESS_ID>
+<!--58763832F5F3485CAD33B8B9FCD6C640-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--58763832F5F3485CAD33B8B9FCD6C640-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--58763832F5F3485CAD33B8B9FCD6C640-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--58763832F5F3485CAD33B8B9FCD6C640-->  <VALUE><![CDATA[UpdateAuditTrail]]></VALUE>
+<!--58763832F5F3485CAD33B8B9FCD6C640-->  <NAME><![CDATA[Update Audit Trail Infrastructure]]></NAME>
+<!--58763832F5F3485CAD33B8B9FCD6C640-->  <DESCRIPTION><![CDATA[Update Audit Trail Infrastructure]]></DESCRIPTION>
+<!--58763832F5F3485CAD33B8B9FCD6C640-->  <HELP><![CDATA[This process updates the infrastructure for a complete audit of the selected tables.<br/>
+This process:<br/>
+- Will Stop the background process scheduler during process execution<br/>
+- Can take several minutes. Do not close the browser during execution.]]></HELP>
+<!--58763832F5F3485CAD33B8B9FCD6C640-->  <ACCESSLEVEL><![CDATA[4]]></ACCESSLEVEL>
+<!--58763832F5F3485CAD33B8B9FCD6C640-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
+<!--58763832F5F3485CAD33B8B9FCD6C640-->  <ISREPORT><![CDATA[N]]></ISREPORT>
+<!--58763832F5F3485CAD33B8B9FCD6C640-->  <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
+<!--58763832F5F3485CAD33B8B9FCD6C640-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
+<!--58763832F5F3485CAD33B8B9FCD6C640-->  <ISJASPER><![CDATA[N]]></ISJASPER>
+<!--58763832F5F3485CAD33B8B9FCD6C640-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
+<!--58763832F5F3485CAD33B8B9FCD6C640-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--58763832F5F3485CAD33B8B9FCD6C640-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
+<!--58763832F5F3485CAD33B8B9FCD6C640-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
+<!--58763832F5F3485CAD33B8B9FCD6C640-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--58763832F5F3485CAD33B8B9FCD6C640-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
+<!--58763832F5F3485CAD33B8B9FCD6C640-->  <ISKILLABLE><![CDATA[N]]></ISKILLABLE>
+<!--58763832F5F3485CAD33B8B9FCD6C640--></AD_PROCESS>
+
 <!--5A2A0AF88AF54BB085DCC52FCC9B17B7--><AD_PROCESS>
 <!--5A2A0AF88AF54BB085DCC52FCC9B17B7-->  <AD_PROCESS_ID><![CDATA[5A2A0AF88AF54BB085DCC52FCC9B17B7]]></AD_PROCESS_ID>
 <!--5A2A0AF88AF54BB085DCC52FCC9B17B7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_REFERENCE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/sourcedata/AD_REFERENCE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -6237,6 +6237,20 @@
 <!--AFA80A98B3C6469EA15ECB8A0011A79F-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--AFA80A98B3C6469EA15ECB8A0011A79F--></AD_REFERENCE>
 
+<!--B4D13EC034E14FDAA061C41D3C62789C--><AD_REFERENCE>
+<!--B4D13EC034E14FDAA061C41D3C62789C-->  <AD_REFERENCE_ID><![CDATA[B4D13EC034E14FDAA061C41D3C62789C]]></AD_REFERENCE_ID>
+<!--B4D13EC034E14FDAA061C41D3C62789C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B4D13EC034E14FDAA061C41D3C62789C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B4D13EC034E14FDAA061C41D3C62789C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B4D13EC034E14FDAA061C41D3C62789C-->  <NAME><![CDATA[Copy from Orders]]></NAME>
+<!--B4D13EC034E14FDAA061C41D3C62789C-->  <DESCRIPTION><![CDATA[Copies lines from Orders]]></DESCRIPTION>
+<!--B4D13EC034E14FDAA061C41D3C62789C-->  <HELP><![CDATA[Copies lines from Orders]]></HELP>
+<!--B4D13EC034E14FDAA061C41D3C62789C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B4D13EC034E14FDAA061C41D3C62789C-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--B4D13EC034E14FDAA061C41D3C62789C-->  <PARENTREFERENCE_ID><![CDATA[FF80818132D8F0F30132D9BC395D0038]]></PARENTREFERENCE_ID>
+<!--B4D13EC034E14FDAA061C41D3C62789C-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--B4D13EC034E14FDAA061C41D3C62789C--></AD_REFERENCE>
+
 <!--B7B8495A15AE4904A88CAD93A2A1FD4B--><AD_REFERENCE>
 <!--B7B8495A15AE4904A88CAD93A2A1FD4B-->  <AD_REFERENCE_ID><![CDATA[B7B8495A15AE4904A88CAD93A2A1FD4B]]></AD_REFERENCE_ID>
 <!--B7B8495A15AE4904A88CAD93A2A1FD4B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_TAB.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/sourcedata/AD_TAB.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -14679,6 +14679,36 @@
 <!--39B3DB3BF4C44EE192BE3F6CA69903C0-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
 <!--39B3DB3BF4C44EE192BE3F6CA69903C0--></AD_TAB>
 
+<!--3ACD18ADFBA8406086852B071250C481--><AD_TAB>
+<!--3ACD18ADFBA8406086852B071250C481-->  <AD_TAB_ID><![CDATA[3ACD18ADFBA8406086852B071250C481]]></AD_TAB_ID>
+<!--3ACD18ADFBA8406086852B071250C481-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3ACD18ADFBA8406086852B071250C481-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3ACD18ADFBA8406086852B071250C481-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3ACD18ADFBA8406086852B071250C481-->  <NAME><![CDATA[Copy from Orders]]></NAME>
+<!--3ACD18ADFBA8406086852B071250C481-->  <AD_TABLE_ID><![CDATA[259]]></AD_TABLE_ID>
+<!--3ACD18ADFBA8406086852B071250C481-->  <AD_WINDOW_ID><![CDATA[A839712F8D5E4929BB2D057BAA55A2A3]]></AD_WINDOW_ID>
+<!--3ACD18ADFBA8406086852B071250C481-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--3ACD18ADFBA8406086852B071250C481-->  <TABLEVEL><![CDATA[0]]></TABLEVEL>
+<!--3ACD18ADFBA8406086852B071250C481-->  <ISSINGLEROW><![CDATA[N]]></ISSINGLEROW>
+<!--3ACD18ADFBA8406086852B071250C481-->  <ISINFOTAB><![CDATA[N]]></ISINFOTAB>
+<!--3ACD18ADFBA8406086852B071250C481-->  <ISTRANSLATIONTAB><![CDATA[N]]></ISTRANSLATIONTAB>
+<!--3ACD18ADFBA8406086852B071250C481-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--3ACD18ADFBA8406086852B071250C481-->  <HASTREE><![CDATA[N]]></HASTREE>
+<!--3ACD18ADFBA8406086852B071250C481-->  <PROCESSING><![CDATA[N]]></PROCESSING>
+<!--3ACD18ADFBA8406086852B071250C481-->  <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS>
+<!--3ACD18ADFBA8406086852B071250C481-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
+<!--3ACD18ADFBA8406086852B071250C481-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3ACD18ADFBA8406086852B071250C481-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
+<!--3ACD18ADFBA8406086852B071250C481-->  <HQLORDERBYCLAUSE><![CDATA[documentNo desc]]></HQLORDERBYCLAUSE>
+<!--3ACD18ADFBA8406086852B071250C481-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--3ACD18ADFBA8406086852B071250C481-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
+<!--3ACD18ADFBA8406086852B071250C481-->  <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE>
+<!--3ACD18ADFBA8406086852B071250C481-->  <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS>
+<!--3ACD18ADFBA8406086852B071250C481-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--3ACD18ADFBA8406086852B071250C481-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
+<!--3ACD18ADFBA8406086852B071250C481-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
+<!--3ACD18ADFBA8406086852B071250C481--></AD_TAB>
+
 <!--3D342267CAAE4CA5B191082E20F87660--><AD_TAB>
 <!--3D342267CAAE4CA5B191082E20F87660-->  <AD_TAB_ID><![CDATA[3D342267CAAE4CA5B191082E20F87660]]></AD_TAB_ID>
 <!--3D342267CAAE4CA5B191082E20F87660-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -20198,7 +20228,7 @@
 <!--FEFB495F59894AD6A1163D13ABE88833-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--FEFB495F59894AD6A1163D13ABE88833-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--FEFB495F59894AD6A1163D13ABE88833-->  <HQLWHERECLAUSE><![CDATA[COALESCE(e.goodsShipment.id, @MaterialMgmtShipmentInOut.id@) = @MaterialMgmtShipmentInOut.id@
-AND @MaterialMgmtShipmentInOut.businessPartner@ = e.orderLine.salesOrder.businessPartner.id]]></HQLWHERECLAUSE>
+AND @MaterialMgmtShipmentInOut.businessPartner@ = e.businessPartner.id]]></HQLWHERECLAUSE>
 <!--FEFB495F59894AD6A1163D13ABE88833-->  <HQLORDERBYCLAUSE><![CDATA[obSelected DESC, rMOrderNo, lineNo]]></HQLORDERBYCLAUSE>
 <!--FEFB495F59894AD6A1163D13ABE88833-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
 <!--FEFB495F59894AD6A1163D13ABE88833-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
--- a/model/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -19148,17 +19148,6 @@
 <!--81243D63B75A45A189F333425025E4BC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--81243D63B75A45A189F333425025E4BC--></AD_TEXTINTERFACES>
 
-<!--81AA532AF2B54E88B5902855410C8E02--><AD_TEXTINTERFACES>
-<!--81AA532AF2B54E88B5902855410C8E02-->  <AD_TEXTINTERFACES_ID><![CDATA[81AA532AF2B54E88B5902855410C8E02]]></AD_TEXTINTERFACES_ID>
-<!--81AA532AF2B54E88B5902855410C8E02-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--81AA532AF2B54E88B5902855410C8E02-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--81AA532AF2B54E88B5902855410C8E02-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--81AA532AF2B54E88B5902855410C8E02-->  <TEXT><![CDATA[Copyright © Openbravo, S.L.U. 2001-2017]]></TEXT>
-<!--81AA532AF2B54E88B5902855410C8E02-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/About.html]]></FILENAME>
-<!--81AA532AF2B54E88B5902855410C8E02-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--81AA532AF2B54E88B5902855410C8E02-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--81AA532AF2B54E88B5902855410C8E02--></AD_TEXTINTERFACES>
-
 <!--81CA70895F4843ADAFBB3C5945DC2BB5--><AD_TEXTINTERFACES>
 <!--81CA70895F4843ADAFBB3C5945DC2BB5-->  <AD_TEXTINTERFACES_ID><![CDATA[81CA70895F4843ADAFBB3C5945DC2BB5]]></AD_TEXTINTERFACES_ID>
 <!--81CA70895F4843ADAFBB3C5945DC2BB5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -19434,6 +19423,17 @@
 <!--87A92A55A82A41EA9439A2A15B2E5B8C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--87A92A55A82A41EA9439A2A15B2E5B8C--></AD_TEXTINTERFACES>
 
+<!--87B60A13C1904D17B01147C49FF60791--><AD_TEXTINTERFACES>
+<!--87B60A13C1904D17B01147C49FF60791-->  <AD_TEXTINTERFACES_ID><![CDATA[87B60A13C1904D17B01147C49FF60791]]></AD_TEXTINTERFACES_ID>
+<!--87B60A13C1904D17B01147C49FF60791-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--87B60A13C1904D17B01147C49FF60791-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--87B60A13C1904D17B01147C49FF60791-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--87B60A13C1904D17B01147C49FF60791-->  <TEXT><![CDATA[Copyright © Openbravo, S.L.U. 2001-2018]]></TEXT>
+<!--87B60A13C1904D17B01147C49FF60791-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/About.html]]></FILENAME>
+<!--87B60A13C1904D17B01147C49FF60791-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--87B60A13C1904D17B01147C49FF60791-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--87B60A13C1904D17B01147C49FF60791--></AD_TEXTINTERFACES>
+
 <!--8834FF4A1C39444D9CF0AF6FA1E54BE7--><AD_TEXTINTERFACES>
 <!--8834FF4A1C39444D9CF0AF6FA1E54BE7-->  <AD_TEXTINTERFACES_ID><![CDATA[8834FF4A1C39444D9CF0AF6FA1E54BE7]]></AD_TEXTINTERFACES_ID>
 <!--8834FF4A1C39444D9CF0AF6FA1E54BE7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -22831,17 +22831,6 @@
 <!--D6836A7FA29D4396AA319E5818DB66EE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--D6836A7FA29D4396AA319E5818DB66EE--></AD_TEXTINTERFACES>
 
-<!--D69AA41C4E364F7385E8A4CC0C7E470F--><AD_TEXTINTERFACES>
-<!--D69AA41C4E364F7385E8A4CC0C7E470F-->  <AD_TEXTINTERFACES_ID><![CDATA[D69AA41C4E364F7385E8A4CC0C7E470F]]></AD_TEXTINTERFACES_ID>
-<!--D69AA41C4E364F7385E8A4CC0C7E470F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--D69AA41C4E364F7385E8A4CC0C7E470F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--D69AA41C4E364F7385E8A4CC0C7E470F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--D69AA41C4E364F7385E8A4CC0C7E470F-->  <TEXT><![CDATA[Upload]]></TEXT>
-<!--D69AA41C4E364F7385E8A4CC0C7E470F-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/info/ImageInfoBLOB.html]]></FILENAME>
-<!--D69AA41C4E364F7385E8A4CC0C7E470F-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--D69AA41C4E364F7385E8A4CC0C7E470F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--D69AA41C4E364F7385E8A4CC0C7E470F--></AD_TEXTINTERFACES>
-
 <!--D7433B706C6C4AFCA46E9EB1C61EAE07--><AD_TEXTINTERFACES>
 <!--D7433B706C6C4AFCA46E9EB1C61EAE07-->  <AD_TEXTINTERFACES_ID><![CDATA[D7433B706C6C4AFCA46E9EB1C61EAE07]]></AD_TEXTINTERFACES_ID>
 <!--D7433B706C6C4AFCA46E9EB1C61EAE07-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -23172,17 +23161,6 @@
 <!--E228440A042711DE90B03B18C9F4D4A2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--E228440A042711DE90B03B18C9F4D4A2--></AD_TEXTINTERFACES>
 
-<!--E22DAD1A1598472BB3F6CB745B1A7F50--><AD_TEXTINTERFACES>
-<!--E22DAD1A1598472BB3F6CB745B1A7F50-->  <AD_TEXTINTERFACES_ID><![CDATA[E22DAD1A1598472BB3F6CB745B1A7F50]]></AD_TEXTINTERFACES_ID>
-<!--E22DAD1A1598472BB3F6CB745B1A7F50-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--E22DAD1A1598472BB3F6CB745B1A7F50-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--E22DAD1A1598472BB3F6CB745B1A7F50-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--E22DAD1A1598472BB3F6CB745B1A7F50-->  <TEXT><![CDATA[Close]]></TEXT>
-<!--E22DAD1A1598472BB3F6CB745B1A7F50-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/info/ImageInfoBLOB.html]]></FILENAME>
-<!--E22DAD1A1598472BB3F6CB745B1A7F50-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--E22DAD1A1598472BB3F6CB745B1A7F50-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--E22DAD1A1598472BB3F6CB745B1A7F50--></AD_TEXTINTERFACES>
-
 <!--E27EA944ED494BB19F4CCAEBC0937E42--><AD_TEXTINTERFACES>
 <!--E27EA944ED494BB19F4CCAEBC0937E42-->  <AD_TEXTINTERFACES_ID><![CDATA[E27EA944ED494BB19F4CCAEBC0937E42]]></AD_TEXTINTERFACES_ID>
 <!--E27EA944ED494BB19F4CCAEBC0937E42-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_TREENODE.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/sourcedata/AD_TREENODE.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -3662,6 +3662,17 @@
 <!--52118BF1A3754D84E040007F01005FEC-->  <SEQNO><![CDATA[100]]></SEQNO>
 <!--52118BF1A3754D84E040007F01005FEC--></AD_TREENODE>
 
+<!--52118BF1A3764D84E040007F01005FEC--><AD_TREENODE>
+<!--52118BF1A3764D84E040007F01005FEC-->  <AD_TREENODE_ID><![CDATA[52118BF1A3764D84E040007F01005FEC]]></AD_TREENODE_ID>
+<!--52118BF1A3764D84E040007F01005FEC-->  <AD_TREE_ID><![CDATA[10]]></AD_TREE_ID>
+<!--52118BF1A3764D84E040007F01005FEC-->  <NODE_ID><![CDATA[800289]]></NODE_ID>
+<!--52118BF1A3764D84E040007F01005FEC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--52118BF1A3764D84E040007F01005FEC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--52118BF1A3764D84E040007F01005FEC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--52118BF1A3764D84E040007F01005FEC-->  <PARENT_ID><![CDATA[280]]></PARENT_ID>
+<!--52118BF1A3764D84E040007F01005FEC-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--52118BF1A3764D84E040007F01005FEC--></AD_TREENODE>
+
 <!--52118BF1A3774D84E040007F01005FEC--><AD_TREENODE>
 <!--52118BF1A3774D84E040007F01005FEC-->  <AD_TREENODE_ID><![CDATA[52118BF1A3774D84E040007F01005FEC]]></AD_TREENODE_ID>
 <!--52118BF1A3774D84E040007F01005FEC-->  <AD_TREE_ID><![CDATA[10]]></AD_TREE_ID>
@@ -4112,6 +4123,17 @@
 <!--7AC6A56E80D711DDADB69B718A17D8D7-->  <SEQNO><![CDATA[20]]></SEQNO>
 <!--7AC6A56E80D711DDADB69B718A17D8D7--></AD_TREENODE>
 
+<!--7D1C87F73FC4C60BE040007F01016206--><AD_TREENODE>
+<!--7D1C87F73FC4C60BE040007F01016206-->  <AD_TREENODE_ID><![CDATA[7D1C87F73FC4C60BE040007F01016206]]></AD_TREENODE_ID>
+<!--7D1C87F73FC4C60BE040007F01016206-->  <AD_TREE_ID><![CDATA[10]]></AD_TREE_ID>
+<!--7D1C87F73FC4C60BE040007F01016206-->  <NODE_ID><![CDATA[2345D54C6D044A999C7FDD5C504008A6]]></NODE_ID>
+<!--7D1C87F73FC4C60BE040007F01016206-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7D1C87F73FC4C60BE040007F01016206-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7D1C87F73FC4C60BE040007F01016206-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7D1C87F73FC4C60BE040007F01016206-->  <PARENT_ID><![CDATA[153]]></PARENT_ID>
+<!--7D1C87F73FC4C60BE040007F01016206-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--7D1C87F73FC4C60BE040007F01016206--></AD_TREENODE>
+
 <!--80C68CDB5E77494C95DDBBDC8805713F--><AD_TREENODE>
 <!--80C68CDB5E77494C95DDBBDC8805713F-->  <AD_TREENODE_ID><![CDATA[80C68CDB5E77494C95DDBBDC8805713F]]></AD_TREENODE_ID>
 <!--80C68CDB5E77494C95DDBBDC8805713F-->  <AD_TREE_ID><![CDATA[10]]></AD_TREE_ID>
--- a/model/src-db/database/sourcedata/AD_WINDOW.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/sourcedata/AD_WINDOW.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -865,7 +865,7 @@
 <!--170-->  <DESCRIPTION><![CDATA[Create and edit internal inventory movements among warehouses and storage bins.]]></DESCRIPTION>
 <!--170-->  <HELP><![CDATA[Goods Movements window allows to create internal inventory movements among warehouses and storage bins.]]></HELP>
 <!--170-->  <WINDOWTYPE><![CDATA[T]]></WINDOWTYPE>
-<!--170-->  <ISSOTRX><![CDATA[Y]]></ISSOTRX>
+<!--170-->  <ISSOTRX><![CDATA[N]]></ISSOTRX>
 <!--170-->  <PROCESSING><![CDATA[N]]></PROCESSING>
 <!--170-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--170-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -3232,6 +3232,23 @@
 <!--A4BC3EDFD2424618840A981321C9EC1B-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--A4BC3EDFD2424618840A981321C9EC1B--></AD_WINDOW>
 
+<!--A839712F8D5E4929BB2D057BAA55A2A3--><AD_WINDOW>
+<!--A839712F8D5E4929BB2D057BAA55A2A3-->  <AD_WINDOW_ID><![CDATA[A839712F8D5E4929BB2D057BAA55A2A3]]></AD_WINDOW_ID>
+<!--A839712F8D5E4929BB2D057BAA55A2A3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A839712F8D5E4929BB2D057BAA55A2A3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A839712F8D5E4929BB2D057BAA55A2A3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A839712F8D5E4929BB2D057BAA55A2A3-->  <NAME><![CDATA[Copy from Orders P&E]]></NAME>
+<!--A839712F8D5E4929BB2D057BAA55A2A3-->  <DESCRIPTION><![CDATA[Copies lines from Orders]]></DESCRIPTION>
+<!--A839712F8D5E4929BB2D057BAA55A2A3-->  <HELP><![CDATA[Copies lines from Orders]]></HELP>
+<!--A839712F8D5E4929BB2D057BAA55A2A3-->  <WINDOWTYPE><![CDATA[OBUIAPP_PickAndExecute]]></WINDOWTYPE>
+<!--A839712F8D5E4929BB2D057BAA55A2A3-->  <ISSOTRX><![CDATA[Y]]></ISSOTRX>
+<!--A839712F8D5E4929BB2D057BAA55A2A3-->  <PROCESSING><![CDATA[N]]></PROCESSING>
+<!--A839712F8D5E4929BB2D057BAA55A2A3-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
+<!--A839712F8D5E4929BB2D057BAA55A2A3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A839712F8D5E4929BB2D057BAA55A2A3-->  <ISTHREADSAFE><![CDATA[N]]></ISTHREADSAFE>
+<!--A839712F8D5E4929BB2D057BAA55A2A3-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
+<!--A839712F8D5E4929BB2D057BAA55A2A3--></AD_WINDOW>
+
 <!--A9FD6A5AED3546EC83DB567882646D2E--><AD_WINDOW>
 <!--A9FD6A5AED3546EC83DB567882646D2E-->  <AD_WINDOW_ID><![CDATA[A9FD6A5AED3546EC83DB567882646D2E]]></AD_WINDOW_ID>
 <!--A9FD6A5AED3546EC83DB567882646D2E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -1038,6 +1038,34 @@
 <!--642AFC2EE03646DBA83C8744F81BA691-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--642AFC2EE03646DBA83C8744F81BA691--></OBUIAPP_PARAMETER>
 
+<!--67D3A7BA80F7458B827BBC82373F4910--><OBUIAPP_PARAMETER>
+<!--67D3A7BA80F7458B827BBC82373F4910-->  <OBUIAPP_PARAMETER_ID><![CDATA[67D3A7BA80F7458B827BBC82373F4910]]></OBUIAPP_PARAMETER_ID>
+<!--67D3A7BA80F7458B827BBC82373F4910-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--67D3A7BA80F7458B827BBC82373F4910-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--67D3A7BA80F7458B827BBC82373F4910-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--67D3A7BA80F7458B827BBC82373F4910-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--67D3A7BA80F7458B827BBC82373F4910-->  <NAME><![CDATA[Legal Entity Organization]]></NAME>
+<!--67D3A7BA80F7458B827BBC82373F4910-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--67D3A7BA80F7458B827BBC82373F4910-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--67D3A7BA80F7458B827BBC82373F4910-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--67D3A7BA80F7458B827BBC82373F4910-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--67D3A7BA80F7458B827BBC82373F4910-->  <AD_REFERENCE_VALUE_ID><![CDATA[EE3A1FFA879945C88957F4401BF15C0B]]></AD_REFERENCE_VALUE_ID>
+<!--67D3A7BA80F7458B827BBC82373F4910-->  <COLUMNNAME><![CDATA[ad_org_id]]></COLUMNNAME>
+<!--67D3A7BA80F7458B827BBC82373F4910-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
+<!--67D3A7BA80F7458B827BBC82373F4910-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--67D3A7BA80F7458B827BBC82373F4910-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--67D3A7BA80F7458B827BBC82373F4910-->  <DEFAULTVALUE><![CDATA[OB.getFilterExpression("org.openbravo.common.actionhandler.copyfromorderprocess.CopyFromOrdersProcessFilterExpression")]]></DEFAULTVALUE>
+<!--67D3A7BA80F7458B827BBC82373F4910-->  <AD_ELEMENT_ID><![CDATA[4E3326D8537849D2BBB20D1779080C93]]></AD_ELEMENT_ID>
+<!--67D3A7BA80F7458B827BBC82373F4910-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--67D3A7BA80F7458B827BBC82373F4910-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--67D3A7BA80F7458B827BBC82373F4910-->  <OBUIAPP_PROCESS_ID><![CDATA[8B81D80B06364566B87853FEECAB5DE0]]></OBUIAPP_PROCESS_ID>
+<!--67D3A7BA80F7458B827BBC82373F4910-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
+<!--67D3A7BA80F7458B827BBC82373F4910-->  <READONLYLOGIC><![CDATA[true]]></READONLYLOGIC>
+<!--67D3A7BA80F7458B827BBC82373F4910-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
+<!--67D3A7BA80F7458B827BBC82373F4910-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
+<!--67D3A7BA80F7458B827BBC82373F4910-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
+<!--67D3A7BA80F7458B827BBC82373F4910--></OBUIAPP_PARAMETER>
+
 <!--6B15654D49A4408DBC25E63836D02199--><OBUIAPP_PARAMETER>
 <!--6B15654D49A4408DBC25E63836D02199-->  <OBUIAPP_PARAMETER_ID><![CDATA[6B15654D49A4408DBC25E63836D02199]]></OBUIAPP_PARAMETER_ID>
 <!--6B15654D49A4408DBC25E63836D02199-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1241,6 +1269,30 @@
 <!--83F3D8041AE8417EB3AA2AD3311A6AFE-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
 <!--83F3D8041AE8417EB3AA2AD3311A6AFE--></OBUIAPP_PARAMETER>
 
+<!--87D3EC03AB7D474182E54CB2327E2125--><OBUIAPP_PARAMETER>
+<!--87D3EC03AB7D474182E54CB2327E2125-->  <OBUIAPP_PARAMETER_ID><![CDATA[87D3EC03AB7D474182E54CB2327E2125]]></OBUIAPP_PARAMETER_ID>
+<!--87D3EC03AB7D474182E54CB2327E2125-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--87D3EC03AB7D474182E54CB2327E2125-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--87D3EC03AB7D474182E54CB2327E2125-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--87D3EC03AB7D474182E54CB2327E2125-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--87D3EC03AB7D474182E54CB2327E2125-->  <NAME><![CDATA[Pick/Edit Lines]]></NAME>
+<!--87D3EC03AB7D474182E54CB2327E2125-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--87D3EC03AB7D474182E54CB2327E2125-->  <AD_REFERENCE_ID><![CDATA[FF80818132D8F0F30132D9BC395D0038]]></AD_REFERENCE_ID>
+<!--87D3EC03AB7D474182E54CB2327E2125-->  <AD_REFERENCE_VALUE_ID><![CDATA[B4D13EC034E14FDAA061C41D3C62789C]]></AD_REFERENCE_VALUE_ID>
+<!--87D3EC03AB7D474182E54CB2327E2125-->  <COLUMNNAME><![CDATA[grid]]></COLUMNNAME>
+<!--87D3EC03AB7D474182E54CB2327E2125-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--87D3EC03AB7D474182E54CB2327E2125-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--87D3EC03AB7D474182E54CB2327E2125-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--87D3EC03AB7D474182E54CB2327E2125-->  <AD_ELEMENT_ID><![CDATA[B27C7AF72FEFEC33E040007F0100076A]]></AD_ELEMENT_ID>
+<!--87D3EC03AB7D474182E54CB2327E2125-->  <ISFIXED><![CDATA[N]]></ISFIXED>
+<!--87D3EC03AB7D474182E54CB2327E2125-->  <EVALUATEFIXEDVALUE><![CDATA[N]]></EVALUATEFIXEDVALUE>
+<!--87D3EC03AB7D474182E54CB2327E2125-->  <OBUIAPP_PROCESS_ID><![CDATA[8B81D80B06364566B87853FEECAB5DE0]]></OBUIAPP_PROCESS_ID>
+<!--87D3EC03AB7D474182E54CB2327E2125-->  <STARTINNEWLINE><![CDATA[N]]></STARTINNEWLINE>
+<!--87D3EC03AB7D474182E54CB2327E2125-->  <DISPLAYEDROWS><![CDATA[20]]></DISPLAYEDROWS>
+<!--87D3EC03AB7D474182E54CB2327E2125-->  <DISPLAYTITLE><![CDATA[N]]></DISPLAYTITLE>
+<!--87D3EC03AB7D474182E54CB2327E2125-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
+<!--87D3EC03AB7D474182E54CB2327E2125--></OBUIAPP_PARAMETER>
+
 <!--8EFB8BDF0A4643E3B86AC14DA60C1934--><OBUIAPP_PARAMETER>
 <!--8EFB8BDF0A4643E3B86AC14DA60C1934-->  <OBUIAPP_PARAMETER_ID><![CDATA[8EFB8BDF0A4643E3B86AC14DA60C1934]]></OBUIAPP_PARAMETER_ID>
 <!--8EFB8BDF0A4643E3B86AC14DA60C1934-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -454,6 +454,26 @@
 <!--7DC2C8DC186B4C1DB18E147911950861-->  <ISCANADDRECORDSTOSELECTOR><![CDATA[N]]></ISCANADDRECORDSTOSELECTOR>
 <!--7DC2C8DC186B4C1DB18E147911950861--></OBUIAPP_PROCESS>
 
+<!--8B81D80B06364566B87853FEECAB5DE0--><OBUIAPP_PROCESS>
+<!--8B81D80B06364566B87853FEECAB5DE0-->  <OBUIAPP_PROCESS_ID><![CDATA[8B81D80B06364566B87853FEECAB5DE0]]></OBUIAPP_PROCESS_ID>
+<!--8B81D80B06364566B87853FEECAB5DE0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8B81D80B06364566B87853FEECAB5DE0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8B81D80B06364566B87853FEECAB5DE0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8B81D80B06364566B87853FEECAB5DE0-->  <VALUE><![CDATA[CopyFromOrders]]></VALUE>
+<!--8B81D80B06364566B87853FEECAB5DE0-->  <NAME><![CDATA[Copy from Orders]]></NAME>
+<!--8B81D80B06364566B87853FEECAB5DE0-->  <DESCRIPTION><![CDATA[Copies lines from Orders]]></DESCRIPTION>
+<!--8B81D80B06364566B87853FEECAB5DE0-->  <HELP><![CDATA[Copies lines from Orders]]></HELP>
+<!--8B81D80B06364566B87853FEECAB5DE0-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
+<!--8B81D80B06364566B87853FEECAB5DE0-->  <CLASSNAME><![CDATA[org.openbravo.common.actionhandler.CopyFromOrdersActionHandler]]></CLASSNAME>
+<!--8B81D80B06364566B87853FEECAB5DE0-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
+<!--8B81D80B06364566B87853FEECAB5DE0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8B81D80B06364566B87853FEECAB5DE0-->  <UIPATTERN><![CDATA[OBUIAPP_PickAndExecute]]></UIPATTERN>
+<!--8B81D80B06364566B87853FEECAB5DE0-->  <ISMULTIRECORD><![CDATA[N]]></ISMULTIRECORD>
+<!--8B81D80B06364566B87853FEECAB5DE0-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
+<!--8B81D80B06364566B87853FEECAB5DE0-->  <ISGRIDLEGACY><![CDATA[N]]></ISGRIDLEGACY>
+<!--8B81D80B06364566B87853FEECAB5DE0-->  <ISCANADDRECORDSTOSELECTOR><![CDATA[N]]></ISCANADDRECORDSTOSELECTOR>
+<!--8B81D80B06364566B87853FEECAB5DE0--></OBUIAPP_PROCESS>
+
 <!--8E5996F1F3154B498468938B5341A0CB--><OBUIAPP_PROCESS>
 <!--8E5996F1F3154B498468938B5341A0CB-->  <OBUIAPP_PROCESS_ID><![CDATA[8E5996F1F3154B498468938B5341A0CB]]></OBUIAPP_PROCESS_ID>
 <!--8E5996F1F3154B498468938B5341A0CB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -27,6 +27,15 @@
 <!--1E00B1F00707416DA322492DB19A54E1-->  <AD_WINDOW_ID><![CDATA[8DB776A77D374882B73DE6EC6A78D800]]></AD_WINDOW_ID>
 <!--1E00B1F00707416DA322492DB19A54E1--></OBUIAPP_REF_WINDOW>
 
+<!--2C25A58A17C345CBA7C01F2898005099--><OBUIAPP_REF_WINDOW>
+<!--2C25A58A17C345CBA7C01F2898005099-->  <OBUIAPP_REF_WINDOW_ID><![CDATA[2C25A58A17C345CBA7C01F2898005099]]></OBUIAPP_REF_WINDOW_ID>
+<!--2C25A58A17C345CBA7C01F2898005099-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2C25A58A17C345CBA7C01F2898005099-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2C25A58A17C345CBA7C01F2898005099-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2C25A58A17C345CBA7C01F2898005099-->  <AD_REFERENCE_ID><![CDATA[B4D13EC034E14FDAA061C41D3C62789C]]></AD_REFERENCE_ID>
+<!--2C25A58A17C345CBA7C01F2898005099-->  <AD_WINDOW_ID><![CDATA[A839712F8D5E4929BB2D057BAA55A2A3]]></AD_WINDOW_ID>
+<!--2C25A58A17C345CBA7C01F2898005099--></OBUIAPP_REF_WINDOW>
+
 <!--2F0E0BF845394F46A861EE48A1A4E561--><OBUIAPP_REF_WINDOW>
 <!--2F0E0BF845394F46A861EE48A1A4E561-->  <OBUIAPP_REF_WINDOW_ID><![CDATA[2F0E0BF845394F46A861EE48A1A4E561]]></OBUIAPP_REF_WINDOW_ID>
 <!--2F0E0BF845394F46A861EE48A1A4E561-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -351,7 +351,7 @@
 <!--4C8BC3E8E56441F4B8C98C684A0C9212-->  <AD_REFERENCE_ID><![CDATA[800011]]></AD_REFERENCE_ID>
 <!--4C8BC3E8E56441F4B8C98C684A0C9212-->  <AD_TABLE_ID><![CDATA[FF8080812E381D1E012E3898C5DD0010]]></AD_TABLE_ID>
 <!--4C8BC3E8E56441F4B8C98C684A0C9212-->  <WHERECLAUSE><![CDATA[e.active='Y']]></WHERECLAUSE>
-<!--4C8BC3E8E56441F4B8C98C684A0C9212-->  <FILTER_EXPRESSION><![CDATA["( (\'"+OB.getWindowId()+"\' in (\'800051\', \'800052\', \'800053\', \'FF808181323E504701323E57E08D0017\', \'800096\') and e.product.production = true and e.stocked = false) or (\'"+OB.getWindowId()+"\' in (\'170\') and e.product.stocked = true) or (\'"+OB.getWindowId()+"\' in (\'800092\') and e.product.purchase = true) or (\'"+OB.getWindowId()+"\' in (\'169\') and (e.warehouse.id is null or e.warehouse.id in (select ow.warehouse.id from OrganizationWarehouse ow where ow.organization.id = \'"+ OB.getParameters().get("inpadOrgId")+"\'))) or \'"+OB.getWindowId()+"\' not in (\'800051\', \'800052\', \'800053\', \'FF808181323E504701323E57E08D0017\', \'800096\',\'170\',\'800092\',\'169\'))"]]></FILTER_EXPRESSION>
+<!--4C8BC3E8E56441F4B8C98C684A0C9212-->  <FILTER_EXPRESSION><![CDATA["( (\'"+OB.getWindowId()+"\' in (\'800051\', \'800052\', \'800096\') and e.product.production = true and e.stocked = false) or (\'"+OB.getWindowId()+"\' in (\'800053\', \'FF808181323E504701323E57E08D0017\') and e.product.production = true) or (\'"+OB.getWindowId()+"\' in (\'170\') and e.product.stocked = true) or (\'"+OB.getWindowId()+"\' in (\'800092\') and e.product.purchase = true) or (\'"+OB.getWindowId()+"\' in (\'169\') and (e.warehouse.id is null or e.warehouse.id in (select ow.warehouse.id from OrganizationWarehouse ow where ow.organization.id = \'"+ OB.getParameters().get("inpadOrgId")+"\'))) or \'"+OB.getWindowId()+"\' not in (\'800051\', \'800052\', \'800053\', \'FF808181323E504701323E57E08D0017\', \'800096\',\'170\',\'800092\',\'169\'))"]]></FILTER_EXPRESSION>
 <!--4C8BC3E8E56441F4B8C98C684A0C9212-->  <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
 <!--4C8BC3E8E56441F4B8C98C684A0C9212-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4C8BC3E8E56441F4B8C98C684A0C9212-->  <VALUEFIELD_ID><![CDATA[D5CD42F686A14DFA949052B99900D679]]></VALUEFIELD_ID>
--- a/model/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Thu Feb 15 17:22:53 2018 +0100
+++ b/model/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Wed Feb 21 11:03:41 2018 +0000
@@ -4980,7 +4980,7 @@
 <!--FF8080812E77708D012E7796A94B0017-->  <SORTNO><![CDATA[110]]></SORTNO>
 <!--FF8080812E77708D012E7796A94B0017-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812E77708D012E7796A94B0017-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
-<!--FF8080812E77708D012E7796A94B0017-->  <DEFAULT_EXPRESSION><![CDATA[if (OB.getWindowId() == '800051' ||  OB.getWindowId() == '800052' || OB.getWindowId() == '800096' || OB.getWindowId() == '800027') {false} else {if (OB.isSalesTransaction() == true) { true } else {false}}]]></DEFAULT_EXPRESSION>
+<!--FF8080812E77708D012E7796A94B0017-->  <DEFAULT_EXPRESSION><![CDATA[if (OB.getWindowId() == '800051' ||  OB.getWindowId() == '800052' || OB.getWindowId() == '800096' || OB.getWindowId() == '800027') {false} else {if (OB.isSalesTransaction() == true || OB.getWindowId() == '170') { true } else {false}}]]></DEFAULT_EXPRESSION>
 <!--FF8080812E77708D012E7796A94B0017-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--FF8080812E77708D012E7796A94B0017--></OBUISEL_SELECTOR_FIELD>