Update to 3.0PR17Q4 3.0PR17Q4
authorRM packaging bot <staff.rm@openbravo.com>
Fri, 29 Dec 2017 11:00:37 +0000
changeset 773 c1b22e833b5d
parent 772 d0c3d7dc51cf
child 774 428ab62fe0fe
Update to 3.0PR17Q4
java/reference/java.japi.gz
model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml
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.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.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/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/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.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.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_MESSAGE.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_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/configScript.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/C_INVOICE_POST.xml
model/src-db/database/model/functions/MA_STANDARD_COST.xml
model/src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml
model/src-db/database/model/functions/MRP_RUN_INITIALIZE.xml
model/src-db/database/model/functions/M_CHECK_STOCK.xml
model/src-db/database/model/functions/M_EXPLODEBOMNOTSTOCK.xml
model/src-db/database/model/functions/M_GETJSONDESCRIPTION.xml
model/src-db/database/model/functions/M_GET_DEFAULT_AUM_FOR_DOCUMENT.xml
model/src-db/database/model/functions/M_GET_OFFERS_NAME.xml
model/src-db/database/model/functions/M_GET_STOCK_PARAM.xml
model/src-db/database/model/functions/M_INOUTEXPLODEBOMNOTSTOCK.xml
model/src-db/database/model/functions/M_INOUT_CREATE.xml
model/src-db/database/model/functions/M_INOUT_POST.xml
model/src-db/database/model/functions/M_INTERNAL_CONSUMPTION_POST1.xml
model/src-db/database/model/functions/M_PRICELIST_CREATE.xml
model/src-db/database/model/functions/M_PRODUCTION_RUN.xml
model/src-db/database/model/functions/M_REQUISITION_CREATEPO.xml
model/src-db/database/model/functions/M_RESERVATION_POST.xml
model/src-db/database/model/tables/AD_ALERT.xml
model/src-db/database/model/tables/C_IMPORT_ENTRY.xml
model/src-db/database/model/tables/C_IMPORT_ENTRY_ARCHIVE.xml
model/src-db/database/model/tables/C_ORDERLINE.xml
model/src-db/database/model/tables/FACT_ACCT.xml
model/src-db/database/model/tables/M_INOUTLINE.xml
model/src-db/database/model/tables/M_LOCATOR.xml
model/src-db/database/model/tables/M_MOVEMENTLINE.xml
model/src-db/database/model/tables/M_PRODUCT_ORG.xml
model/src-db/database/model/triggers/C_INVOICELINE_BEFORE_TRG.xml
model/src-db/database/model/triggers/C_INVOICELINE_TRG2.xml
model/src-db/database/model/triggers/C_INVOICE_TRG2.xml
model/src-db/database/model/triggers/C_ORDERLINE2_TRG.xml
model/src-db/database/model/triggers/C_ORDERLINE_TRG.xml
model/src-db/database/model/triggers/C_ORDERLINE_TRG2.xml
model/src-db/database/model/triggers/C_ORDER_TRG2.xml
model/src-db/database/model/views/M_RM_SHIPMENT_PICK_EDIT.xml
model/src-db/database/sourcedata/AD_AUXILIARINPUT.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_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_MODEL_OBJECT_PARA.xml
model/src-db/database/sourcedata/AD_MODULE.xml
model/src-db/database/sourcedata/AD_PROCESS.xml
model/src-db/database/sourcedata/AD_PROCESS_PARA.xml
model/src-db/database/sourcedata/AD_REFERENCE.xml
model/src-db/database/sourcedata/AD_TAB.xml
model/src-db/database/sourcedata/AD_TABLE_TREE.xml
model/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
model/src-db/database/sourcedata/AD_VAL_RULE.xml
model/src-db/database/sourcedata/M_INVENTORYSTATUS.xml
model/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
model/src-db/database/sourcedata/OBUIAPP_PROCESS.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/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -392,6 +392,7 @@
                 SELECT COALESCE(COUNT(*),0) INTO v_Count
                 FROM c_orderline
                 WHERE qtyordered <> (qtyinvoiced*v_MultiplierARC)
+                  AND linenetamt <> 0
                   AND c_order_id = order_schdet.order_id;
               ELSE
                 SELECT count(*) INTO v_count
@@ -401,6 +402,7 @@
                        LEFT JOIN m_matchpo mpo ON ol.c_orderline_id = mpo.c_orderline_id
                                                   AND mpo.c_invoiceline_id IS NOT NULL
                   WHERE ol.c_order_id = order_schdet.order_id
+                    AND ol.linenetamt <> 0
                   GROUP BY ol.c_orderline_id, ol.qtyordered) a
                 WHERE a.qtyordered != (a.matchedqty*v_MultiplierARC);
               END IF;
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.32857]]></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[PR17Q3]]></VERSION_LABEL>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION_LABEL><![CDATA[PR17Q4]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.32857]]></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.32403]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.32857]]></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.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -254,6 +254,7 @@
 left join e.finPayment fp
 @joinClause@
 where @additional_filters@
+and e.processed = 'Y'
 and @whereclause@]]></HQLQUERY>
 <!--D56CF1065EF14D52ADAD2AAB0CB63EFC-->  <ENTITY_ALIAS><![CDATA[e]]></ENTITY_ALIAS>
 <!--D56CF1065EF14D52ADAD2AAB0CB63EFC--></AD_TABLE>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -53,7 +53,7 @@
 <!--4EEB3497082C4F2182E16A4371CD5D96-->  <UIPATTERN><![CDATA[OBUIAPP_PickAndExecute]]></UIPATTERN>
 <!--4EEB3497082C4F2182E16A4371CD5D96-->  <ISMULTIRECORD><![CDATA[N]]></ISMULTIRECORD>
 <!--4EEB3497082C4F2182E16A4371CD5D96-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
-<!--4EEB3497082C4F2182E16A4371CD5D96-->  <ISGRIDLEGACY><![CDATA[Y]]></ISGRIDLEGACY>
+<!--4EEB3497082C4F2182E16A4371CD5D96-->  <ISGRIDLEGACY><![CDATA[N]]></ISGRIDLEGACY>
 <!--4EEB3497082C4F2182E16A4371CD5D96-->  <ISCANADDRECORDSTOSELECTOR><![CDATA[N]]></ISCANADDRECORDSTOSELECTOR>
 <!--4EEB3497082C4F2182E16A4371CD5D96--></OBUIAPP_PROCESS>
 
@@ -71,7 +71,7 @@
 <!--6F87442DF7BC43AB8A666BDED2F7D64E-->  <UIPATTERN><![CDATA[OBUIAPP_PickAndExecute]]></UIPATTERN>
 <!--6F87442DF7BC43AB8A666BDED2F7D64E-->  <ISMULTIRECORD><![CDATA[N]]></ISMULTIRECORD>
 <!--6F87442DF7BC43AB8A666BDED2F7D64E-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
-<!--6F87442DF7BC43AB8A666BDED2F7D64E-->  <ISGRIDLEGACY><![CDATA[Y]]></ISGRIDLEGACY>
+<!--6F87442DF7BC43AB8A666BDED2F7D64E-->  <ISGRIDLEGACY><![CDATA[N]]></ISGRIDLEGACY>
 <!--6F87442DF7BC43AB8A666BDED2F7D64E-->  <ISCANADDRECORDSTOSELECTOR><![CDATA[N]]></ISCANADDRECORDSTOSELECTOR>
 <!--6F87442DF7BC43AB8A666BDED2F7D64E--></OBUIAPP_PROCESS>
 
--- a/model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></VERSION>
+<!--8A098711BB324335A19833286BDB093D-->  <VERSION><![CDATA[1.0.32857]]></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[PR17Q3]]></VERSION_LABEL>
+<!--8A098711BB324335A19833286BDB093D-->  <VERSION_LABEL><![CDATA[PR17Q4]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></STARTVERSION>
+<!--1467C397BC5F4999A5606F39CD6FF8A4-->  <STARTVERSION><![CDATA[2.1.32857]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.32857]]></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[PR17Q3]]></VERSION_LABEL>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION_LABEL><![CDATA[PR17Q4]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.32857]]></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/sourcedata/AD_MESSAGE.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -2872,7 +2872,7 @@
 <!--FF80808130D5DD6A0130D5EEF54A000A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF80808130D5DD6A0130D5EEF54A000A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF80808130D5DD6A0130D5EEF54A000A-->  <VALUE><![CDATA[OBUIAPP_GAinCommunity]]></VALUE>
-<!--FF80808130D5DD6A0130D5EEF54A000A-->  <MSGTEXT><![CDATA[Only Professional and Basic Edition subscribers can restrict access to modules in %0 maturity status.<br/>
+<!--FF80808130D5DD6A0130D5EEF54A000A-->  <MSGTEXT><![CDATA[Only Professional and Enterprise Edition subscribers can restrict access to modules in %0 maturity status.<br/>
 <a href="http://wiki.openbravo.com/wiki/Modules_Management#Learn_why" class="OBNoteListGridDelete" target="_blank">Learn why</a>.]]></MSGTEXT>
 <!--FF80808130D5DD6A0130D5EEF54A000A-->  <MSGTYPE><![CDATA[W]]></MSGTYPE>
 <!--FF80808130D5DD6A0130D5EEF54A000A-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
@@ -2885,7 +2885,7 @@
 <!--FF80808130DC55FE0130DC9631A60019-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF80808130DC55FE0130DC9631A60019-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF80808130DC55FE0130DC9631A60019-->  <VALUE><![CDATA[OBUIAPP_ActivateMessage]]></VALUE>
-<!--FF80808130DC55FE0130DC9631A60019-->  <MSGTEXT><![CDATA[%0 only available for Professional and Basic Edition subscribers. <br/><a target="_blank" href="http://www.openbravo.com/product/erp/editions/">Learn more</a> about the benefits of Openbravo's Professional and Basic Editions.]]></MSGTEXT>
+<!--FF80808130DC55FE0130DC9631A60019-->  <MSGTEXT><![CDATA[%0 only available for Professional and Enterprise Edition subscribers. <br/><a target="_blank" href="http://www.openbravo.com/product/erp/editions/">Learn more</a> about the benefits of Openbravo's Professional and Enterprise Editions.]]></MSGTEXT>
 <!--FF80808130DC55FE0130DC9631A60019-->  <MSGTIP><![CDATA[%0 is a place-holder used to show a feature description]]></MSGTIP>
 <!--FF80808130DC55FE0130DC9631A60019-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--FF80808130DC55FE0130DC9631A60019-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.32857]]></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[PR17Q3]]></VERSION_LABEL>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION_LABEL><![CDATA[PR17Q4]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.32857]]></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.32403]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.32857]]></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.32403]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.32857]]></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.32403]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.32857]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.32857]]></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[PR17Q3]]></VERSION_LABEL>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION_LABEL><![CDATA[PR17Q4]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.32857]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.32857]]></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[PR17Q3]]></VERSION_LABEL>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION_LABEL><![CDATA[PR17Q4]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.32857]]></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.32403]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.32857]]></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.32403]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.32857]]></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/sourcedata/AD_MODULE.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.32857]]></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[PR17Q3]]></VERSION_LABEL>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION_LABEL><![CDATA[PR17Q4]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.32857]]></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.32403]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.32857]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.32857]]></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[PR17Q3]]></VERSION_LABEL>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION_LABEL><![CDATA[PR17Q4]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.32857]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.32857]]></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[PR17Q3]]></VERSION_LABEL>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION_LABEL><![CDATA[PR17Q4]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.32857]]></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.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/OBKMO_WIDGET_CLASS.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -165,7 +165,7 @@
 <!--862EEC18D6FC4FA68E7867E3CF337CC7-->  <WIDGET_SUPERCLASS_ID><![CDATA[2A32CF26F3F64FE39C7F94E9D82497D1]]></WIDGET_SUPERCLASS_ID>
 <!--862EEC18D6FC4FA68E7867E3CF337CC7-->  <CAN_MAXIMIZE><![CDATA[N]]></CAN_MAXIMIZE>
 <!--862EEC18D6FC4FA68E7867E3CF337CC7-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
-<!--862EEC18D6FC4FA68E7867E3CF337CC7-->  <AUTHOR_MSG><![CDATA[Requires Project Management module, which is part of Basic or Professional Edition]]></AUTHOR_MSG>
+<!--862EEC18D6FC4FA68E7867E3CF337CC7-->  <AUTHOR_MSG><![CDATA[Requires Project Management module, which is part of Professional or Enterprise Edition]]></AUTHOR_MSG>
 <!--862EEC18D6FC4FA68E7867E3CF337CC7-->  <AUTHOR_URL><![CDATA[http://www.openbravo.com/product/erp/]]></AUTHOR_URL>
 <!--862EEC18D6FC4FA68E7867E3CF337CC7-->  <AVAILABLE_IN_WORKSPACE><![CDATA[Y]]></AVAILABLE_IN_WORKSPACE>
 <!--862EEC18D6FC4FA68E7867E3CF337CC7--></OBKMO_WIDGET_CLASS>
--- a/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.32857]]></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[PR17Q3]]></VERSION_LABEL>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION_LABEL><![CDATA[PR17Q4]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.32857]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.32857]]></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[PR17Q3]]></VERSION_LABEL>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION_LABEL><![CDATA[PR17Q4]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.32857]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.32857]]></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[PR17Q3]]></VERSION_LABEL>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION_LABEL><![CDATA[PR17Q4]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.32857]]></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.32403]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.32857]]></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.32403]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.32857]]></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.32403]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.32857]]></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.32403]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.32857]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.32857]]></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[PR17Q3]]></VERSION_LABEL>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION_LABEL><![CDATA[PR17Q4]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.32857]]></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.32403]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.32857]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.32857]]></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[PR17Q3]]></VERSION_LABEL>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION_LABEL><![CDATA[PR17Q4]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.32857]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.32857]]></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[PR17Q3]]></VERSION_LABEL>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION_LABEL><![CDATA[PR17Q4]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.32857]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.32857]]></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[PR17Q3]]></VERSION_LABEL>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION_LABEL><![CDATA[PR17Q4]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.32857]]></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.32403]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.32857]]></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.32403]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.32857]]></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.32403]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.32857]]></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.32403]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.32857]]></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.32403]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.32857]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.32857]]></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[PR17Q3]]></VERSION_LABEL>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION_LABEL><![CDATA[PR17Q4]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.32857]]></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_MESSAGE.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MESSAGE.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -96,6 +96,18 @@
 <!--19875CFF6B6B4D6B8D06FE1EF0313139-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--19875CFF6B6B4D6B8D06FE1EF0313139--></AD_MESSAGE>
 
+<!--1BE0B51C7D144A32B03D624F64651740--><AD_MESSAGE>
+<!--1BE0B51C7D144A32B03D624F64651740-->  <AD_MESSAGE_ID><![CDATA[1BE0B51C7D144A32B03D624F64651740]]></AD_MESSAGE_ID>
+<!--1BE0B51C7D144A32B03D624F64651740-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1BE0B51C7D144A32B03D624F64651740-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1BE0B51C7D144A32B03D624F64651740-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1BE0B51C7D144A32B03D624F64651740-->  <VALUE><![CDATA[OBUISC_RPCManager.timeoutErrorMessage]]></VALUE>
+<!--1BE0B51C7D144A32B03D624F64651740-->  <MSGTEXT><![CDATA[Operation timed out]]></MSGTEXT>
+<!--1BE0B51C7D144A32B03D624F64651740-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--1BE0B51C7D144A32B03D624F64651740-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
+<!--1BE0B51C7D144A32B03D624F64651740-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--1BE0B51C7D144A32B03D624F64651740--></AD_MESSAGE>
+
 <!--1D5D0B5F0D854C80A33E3D80C03BA92E--><AD_MESSAGE>
 <!--1D5D0B5F0D854C80A33E3D80C03BA92E-->  <AD_MESSAGE_ID><![CDATA[1D5D0B5F0D854C80A33E3D80C03BA92E]]></AD_MESSAGE_ID>
 <!--1D5D0B5F0D854C80A33E3D80C03BA92E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.32857]]></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[PR17Q3]]></VERSION_LABEL>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION_LABEL><![CDATA[PR17Q4]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.32857]]></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.32403]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.32857]]></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.32403]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.32857]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></VERSION>
+<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION><![CDATA[1.0.32857]]></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[PR17Q3]]></VERSION_LABEL>
+<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION_LABEL><![CDATA[PR17Q4]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></STARTVERSION>
+<!--86EBD30DEB8045508185B457896C9F6D-->  <STARTVERSION><![CDATA[2.1.32857]]></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_MODULE.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.32857]]></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[PR17Q3]]></VERSION_LABEL>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION_LABEL><![CDATA[PR17Q4]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.32857]]></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.32403]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.32857]]></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.32403]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.32857]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.32857]]></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[PR17Q3]]></VERSION_LABEL>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION_LABEL><![CDATA[PR17Q4]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.32857]]></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.32403]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.32857]]></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.32403]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.32857]]></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.32403]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.32857]]></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.32403]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.32857]]></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.32403]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.32857]]></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.32403]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.32857]]></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.32403]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.32857]]></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.32403]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.32857]]></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.32403]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.32857]]></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.32403]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.32857]]></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.32403]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.32857]]></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/configScript.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.v3/src-db/database/configScript.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -25,10 +25,6 @@
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
     </columnDataChange>
-    <columnDataChange tablename="AD_TAB" columnname="ISACTIVE" pkRow="134">
-      <oldValue><![CDATA[Y]]></oldValue>
-      <newValue><![CDATA[N]]></newValue>
-    </columnDataChange>
     <columnDataChange tablename="AD_TAB" columnname="ISACTIVE" pkRow="181">
       <oldValue><![CDATA[Y]]></oldValue>
       <newValue><![CDATA[N]]></newValue>
--- a/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.32857]]></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[PR17Q3]]></VERSION_LABEL>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[PR17Q4]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></STARTVERSION>
+<!--48D556894CE54CF998DC97882E904CBD-->  <STARTVERSION><![CDATA[1.0.32857]]></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.32403]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.32857]]></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.32403]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.32857]]></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.32403]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.32857]]></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.32403]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.32857]]></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.32403]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.32857]]></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.32403]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.32857]]></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.32403]]></STARTVERSION>
+<!--FEF6E40F244A4061B7C62CB755663712-->  <STARTVERSION><![CDATA[1.0.32857]]></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.32403]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.32857]]></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.32403]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.32857]]></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.32403]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.32857]]></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	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/excludeFilter.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -67,9 +67,11 @@
     <excludedFunction name="ADD_HMS"/>
     <excludedFunction name="PG\_%"/> <!-- PostgreSQL extension functions -->
     <excludedTrigger name="AU\_%"/> <!-- Audit trail triggers -->
+
     <excludedFunction name="GIN_EXTRACT_QUERY_TRGM"/>
     <excludedFunction name="GIN_EXTRACT_VALUE_TRGM"/>
     <excludedFunction name="GIN_TRGM_CONSISTENT"/>
+    <excludedFunction name="GIN_TRGM_TRICONSISTENT"/>
     <excludedFunction name="GTRGM_COMPRESS"/>
     <excludedFunction name="GTRGM_CONSISTENT"/>
     <excludedFunction name="GTRGM_DECOMPRESS"/>
@@ -86,5 +88,11 @@
     <excludedFunction name="SIMILARITY"/>
     <excludedFunction name="SIMILARITY_DIST"/>
     <excludedFunction name="SIMILARITY_OP"/>
+    <excludedFunction name="WORD_SIMILARITY"/>
+    <excludedFunction name="WORD_SIMILARITY_DIST_OP"/>
+    <excludedFunction name="WORD_SIMILARITY_DIST_COMMUTATOR_OP"/>
+    <excludedFunction name="WORD_SIMILARITY_OP"/>
+    <excludedFunction name="WORD_SIMILARITY_COMMUTATOR_OP"/>
+
     <excludedFunction name="OBEQUALS"/>
   </vector>
--- a/model/src-db/database/model/functions/C_INVOICE_POST.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/functions/C_INVOICE_POST.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -176,6 +176,7 @@
   v_prepaymentamt NUMBER;
   v_hasTaxes NUMBER;
   v_calendarId C_CALENDAR.C_CALENDAR_ID%TYPE;
+  v_calendar_owner_id AD_Org.AD_Org_ID%TYPE;
    
 BEGIN
   IF (p_PInstance_ID IS NOT NULL) THEN
@@ -344,9 +345,11 @@
     /*
      * Avoids repeating the same documentno for the same organization tree within the same fiscal year
      */
-    SELECT C_CALENDAR_ID INTO v_calendarId FROM AD_ORG WHERE AD_ORG_ID = AD_ORG_GETCALENDAROWNER(v_Org_ID);
-    SELECT COUNT(*) INTO v_count
-    FROM (SELECT Y.C_CALENDAR_ID, Y.C_YEAR_ID,
+    SELECT AD_ORG_GETCALENDAROWNER(v_Org_ID) INTO v_calendar_owner_id FROM DUAL;
+    IF (v_calendar_owner_id IS NOT NULL) THEN
+      SELECT C_CALENDAR_ID INTO v_calendarId FROM AD_ORG WHERE AD_ORG_ID = v_calendar_owner_id;
+      SELECT COUNT(*) INTO v_count
+      FROM (SELECT Y.C_CALENDAR_ID, Y.C_YEAR_ID,
               MIN(P.STARTDATE) AS PERIODSTARTDATE, MAX(P.ENDDATE) AS PERIODENDDATE
           FROM C_YEAR Y, C_PERIOD P
           WHERE Y.C_YEAR_ID = P.C_YEAR_ID
@@ -354,36 +357,37 @@
             AND P.ISACTIVE = 'Y'
             AND Y.C_CALENDAR_ID = v_calendarId
           GROUP BY Y.C_CALENDAR_ID, Y.C_YEAR_ID) A
-    WHERE PERIODSTARTDATE <= v_DateInvoiced
-      AND PERIODENDDATE+1 > v_DateInvoiced ;
-    IF (v_count<>0) THEN
-      SELECT PERIODSTARTDATE, PERIODENDDATE
-        INTO v_PeriodStartDate, v_PeriodEndDate
-      FROM (SELECT Y.C_CALENDAR_ID, Y.C_YEAR_ID,
-                MIN(P.STARTDATE) AS PERIODSTARTDATE, MAX(P.ENDDATE) AS PERIODENDDATE
-            FROM C_YEAR Y, C_PERIOD P
-            WHERE Y.C_YEAR_ID = P.C_YEAR_ID
-              AND Y.ISACTIVE = 'Y'
-              AND P.ISACTIVE = 'Y'
-              AND Y.C_CALENDAR_ID = v_calendarId
-            GROUP BY Y.C_CALENDAR_ID, Y.C_YEAR_ID) A
       WHERE PERIODSTARTDATE <= v_DateInvoiced
         AND PERIODENDDATE+1 > v_DateInvoiced ;
-      IF (v_PeriodStartDate IS NOT NULL AND v_PeriodEndDate IS NOT NULL) THEN
-        SELECT D.AD_ORG_ID INTO v_DocNo_Org_ID
-        FROM C_DOCTYPE D
-        WHERE D.C_DOCTYPE_ID = v_DocTypeTarget_ID ;
-        SELECT COUNT(*) INTO v_count
-        FROM C_INVOICE I
-        WHERE I.DOCUMENTNO = v_DocumentNo
-          AND I.C_DOCTYPETARGET_ID = v_DocTypeTarget_ID
-          AND I.DATEINVOICED >= v_PeriodStartDate
-          AND I.DATEINVOICED < v_PeriodEndDate+1 
-          AND I.C_INVOICE_ID <> v_Record_ID 
-          AND AD_ISORGINCLUDED(I.AD_ORG_ID, v_DocNo_Org_ID, I.AD_CLIENT_ID) <> -1
-          AND I.AD_CLIENT_ID = v_Client_ID ;
-        IF (v_count<>0) THEN
-          RAISE_APPLICATION_ERROR(-20000, '@DifferentDocumentNo@');
+      IF (v_count<>0) THEN
+        SELECT PERIODSTARTDATE, PERIODENDDATE
+          INTO v_PeriodStartDate, v_PeriodEndDate
+        FROM (SELECT Y.C_CALENDAR_ID, Y.C_YEAR_ID,
+                  MIN(P.STARTDATE) AS PERIODSTARTDATE, MAX(P.ENDDATE) AS PERIODENDDATE
+              FROM C_YEAR Y, C_PERIOD P
+              WHERE Y.C_YEAR_ID = P.C_YEAR_ID
+                AND Y.ISACTIVE = 'Y'
+                AND P.ISACTIVE = 'Y'
+                AND Y.C_CALENDAR_ID = v_calendarId
+              GROUP BY Y.C_CALENDAR_ID, Y.C_YEAR_ID) A
+        WHERE PERIODSTARTDATE <= v_DateInvoiced
+          AND PERIODENDDATE+1 > v_DateInvoiced ;
+        IF (v_PeriodStartDate IS NOT NULL AND v_PeriodEndDate IS NOT NULL) THEN
+          SELECT D.AD_ORG_ID INTO v_DocNo_Org_ID
+          FROM C_DOCTYPE D
+          WHERE D.C_DOCTYPE_ID = v_DocTypeTarget_ID ;
+          SELECT COUNT(*) INTO v_count
+          FROM C_INVOICE I
+          WHERE I.DOCUMENTNO = v_DocumentNo
+            AND I.C_DOCTYPETARGET_ID = v_DocTypeTarget_ID
+            AND I.DATEINVOICED >= v_PeriodStartDate
+            AND I.DATEINVOICED < v_PeriodEndDate+1
+            AND I.C_INVOICE_ID <> v_Record_ID
+            AND AD_ISORGINCLUDED(I.AD_ORG_ID, v_DocNo_Org_ID, I.AD_CLIENT_ID) <> -1
+            AND I.AD_CLIENT_ID = v_Client_ID ;
+          IF (v_count<>0) THEN
+            RAISE_APPLICATION_ERROR(-20000, '@DifferentDocumentNo@');
+          END IF;
         END IF;
       END IF;
     END IF;
--- a/model/src-db/database/model/functions/MA_STANDARD_COST.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/functions/MA_STANDARD_COST.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -127,7 +127,7 @@
   END LOOP;
 
   --  Update AD_PInstance
-  IF (v_Message IS NOT NULL AND v_Message <> '') THEN
+  IF (v_Message IS NOT NULL) THEN
     v_Message := '@Success@<br>' || v_Message;
     v_Result := 2;
   END IF;
--- a/model/src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -16,7 +16,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) 2001-2015 Openbravo SLU
+* All portions are Copyright (C) 2001-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -310,8 +310,8 @@
     END IF;
     IF(NOT FINISH_PROCESS) THEN
       DECLARE
-        v_Message_ProductionRun VARCHAR(2000) :='';
-        v_Message_ProductLine VARCHAR(2000) :='';
+        v_Message_ProductionRun VARCHAR(2000);
+        v_Message_ProductLine VARCHAR(2000);
         BEGIN
           FOR CUR_ProductionPlan IN
             (SELECT pp.Line, pp.M_PRODUCTIONPLAN_ID
@@ -328,14 +328,14 @@
               AND pr.ISACTIVE='N'
               ORDER BY pl.Line)
             LOOP
-              v_Message_ProductLine:=v_Message_ProductLine||CUR_PL_Post.line||', ';
+              v_Message_ProductLine := COALESCE(v_Message_ProductLine, '') || CUR_PL_Post.line || ', ';
             END LOOP;
-            IF(v_Message_ProductLine != '') THEN
-              v_Message_ProductionRun:=v_Message_ProductionRun||'@ProductionRunLine@'||Cur_ProductionPlan.line||' @ProductLine@'||v_Message_ProductLine;
-              v_Message_ProductLine:='';
+            IF (v_Message_ProductLine IS NOT NULL) THEN
+              v_Message_ProductionRun := COALESCE(v_Message_ProductionRun, '') || '@ProductionRunLine@' || Cur_ProductionPlan.line || ' @ProductLine@' || v_Message_ProductLine;
+              v_Message_ProductLine := NULL;
             END IF;
           END LOOP;
-          IF v_Message_ProductionRun != '' THEN
+          IF (v_Message_ProductionRun IS NOT NULL) THEN
             RAISE_APPLICATION_ERROR(-20000, v_Message_ProductionRun||'@InActiveProducts@');
           END IF;
         END;
--- a/model/src-db/database/model/functions/MRP_RUN_INITIALIZE.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/functions/MRP_RUN_INITIALIZE.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -201,41 +201,33 @@
         SELECT MRP_CHECK_PLANNINGMETHOD(cur_product.mrp_planningmethod_id,
                                         (CASE o.issotrx WHEN 'Y' THEN 'SO' ELSE 'PO' END),
                                         TO_NUMBER(COALESCE(ol.datepromised, ol.dateordered, o.dateordered) - p_planningdate), p_timehorizon) AS weighting,
-              (ol.qtyordered - COALESCE(ol.qtydelivered, 0) - COALESCE(matchpo.qty,0) - COALESCE(preres.reservedqty, 0) - (COALESCE(res.reservedqty,0) - COALESCE(res.releasedqty, 0))) AS qty,
+              (ol.qtyordered - COALESCE(ol.qtydelivered, 0) - COALESCE(sum(matchpo.qty), 0) - COALESCE(SUM(rs.quantity - COALESCE(rs.releasedqty, 0)), 0) - (COALESCE(res.reservedqty, 0) - COALESCE(res.releasedqty, 0))) AS qty,
               ol.c_orderline_id, GREATEST(COALESCE(ol.datepromised, ol.dateordered, o.dateordered), p_planningdate) AS planningdate,
               COALESCE(ol.dateordered, o.dateordered) AS dateordered,
               o.issotrx
          FROM c_orderline ol
               JOIN c_order o ON o.c_order_id = ol.c_order_id
               JOIN c_doctype dt ON o.c_doctypetarget_id = dt.c_doctype_id
-              LEFT JOIN (SELECT c_orderline_id, sum(qty) AS qty 
-                        FROM m_matchpo
-                        WHERE m_inoutline_id IS NOT NULL
-                        GROUP BY c_orderline_id) matchpo ON ol.c_orderline_id = matchpo.c_orderline_id
+              LEFT JOIN m_matchpo matchpo ON ol.c_orderline_id = matchpo.c_orderline_id AND matchpo.m_inoutline_id IS NOT NULL
               JOIN m_warehouse w ON ol.m_warehouse_id = w.m_warehouse_id
               -- Sales order reservation
               LEFT JOIN m_reservation res ON res.c_orderline_id = ol.c_orderline_id AND res.res_status NOT IN ('CL', 'DR')
               -- Prereserved purchase orders
-              LEFT JOIN (
-                  SELECT rs.c_orderline_id, SUM(rs.quantity - COALESCE(rs.releasedqty, 0)) AS reservedqty
-                  FROM m_reservation r
-                      JOIN m_reservation_stock rs ON r.m_reservation_id = rs.m_reservation_id
-                  WHERE rs.c_orderline_id IS NOT NULL
-                    AND r.res_status NOT IN ('CL', 'DR')
-                    AND rs.m_locator_id IS NULL
-                  GROUP BY rs.c_orderline_id 
-              ) preres ON preres.c_orderline_id = ol.c_orderline_id
+              LEFT JOIN m_reservation r ON r.c_orderline_id = ol.c_orderline_id AND r.res_status NOT IN ('CL', 'DR')
+              LEFT JOIN m_reservation_stock rs ON rs.m_reservation_id = r.m_reservation_id AND rs.c_orderline_id IS NOT NULL AND rs.m_locator_id IS NULL
          WHERE o.processed = 'Y'
-           AND ol.qtyordered <> (COALESCE(ol.qtydelivered,0) + COALESCE(matchpo.qty,0))
            AND ol.m_product_id = cur_product.m_product_id
            AND MRP_CHECK_PLANNINGMETHOD(cur_product.mrp_planningmethod_id,
                                        (CASE o.issotrx WHEN 'Y' THEN 'SO' ELSE 'PO' END),
                                        to_number(COALESCE(ol.datepromised, ol.dateordered, o.dateordered) - p_planningdate), p_timehorizon) <> -1
-           AND ((o.issotrx = 'N' AND ol.qtyordered - COALESCE(matchpo.qty,0) > COALESCE(preres.reservedqty, 0))
-               OR (o.issotrx = 'Y' AND (dt.docsubtypeso <> 'OB') AND ol.qtyordered - COALESCE(ol.qtydelivered, 0) > COALESCE(res.reservedqty,0) - COALESCE(res.releasedqty, 0)))
            AND AD_ISORGINCLUDED(o.ad_org_id, p_org_id, p_client_id) > -1
            -- Only orders of warehouses in p_org_id and its childs
            AND AD_ISORGINCLUDED(w.ad_org_id, p_org_id, p_client_id) > -1
+         GROUP BY o.issotrx, ol.datepromised, ol.dateordered, o.dateordered, ol.qtyordered,
+                  ol.qtydelivered, res.reservedqty, res.releasedqty, ol.c_orderline_id, dt.docsubtypeso
+         HAVING ol.qtyordered <> (COALESCE(ol.qtydelivered, 0) + COALESCE(sum(matchpo.qty), 0))
+            AND ((o.issotrx = 'N' AND ol.qtyordered - COALESCE(sum(matchpo.qty), 0) > COALESCE(sum(rs.quantity - COALESCE(rs.releasedqty, 0)), 0))
+             OR (o.issotrx = 'Y' AND dt.docsubtypeso <> 'OB' AND ol.qtyordered - COALESCE(ol.qtydelivered, 0) > COALESCE(res.reservedqty, 0) - COALESCE(res.releasedqty, 0)))
     ) LOOP
       MRP_RUN_INSERTLINES(p_Client_ID, p_Org_ID, p_User_ID, p_Run, Cur_Product.M_Product_ID, (CASE Cur_OrderLine.IsSOTrx WHEN 'Y' THEN (-1*Cur_OrderLine.Qty*Cur_OrderLine.Weighting) ELSE (Cur_OrderLine.Qty*Cur_OrderLine.Weighting) END), (CASE Cur_OrderLine.IsSOTrx WHEN 'Y' THEN (-1*Cur_OrderLine.Qty*Cur_OrderLine.Weighting) ELSE (Cur_OrderLine.Qty*Cur_OrderLine.Weighting) END), NULL, (CASE Cur_OrderLine.IsSOTrx WHEN 'Y' THEN 'SO' ELSE 'PO' END), 'Y', Cur_OrderLine.C_OrderLine_ID, NULL, NULL, NULL, NULL, Cur_OrderLine.planningDate, Cur_OrderLine.dateordered, p_Production, (CASE WHEN (Cur_OrderLine.IsSOTrx = 'Y' AND p_Production = 'Y') OR (p_Production = 'N' AND Cur_OrderLine.Qty < 0 ) THEN 'N' ELSE 'Y' END), NULL, v_Aux_ID);
     END LOOP;
--- a/model/src-db/database/model/functions/M_CHECK_STOCK.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/functions/M_CHECK_STOCK.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -50,7 +50,6 @@
       JOIN M_INVENTORYSTATUS INVS ON (INVS.M_INVENTORYSTATUS_ID = L.M_INVENTORYSTATUS_ID)
       WHERE M_PRODUCT_ID=p_M_Product_ID
       AND SD.AD_CLIENT_ID=p_AD_Client_ID
-      AND AD_ORG_ISINNATURALTREE(SD.AD_ORG_ID, p_AD_Org_ID, p_AD_Client_ID) = 'Y'
       AND (QTYONHAND<0 OR COALESCE(QTYORDERONHAND,0)<0)
       AND INVS.OVERISSUE='N'
       AND L.M_LOCATOR_ID = COALESCE(p_m_locator_id, L.M_LOCATOR_ID));
--- a/model/src-db/database/model/functions/M_EXPLODEBOMNOTSTOCK.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/functions/M_EXPLODEBOMNOTSTOCK.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -50,7 +50,6 @@
   v_orderline_ID  VARCHAR2(32);
   v_aum C_ORDERLINE.C_AUM%TYPE;
   v_aumqty NUMBER;
-  v_count NUMBER;
   v_uom_preference AD_PREFERENCE.VALUE%TYPE;
   
   BEGIN
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/functions/M_GETJSONDESCRIPTION.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -0,0 +1,92 @@
+<?xml version="1.0"?>
+  <database name="FUNCTION M_GETJSONDESCRIPTION">
+    <function name="M_GETJSONDESCRIPTION" type="VARCHAR">
+      <parameter name="p_attributesetinstance_id" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_exclude_characters" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_language_id" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_dateformatsql" type="VARCHAR" mode="in">
+        <default><![CDATA[DD-MM-YYYY]]></default>
+      </parameter>
+      <body><![CDATA[/*
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo  Public  License
+ * Version  1.1  (the  "License"),  being   the  Mozilla   Public  License
+ * Version 1.1  with a permitted attribution clause; you may not  use this
+ * file except in compliance with the License. You  may  obtain  a copy of
+ * the License at http://www.openbravo.com/legal/license.html
+ * Software distributed under the License  is  distributed  on  an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific  language  governing  rights  and  limitations
+ * under the License.
+ * The Original Code is Openbravo ERP.
+ * The Initial Developer of the Original Code is Openbravo SLU
+ * All portions are Copyright (C) 2017 Openbravo SLU
+ * All Rights Reserved.
+ * Contributor(s):  ______________________________________.
+ *************************************************************************
+ */
+ 
+ /*
+ * Generates a JSON with the attributesetinstance description.
+ * Example: '{"lot":{"value":"L0","name":"lot"},"serialno":{"value":"#0","name":"serialno"},"CEE55391F603473DBD164BF00A6FCDBC":{"value":"77","name":"Instanciable1"},"AC8962C737FA47D6872654D4C1769427":{"value":"","name":"Not Mandatory"}}'
+ */
+
+  v_json VARCHAR2(2000):='{';
+  v_serno VARCHAR2(2000):='';
+  v_lot VARCHAR2(2000):='';
+  v_guaranteedate VARCHAR2(2000):='';
+  v_serno_sk VARCHAR(60):='SerialNoLabel';
+  v_guaranteedate_sk VARCHAR(60):='ExpirationDateLabel';
+  v_lot_sk VARCHAR(60):='LotLabel';
+  v_serno_label AD_Message.MsgText%TYPE;
+  v_guaranteedate_label AD_Message.MsgText%TYPE;
+  v_lot_label AD_Message.MsgText%TYPE;
+  v_language_code VARCHAR(6);
+  TYPE RECORD IS REF CURSOR;
+  Cur_Attribute RECORD;
+  
+BEGIN
+  SELECT ad_language into v_language_code from ad_language where ad_language_id = p_language_id;
+  select ad_message_get2(v_serno_sk, v_language_code) INTO v_serno_label from dual;
+  select ad_message_get2(v_guaranteedate_sk, v_language_code) INTO v_guaranteedate_label from dual;
+  select ad_message_get2(v_lot_sk, v_language_code) INTO v_lot_label from dual;
+  
+  FOR Cur_Attribute IN
+    (SELECT mai.m_attribute_id as attributeId, coalesce(to_char(mai.value), '') as attributeValue, ma.name as attributeName, mau.seqno as seqNo, ma.ismandatory as isMandatory
+     FROM m_attributeinstance mai
+     INNER JOIN m_attribute ma on (ma.m_attribute_id=mai.m_attribute_id)
+     INNER JOIN m_attributesetinstance masi on (masi.m_attributesetinstance_id=mai.m_attributesetinstance_id)
+     INNER JOIN m_attributeuse mau on (ma.m_attribute_id = mau.m_attribute_id and masi.m_attributeset_id = mau.m_attributeset_id)
+     WHERE mai.m_attributesetinstance_id = p_attributesetinstance_id
+     ORDER BY seqno asc, ma.name)
+  LOOP
+    v_json:=v_json || '"' || Cur_Attribute.attributeId || '":{"value":"' || Cur_Attribute.attributeValue || '","name":"' || Cur_Attribute.attributeName || '","ismandatory":' || (CASE WHEN (Cur_Attribute.isMandatory = 'Y') THEN 'true' ELSE 'false' END)  || ',"seqno":' || Cur_Attribute.seqNo || '},';
+  END LOOP;
+  
+  SELECT coalesce(to_char(case when mas.M_SERNOCTL_ID is null AND p_exclude_characters = 'N' then concat('#', masi.serno) else masi.serno end), ''),
+         coalesce(to_char(case when mas.M_LOTCTL_ID is null AND p_exclude_characters = 'N' then concat('L', masi.lot) else masi.lot end),  ''), 
+         coalesce(to_char(TO_DATE(masi.guaranteedate), p_dateformatsql), '')
+  INTO v_serno, 
+       v_lot, 
+       v_guaranteedate
+  FROM m_attributesetinstance masi
+  INNER JOIN m_attributeset mas on (mas.m_attributeset_id = masi.m_attributeset_id)
+  where masi.m_attributesetinstance_id = p_attributesetinstance_id;
+
+  v_json:=v_json || '"lot":{"value":"' || v_lot || '","name":"lot","label":"' || v_lot_label || '"},';
+  v_json:=v_json || '"serialno":{"value":"' || v_serno || '","name":"serialno","label":"' || v_serno_label || '"},';
+  v_json:=v_json || '"guaranteedate":{"value":"' || v_guaranteedate || '","name":"guaranteedate","label":"' || v_guaranteedate_label || '"}';
+
+  v_json:=v_json || '}';
+  
+  RETURN v_json;
+END M_GETJSONDESCRIPTION
+]]></body>
+    </function>
+  </database>
--- a/model/src-db/database/model/functions/M_GET_DEFAULT_AUM_FOR_DOCUMENT.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/functions/M_GET_DEFAULT_AUM_FOR_DOCUMENT.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -34,7 +34,6 @@
 ************************************************************************/
 
   TYPE RECORD IS REF CURSOR;
-  Cur_M_Product_Aum RECORD;
   v_isSOTRX char(1);
   v_Default_Aum varchar(32); --OBTG:VARCHAR2--
 BEGIN
--- a/model/src-db/database/model/functions/M_GET_OFFERS_NAME.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/functions/M_GET_OFFERS_NAME.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -22,13 +22,13 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2016 Openbravo SLU
+* All portions are Copyright (C) 2001-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
   TYPE RECORD IS REF CURSOR;
     Cur_Offer RECORD;
-    v_Names varchar2(10000) := '';
+    v_Names varchar2(10000);
   BEGIN
     FOR Cur_Offer IN
       (SELECT NAME
@@ -103,10 +103,10 @@
         M_OFFER_ID DESC
       )
     LOOP
-      IF v_Names <> '' THEN
+      IF (v_Names IS NOT NULL) THEN
         v_Names := v_Names||'<br/>&nbsp;';
       END IF;
-      v_Names := v_Names||Cur_Offer.name;
+      v_Names := COALESCE(v_Names, '') || Cur_Offer.name;
     END LOOP;
     RETURN v_Names;
 EXCEPTION
--- a/model/src-db/database/model/functions/M_GET_STOCK_PARAM.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/functions/M_GET_STOCK_PARAM.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -104,7 +104,7 @@
   cur_allocated RECORD;
 
   -- Parameter Variables
-  v_Quantity NUMBER(10);
+  v_Quantity NUMBER;
   v_ProductID   VARCHAR2(32);
   v_LocatorID   VARCHAR2(32);
   v_WarehouseID VARCHAR2(32) ;
@@ -420,7 +420,6 @@
     v_finalqty NUMBER;
     v_totalqty NUMBER;
     v_availableqty NUMBER;
-    v_qtyaux NUMBER:=v_quantity;
     v_AuxResult NUMBER;
     v_AuxMessage VARCHAR2(2000):='';
     v_productname M_PRODUCT.NAME%TYPE;
@@ -587,8 +586,7 @@
       WHERE ad_pinstance_id = p_uuid
         AND priority <= cur_warehouse.priority
         AND isfinal = 'Y';
-      v_qtyaux := v_qtyaux - v_finalqty;
-      IF (v_qtyaux <= 0) THEN
+      IF (v_quantity - v_finalqty <= 0) THEN
         DELETE FROM m_stock_proposed
         WHERE ad_pinstance_id = p_uuid
           AND (priority > cur_warehouse.priority
--- a/model/src-db/database/model/functions/M_INOUTEXPLODEBOMNOTSTOCK.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/functions/M_INOUTEXPLODEBOMNOTSTOCK.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -37,7 +37,6 @@
   v_result NUMBER:= 1;  
   v_aum C_ORDERLINE.C_AUM%TYPE;
   v_aumqty NUMBER;
-  v_count NUMBER;
   v_uom_preference AD_PREFERENCE.VALUE%TYPE;
   
   BEGIN
--- a/model/src-db/database/model/functions/M_INOUT_CREATE.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/functions/M_INOUT_CREATE.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -404,7 +404,7 @@
             Cur_Order.AD_Org_ID, 'Y', now(), v_User_ID,
             now(), v_User_ID, v_DocumentNo, v_DocType_ID,
             Cur_Order.Description, 'N', 'C-', v_NEWORDERDATE,
-            TRUNC(now()), Cur_Order.C_BPartner_ID, Cur_Order.C_BPartner_Location_ID, Cur_Order.AD_User_ID,
+            v_NEWORDERDATE, Cur_Order.C_BPartner_ID, Cur_Order.C_BPartner_Location_ID, Cur_Order.AD_User_ID,
             Cur_Order.M_Warehouse_ID, Cur_Order.POReference, Cur_Order.DateOrdered, v_DeliveryRule,
             Cur_Order.FreightCostRule, Cur_Order.FreightAmt, Cur_Order.C_Project_ID, Cur_Order.C_Activity_ID,
             Cur_Order.C_Campaign_ID, Cur_Order.AD_OrgTrx_ID, Cur_Order.User1_ID, Cur_Order.User2_ID,
@@ -435,7 +435,6 @@
           v_orderline_old varchar2(32);
           v_QtyStorage NUMBER:=0;
           v_LocatorQty NUMBER;
-          v_Locator_ID VARCHAR2(32) ;
           v_IsStocked NUMBER:=0;
           v_pinstance_ID VARCHAR2(32);
         BEGIN
--- a/model/src-db/database/model/functions/M_INOUT_POST.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/functions/M_INOUT_POST.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -45,7 +45,7 @@
   -- Logistice
   v_ResultStr VARCHAR2(2000):='';
   v_Message VARCHAR2(2000):='';
-  v_Message_aux VARCHAR2(2000):='';
+  v_Message_aux VARCHAR2(2000);
   v_Record_ID VARCHAR2(32);
   v_User VARCHAR2(32);
   v_PUser VARCHAR2(32);
@@ -193,7 +193,7 @@
         END IF;
       END IF;
        Declare
-       v_Message_product VARCHAR(2000) :='';
+       v_Message_product VARCHAR(2000);
        Begin
           FOR Cur_Lines IN (
                              SELECT M.line
@@ -204,14 +204,14 @@
                                AND (M.M_PRODUCT_ID IS NULL AND M.MOVEMENTQTY <> 0)
                                ORDER BY M.line
                             ) LOOP
-               v_Message_product:=v_Message_product||Cur_Lines.line||', ';
+               v_Message_product := COALESCE(v_Message_product, '') || Cur_Lines.line || ', ';
           END LOOP;
-          if v_Message_product != '' then
+          IF (v_Message_product IS NOT NULL) THEN
              RAISE_APPLICATION_ERROR(-20000, '@Inline@ '||v_Message_product||' '||'@ProductNullAndMovementQtyGreaterZero@') ;
-          end if ;
+          END IF;
 	     End ;
 	     Declare
-       v_Message_Qty VARCHAR(2000) :='';
+       v_Message_Qty VARCHAR(2000);
 	     BEGIN
 					FOR Cur_Lines IN (
                              SELECT M.line
@@ -222,14 +222,14 @@
                                AND (M.M_PRODUCT_ID IS NOT NULL AND M.MOVEMENTQTY = 0)
                                ORDER BY M.line
                             ) LOOP
-          v_Message_Qty:=v_Message_Qty||Cur_Lines.line||', ';
+          v_Message_Qty := COALESCE(v_Message_Qty, '') || Cur_Lines.line || ', ';
           END LOOP;
-          IF v_Message_Qty != '' THEN
+          IF (v_Message_Qty IS NOT NULL) THEN
              RAISE_APPLICATION_ERROR(-20000, '@Inline@ '||v_Message_Qty||' '||'@ProductNotNullAndMovementQtyZero@') ;
           END IF;
 	     End ;
 	     Declare
-       v_Message_NotAvail VARCHAR(2000) :='';
+       v_Message_NotAvail VARCHAR(2000);
 	     BEGIN
 					FOR Cur_Lines IN (
                              SELECT M.line
@@ -245,14 +245,14 @@
                                   (I.issotrx = 'N' AND v_isreturndoctype = 'Y'))
                              ORDER BY M.line
                             ) LOOP
-          v_Message_NotAvail:=v_Message_NotAvail||Cur_Lines.line||', ';
+          v_Message_NotAvail := COALESCE(v_Message_NotAvail, '') || Cur_Lines.line || ', ';
           END LOOP;
-          IF v_Message_NotAvail != '' THEN
+          IF (v_Message_NotAvail IS NOT NULL) THEN
              RAISE_APPLICATION_ERROR(-20000, '@Inline@ '||v_Message_NotAvail||' '||'@LocatorWithNotAvailableStatus@') ;
           END IF;
 	     End ;
       DECLARE
-      v_Message_Inactive_Products VARCHAR(2000) :='';
+      v_Message_Inactive_Products VARCHAR(2000);
       BEGIN
         FOR Cur_Lines IN (
           SELECT IOL.line
@@ -263,9 +263,9 @@
           ORDER BY IOL.line
           )
         LOOP
-          v_Message_Inactive_Products:=v_Message_Inactive_Products||Cur_Lines.line||', ';
+          v_Message_Inactive_Products := COALESCE(v_Message_Inactive_Products, '') || Cur_Lines.line || ', ';
         END LOOP;
-        IF v_Message_Inactive_Products != '' THEN
+        IF (v_Message_Inactive_Products IS NOT NULL) THEN
           RAISE_APPLICATION_ERROR(-20000, '@Inline@ '||v_Message_Inactive_Products||' '||'@InActiveProducts@') ;
         END IF;
       END;
@@ -994,7 +994,6 @@
             where M_INOUT.M_INOUT_id =v_Record_ID;
             if v_voiddoccount = 0 then
               v_ResultStr:='Check delivery rule for sales orders';
-              v_Message_aux:='';
               v_orderid_old:='0';
               FOR Cur_Order IN 
                 (SELECT c_order.deliveryrule, m_inoutline.line, c_order.c_order_id,
@@ -1024,7 +1023,7 @@
                 END IF;
                 v_orderid_old := cur_order.c_order_id;
               END LOOP;
-              IF (v_Message_aux IS NOT NULL AND v_Message_aux <> '') THEN
+              IF (v_Message_aux IS NOT NULL) THEN
                 RAISE_APPLICATION_ERROR(-20000, v_Message_aux);
               END IF;
             END IF;
--- a/model/src-db/database/model/functions/M_INTERNAL_CONSUMPTION_POST1.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/functions/M_INTERNAL_CONSUMPTION_POST1.xml	Fri Dec 29 11:00:37 2017 +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):  ______________________________________.
 ************************************************************************/
@@ -138,10 +138,13 @@
       Cur_MoveLine RECORD;
     BEGIN
       FOR Cur_MoveLine IN (
-          SELECT *
-          FROM M_Internal_ConsumptionLine
-          WHERE M_Internal_Consumption_ID=Record_ID
-          ORDER BY Line
+          SELECT icl.*
+          FROM M_Internal_ConsumptionLine icl
+          JOIN M_Product p
+          ON icl.M_Product_ID = p.M_Product_ID
+          WHERE icl.M_Internal_Consumption_ID = Record_ID
+          AND p.IsStocked = 'Y'
+          ORDER BY icl.Line
       ) LOOP
         v_ResultStr:='Transaction for line' || Cur_MoveLine.Line;
 
--- a/model/src-db/database/model/functions/M_PRICELIST_CREATE.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/functions/M_PRICELIST_CREATE.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -19,7 +19,7 @@
   * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
   * All Rights Reserved.
   * Contributor(s): Openbravo SLU
-  * Contributions are Copyright (C) 2001-2015 Openbravo, S.L.U.
+  * Contributions are Copyright (C) 2001-2017 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -67,7 +67,8 @@
     v_Sql_analyze_pg VARCHAR2(2000):='ANALYZE C_TEMP_Selection';
     v_Sql_insert VARCHAR2(2000);
     v_rdbms VARCHAR2(2000):=AD_GET_RDBMS();
-    
+
+    v_priceRemoved CHAR(1) := 'N';
   BEGIN
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Processing') ;
@@ -157,6 +158,7 @@
         rowcount:=SQL%ROWCOUNT;
         v_Message:='@Deleted@=' || rowcount || ' - ';
         DBMS_OUTPUT.PUT_LINE(v_Message) ;
+        v_priceRemoved := 'Y';
       END IF;
       /**
       * For All Discount Lines in Sequence
@@ -261,8 +263,8 @@
           EXECUTE IMMEDIATE v_Sql_analyze_pg;
         END IF;
 
-        -- Delete Prices in Selection, so that we can insert
-        IF(v_PriceList_Version_Base_ID IS NULL  OR v_PriceList_Version_Base_ID<>v_PriceList_Version_ID) THEN
+        -- Product Price will be created with initial values only the first time and will be used as basis for next iterations
+        IF (v_priceRemoved = 'N' AND (v_PriceList_Version_Base_ID IS NULL OR v_PriceList_Version_Base_ID <> v_PriceList_Version_ID)) THEN
           v_ResultStr:=v_ResultStr || ', Delete';
           DELETE
           FROM M_ProductPrice
@@ -273,8 +275,7 @@
             WHERE M_ProductPrice.M_Product_ID=s.C_TEMP_Selection_ID
             )
             ;
-          rowcount:=SQL%ROWCOUNT;
-          v_Message:=', @Deleted@=' || rowcount;
+          v_priceRemoved := 'Y';
         END IF;
         -- --------------------
         -- Copy (Insert) Prices
@@ -304,7 +305,13 @@
             COALESCE(M_GET_COST (mp.M_Product_ID, add_hms(v_validfromdate, 23, 59, 59), CASE v_isCostMigrated WHEN 0 THEN mp.costtype ELSE null END, v_Org_ID, mp.ad_client_id, null, v_clientCurrencyId, v_Currency_ID),0)
             from m_product mp
             where EXISTS (SELECT 1 FROM C_TEMP_Selection s WHERE mp.M_Product_ID=s.C_TEMP_Selection_ID)
-            AND mp.IsActive='Y'; 
+            AND mp.IsActive='Y'
+            AND NOT EXISTS (
+              SELECT 1
+              FROM M_ProductPrice pp
+              WHERE pp.M_Product_ID = mp.M_Product_ID
+              AND pp.M_PriceList_Version_ID = v_PriceList_Version_ID
+            );
             
         ELSE
           -- Copy and Convert from other PriceList_Version
@@ -336,7 +343,13 @@
           WHERE pp.M_PriceList_Version_ID=v_PriceList_Version_Base_ID
             AND EXISTS
             (SELECT 1 FROM C_TEMP_Selection s WHERE pp.M_Product_ID=s.C_TEMP_Selection_ID)
-            AND pp.IsActive='Y';
+            AND pp.IsActive='Y'
+            AND NOT EXISTS (
+              SELECT 1
+              FROM M_ProductPrice pp2
+              WHERE pp2.M_Product_ID = pp.M_Product_ID
+              AND pp2.M_PriceList_Version_ID = v_PriceList_Version_ID
+            );
         END IF;
         rowcount:=SQL%ROWCOUNT;
         v_Message:=v_Message || ', @Inserted@=' || rowcount;
--- a/model/src-db/database/model/functions/M_PRODUCTION_RUN.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/functions/M_PRODUCTION_RUN.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -56,7 +56,6 @@
   v_Processed VARCHAR2(60) ;
   v_Client_ID VARCHAR2(32);
   v_Org_ID VARCHAR2(32);
-  v_Locator_ID VARCHAR2(32);
   --
   v_Line NUMBER;
   v_Count NUMBER;
@@ -571,8 +570,8 @@
     END IF;
 
     DECLARE
-        v_Message_ProductionRun VARCHAR(2000) :='';
-        v_Message_ProductLine VARCHAR(2000) :='';
+        v_Message_ProductionRun VARCHAR(2000);
+        v_Message_ProductLine VARCHAR(2000);
         BEGIN
           FOR CUR_ProductionPlan IN
             (SELECT pp.Line, pp.M_PRODUCTIONPLAN_ID
@@ -589,14 +588,14 @@
               AND pr.ISACTIVE='N'
               ORDER BY pl.Line)
             LOOP
-              v_Message_ProductLine:=v_Message_ProductLine||CUR_PL_Post.line||', ';
+              v_Message_ProductLine := COALESCE(v_Message_ProductLine, '') || CUR_PL_Post.line || ', ';
             END LOOP;
-            IF(v_Message_ProductLine != '') THEN
-              v_Message_ProductionRun:=v_Message_ProductionRun||'@ProductionRunLine@'||Cur_ProductionPlan.line||' @ProductLine@'||v_Message_ProductLine;
-              v_Message_ProductLine:='';
+            IF (v_Message_ProductLine IS NOT NULL) THEN
+              v_Message_ProductionRun := COALESCE(v_Message_ProductionRun, '') || '@ProductionRunLine@' || Cur_ProductionPlan.line || ' @ProductLine@' || v_Message_ProductLine;
+              v_Message_ProductLine := NULL;
             END IF;
           END LOOP;
-          IF v_Message_ProductionRun != '' THEN
+          IF (v_Message_ProductionRun IS NOT NULL) THEN
             RAISE_APPLICATION_ERROR(-20000, v_Message_ProductionRun||'@InActiveProducts@');
           END IF;
         END;
--- a/model/src-db/database/model/functions/M_REQUISITION_CREATEPO.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/functions/M_REQUISITION_CREATEPO.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -65,7 +65,6 @@
   v_Aum C_ORDERLINE.C_AUM%TYPE;
   v_AumQty NUMBER;
   v_uom_preference AD_PREFERENCE.VALUE%TYPE;
-  v_count NUMBER;
   
   --  Parameter
   TYPE RECORD IS REF CURSOR;
--- a/model/src-db/database/model/functions/M_RESERVATION_POST.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/functions/M_RESERVATION_POST.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -25,7 +25,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):  ______________________________________.
 ************************************************************************/
@@ -311,18 +311,6 @@
         RAISE_APPLICATION_ERROR(-20000, '@ActionNotSupported@');
       END IF;
 
-      UPDATE c_orderline
-      SET so_res_status = 'NR'
-      WHERE c_orderline_id = v_orderline_id;
-
-      SELECT c_order_id INTO v_sales_order_id
-      FROM c_orderline
-      WHERE c_orderline_id = v_orderline_id;
-      SELECT COUNT(*) INTO v_reservedcount
-      FROM c_orderline
-      WHERE c_order_id = v_sales_order_id
-        AND so_res_status <> 'NR';
-      
       -- Convert to pre-reserve reservations related to purchase orders that are not released.
       FOR cur_prereserve IN (
           SELECT m_reservation_stock_id, quantity - COALESCE(releasedqty, 0) AS reservedqty, c_orderline_id
@@ -366,11 +354,28 @@
         AND quantity = 0
         AND COALESCE(releasedqty, 0) = 0;
 
-      UPDATE c_order
-      SET so_res_status = CASE WHEN v_reservedcount > 0 THEN 'PR'
-                               ELSE 'NR'
-                          END
-      WHERE c_order_id = v_sales_order_id;
+      IF (v_orderline_id IS NOT NULL) THEN
+
+        UPDATE c_orderline
+        SET so_res_status = 'NR'
+        WHERE c_orderline_id = v_orderline_id;
+
+        SELECT c_order_id
+        INTO v_sales_order_id
+        FROM c_orderline
+        WHERE c_orderline_id = v_orderline_id;
+
+        SELECT count(1)
+        INTO v_reservedcount
+        FROM c_orderline
+        WHERE c_order_id = v_sales_order_id
+        AND so_res_status <> 'NR';
+
+        UPDATE c_order
+        SET so_res_status = CASE WHEN v_reservedcount > 0 THEN 'PR' ELSE 'NR' END
+        WHERE c_order_id = v_sales_order_id;
+
+      END IF;
 
       v_newstatus := 'DR';
       v_newaction := 'PR';
--- a/model/src-db/database/model/tables/AD_ALERT.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/tables/AD_ALERT.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -61,7 +61,7 @@
         <default/>
         <onCreateDefault/>
       </column>
-      <column name="RECORD_ID" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false">
+      <column name="RECORD_ID" primaryKey="false" required="false" type="VARCHAR" size="100" autoIncrement="false">
         <default/>
         <onCreateDefault/>
       </column>
--- a/model/src-db/database/model/tables/C_IMPORT_ENTRY.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/tables/C_IMPORT_ENTRY.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -61,6 +61,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="RESPONSEINFO" primaryKey="false" required="false" type="CLOB" size="4000" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_ROLE" name="C_IMPORT_ENTRY_AD_ROLE">
         <reference local="AD_ROLE_ID" foreign="AD_ROLE_ID"/>
       </foreign-key>
--- a/model/src-db/database/model/tables/C_IMPORT_ENTRY_ARCHIVE.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/tables/C_IMPORT_ENTRY_ARCHIVE.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -57,6 +57,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="RESPONSEINFO" primaryKey="false" required="false" type="CLOB" size="4000" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_ROLE" name="C_IMPORT_EA_AD_ROLE">
         <reference local="AD_ROLE_ID" foreign="AD_ROLE_ID"/>
       </foreign-key>
@@ -66,5 +70,8 @@
       <foreign-key foreignTable="AD_ORG" name="C_IMPORT_EA_ORG">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <index name="C_IMPORT_ENTRY_ARCHIVE_IDX" unique="false">
+        <index-column name="CREATED"/>
+      </index>
     </table>
   </database>
--- a/model/src-db/database/model/tables/C_ORDERLINE.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/tables/C_ORDERLINE.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -380,6 +380,10 @@
       <foreign-key foreignTable="M_WAREHOUSE_RULE" name="C_ORDERLINE_WAREHOUSERULE">
         <reference local="M_WAREHOUSE_RULE_ID" foreign="M_WAREHOUSE_RULE_ID"/>
       </foreign-key>
+      <index name="C_ORDERLINE_BOMPARENT" unique="false">
+        <index-column name="BOM_PARENT_ID"/>
+        <whereClause><![CDATA[BOM_PARENT_ID IS NOT NULL]]></whereClause>
+      </index>
       <index name="C_ORDERLINE_C_RETURN_REASON" unique="false">
         <index-column name="C_RETURN_REASON_ID"/>
         <whereClause><![CDATA[C_RETURN_REASON_ID IS NOT NULL]]></whereClause>
@@ -394,6 +398,14 @@
       <index name="C_ORDERLINE_PRODUCT" unique="false">
         <index-column name="M_PRODUCT_ID"/>
       </index>
+      <index name="C_ORDERLINE_QUOTATIONLINE" unique="false">
+        <index-column name="QUOTATIONLINE_ID"/>
+        <whereClause><![CDATA[QUOTATIONLINE_ID IS NOT NULL]]></whereClause>
+      </index>
+      <index name="C_ORDERLINE_REFORDERLINE" unique="false">
+        <index-column name="REF_ORDERLINE_ID"/>
+        <whereClause><![CDATA[REF_ORDERLINE_ID IS NOT NULL]]></whereClause>
+      </index>
       <check name="C_ORDERLINE_CHECK1"><![CDATA[QUANTITYORDER IS NULL AND M_PRODUCT_UOM_ID IS NULL OR QUANTITYORDER IS NOT NULL AND M_PRODUCT_UOM_ID IS NOT NULL]]></check>
       <check name="C_ORDERLINE_CHECK2"><![CDATA[LINENETAMT = 0 OR C_TAX_ID IS NOT NULL]]></check>
       <check name="C_ORDERLINE_DIRECTSHIP_CHECK"><![CDATA[DIRECTSHIP IN ('Y', 'N')]]></check>
--- a/model/src-db/database/model/tables/FACT_ACCT.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/tables/FACT_ACCT.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -292,6 +292,10 @@
         <index-column name="C_ACCTSCHEMA_ID"/>
         <index-column name="ACCOUNT_ID"/>
       </index>
+      <index name="FACT_ACCT_BPARTNER" unique="false">
+        <index-column name="C_BPARTNER_ID"/>
+        <whereClause><![CDATA[C_BPARTNER_ID IS NOT NULL]]></whereClause>
+      </index>
       <index name="FACT_ACCT_DATEACCT" unique="false">
         <index-column name="DATEACCT"/>
       </index>
--- a/model/src-db/database/model/tables/M_INOUTLINE.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/tables/M_INOUTLINE.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -194,6 +194,14 @@
       <foreign-key foreignTable="USER2" name="M_INOUTLINE_USER2">
         <reference local="USER2_ID" foreign="USER2_ID"/>
       </foreign-key>
+      <index name="M_INOUTLINE_BOMPARENT" unique="false">
+        <index-column name="BOM_PARENT_ID"/>
+        <whereClause><![CDATA[BOM_PARENT_ID IS NOT NULL]]></whereClause>
+      </index>
+      <index name="M_INOUTLINE_CANCELEDINOUTLINE" unique="false">
+        <index-column name="CANCELED_INOUTLINE_ID"/>
+        <whereClause><![CDATA[CANCELED_INOUTLINE_ID IS NOT NULL]]></whereClause>
+      </index>
       <index name="M_INOUTLINE_INOUT" unique="false">
         <index-column name="M_INOUT_ID"/>
       </index>
--- a/model/src-db/database/model/tables/M_LOCATOR.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/tables/M_LOCATOR.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -66,7 +66,7 @@
         <onCreateDefault/>
       </column>
       <column name="M_INVENTORYSTATUS_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
-        <default><![CDATA[0]]></default>
+        <default><![CDATA[7B3DC15A20234C418D26EECDC5D59003]]></default>
         <onCreateDefault><![CDATA['0']]></onCreateDefault>
       </column>
       <column name="CHANGE_STATUS" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
--- a/model/src-db/database/model/tables/M_MOVEMENTLINE.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/tables/M_MOVEMENTLINE.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -81,12 +81,23 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="C_AUM" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AUMQTY" primaryKey="false" required="false" type="DECIMAL" 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="C_UOM" name="M_MOVEMENTLINE_C_AUM">
+        <reference local="C_AUM" foreign="C_UOM_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_UOM" name="M_MOVEMENTLINE_C_UOM">
         <reference local="C_UOM_ID" foreign="C_UOM_ID"/>
       </foreign-key>
@@ -111,6 +122,9 @@
       <foreign-key foreignTable="M_RESERVATION" name="M_MOVEMENTLINE_RESERVATION">
         <reference local="M_RESERVATION_ID" foreign="M_RESERVATION_ID"/>
       </foreign-key>
+      <index name="M_MOVEMENTLINE_C_AUM" unique="false">
+        <index-column name="C_AUM"/>
+      </index>
       <index name="M_MOVEMENTLINE_MOVEMENT" unique="false">
         <index-column name="M_MOVEMENT_ID"/>
       </index>
--- a/model/src-db/database/model/tables/M_PRODUCT_ORG.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/tables/M_PRODUCT_ORG.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -110,6 +110,13 @@
       <foreign-key foreignTable="M_PRODUCT_PO" name="M_PRODUCT_ORG_PRODUCTPO">
         <reference local="M_PRODUCT_PO_ID" foreign="M_PRODUCT_PO_ID"/>
       </foreign-key>
+      <index name="M_PRODUCT_ORG_BIN" unique="false">
+        <index-column name="M_LOCATOR_ID"/>
+        <whereClause><![CDATA[M_LOCATOR_ID IS NOT NULL]]></whereClause>
+      </index>
+      <index name="M_PRODUCT_ORG_PRODUCT" unique="false">
+        <index-column name="M_PRODUCT_ID"/>
+      </index>
       <unique name="M_PRODUCT_ORG_ORG_PRODUCT_UN">
         <unique-column name="M_PRODUCT_ID"/>
         <unique-column name="AD_ORG_ID"/>
--- a/model/src-db/database/model/triggers/C_INVOICELINE_BEFORE_TRG.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/triggers/C_INVOICELINE_BEFORE_TRG.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -37,7 +37,6 @@
   v_Line NUMBER;
   v_LineAcum NUMBER;   
   v_NetActual NUMBER;
-  v_PriceLine NUMBER;
   v_CalcLine NUMBER;
   v_execute CHAR(1):='N';
           
--- a/model/src-db/database/model/triggers/C_INVOICELINE_TRG2.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/triggers/C_INVOICELINE_TRG2.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -35,8 +35,6 @@
   v_istaxincluded CHAR(1) ;
   v_oldGrossAmt NUMBER:=0;
   v_newGrossAmt NUMBER:=0;
-  v_totallines NUMBER:=0;
-  v_grandtotal NUMBER:=0;
   v_oldLineAlternate NUMBER;
   v_create CHAR(1):='Y';  
   
@@ -55,7 +53,6 @@
   v_LineAlternate NUMBER;
   v_LineAlternateAcum NUMBER;
   
-  v_PriceLine NUMBER;
   v_CalcLine NUMBER;
           
   TYPE RECORD IS REF CURSOR;
--- a/model/src-db/database/model/triggers/C_INVOICE_TRG2.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/triggers/C_INVOICE_TRG2.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
   <database name="TRIGGER C_INVOICE_TRG2">
-    <trigger name="C_INVOICE_TRG2" table="C_INVOICE" fires="after" insert="true" update="false" delete="false" foreach="row">
+    <trigger name="C_INVOICE_TRG2" table="C_INVOICE" fires="after" insert="true" update="true" delete="false" foreach="row">
       <body><![CDATA[
 
 
@@ -18,54 +18,62 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2006 Openbravo SLU
+* All portions are Copyright (C) 2001-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
    TYPE RECORD IS REF CURSOR;
   Cur_Discounts RECORD;
   v_Key VARCHAR2(32) ;
+  v_updateDiscount CHAR(1) := 'N';
     
 BEGIN
     
     IF AD_isTriggerEnabled()='N' THEN RETURN;
     END IF;
 
+  IF (UPDATING) THEN
+    IF (:OLD.C_BPARTNER_ID <> :NEW.C_BPARTNER_ID) THEN
+      v_updateDiscount := 'Y';
+    END IF;
+  END IF;
 
-  FOR Cur_Discounts IN
+  IF (INSERTING OR v_updateDiscount = 'Y') THEN
+    FOR Cur_Discounts IN
     (
-    SELECT BPD.C_DISCOUNT_ID,
-      BPD.LINE,
-      BPD.CASCADE
-    FROM C_BPARTNER_DISCOUNT BPD, C_DISCOUNT D
-    WHERE BPD.C_BPARTNER_ID=:NEW.C_BPARTNER_ID
-      AND D.C_DISCOUNT_ID = BPD.C_DISCOUNT_ID
-      AND BPD.ISACTIVE='Y'
-      AND D.ISACTIVE='Y'
-      AND(BPD.ISCUSTOMER=:NEW.ISSOTRX
-      OR BPD.ISVENDOR <> :NEW.ISSOTRX)
-      AND BPD.APPLYINORDER='N'
-    ORDER BY BPD.LINE
+      SELECT BPD.C_DISCOUNT_ID,
+        BPD.LINE,
+        BPD.CASCADE
+      FROM C_BPARTNER_DISCOUNT BPD, C_DISCOUNT D
+      WHERE BPD.C_BPARTNER_ID=:NEW.C_BPARTNER_ID
+        AND D.C_DISCOUNT_ID = BPD.C_DISCOUNT_ID
+        AND BPD.ISACTIVE='Y'
+        AND D.ISACTIVE='Y'
+        AND(BPD.ISCUSTOMER=:NEW.ISSOTRX
+        OR BPD.ISVENDOR <> :NEW.ISSOTRX)
+        AND BPD.APPLYINORDER='N'
+      ORDER BY BPD.LINE
     )
-  LOOP
-    Ad_Sequence_Next('C_Invoice_Discount', :NEW.AD_Client_ID, v_Key) ;
-    INSERT
-    INTO C_INVOICE_DISCOUNT
-      (
-        C_INVOICE_DISCOUNT_ID, AD_CLIENT_ID, AD_ORG_ID,
-        ISACTIVE, CREATED, CREATEDBY,
-        UPDATED, UPDATEDBY, C_INVOICE_ID,
-        C_DISCOUNT_ID, LINE, CASCADE
-      )
-      VALUES
-      (
-        v_Key, :NEW.AD_Client_ID, :NEW.AD_Org_ID,
-         'Y', now(),  :NEW.CREATEDBY,
-        now(), :NEW.UPDATEDBY, :NEW.C_INVOICE_ID,
-        Cur_Discounts.C_DISCOUNT_ID, Cur_Discounts.LINE, Cur_Discounts.CASCADE
-      )
+    LOOP
+      Ad_Sequence_Next('C_Invoice_Discount', :NEW.AD_Client_ID, v_Key) ;
+      INSERT
+      INTO C_INVOICE_DISCOUNT
+        (
+          C_INVOICE_DISCOUNT_ID, AD_CLIENT_ID, AD_ORG_ID,
+          ISACTIVE, CREATED, CREATEDBY,
+          UPDATED, UPDATEDBY, C_INVOICE_ID,
+          C_DISCOUNT_ID, LINE, CASCADE
+        )
+        VALUES
+        (
+          v_Key, :NEW.AD_Client_ID, :NEW.AD_Org_ID,
+           'Y', now(),  :NEW.CREATEDBY,
+          now(), :NEW.UPDATEDBY, :NEW.C_INVOICE_ID,
+          Cur_Discounts.C_DISCOUNT_ID, Cur_Discounts.LINE, Cur_Discounts.CASCADE
+        )
       ;
-  END LOOP;
+    END LOOP;
+  END IF;
 END C_INVOICE_TRG2
 ]]></body>
     </trigger>
--- a/model/src-db/database/model/triggers/C_ORDERLINE2_TRG.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/triggers/C_ORDERLINE2_TRG.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -90,7 +90,7 @@
              SELECT res.m_reservation_id as m_reservation_id
              FROM m_reservation res
              WHERE res.C_ORDERLINE_ID = :new.C_ORDERLINE_ID
-             AND res.RES_STATUS <> 'CL'
+             AND res.RES_STATUS IN ('CO', 'HO')
            ) LOOP
                M_RESERVATION_POST(null, cur_reservations.m_reservation_id, 'CL', :new.updatedBy);
              END LOOP;
--- a/model/src-db/database/model/triggers/C_ORDERLINE_TRG.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/triggers/C_ORDERLINE_TRG.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -45,7 +45,6 @@
   v_Line NUMBER;
   v_LineAcum NUMBER;   
   v_NetActual NUMBER;
-  v_PriceLine NUMBER;
   v_CalcLine NUMBER;
 
   TYPE RECORD IS REF CURSOR;
--- a/model/src-db/database/model/triggers/C_ORDERLINE_TRG2.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/triggers/C_ORDERLINE_TRG2.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -57,7 +57,6 @@
   v_LineAlternate NUMBER;
   v_LineAlternateAcum NUMBER;
   
-  v_PriceLine NUMBER;
   v_CalcLine NUMBER;
           
   TYPE RECORD IS REF CURSOR;
--- a/model/src-db/database/model/triggers/C_ORDER_TRG2.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/triggers/C_ORDER_TRG2.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -18,7 +18,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) 2001-2015 Openbravo SLU
+    * All portions are Copyright (C) 2001-2017 Openbravo SLU
     * All Rights Reserved.
     * Contributor(s):  ______________________________________.
     ************************************************************************/
@@ -27,6 +27,7 @@
     TYPE RECORD IS REF CURSOR;
     Cur_Discounts RECORD;
     V_RequiresDescription CHAR(1);
+    v_updateDiscount CHAR(1) := 'N';
         
 BEGIN
     
@@ -47,11 +48,16 @@
     AND DocStatus NOT IN('RE', 'CL', 'CO', 'VO') ;
   END IF;
  END IF;
- 
- 
- -- Discounts
- IF (INSERTING) THEN
- FOR Cur_Discounts IN
+
+  -- Discounts
+  IF (UPDATING) THEN
+    IF (:OLD.C_BPARTNER_ID <> :NEW.C_BPARTNER_ID) THEN
+      v_updateDiscount := 'Y';
+    END IF;
+  END IF;
+
+  IF (INSERTING OR v_updateDiscount = 'Y') THEN
+    FOR Cur_Discounts IN
     (
     SELECT C_DISCOUNT_ID,
       LINE,
@@ -64,7 +70,7 @@
       AND APPLYINORDER='Y'
     ORDER BY LINE
     )
-  LOOP
+    LOOP
     INSERT
     INTO C_ORDER_DISCOUNT
       (
@@ -80,9 +86,10 @@
         now(), :NEW.UPDATEDBY, :NEW.C_ORDER_ID,
         Cur_Discounts.C_DISCOUNT_ID, Cur_Discounts.LINE, Cur_Discounts.CASCADE
       )
-      ;
-  END LOOP;
+    ;
+    END LOOP;
   END IF;
+
   IF(INSERTING OR UPDATING) THEN
   	IF(:NEW.C_INCOTERMS_ID IS NOT NULL) THEN
   		SELECT REQUIRESDESCRIPTION INTO V_RequiresDescription FROM C_INCOTERMS WHERE C_INCOTERMS_ID = :NEW.C_INCOTERMS_ID;
--- a/model/src-db/database/model/views/M_RM_SHIPMENT_PICK_EDIT.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/model/views/M_RM_SHIPMENT_PICK_EDIT.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
   <database name="VIEW M_RM_SHIPMENT_PICK_EDIT">
-    <view name="M_RM_SHIPMENT_PICK_EDIT"><![CDATA[SELECT COALESCE(sd.m_storage_detail_id, '') || ol.c_orderline_id AS m_rm_shipment_pick_edit_id, ol.ad_client_id, COALESCE(iol.ad_org_id, ol.ad_org_id) AS ad_org_id, ol.isactive, ol.createdby, ol.created, ol.updatedby, ol.updated, o.documentno AS returnorderno, ol.m_product_id, ol.m_attributesetinstance_id, ol.c_uom_id, (-1) * ol.qtyordered AS returned, (-1) * iol.movementqty AS movementqty, sd.m_locator_id, CASE WHEN sd.m_locator_id IS NULL THEN (-1) * ol.qtyordered ELSE COALESCE(sd.qtyonhand, 0) END AS availableqty, (-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 pendingqty, iol.m_inout_id, CASE WHEN iol.m_inout_id IS NOT NULL THEN 'Y' ELSE 'N' END AS ob_selected, ol.c_orderline_id, ol.line, iol.m_inoutline_id, p.isstocked, o.c_bpartner_id, l.ad_org_id AS locatororg, ol.c_aum, (-1) * ol.aumqty AS aumqty, ol.c_uom_id AS returneduom, (-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 pendingaumqty, m_get_converted_aumqty(ol.m_product_id, CASE WHEN sd.m_locator_id IS NULL THEN (-1) * ol.qtyordered ELSE COALESCE(sd.qtyonhand, 0) END, ol.c_aum) AS availableaumqty, m_get_converted_qty(ol.m_product_id, 1, ol.c_aum) AS rate FROM c_orderline ol JOIN c_order o ON o.c_order_id = ol.c_order_id AND o.processed = 'Y' AND o.issotrx = 'N' AND o.isdelivered = 'N' JOIN m_product p ON p.m_product_id = ol.m_product_id LEFT JOIN m_storage_detail sd ON sd.m_product_id = ol.m_product_id AND COALESCE(sd.m_attributesetinstance_id, '0') = COALESCE(ol.m_attributesetinstance_id, '0') AND sd.qtyonhand > 0 JOIN c_doctype dt ON o.c_doctypetarget_id = dt.c_doctype_id AND dt.isreturn = 'Y' LEFT JOIN (SELECT iol2.m_inoutline_id, iol2.m_inout_id, iol2.movementqty, iol2.c_orderline_id, iol2.ad_org_id, iol2.m_locator_id FROM m_inoutline iol2 JOIN m_inout io2 ON iol2.m_inout_id = io2.m_inout_id AND io2.processed = 'N') iol ON iol.c_orderline_id = ol.c_orderline_id AND iol.m_locator_id = sd.m_locator_id LEFT JOIN m_locator l ON sd.m_locator_id = l.m_locator_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 o.docstatus = 'CO' AND ol.qtyordered <> ol.qtydelivered]]></view>
+    <view name="M_RM_SHIPMENT_PICK_EDIT"><![CDATA[SELECT COALESCE(sd.m_storage_detail_id, '') || ol.c_orderline_id AS m_rm_shipment_pick_edit_id, ol.ad_client_id, COALESCE(iol.ad_org_id, ol.ad_org_id) AS ad_org_id, ol.isactive, ol.createdby, ol.created, ol.updatedby, ol.updated, o.documentno AS returnorderno, ol.m_product_id, ol.m_attributesetinstance_id, ol.c_uom_id, (-1) * ol.qtyordered AS returned, (-1) * iol.movementqty AS movementqty, sd.m_locator_id, CASE WHEN p.isstocked = 'N' THEN (-1) * ol.qtyordered ELSE COALESCE(sd.qtyonhand, 0) END AS availableqty, (-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 pendingqty, iol.m_inout_id, CASE WHEN iol.m_inout_id IS NOT NULL THEN 'Y' ELSE 'N' END AS ob_selected, ol.c_orderline_id, ol.line, iol.m_inoutline_id, p.isstocked, o.c_bpartner_id, l.ad_org_id AS locatororg, ol.c_aum, (-1) * ol.aumqty AS aumqty, ol.c_uom_id AS returneduom, (-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 pendingaumqty, m_get_converted_aumqty(ol.m_product_id, CASE WHEN sd.m_locator_id IS NULL THEN (-1) * ol.qtyordered ELSE COALESCE(sd.qtyonhand, 0) END, ol.c_aum) AS availableaumqty, m_get_converted_qty(ol.m_product_id, 1, ol.c_aum) AS rate FROM c_orderline ol JOIN c_order o ON o.c_order_id = ol.c_order_id AND o.processed = 'Y' AND o.issotrx = 'N' AND o.isdelivered = 'N' JOIN m_product p ON p.m_product_id = ol.m_product_id LEFT JOIN m_storage_detail sd ON sd.m_product_id = ol.m_product_id AND COALESCE(sd.m_attributesetinstance_id, '0') = COALESCE(ol.m_attributesetinstance_id, '0') AND sd.qtyonhand > 0 JOIN c_doctype dt ON o.c_doctypetarget_id = dt.c_doctype_id AND dt.isreturn = 'Y' LEFT JOIN (SELECT iol2.m_inoutline_id, iol2.m_inout_id, iol2.movementqty, iol2.c_orderline_id, iol2.ad_org_id, iol2.m_locator_id FROM m_inoutline iol2 JOIN m_inout io2 ON iol2.m_inout_id = io2.m_inout_id AND io2.processed = 'N') iol ON iol.c_orderline_id = ol.c_orderline_id AND iol.m_locator_id = sd.m_locator_id LEFT JOIN m_locator l ON sd.m_locator_id = l.m_locator_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 o.docstatus = 'CO' AND ol.qtyordered <> ol.qtydelivered]]></view>
   </database>
--- a/model/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -2311,7 +2311,11 @@
 <!--600FD6A6E8E74921AA876A03ECF46C41-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--600FD6A6E8E74921AA876A03ECF46C41-->  <AD_TAB_ID><![CDATA[BD883B355F1B448A9CB6BD472600EB2D]]></AD_TAB_ID>
 <!--600FD6A6E8E74921AA876A03ECF46C41-->  <NAME><![CDATA[isWarehouseDimension]]></NAME>
-<!--600FD6A6E8E74921AA876A03ECF46C41-->  <CODE><![CDATA[N]]></CODE>
+<!--600FD6A6E8E74921AA876A03ECF46C41-->  <CODE><![CDATA[@SQL=SELECT min(r.Warehouse_Dimension)
+FROM M_Costing_Rule r
+WHERE r.AD_Org_ID = @AD_ORG_ID@
+AND r.Dateto IS NULL
+AND r.IsValidated = 'Y']]></CODE>
 <!--600FD6A6E8E74921AA876A03ECF46C41-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--600FD6A6E8E74921AA876A03ECF46C41--></AD_AUXILIARINPUT>
 
--- a/model/src-db/database/sourcedata/AD_COLUMN.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/sourcedata/AD_COLUMN.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -24717,7 +24717,7 @@
 <!--1636-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
 <!--1636-->  <AD_REFERENCE_VALUE_ID><![CDATA[233]]></AD_REFERENCE_VALUE_ID>
 <!--1636-->  <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
-<!--1636-->  <DEFAULTVALUE><![CDATA[@SQL= SELECT CASE WHEN (@C_Period_ID@ <> '' AND @C_Period_ID@ IS NOT NULL) THEN @C_Period_ID@ ELSE C_Period_ID END FROM C_Period WHERE C_Year_ID IN (SELECT C_Year_ID FROM C_Year WHERE C_Calendar_ID =(SELECT C_Calendar_ID FROM AD_ORG WHERE AD_Client_ID= @AD_Client_ID@ AND AD_ORG_ID=(SELECT AD_ORG_GETCALENDAROWNER( @AD_Org_ID@ ) from dual))) AND to_date( COALESCE(@DateAcct@,@#Date@) ) BETWEEN StartDate AND EndDate AND PeriodType='S' AND exists (select 1 from c_periodcontrol where c_periodcontrol.c_period_id = c_period.c_period_id AND periodstatus = 'O')]]></DEFAULTVALUE>
+<!--1636-->  <DEFAULTVALUE><![CDATA[@SQL= SELECT CASE WHEN @C_Period_ID@ IS NOT NULL THEN @C_Period_ID@ ELSE C_Period_ID END FROM C_Period WHERE C_Year_ID IN (SELECT C_Year_ID FROM C_Year WHERE C_Calendar_ID =(SELECT C_Calendar_ID FROM AD_ORG WHERE AD_Client_ID= @AD_Client_ID@ AND AD_ORG_ID=(SELECT AD_ORG_GETCALENDAROWNER( @AD_Org_ID@ ) from dual))) AND to_date( COALESCE(@DateAcct@,@#Date@) ) BETWEEN StartDate AND EndDate AND PeriodType='S' AND exists (select 1 from c_periodcontrol where c_periodcontrol.c_period_id = c_period.c_period_id AND periodstatus = 'O')]]></DEFAULTVALUE>
 <!--1636-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--1636-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--1636-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
@@ -62915,7 +62915,7 @@
 <!--3580-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--3580-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
 <!--3580-->  <AD_ELEMENT_ID><![CDATA[1047]]></AD_ELEMENT_ID>
-<!--3580-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--3580-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--3580-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--3580-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--3580-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
@@ -63446,7 +63446,7 @@
 <!--3594-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--3594-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--3594-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--3594-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--3594-->  <READONLYLOGIC><![CDATA[@Processed@='Y' | @UomManagement@='Y']]></READONLYLOGIC>
 <!--3594-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
 <!--3594-->  <SEQNO><![CDATA[2]]></SEQNO>
 <!--3594-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -91252,7 +91252,7 @@
 <!--5669-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--5669-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--5669-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--5669-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--5669-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
 <!--5669-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--5669-->  <SEQNO><![CDATA[0]]></SEQNO>
 <!--5669-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -260350,7 +260350,7 @@
 <!--393102FB4B954F58A9D8223E19453EC6-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--393102FB4B954F58A9D8223E19453EC6-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--393102FB4B954F58A9D8223E19453EC6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--393102FB4B954F58A9D8223E19453EC6-->  <POSITION><![CDATA[11]]></POSITION>
+<!--393102FB4B954F58A9D8223E19453EC6-->  <POSITION><![CDATA[10]]></POSITION>
 <!--393102FB4B954F58A9D8223E19453EC6-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--393102FB4B954F58A9D8223E19453EC6-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--393102FB4B954F58A9D8223E19453EC6-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -265990,6 +265990,42 @@
 <!--4C935385499E485989264EA4AA71E60A-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--4C935385499E485989264EA4AA71E60A--></AD_COLUMN>
 
+<!--4C9B2ECB281E4685B0E4D0292F40D79D--><AD_COLUMN>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <AD_COLUMN_ID><![CDATA[4C9B2ECB281E4685B0E4D0292F40D79D]]></AD_COLUMN_ID>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <NAME><![CDATA[Responseinfo]]></NAME>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <COLUMNNAME><![CDATA[Responseinfo]]></COLUMNNAME>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <AD_TABLE_ID><![CDATA[C2968EF014C146B99A0C136BA9D6331F]]></AD_TABLE_ID>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <AD_REFERENCE_ID><![CDATA[14]]></AD_REFERENCE_ID>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <FIELDLENGTH><![CDATA[1000000]]></FIELDLENGTH>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <SEQNO><![CDATA[180]]></SEQNO>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <AD_ELEMENT_ID><![CDATA[4AF1DF6775834D8A944890A79CBC3158]]></AD_ELEMENT_ID>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <POSITION><![CDATA[17]]></POSITION>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--4C9B2ECB281E4685B0E4D0292F40D79D--></AD_COLUMN>
+
 <!--4CED13820EFB47E3B3A4A37CBEBB4BC6--><AD_COLUMN>
 <!--4CED13820EFB47E3B3A4A37CBEBB4BC6-->  <AD_COLUMN_ID><![CDATA[4CED13820EFB47E3B3A4A37CBEBB4BC6]]></AD_COLUMN_ID>
 <!--4CED13820EFB47E3B3A4A37CBEBB4BC6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -289389,7 +289425,7 @@
 <!--6399F0E18AA845A3BD26A185AE267D27-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--6399F0E18AA845A3BD26A185AE267D27-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--6399F0E18AA845A3BD26A185AE267D27-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6399F0E18AA845A3BD26A185AE267D27-->  <POSITION><![CDATA[16]]></POSITION>
+<!--6399F0E18AA845A3BD26A185AE267D27-->  <POSITION><![CDATA[15]]></POSITION>
 <!--6399F0E18AA845A3BD26A185AE267D27-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--6399F0E18AA845A3BD26A185AE267D27-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--6399F0E18AA845A3BD26A185AE267D27-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -294636,7 +294672,7 @@
 <!--6D88290995F243E4921F60E1BD25D2F7-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--6D88290995F243E4921F60E1BD25D2F7-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--6D88290995F243E4921F60E1BD25D2F7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6D88290995F243E4921F60E1BD25D2F7-->  <POSITION><![CDATA[12]]></POSITION>
+<!--6D88290995F243E4921F60E1BD25D2F7-->  <POSITION><![CDATA[11]]></POSITION>
 <!--6D88290995F243E4921F60E1BD25D2F7-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--6D88290995F243E4921F60E1BD25D2F7-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--6D88290995F243E4921F60E1BD25D2F7-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -296843,7 +296879,7 @@
 <!--7079E2FD4AA7799EE040007F010104AD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7079E2FD4AA7799EE040007F010104AD-->  <NAME><![CDATA[Commercial]]></NAME>
 <!--7079E2FD4AA7799EE040007F010104AD-->  <DESCRIPTION><![CDATA[Commercial Module]]></DESCRIPTION>
-<!--7079E2FD4AA7799EE040007F010104AD-->  <HELP><![CDATA[Commercial modules are only available to Professional and Basic Edition instances whereas non commercial ones can be downloaded and installed in Community Edition Instances.
+<!--7079E2FD4AA7799EE040007F010104AD-->  <HELP><![CDATA[Commercial modules are only available to Professional and Enterprise Edition instances whereas non commercial ones can be downloaded and installed in Community Edition Instances.
 Commercial modules can have a fee to be payed before they can be installed.]]></HELP>
 <!--7079E2FD4AA7799EE040007F010104AD-->  <COLUMNNAME><![CDATA[IsCommercial]]></COLUMNNAME>
 <!--7079E2FD4AA7799EE040007F010104AD-->  <AD_TABLE_ID><![CDATA[9D36D488605044F5A0264D7C8B916657]]></AD_TABLE_ID>
@@ -324452,7 +324488,7 @@
 <!--89C6C4F0065443B383FF5F11C923AA1B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--89C6C4F0065443B383FF5F11C923AA1B-->  <NAME><![CDATA[IsCommercial]]></NAME>
 <!--89C6C4F0065443B383FF5F11C923AA1B-->  <DESCRIPTION><![CDATA[Commercial Module]]></DESCRIPTION>
-<!--89C6C4F0065443B383FF5F11C923AA1B-->  <HELP><![CDATA[Commercial modules are only available to Professional and Basic Edition instances whereas non commercial ones can be downloaded and installed in Community Edition Instances.
+<!--89C6C4F0065443B383FF5F11C923AA1B-->  <HELP><![CDATA[Commercial modules are only available to Professional and Enterprise Edition instances whereas non commercial ones can be downloaded and installed in Community Edition Instances.
 Commercial modules can have a fee to be payed before they can be installed.]]></HELP>
 <!--89C6C4F0065443B383FF5F11C923AA1B-->  <COLUMNNAME><![CDATA[Iscommercial]]></COLUMNNAME>
 <!--89C6C4F0065443B383FF5F11C923AA1B-->  <AD_TABLE_ID><![CDATA[8FD3DEA921D74CAFB5D4296A0375E958]]></AD_TABLE_ID>
@@ -325579,7 +325615,7 @@
 <!--8BCFEC1D2692D1A8E040007F010135A9-->  <AD_COLUMN_ID><![CDATA[8BCFEC1D2692D1A8E040007F010135A9]]></AD_COLUMN_ID>
 <!--8BCFEC1D2692D1A8E040007F010135A9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--8BCFEC1D2692D1A8E040007F010135A9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8BCFEC1D2692D1A8E040007F010135A9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8BCFEC1D2692D1A8E040007F010135A9-->  <ISACTIVE><![CDATA[N]]></ISACTIVE>
 <!--8BCFEC1D2692D1A8E040007F010135A9-->  <NAME><![CDATA[Tier]]></NAME>
 <!--8BCFEC1D2692D1A8E040007F010135A9-->  <DESCRIPTION><![CDATA[Tier for commercial modules]]></DESCRIPTION>
 <!--8BCFEC1D2692D1A8E040007F010135A9-->  <HELP><![CDATA[Commercial modules are defined in different tiers:
@@ -325603,7 +325639,7 @@
 <!--8BCFEC1D2692D1A8E040007F010135A9-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--8BCFEC1D2692D1A8E040007F010135A9-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--8BCFEC1D2692D1A8E040007F010135A9-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--8BCFEC1D2692D1A8E040007F010135A9-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--8BCFEC1D2692D1A8E040007F010135A9-->  <DEVELOPMENTSTATUS><![CDATA[DP]]></DEVELOPMENTSTATUS>
 <!--8BCFEC1D2692D1A8E040007F010135A9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8BCFEC1D2692D1A8E040007F010135A9-->  <POSITION><![CDATA[37]]></POSITION>
 <!--8BCFEC1D2692D1A8E040007F010135A9-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
@@ -329717,7 +329753,7 @@
 <!--91C5DA32197D4D3DB9FA5D25B650ADEF-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--91C5DA32197D4D3DB9FA5D25B650ADEF-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--91C5DA32197D4D3DB9FA5D25B650ADEF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--91C5DA32197D4D3DB9FA5D25B650ADEF-->  <POSITION><![CDATA[10]]></POSITION>
+<!--91C5DA32197D4D3DB9FA5D25B650ADEF-->  <POSITION><![CDATA[9]]></POSITION>
 <!--91C5DA32197D4D3DB9FA5D25B650ADEF-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--91C5DA32197D4D3DB9FA5D25B650ADEF-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--91C5DA32197D4D3DB9FA5D25B650ADEF-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -363376,6 +363412,46 @@
 <!--D09DB7E52BFB468BBB10DB2AA00EF465-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[2669887A12CA495787BEBD2F425849AB]]></EM_OBUIAPP_PROCESS_ID>
 <!--D09DB7E52BFB468BBB10DB2AA00EF465--></AD_COLUMN>
 
+<!--D0B078B5FC054979A1D62A846D79F7CD--><AD_COLUMN>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <AD_COLUMN_ID><![CDATA[D0B078B5FC054979A1D62A846D79F7CD]]></AD_COLUMN_ID>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <NAME><![CDATA[Operative Quantity]]></NAME>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <COLUMNNAME><![CDATA[Aumqty]]></COLUMNNAME>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <AD_TABLE_ID><![CDATA[324]]></AD_TABLE_ID>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <FIELDLENGTH><![CDATA[2]]></FIELDLENGTH>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <SEQNO><![CDATA[53]]></SEQNO>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <AD_ELEMENT_ID><![CDATA[9AAC1EE202DB487D89C4A3E75631E6C4]]></AD_ELEMENT_ID>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <AD_CALLOUT_ID><![CDATA[1AB9BD3356D643A79C058AA3B4EB175E]]></AD_CALLOUT_ID>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <POSITION><![CDATA[24]]></POSITION>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--D0B078B5FC054979A1D62A846D79F7CD-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--D0B078B5FC054979A1D62A846D79F7CD--></AD_COLUMN>
+
 <!--D0C775ACDFFE43E0B9ECE73CEBE31D4B--><AD_COLUMN>
 <!--D0C775ACDFFE43E0B9ECE73CEBE31D4B-->  <AD_COLUMN_ID><![CDATA[D0C775ACDFFE43E0B9ECE73CEBE31D4B]]></AD_COLUMN_ID>
 <!--D0C775ACDFFE43E0B9ECE73CEBE31D4B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -364604,6 +364680,42 @@
 <!--D44EC8E368A74AEA8AD7EFF13B1FBA6A-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--D44EC8E368A74AEA8AD7EFF13B1FBA6A--></AD_COLUMN>
 
+<!--D453E5E38589426281AFEE3BCE556F11--><AD_COLUMN>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <AD_COLUMN_ID><![CDATA[D453E5E38589426281AFEE3BCE556F11]]></AD_COLUMN_ID>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <NAME><![CDATA[Responseinfo]]></NAME>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <COLUMNNAME><![CDATA[Responseinfo]]></COLUMNNAME>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <AD_TABLE_ID><![CDATA[1B19E761F8E24E00B5FBF2C22082A006]]></AD_TABLE_ID>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <AD_REFERENCE_ID><![CDATA[14]]></AD_REFERENCE_ID>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <FIELDLENGTH><![CDATA[1000000]]></FIELDLENGTH>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <SEQNO><![CDATA[180]]></SEQNO>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <AD_ELEMENT_ID><![CDATA[4AF1DF6775834D8A944890A79CBC3158]]></AD_ELEMENT_ID>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <POSITION><![CDATA[16]]></POSITION>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--D453E5E38589426281AFEE3BCE556F11-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--D453E5E38589426281AFEE3BCE556F11--></AD_COLUMN>
+
 <!--D45692C2890144AFBB6F139CDC38457A--><AD_COLUMN>
 <!--D45692C2890144AFBB6F139CDC38457A-->  <AD_COLUMN_ID><![CDATA[D45692C2890144AFBB6F139CDC38457A]]></AD_COLUMN_ID>
 <!--D45692C2890144AFBB6F139CDC38457A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -364867,7 +364979,7 @@
 <!--D51CD55DE2D441ED99283A396909336F-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--D51CD55DE2D441ED99283A396909336F-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--D51CD55DE2D441ED99283A396909336F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--D51CD55DE2D441ED99283A396909336F-->  <POSITION><![CDATA[16]]></POSITION>
+<!--D51CD55DE2D441ED99283A396909336F-->  <POSITION><![CDATA[14]]></POSITION>
 <!--D51CD55DE2D441ED99283A396909336F-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--D51CD55DE2D441ED99283A396909336F-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--D51CD55DE2D441ED99283A396909336F-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -368433,7 +368545,7 @@
 <!--D7422D1734144D74A852896F6DB8EADA-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
 <!--D7422D1734144D74A852896F6DB8EADA-->  <AD_REFERENCE_VALUE_ID><![CDATA[7762716851904CC9AC1CF39787F1FBF4]]></AD_REFERENCE_VALUE_ID>
 <!--D7422D1734144D74A852896F6DB8EADA-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
-<!--D7422D1734144D74A852896F6DB8EADA-->  <DEFAULTVALUE><![CDATA[0]]></DEFAULTVALUE>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <DEFAULTVALUE><![CDATA[7B3DC15A20234C418D26EECDC5D59003]]></DEFAULTVALUE>
 <!--D7422D1734144D74A852896F6DB8EADA-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--D7422D1734144D74A852896F6DB8EADA-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--D7422D1734144D74A852896F6DB8EADA-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
@@ -370034,7 +370146,7 @@
 <!--DA765BB9E57446E38A71F6085AD52DB8-->  <AD_COLUMN_ID><![CDATA[DA765BB9E57446E38A71F6085AD52DB8]]></AD_COLUMN_ID>
 <!--DA765BB9E57446E38A71F6085AD52DB8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--DA765BB9E57446E38A71F6085AD52DB8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--DA765BB9E57446E38A71F6085AD52DB8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DA765BB9E57446E38A71F6085AD52DB8-->  <ISACTIVE><![CDATA[N]]></ISACTIVE>
 <!--DA765BB9E57446E38A71F6085AD52DB8-->  <NAME><![CDATA[Free for Trial]]></NAME>
 <!--DA765BB9E57446E38A71F6085AD52DB8-->  <COLUMNNAME><![CDATA[Istrialallowed]]></COLUMNNAME>
 <!--DA765BB9E57446E38A71F6085AD52DB8-->  <AD_TABLE_ID><![CDATA[9D36D488605044F5A0264D7C8B916657]]></AD_TABLE_ID>
@@ -370054,7 +370166,7 @@
 <!--DA765BB9E57446E38A71F6085AD52DB8-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--DA765BB9E57446E38A71F6085AD52DB8-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--DA765BB9E57446E38A71F6085AD52DB8-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--DA765BB9E57446E38A71F6085AD52DB8-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--DA765BB9E57446E38A71F6085AD52DB8-->  <DEVELOPMENTSTATUS><![CDATA[DP]]></DEVELOPMENTSTATUS>
 <!--DA765BB9E57446E38A71F6085AD52DB8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--DA765BB9E57446E38A71F6085AD52DB8-->  <POSITION><![CDATA[41]]></POSITION>
 <!--DA765BB9E57446E38A71F6085AD52DB8-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
@@ -370751,7 +370863,7 @@
 <!--DD072B18A9034797933D9A21E46A2D62-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--DD072B18A9034797933D9A21E46A2D62-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--DD072B18A9034797933D9A21E46A2D62-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--DD072B18A9034797933D9A21E46A2D62-->  <POSITION><![CDATA[14]]></POSITION>
+<!--DD072B18A9034797933D9A21E46A2D62-->  <POSITION><![CDATA[13]]></POSITION>
 <!--DD072B18A9034797933D9A21E46A2D62-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--DD072B18A9034797933D9A21E46A2D62-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--DD072B18A9034797933D9A21E46A2D62-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -371251,7 +371363,7 @@
 <!--DF4E696E97FC44AEB236AF78826917F2-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--DF4E696E97FC44AEB236AF78826917F2-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--DF4E696E97FC44AEB236AF78826917F2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--DF4E696E97FC44AEB236AF78826917F2-->  <POSITION><![CDATA[13]]></POSITION>
+<!--DF4E696E97FC44AEB236AF78826917F2-->  <POSITION><![CDATA[12]]></POSITION>
 <!--DF4E696E97FC44AEB236AF78826917F2-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--DF4E696E97FC44AEB236AF78826917F2-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--DF4E696E97FC44AEB236AF78826917F2-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -380345,6 +380457,48 @@
 <!--FA378E83BDF64E50B44290065FA22F54-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--FA378E83BDF64E50B44290065FA22F54--></AD_COLUMN>
 
+<!--FA4D837211D94085B37247595B490179--><AD_COLUMN>
+<!--FA4D837211D94085B37247595B490179-->  <AD_COLUMN_ID><![CDATA[FA4D837211D94085B37247595B490179]]></AD_COLUMN_ID>
+<!--FA4D837211D94085B37247595B490179-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FA4D837211D94085B37247595B490179-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FA4D837211D94085B37247595B490179-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FA4D837211D94085B37247595B490179-->  <NAME><![CDATA[Alternative UOM]]></NAME>
+<!--FA4D837211D94085B37247595B490179-->  <DESCRIPTION><![CDATA[A non monetary unit of measure.]]></DESCRIPTION>
+<!--FA4D837211D94085B37247595B490179-->  <HELP><![CDATA[The Alternative UOM defines a unique non monetary unit of measure]]></HELP>
+<!--FA4D837211D94085B37247595B490179-->  <COLUMNNAME><![CDATA[C_Aum]]></COLUMNNAME>
+<!--FA4D837211D94085B37247595B490179-->  <AD_TABLE_ID><![CDATA[324]]></AD_TABLE_ID>
+<!--FA4D837211D94085B37247595B490179-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
+<!--FA4D837211D94085B37247595B490179-->  <AD_REFERENCE_VALUE_ID><![CDATA[D8CABB4103B14B42BE3064A68C600935]]></AD_REFERENCE_VALUE_ID>
+<!--FA4D837211D94085B37247595B490179-->  <AD_VAL_RULE_ID><![CDATA[D9A3E30D0CCA43F487EC83756C33D435]]></AD_VAL_RULE_ID>
+<!--FA4D837211D94085B37247595B490179-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--FA4D837211D94085B37247595B490179-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--FA4D837211D94085B37247595B490179-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--FA4D837211D94085B37247595B490179-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--FA4D837211D94085B37247595B490179-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--FA4D837211D94085B37247595B490179-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--FA4D837211D94085B37247595B490179-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--FA4D837211D94085B37247595B490179-->  <SEQNO><![CDATA[43]]></SEQNO>
+<!--FA4D837211D94085B37247595B490179-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--FA4D837211D94085B37247595B490179-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--FA4D837211D94085B37247595B490179-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--FA4D837211D94085B37247595B490179-->  <AD_ELEMENT_ID><![CDATA[397A72C953A54C3BA77B8B8F8C11407E]]></AD_ELEMENT_ID>
+<!--FA4D837211D94085B37247595B490179-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--FA4D837211D94085B37247595B490179-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--FA4D837211D94085B37247595B490179-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--FA4D837211D94085B37247595B490179-->  <AD_CALLOUT_ID><![CDATA[1AB9BD3356D643A79C058AA3B4EB175E]]></AD_CALLOUT_ID>
+<!--FA4D837211D94085B37247595B490179-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--FA4D837211D94085B37247595B490179-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FA4D837211D94085B37247595B490179-->  <POSITION><![CDATA[23]]></POSITION>
+<!--FA4D837211D94085B37247595B490179-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--FA4D837211D94085B37247595B490179-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--FA4D837211D94085B37247595B490179-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--FA4D837211D94085B37247595B490179-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--FA4D837211D94085B37247595B490179-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--FA4D837211D94085B37247595B490179-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--FA4D837211D94085B37247595B490179-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--FA4D837211D94085B37247595B490179-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--FA4D837211D94085B37247595B490179--></AD_COLUMN>
+
 <!--FA5FCE09EB7F40999DD0DF1D51AF7DB7--><AD_COLUMN>
 <!--FA5FCE09EB7F40999DD0DF1D51AF7DB7-->  <AD_COLUMN_ID><![CDATA[FA5FCE09EB7F40999DD0DF1D51AF7DB7]]></AD_COLUMN_ID>
 <!--FA5FCE09EB7F40999DD0DF1D51AF7DB7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_ELEMENT.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/sourcedata/AD_ELEMENT.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -23414,6 +23414,18 @@
 <!--4AA4A4BCDB7043B6BB570B3E69DCEE21-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--4AA4A4BCDB7043B6BB570B3E69DCEE21--></AD_ELEMENT>
 
+<!--4AF1DF6775834D8A944890A79CBC3158--><AD_ELEMENT>
+<!--4AF1DF6775834D8A944890A79CBC3158-->  <AD_ELEMENT_ID><![CDATA[4AF1DF6775834D8A944890A79CBC3158]]></AD_ELEMENT_ID>
+<!--4AF1DF6775834D8A944890A79CBC3158-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4AF1DF6775834D8A944890A79CBC3158-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4AF1DF6775834D8A944890A79CBC3158-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4AF1DF6775834D8A944890A79CBC3158-->  <COLUMNNAME><![CDATA[Responseinfo]]></COLUMNNAME>
+<!--4AF1DF6775834D8A944890A79CBC3158-->  <NAME><![CDATA[Response Info]]></NAME>
+<!--4AF1DF6775834D8A944890A79CBC3158-->  <PRINTNAME><![CDATA[Response Info]]></PRINTNAME>
+<!--4AF1DF6775834D8A944890A79CBC3158-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4AF1DF6775834D8A944890A79CBC3158-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--4AF1DF6775834D8A944890A79CBC3158--></AD_ELEMENT>
+
 <!--4AF74F3AEF4B46EA94AAAEA825358D2A--><AD_ELEMENT>
 <!--4AF74F3AEF4B46EA94AAAEA825358D2A-->  <AD_ELEMENT_ID><![CDATA[4AF74F3AEF4B46EA94AAAEA825358D2A]]></AD_ELEMENT_ID>
 <!--4AF74F3AEF4B46EA94AAAEA825358D2A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -27058,7 +27070,7 @@
 <!--7079E2FD4AA8799EE040007F010104AD-->  <NAME><![CDATA[Commercial]]></NAME>
 <!--7079E2FD4AA8799EE040007F010104AD-->  <PRINTNAME><![CDATA[Commercial]]></PRINTNAME>
 <!--7079E2FD4AA8799EE040007F010104AD-->  <DESCRIPTION><![CDATA[Commercial Module]]></DESCRIPTION>
-<!--7079E2FD4AA8799EE040007F010104AD-->  <HELP><![CDATA[Commercial modules are only available to Professional and Basic Edition instances whereas non commercial ones can be downloaded and installed in Community Edition Instances.
+<!--7079E2FD4AA8799EE040007F010104AD-->  <HELP><![CDATA[Commercial modules are only available to Professional and Enterprise Edition instances whereas non commercial ones can be downloaded and installed in Community Edition Instances.
 Commercial modules can have a fee to be payed before they can be installed.]]></HELP>
 <!--7079E2FD4AA8799EE040007F010104AD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7079E2FD4AA8799EE040007F010104AD-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
--- a/model/src-db/database/sourcedata/AD_FIELD.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/sourcedata/AD_FIELD.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -184202,7 +184202,7 @@
 <!--10DF1B99945642B58FB40BD89F0C748F-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--10DF1B99945642B58FB40BD89F0C748F-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--10DF1B99945642B58FB40BD89F0C748F-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
-<!--10DF1B99945642B58FB40BD89F0C748F-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--10DF1B99945642B58FB40BD89F0C748F-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
 <!--10DF1B99945642B58FB40BD89F0C748F-->  <SEQNO><![CDATA[65]]></SEQNO>
 <!--10DF1B99945642B58FB40BD89F0C748F-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--10DF1B99945642B58FB40BD89F0C748F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
@@ -184213,7 +184213,7 @@
 <!--10DF1B99945642B58FB40BD89F0C748F-->  <GRID_SEQNO><![CDATA[65]]></GRID_SEQNO>
 <!--10DF1B99945642B58FB40BD89F0C748F-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--10DF1B99945642B58FB40BD89F0C748F-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--10DF1B99945642B58FB40BD89F0C748F-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--10DF1B99945642B58FB40BD89F0C748F-->  <ISSHOWNINSTATUSBAR><![CDATA[Y]]></ISSHOWNINSTATUSBAR>
 <!--10DF1B99945642B58FB40BD89F0C748F-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--10DF1B99945642B58FB40BD89F0C748F--></AD_FIELD>
 
@@ -198409,6 +198409,36 @@
 <!--317E7BE2AEB1474F9F37D3C115B72EB6-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--317E7BE2AEB1474F9F37D3C115B72EB6--></AD_FIELD>
 
+<!--3181A5FA77E04CDB8CF1019A8B74F559--><AD_FIELD>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <AD_FIELD_ID><![CDATA[3181A5FA77E04CDB8CF1019A8B74F559]]></AD_FIELD_ID>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <NAME><![CDATA[Alternative UOM]]></NAME>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <DESCRIPTION><![CDATA[A non monetary unit of measure.]]></DESCRIPTION>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <HELP><![CDATA[The Alternative UOM defines a unique non monetary unit of measure]]></HELP>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <AD_TAB_ID><![CDATA[260]]></AD_TAB_ID>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <AD_COLUMN_ID><![CDATA[FA4D837211D94085B37247595B490179]]></AD_COLUMN_ID>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <DISPLAYLOGIC><![CDATA[@M_Product_Uom_Id@='']]></DISPLAYLOGIC>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <SEQNO><![CDATA[45]]></SEQNO>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER>
+<!--3181A5FA77E04CDB8CF1019A8B74F559-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--3181A5FA77E04CDB8CF1019A8B74F559--></AD_FIELD>
+
 <!--318588F6E35249488A0470C1905F3E0B--><AD_FIELD>
 <!--318588F6E35249488A0470C1905F3E0B-->  <AD_FIELD_ID><![CDATA[318588F6E35249488A0470C1905F3E0B]]></AD_FIELD_ID>
 <!--318588F6E35249488A0470C1905F3E0B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -199848,6 +199878,35 @@
 <!--348E81878A81453BBD2E73A6D06DB654-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--348E81878A81453BBD2E73A6D06DB654--></AD_FIELD>
 
+<!--3490CF49E1E74844B49698D71944874B--><AD_FIELD>
+<!--3490CF49E1E74844B49698D71944874B-->  <AD_FIELD_ID><![CDATA[3490CF49E1E74844B49698D71944874B]]></AD_FIELD_ID>
+<!--3490CF49E1E74844B49698D71944874B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3490CF49E1E74844B49698D71944874B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3490CF49E1E74844B49698D71944874B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3490CF49E1E74844B49698D71944874B-->  <NAME><![CDATA[Response Info]]></NAME>
+<!--3490CF49E1E74844B49698D71944874B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--3490CF49E1E74844B49698D71944874B-->  <AD_TAB_ID><![CDATA[DA845735FBB34548B04F1908E2089CEC]]></AD_TAB_ID>
+<!--3490CF49E1E74844B49698D71944874B-->  <AD_COLUMN_ID><![CDATA[4C9B2ECB281E4685B0E4D0292F40D79D]]></AD_COLUMN_ID>
+<!--3490CF49E1E74844B49698D71944874B-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--3490CF49E1E74844B49698D71944874B-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--3490CF49E1E74844B49698D71944874B-->  <DISPLAYLENGTH><![CDATA[1000000]]></DISPLAYLENGTH>
+<!--3490CF49E1E74844B49698D71944874B-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--3490CF49E1E74844B49698D71944874B-->  <SEQNO><![CDATA[85]]></SEQNO>
+<!--3490CF49E1E74844B49698D71944874B-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--3490CF49E1E74844B49698D71944874B-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--3490CF49E1E74844B49698D71944874B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3490CF49E1E74844B49698D71944874B-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--3490CF49E1E74844B49698D71944874B-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--3490CF49E1E74844B49698D71944874B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3490CF49E1E74844B49698D71944874B-->  <GRID_SEQNO><![CDATA[78]]></GRID_SEQNO>
+<!--3490CF49E1E74844B49698D71944874B-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--3490CF49E1E74844B49698D71944874B-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--3490CF49E1E74844B49698D71944874B-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--3490CF49E1E74844B49698D71944874B-->  <EM_OBUIAPP_COLSPAN><![CDATA[2]]></EM_OBUIAPP_COLSPAN>
+<!--3490CF49E1E74844B49698D71944874B-->  <EM_OBUIAPP_ROWSPAN><![CDATA[4]]></EM_OBUIAPP_ROWSPAN>
+<!--3490CF49E1E74844B49698D71944874B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--3490CF49E1E74844B49698D71944874B--></AD_FIELD>
+
 <!--349D75F6F62E4743BEC635906B0DEF55--><AD_FIELD>
 <!--349D75F6F62E4743BEC635906B0DEF55-->  <AD_FIELD_ID><![CDATA[349D75F6F62E4743BEC635906B0DEF55]]></AD_FIELD_ID>
 <!--349D75F6F62E4743BEC635906B0DEF55-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -202390,7 +202449,7 @@
 <!--3A94F4D1511B4F6DBC07505B51046BF9-->  <AD_FIELD_ID><![CDATA[3A94F4D1511B4F6DBC07505B51046BF9]]></AD_FIELD_ID>
 <!--3A94F4D1511B4F6DBC07505B51046BF9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--3A94F4D1511B4F6DBC07505B51046BF9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--3A94F4D1511B4F6DBC07505B51046BF9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3A94F4D1511B4F6DBC07505B51046BF9-->  <ISACTIVE><![CDATA[N]]></ISACTIVE>
 <!--3A94F4D1511B4F6DBC07505B51046BF9-->  <NAME><![CDATA[Free for Trial]]></NAME>
 <!--3A94F4D1511B4F6DBC07505B51046BF9-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--3A94F4D1511B4F6DBC07505B51046BF9-->  <AD_TAB_ID><![CDATA[F53E35A11C564F20BE4082A7B8CFF6B7]]></AD_TAB_ID>
@@ -233818,7 +233877,7 @@
 <!--7079E2FD4AA9799EE040007F010104AD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7079E2FD4AA9799EE040007F010104AD-->  <NAME><![CDATA[Commercial]]></NAME>
 <!--7079E2FD4AA9799EE040007F010104AD-->  <DESCRIPTION><![CDATA[Commercial Module]]></DESCRIPTION>
-<!--7079E2FD4AA9799EE040007F010104AD-->  <HELP><![CDATA[Commercial modules are only available to Professional and Basic Edition instances whereas non commercial ones can be downloaded and installed in Community Edition Instances.
+<!--7079E2FD4AA9799EE040007F010104AD-->  <HELP><![CDATA[Commercial modules are only available to Professional and Enterprise Edition instances whereas non commercial ones can be downloaded and installed in Community Edition Instances.
 Commercial modules can have a fee to be payed before they can be installed.]]></HELP>
 <!--7079E2FD4AA9799EE040007F010104AD-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--7079E2FD4AA9799EE040007F010104AD-->  <AD_TAB_ID><![CDATA[F53E35A11C564F20BE4082A7B8CFF6B7]]></AD_TAB_ID>
@@ -253626,7 +253685,7 @@
 <!--8BD10BA993814495E040007F010135AB-->  <AD_FIELD_ID><![CDATA[8BD10BA993814495E040007F010135AB]]></AD_FIELD_ID>
 <!--8BD10BA993814495E040007F010135AB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--8BD10BA993814495E040007F010135AB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8BD10BA993814495E040007F010135AB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8BD10BA993814495E040007F010135AB-->  <ISACTIVE><![CDATA[N]]></ISACTIVE>
 <!--8BD10BA993814495E040007F010135AB-->  <NAME><![CDATA[Tier]]></NAME>
 <!--8BD10BA993814495E040007F010135AB-->  <DESCRIPTION><![CDATA[Tier for commercial modules]]></DESCRIPTION>
 <!--8BD10BA993814495E040007F010135AB-->  <HELP><![CDATA[Commercial modules are defined in different tiers:
@@ -267831,6 +267890,32 @@
 <!--ABE2BD6B9F2B42E5AA58CCD5616230F3-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--ABE2BD6B9F2B42E5AA58CCD5616230F3--></AD_FIELD>
 
+<!--ABE3E4B2254F4A08A110D83FC511A4BB--><AD_FIELD>
+<!--ABE3E4B2254F4A08A110D83FC511A4BB-->  <AD_FIELD_ID><![CDATA[ABE3E4B2254F4A08A110D83FC511A4BB]]></AD_FIELD_ID>
+<!--ABE3E4B2254F4A08A110D83FC511A4BB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ABE3E4B2254F4A08A110D83FC511A4BB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ABE3E4B2254F4A08A110D83FC511A4BB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ABE3E4B2254F4A08A110D83FC511A4BB-->  <NAME><![CDATA[Createdtimestamp]]></NAME>
+<!--ABE3E4B2254F4A08A110D83FC511A4BB-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--ABE3E4B2254F4A08A110D83FC511A4BB-->  <AD_TAB_ID><![CDATA[DA845735FBB34548B04F1908E2089CEC]]></AD_TAB_ID>
+<!--ABE3E4B2254F4A08A110D83FC511A4BB-->  <AD_COLUMN_ID><![CDATA[6399F0E18AA845A3BD26A185AE267D27]]></AD_COLUMN_ID>
+<!--ABE3E4B2254F4A08A110D83FC511A4BB-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--ABE3E4B2254F4A08A110D83FC511A4BB-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--ABE3E4B2254F4A08A110D83FC511A4BB-->  <DISPLAYLENGTH><![CDATA[16]]></DISPLAYLENGTH>
+<!--ABE3E4B2254F4A08A110D83FC511A4BB-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--ABE3E4B2254F4A08A110D83FC511A4BB-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--ABE3E4B2254F4A08A110D83FC511A4BB-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--ABE3E4B2254F4A08A110D83FC511A4BB-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--ABE3E4B2254F4A08A110D83FC511A4BB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--ABE3E4B2254F4A08A110D83FC511A4BB-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--ABE3E4B2254F4A08A110D83FC511A4BB-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--ABE3E4B2254F4A08A110D83FC511A4BB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ABE3E4B2254F4A08A110D83FC511A4BB-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--ABE3E4B2254F4A08A110D83FC511A4BB-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--ABE3E4B2254F4A08A110D83FC511A4BB-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--ABE3E4B2254F4A08A110D83FC511A4BB-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--ABE3E4B2254F4A08A110D83FC511A4BB--></AD_FIELD>
+
 <!--ABED0A65D75A499C9D21BB8E9FE7AEF4--><AD_FIELD>
 <!--ABED0A65D75A499C9D21BB8E9FE7AEF4-->  <AD_FIELD_ID><![CDATA[ABED0A65D75A499C9D21BB8E9FE7AEF4]]></AD_FIELD_ID>
 <!--ABED0A65D75A499C9D21BB8E9FE7AEF4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -303863,6 +303948,36 @@
 <!--E08B7961A1894624A25918204633568E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--E08B7961A1894624A25918204633568E--></AD_FIELD>
 
+<!--E0940FDF8A404210BB13AFFBE0C58645--><AD_FIELD>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <AD_FIELD_ID><![CDATA[E0940FDF8A404210BB13AFFBE0C58645]]></AD_FIELD_ID>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <NAME><![CDATA[Operative Quantity]]></NAME>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <DESCRIPTION><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></DESCRIPTION>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <HELP><![CDATA[The number of a certain item involved in the transaction, according to the defined Operative UOM.]]></HELP>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <AD_TAB_ID><![CDATA[260]]></AD_TAB_ID>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <AD_COLUMN_ID><![CDATA[D0B078B5FC054979A1D62A846D79F7CD]]></AD_COLUMN_ID>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <DISPLAYLOGIC><![CDATA[@M_Product_Uom_Id@='']]></DISPLAYLOGIC>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <SEQNO><![CDATA[43]]></SEQNO>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <DISPLAYLOGIC_SERVER><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC_SERVER>
+<!--E0940FDF8A404210BB13AFFBE0C58645-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--E0940FDF8A404210BB13AFFBE0C58645--></AD_FIELD>
+
 <!--E0B9705EA3F64E78ACBFB1E7284A4BB3--><AD_FIELD>
 <!--E0B9705EA3F64E78ACBFB1E7284A4BB3-->  <AD_FIELD_ID><![CDATA[E0B9705EA3F64E78ACBFB1E7284A4BB3]]></AD_FIELD_ID>
 <!--E0B9705EA3F64E78ACBFB1E7284A4BB3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -308617,6 +308732,35 @@
 <!--EDD7D2727D2E42B99D991F4DBEF7D105-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--EDD7D2727D2E42B99D991F4DBEF7D105--></AD_FIELD>
 
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990--><AD_FIELD>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990-->  <AD_FIELD_ID><![CDATA[EDDBAD6ACD554DD2B1FE8F375D02D990]]></AD_FIELD_ID>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990-->  <NAME><![CDATA[Response Info]]></NAME>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990-->  <AD_TAB_ID><![CDATA[A55C6E2F874F4CD0B7AEDE4362701EA2]]></AD_TAB_ID>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990-->  <AD_COLUMN_ID><![CDATA[D453E5E38589426281AFEE3BCE556F11]]></AD_COLUMN_ID>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990-->  <DISPLAYLENGTH><![CDATA[1000000]]></DISPLAYLENGTH>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990-->  <SEQNO><![CDATA[75]]></SEQNO>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990-->  <GRID_SEQNO><![CDATA[65]]></GRID_SEQNO>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990-->  <EM_OBUIAPP_COLSPAN><![CDATA[2]]></EM_OBUIAPP_COLSPAN>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990-->  <EM_OBUIAPP_ROWSPAN><![CDATA[4]]></EM_OBUIAPP_ROWSPAN>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--EDDBAD6ACD554DD2B1FE8F375D02D990--></AD_FIELD>
+
 <!--EDDF9D5012C54CDABF2A3A9DCF47D90C--><AD_FIELD>
 <!--EDDF9D5012C54CDABF2A3A9DCF47D90C-->  <AD_FIELD_ID><![CDATA[EDDF9D5012C54CDABF2A3A9DCF47D90C]]></AD_FIELD_ID>
 <!--EDDF9D5012C54CDABF2A3A9DCF47D90C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_MESSAGE.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/sourcedata/AD_MESSAGE.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -16336,7 +16336,7 @@
 <!--0FC7B0C6F4FC4F04BEAD06F30E895516-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0FC7B0C6F4FC4F04BEAD06F30E895516-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0FC7B0C6F4FC4F04BEAD06F30E895516-->  <VALUE><![CDATA[OBPSAnyEdition]]></VALUE>
-<!--0FC7B0C6F4FC4F04BEAD06F30E895516-->  <MSGTEXT><![CDATA[Professional or Basic Edition]]></MSGTEXT>
+<!--0FC7B0C6F4FC4F04BEAD06F30E895516-->  <MSGTEXT><![CDATA[Professional or Enterprise Edition]]></MSGTEXT>
 <!--0FC7B0C6F4FC4F04BEAD06F30E895516-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--0FC7B0C6F4FC4F04BEAD06F30E895516-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--0FC7B0C6F4FC4F04BEAD06F30E895516-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
@@ -17324,7 +17324,7 @@
 <!--20008B2C36E44251BB8F715DE450633C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--20008B2C36E44251BB8F715DE450633C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--20008B2C36E44251BB8F715DE450633C-->  <VALUE><![CDATA[IP_CLONED_OPS_MSG]]></VALUE>
-<!--20008B2C36E44251BB8F715DE450633C-->  <MSGTEXT><![CDATA[We have detected that this Openbravo Professional/Basic Edition instance is a clone of
+<!--20008B2C36E44251BB8F715DE450633C-->  <MSGTEXT><![CDATA[We have detected that this Openbravo Professional/Enterprise Edition instance is a clone of
 another one.
 
 You need to go to the Instance Activation window to reactivate the clone. Here you will set
@@ -17362,6 +17362,18 @@
 <!--203AD342E9F9458082388087B6B2B9BC-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--203AD342E9F9458082388087B6B2B9BC--></AD_MESSAGE>
 
+<!--20BB880A0C7D4D158A96EF7C36AE29E2--><AD_MESSAGE>
+<!--20BB880A0C7D4D158A96EF7C36AE29E2-->  <AD_MESSAGE_ID><![CDATA[20BB880A0C7D4D158A96EF7C36AE29E2]]></AD_MESSAGE_ID>
+<!--20BB880A0C7D4D158A96EF7C36AE29E2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--20BB880A0C7D4D158A96EF7C36AE29E2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--20BB880A0C7D4D158A96EF7C36AE29E2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--20BB880A0C7D4D158A96EF7C36AE29E2-->  <VALUE><![CDATA[CR_CouldNotConnect]]></VALUE>
+<!--20BB880A0C7D4D158A96EF7C36AE29E2-->  <MSGTEXT><![CDATA[Could not connect to the Central Repository.]]></MSGTEXT>
+<!--20BB880A0C7D4D158A96EF7C36AE29E2-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--20BB880A0C7D4D158A96EF7C36AE29E2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--20BB880A0C7D4D158A96EF7C36AE29E2-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--20BB880A0C7D4D158A96EF7C36AE29E2--></AD_MESSAGE>
+
 <!--21376B83DE3746328CD8884CD493225C--><AD_MESSAGE>
 <!--21376B83DE3746328CD8884CD493225C-->  <AD_MESSAGE_ID><![CDATA[21376B83DE3746328CD8884CD493225C]]></AD_MESSAGE_ID>
 <!--21376B83DE3746328CD8884CD493225C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -18529,7 +18541,7 @@
 <!--368B60C0A224458D8A388F911BD26785-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--368B60C0A224458D8A388F911BD26785-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--368B60C0A224458D8A388F911BD26785-->  <VALUE><![CDATA[OBPS_EXPIRED_TRIAL]]></VALUE>
-<!--368B60C0A224458D8A388F911BD26785-->  <MSGTEXT><![CDATA[This instance is registered with a Trial license for Evaluation. This license has expired.  Now only System Administrators can login the system to switch to a Basic or Professional subscription or to deactivate the subscription, via the Instance Activation window (administrators only). <a href="http://wiki.openbravo.com/wiki/Instance_Activation" target="_blank">Learn more</a>]]></MSGTEXT>
+<!--368B60C0A224458D8A388F911BD26785-->  <MSGTEXT><![CDATA[This instance is registered with a Trial license for Evaluation. This license has expired.  Now only System Administrators can login the system to switch to a Enterprise or Professional subscription or to deactivate the subscription, via the Instance Activation window (administrators only). <a href="http://wiki.openbravo.com/wiki/Instance_Activation" target="_blank">Learn more</a>]]></MSGTEXT>
 <!--368B60C0A224458D8A388F911BD26785-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--368B60C0A224458D8A388F911BD26785-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--368B60C0A224458D8A388F911BD26785-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
@@ -22955,7 +22967,7 @@
 <!--9124D4EE7DE048D2A19201A1E779B9A7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--9124D4EE7DE048D2A19201A1E779B9A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9124D4EE7DE048D2A19201A1E779B9A7-->  <VALUE><![CDATA[OBPS_TO_EXPIRE_TRIAL]]></VALUE>
-<!--9124D4EE7DE048D2A19201A1E779B9A7-->  <MSGTEXT><![CDATA[This instance is registered with a Trial License for Evaluation. This Trial License will expire in @days@ days, before it expires you should buy a a Basic or Professional Subscription and activate it via the Instance Activation window (administrators only). <a href="http://wiki.openbravo.com/wiki/Instance_Activation" target="_blank">Learn more</a>]]></MSGTEXT>
+<!--9124D4EE7DE048D2A19201A1E779B9A7-->  <MSGTEXT><![CDATA[This instance is registered with a Trial License for Evaluation. This Trial License will expire in @days@ days, before it expires you should buy a Enterprise or Professional Subscription and activate it via the Instance Activation window (administrators only). <a href="http://wiki.openbravo.com/wiki/Instance_Activation" target="_blank">Learn more</a>]]></MSGTEXT>
 <!--9124D4EE7DE048D2A19201A1E779B9A7-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--9124D4EE7DE048D2A19201A1E779B9A7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--9124D4EE7DE048D2A19201A1E779B9A7-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
@@ -23550,6 +23562,18 @@
 <!--9DEDEDDC6E44428A8DC45444FCB9A1DD-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--9DEDEDDC6E44428A8DC45444FCB9A1DD--></AD_MESSAGE>
 
+<!--9DF58DD1831645A7B240DF296302E9CD--><AD_MESSAGE>
+<!--9DF58DD1831645A7B240DF296302E9CD-->  <AD_MESSAGE_ID><![CDATA[9DF58DD1831645A7B240DF296302E9CD]]></AD_MESSAGE_ID>
+<!--9DF58DD1831645A7B240DF296302E9CD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9DF58DD1831645A7B240DF296302E9CD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9DF58DD1831645A7B240DF296302E9CD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9DF58DD1831645A7B240DF296302E9CD-->  <VALUE><![CDATA[ExpirationDateLabel]]></VALUE>
+<!--9DF58DD1831645A7B240DF296302E9CD-->  <MSGTEXT><![CDATA[Expiration Date]]></MSGTEXT>
+<!--9DF58DD1831645A7B240DF296302E9CD-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--9DF58DD1831645A7B240DF296302E9CD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9DF58DD1831645A7B240DF296302E9CD-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--9DF58DD1831645A7B240DF296302E9CD--></AD_MESSAGE>
+
 <!--9E28C2ECFB6F4EBEB05B90F4A71DBBC7--><AD_MESSAGE>
 <!--9E28C2ECFB6F4EBEB05B90F4A71DBBC7-->  <AD_MESSAGE_ID><![CDATA[9E28C2ECFB6F4EBEB05B90F4A71DBBC7]]></AD_MESSAGE_ID>
 <!--9E28C2ECFB6F4EBEB05B90F4A71DBBC7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -23761,7 +23785,7 @@
 <!--A29E0EA08B7B49B6A89722E6DD67A4EE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A29E0EA08B7B49B6A89722E6DD67A4EE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A29E0EA08B7B49B6A89722E6DD67A4EE-->  <VALUE><![CDATA[CannotDeactivateWithCommercialModules]]></VALUE>
-<!--A29E0EA08B7B49B6A89722E6DD67A4EE-->  <MSGTEXT><![CDATA[You cannot deactivate your Professional/Basic Edition because you have active commercial modules installed. Please uninstall or disable all the commercial modules and try again.]]></MSGTEXT>
+<!--A29E0EA08B7B49B6A89722E6DD67A4EE-->  <MSGTEXT><![CDATA[You cannot deactivate your Professional/Enterprise Edition because you have active commercial modules installed. Please uninstall or disable all the commercial modules and try again.]]></MSGTEXT>
 <!--A29E0EA08B7B49B6A89722E6DD67A4EE-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
 <!--A29E0EA08B7B49B6A89722E6DD67A4EE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--A29E0EA08B7B49B6A89722E6DD67A4EE-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
@@ -24381,6 +24405,18 @@
 <!--B029738DD2604EDFA12785CAF3C7DBA0-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--B029738DD2604EDFA12785CAF3C7DBA0--></AD_MESSAGE>
 
+<!--B058F7F31D4B40C3ACC0328D898B1A40--><AD_MESSAGE>
+<!--B058F7F31D4B40C3ACC0328D898B1A40-->  <AD_MESSAGE_ID><![CDATA[B058F7F31D4B40C3ACC0328D898B1A40]]></AD_MESSAGE_ID>
+<!--B058F7F31D4B40C3ACC0328D898B1A40-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B058F7F31D4B40C3ACC0328D898B1A40-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B058F7F31D4B40C3ACC0328D898B1A40-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B058F7F31D4B40C3ACC0328D898B1A40-->  <VALUE><![CDATA[SerialNoLabel]]></VALUE>
+<!--B058F7F31D4B40C3ACC0328D898B1A40-->  <MSGTEXT><![CDATA[Serial No]]></MSGTEXT>
+<!--B058F7F31D4B40C3ACC0328D898B1A40-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--B058F7F31D4B40C3ACC0328D898B1A40-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B058F7F31D4B40C3ACC0328D898B1A40-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--B058F7F31D4B40C3ACC0328D898B1A40--></AD_MESSAGE>
+
 <!--B077B434599241F6B04A8D01E8302C9C--><AD_MESSAGE>
 <!--B077B434599241F6B04A8D01E8302C9C-->  <AD_MESSAGE_ID><![CDATA[B077B434599241F6B04A8D01E8302C9C]]></AD_MESSAGE_ID>
 <!--B077B434599241F6B04A8D01E8302C9C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -25055,6 +25091,18 @@
 <!--BC6E700B0E4745F598FF9A6640F52328-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--BC6E700B0E4745F598FF9A6640F52328--></AD_MESSAGE>
 
+<!--BC85CF19B1354C5992785126D026D303--><AD_MESSAGE>
+<!--BC85CF19B1354C5992785126D026D303-->  <AD_MESSAGE_ID><![CDATA[BC85CF19B1354C5992785126D026D303]]></AD_MESSAGE_ID>
+<!--BC85CF19B1354C5992785126D026D303-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BC85CF19B1354C5992785126D026D303-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BC85CF19B1354C5992785126D026D303-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BC85CF19B1354C5992785126D026D303-->  <VALUE><![CDATA[LotLabel]]></VALUE>
+<!--BC85CF19B1354C5992785126D026D303-->  <MSGTEXT><![CDATA[Lot]]></MSGTEXT>
+<!--BC85CF19B1354C5992785126D026D303-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--BC85CF19B1354C5992785126D026D303-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--BC85CF19B1354C5992785126D026D303-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--BC85CF19B1354C5992785126D026D303--></AD_MESSAGE>
+
 <!--BCAF7F617142477B95BAD71E41291571--><AD_MESSAGE>
 <!--BCAF7F617142477B95BAD71E41291571-->  <AD_MESSAGE_ID><![CDATA[BCAF7F617142477B95BAD71E41291571]]></AD_MESSAGE_ID>
 <!--BCAF7F617142477B95BAD71E41291571-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -25326,7 +25374,7 @@
 <!--C3172067BB244F8693A584A9FAFBEE38-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--C3172067BB244F8693A584A9FAFBEE38-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C3172067BB244F8693A584A9FAFBEE38-->  <VALUE><![CDATA[OPSNotActiveTill]]></VALUE>
-<!--C3172067BB244F8693A584A9FAFBEE38-->  <MSGTEXT><![CDATA[Your Professional/Basic Edition will not be active until ]]></MSGTEXT>
+<!--C3172067BB244F8693A584A9FAFBEE38-->  <MSGTEXT><![CDATA[Your Professional/Enterprise Edition will not be active until ]]></MSGTEXT>
 <!--C3172067BB244F8693A584A9FAFBEE38-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
 <!--C3172067BB244F8693A584A9FAFBEE38-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--C3172067BB244F8693A584A9FAFBEE38-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
@@ -25604,7 +25652,7 @@
 <!--C8433C64354D44C6A76F2A09CAF85907-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--C8433C64354D44C6A76F2A09CAF85907-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C8433C64354D44C6A76F2A09CAF85907-->  <VALUE><![CDATA[OBPSNeededForAudit]]></VALUE>
-<!--C8433C64354D44C6A76F2A09CAF85907-->  <MSGTEXT><![CDATA[Openbravo Professional/Basic Edition is needed in order to be able to keep track of audit.]]></MSGTEXT>
+<!--C8433C64354D44C6A76F2A09CAF85907-->  <MSGTEXT><![CDATA[Openbravo Professional/Enterprise Edition is needed in order to be able to keep track of audit.]]></MSGTEXT>
 <!--C8433C64354D44C6A76F2A09CAF85907-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
 <!--C8433C64354D44C6A76F2A09CAF85907-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--C8433C64354D44C6A76F2A09CAF85907-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
@@ -27013,7 +27061,7 @@
 <!--E3EBB7F6B97348EAA669732392EEF310-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--E3EBB7F6B97348EAA669732392EEF310-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E3EBB7F6B97348EAA669732392EEF310-->  <VALUE><![CDATA[OPSActivationExpired]]></VALUE>
-<!--E3EBB7F6B97348EAA669732392EEF310-->  <MSGTEXT><![CDATA[Your Professional/Basic Edition expired on ]]></MSGTEXT>
+<!--E3EBB7F6B97348EAA669732392EEF310-->  <MSGTEXT><![CDATA[Your Professional/Enterprise Edition expired on ]]></MSGTEXT>
 <!--E3EBB7F6B97348EAA669732392EEF310-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
 <!--E3EBB7F6B97348EAA669732392EEF310-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--E3EBB7F6B97348EAA669732392EEF310-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
@@ -27435,7 +27483,7 @@
 <!--EB6DB180E6444EFB90AE5284E7448BA0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--EB6DB180E6444EFB90AE5284E7448BA0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--EB6DB180E6444EFB90AE5284E7448BA0-->  <VALUE><![CDATA[insuffient_stock]]></VALUE>
-<!--EB6DB180E6444EFB90AE5284E7448BA0-->  <MSGTEXT><![CDATA[Insuffient stock for Product '%1' with%2 UOM '%3' and Storage Bin '%4']]></MSGTEXT>
+<!--EB6DB180E6444EFB90AE5284E7448BA0-->  <MSGTEXT><![CDATA[Insufficient stock for Product '%1' with%2 UOM '%3' and Storage Bin '%4']]></MSGTEXT>
 <!--EB6DB180E6444EFB90AE5284E7448BA0-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--EB6DB180E6444EFB90AE5284E7448BA0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--EB6DB180E6444EFB90AE5284E7448BA0-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
@@ -28106,7 +28154,7 @@
 <!--FBD240BC51C8471F85D65EFB40E079B6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FBD240BC51C8471F85D65EFB40E079B6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FBD240BC51C8471F85D65EFB40E079B6-->  <VALUE><![CDATA[OBPS_SUBSCRIPTION_REQUIRED]]></VALUE>
-<!--FBD240BC51C8471F85D65EFB40E079B6-->  <MSGTEXT><![CDATA[The following module(s) are commercial module(s) that require a subscription to an Openbravo Professional or Basic Edition:&nbsp;<b>@MODULE_LIST@</b>]]></MSGTEXT>
+<!--FBD240BC51C8471F85D65EFB40E079B6-->  <MSGTEXT><![CDATA[The following module(s) are commercial module(s) that require a subscription to an Openbravo Professional or Enterprise Edition:&nbsp;<b>@MODULE_LIST@</b>]]></MSGTEXT>
 <!--FBD240BC51C8471F85D65EFB40E079B6-->  <MSGTIP><![CDATA[@MODULE_LIST@ is a place holder for a list of modules. It must be not changed.]]></MSGTIP>
 <!--FBD240BC51C8471F85D65EFB40E079B6-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--FBD240BC51C8471F85D65EFB40E079B6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
--- a/model/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -1885,6 +1885,18 @@
 <!--801381-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
 <!--801381--></AD_MODEL_OBJECT>
 
+<!--801387--><AD_MODEL_OBJECT>
+<!--801387-->  <AD_MODEL_OBJECT_ID><![CDATA[801387]]></AD_MODEL_OBJECT_ID>
+<!--801387-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--801387-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--801387-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--801387-->  <ACTION><![CDATA[P]]></ACTION>
+<!--801387-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_actionButton.CopyFromPOOrder]]></CLASSNAME>
+<!--801387-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
+<!--801387-->  <AD_PROCESS_ID><![CDATA[800165]]></AD_PROCESS_ID>
+<!--801387-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--801387--></AD_MODEL_OBJECT>
+
 <!--801388--><AD_MODEL_OBJECT>
 <!--801388-->  <AD_MODEL_OBJECT_ID><![CDATA[801388]]></AD_MODEL_OBJECT_ID>
 <!--801388-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -1950,6 +1950,16 @@
 <!--802072-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--802072--></AD_MODEL_OBJECT_MAPPING>
 
+<!--802082--><AD_MODEL_OBJECT_MAPPING>
+<!--802082-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[802082]]></AD_MODEL_OBJECT_MAPPING_ID>
+<!--802082-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--802082-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--802082-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--802082-->  <AD_MODEL_OBJECT_ID><![CDATA[801387]]></AD_MODEL_OBJECT_ID>
+<!--802082-->  <MAPPINGNAME><![CDATA[/ad_actionButton/CopyFromPOOrder.html]]></MAPPINGNAME>
+<!--802082-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
+<!--802082--></AD_MODEL_OBJECT_MAPPING>
+
 <!--802083--><AD_MODEL_OBJECT_MAPPING>
 <!--802083-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[802083]]></AD_MODEL_OBJECT_MAPPING_ID>
 <!--802083-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_MODEL_OBJECT_PARA.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/sourcedata/AD_MODEL_OBJECT_PARA.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -54,6 +54,16 @@
 <!--52DDD9C0FCA04D65BE27B3D80AE7DEBD-->  <VALUE><![CDATA[../../../../../web]]></VALUE>
 <!--52DDD9C0FCA04D65BE27B3D80AE7DEBD--></AD_MODEL_OBJECT_PARA>
 
+<!--634945C93F6F451EAD0C9E9B71B6BD89--><AD_MODEL_OBJECT_PARA>
+<!--634945C93F6F451EAD0C9E9B71B6BD89-->  <AD_MODEL_OBJECT_PARA_ID><![CDATA[634945C93F6F451EAD0C9E9B71B6BD89]]></AD_MODEL_OBJECT_PARA_ID>
+<!--634945C93F6F451EAD0C9E9B71B6BD89-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--634945C93F6F451EAD0C9E9B71B6BD89-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--634945C93F6F451EAD0C9E9B71B6BD89-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--634945C93F6F451EAD0C9E9B71B6BD89-->  <AD_MODEL_OBJECT_ID><![CDATA[F22C501A5088415DBD7D9DC2134D5DA9]]></AD_MODEL_OBJECT_ID>
+<!--634945C93F6F451EAD0C9E9B71B6BD89-->  <LINE><![CDATA[180]]></LINE>
+<!--634945C93F6F451EAD0C9E9B71B6BD89-->  <NAME><![CDATA[ServidorRenderFo]]></NAME>
+<!--634945C93F6F451EAD0C9E9B71B6BD89--></AD_MODEL_OBJECT_PARA>
+
 <!--66854144AE8D4F8A935B7E2C6C3E4DA5--><AD_MODEL_OBJECT_PARA>
 <!--66854144AE8D4F8A935B7E2C6C3E4DA5-->  <AD_MODEL_OBJECT_PARA_ID><![CDATA[66854144AE8D4F8A935B7E2C6C3E4DA5]]></AD_MODEL_OBJECT_PARA_ID>
 <!--66854144AE8D4F8A935B7E2C6C3E4DA5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_MODULE.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/sourcedata/AD_MODULE.xml	Fri Dec 29 11:00:37 2017 +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.32403]]></VERSION>
+<!--0-->  <VERSION><![CDATA[3.0.32857]]></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[PR17Q3]]></VERSION_LABEL>
+<!--0-->  <VERSION_LABEL><![CDATA[PR17Q4]]></VERSION_LABEL>
 <!--0-->  <ISCOMMERCIAL><![CDATA[N]]></ISCOMMERCIAL>
 <!--0-->  <ISTRIALALLOWED><![CDATA[N]]></ISTRIALALLOWED>
 <!--0--></AD_MODULE>
--- a/model/src-db/database/sourcedata/AD_PROCESS.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/sourcedata/AD_PROCESS.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -4770,6 +4770,30 @@
 <!--800164-->  <ISKILLABLE><![CDATA[N]]></ISKILLABLE>
 <!--800164--></AD_PROCESS>
 
+<!--800165--><AD_PROCESS>
+<!--800165-->  <AD_PROCESS_ID><![CDATA[800165]]></AD_PROCESS_ID>
+<!--800165-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--800165-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--800165-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--800165-->  <VALUE><![CDATA[CopyFromPO]]></VALUE>
+<!--800165-->  <NAME><![CDATA[Copy from Order]]></NAME>
+<!--800165-->  <DESCRIPTION><![CDATA[Copy From Order]]></DESCRIPTION>
+<!--800165-->  <HELP><![CDATA[Copies lines from Order]]></HELP>
+<!--800165-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
+<!--800165-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
+<!--800165-->  <ISREPORT><![CDATA[N]]></ISREPORT>
+<!--800165-->  <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
+<!--800165-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_actionButton.CopyFromPOOrder]]></CLASSNAME>
+<!--800165-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
+<!--800165-->  <ISJASPER><![CDATA[N]]></ISJASPER>
+<!--800165-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--800165-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
+<!--800165-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
+<!--800165-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--800165-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
+<!--800165-->  <ISKILLABLE><![CDATA[N]]></ISKILLABLE>
+<!--800165--></AD_PROCESS>
+
 <!--800168--><AD_PROCESS>
 <!--800168-->  <AD_PROCESS_ID><![CDATA[800168]]></AD_PROCESS_ID>
 <!--800168-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_PROCESS_PARA.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/sourcedata/AD_PROCESS_PARA.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -248,8 +248,8 @@
 <!--143-->  <HELP><![CDATA[Unique identifier and a reference to a Sales Order originating from the document sequence defined for this document type.]]></HELP>
 <!--143-->  <AD_PROCESS_ID><![CDATA[119]]></AD_PROCESS_ID>
 <!--143-->  <SEQNO><![CDATA[20]]></SEQNO>
-<!--143-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
-<!--143-->  <AD_VAL_RULE_ID><![CDATA[134]]></AD_VAL_RULE_ID>
+<!--143-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--143-->  <AD_REFERENCE_VALUE_ID><![CDATA[6DA294D48BF14CF691A301ADE4938411]]></AD_REFERENCE_VALUE_ID>
 <!--143-->  <COLUMNNAME><![CDATA[C_Order_ID]]></COLUMNNAME>
 <!--143-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--143-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
--- a/model/src-db/database/sourcedata/AD_REFERENCE.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/sourcedata/AD_REFERENCE.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -4250,6 +4250,18 @@
 <!--0588C365DDAC46079E9D6ABD652CB6E4-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--0588C365DDAC46079E9D6ABD652CB6E4--></AD_REFERENCE>
 
+<!--06AB6C4089ED49C387779E28E0359F8C--><AD_REFERENCE>
+<!--06AB6C4089ED49C387779E28E0359F8C-->  <AD_REFERENCE_ID><![CDATA[06AB6C4089ED49C387779E28E0359F8C]]></AD_REFERENCE_ID>
+<!--06AB6C4089ED49C387779E28E0359F8C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--06AB6C4089ED49C387779E28E0359F8C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--06AB6C4089ED49C387779E28E0359F8C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--06AB6C4089ED49C387779E28E0359F8C-->  <NAME><![CDATA[Context Role Direct Accessible Organizations]]></NAME>
+<!--06AB6C4089ED49C387779E28E0359F8C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--06AB6C4089ED49C387779E28E0359F8C-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--06AB6C4089ED49C387779E28E0359F8C-->  <PARENTREFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></PARENTREFERENCE_ID>
+<!--06AB6C4089ED49C387779E28E0359F8C-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--06AB6C4089ED49C387779E28E0359F8C--></AD_REFERENCE>
+
 <!--085E99751D2045AA9D4FA23F4B765B21--><AD_REFERENCE>
 <!--085E99751D2045AA9D4FA23F4B765B21-->  <AD_REFERENCE_ID><![CDATA[085E99751D2045AA9D4FA23F4B765B21]]></AD_REFERENCE_ID>
 <!--085E99751D2045AA9D4FA23F4B765B21-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -5516,6 +5528,18 @@
 <!--6C11958E975D4DF8A38E7F4A119A3077-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--6C11958E975D4DF8A38E7F4A119A3077--></AD_REFERENCE>
 
+<!--6DA294D48BF14CF691A301ADE4938411--><AD_REFERENCE>
+<!--6DA294D48BF14CF691A301ADE4938411-->  <AD_REFERENCE_ID><![CDATA[6DA294D48BF14CF691A301ADE4938411]]></AD_REFERENCE_ID>
+<!--6DA294D48BF14CF691A301ADE4938411-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6DA294D48BF14CF691A301ADE4938411-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6DA294D48BF14CF691A301ADE4938411-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6DA294D48BF14CF691A301ADE4938411-->  <NAME><![CDATA[Order for invoicing]]></NAME>
+<!--6DA294D48BF14CF691A301ADE4938411-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6DA294D48BF14CF691A301ADE4938411-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--6DA294D48BF14CF691A301ADE4938411-->  <PARENTREFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></PARENTREFERENCE_ID>
+<!--6DA294D48BF14CF691A301ADE4938411-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--6DA294D48BF14CF691A301ADE4938411--></AD_REFERENCE>
+
 <!--7039147A5B49457DA3D13F807EC8E01F--><AD_REFERENCE>
 <!--7039147A5B49457DA3D13F807EC8E01F-->  <AD_REFERENCE_ID><![CDATA[7039147A5B49457DA3D13F807EC8E01F]]></AD_REFERENCE_ID>
 <!--7039147A5B49457DA3D13F807EC8E01F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_TAB.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/sourcedata/AD_TAB.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -882,6 +882,7 @@
 <!--134-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--134-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
 <!--134-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--134-->  <DISPLAYLOGIC><![CDATA[@UomManagement@='Y']]></DISPLAYLOGIC>
 <!--134-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--134-->  <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE>
 <!--134-->  <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS>
--- a/model/src-db/database/sourcedata/AD_TABLE_TREE.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/sourcedata/AD_TABLE_TREE.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -189,7 +189,7 @@
 <!--9D548EFC27864320A3E8E4C62CD6D28D-->  <TREESTRUCTURE><![CDATA[ADTree]]></TREESTRUCTURE>
 <!--9D548EFC27864320A3E8E4C62CD6D28D-->  <ISHANDLENODESMANUALLY><![CDATA[Y]]></ISHANDLENODESMANUALLY>
 <!--9D548EFC27864320A3E8E4C62CD6D28D-->  <ISMAINTREE><![CDATA[Y]]></ISMAINTREE>
-<!--9D548EFC27864320A3E8E4C62CD6D28D-->  <NODEDELETIONPOLICY><![CDATA[RCN]]></NODEDELETIONPOLICY>
+<!--9D548EFC27864320A3E8E4C62CD6D28D-->  <NODEDELETIONPOLICY><![CDATA[DNAIHC]]></NODEDELETIONPOLICY>
 <!--9D548EFC27864320A3E8E4C62CD6D28D--></AD_TABLE_TREE>
 
 <!--9F30DDEA05FC45C9B7CDA2A128ADE374--><AD_TABLE_TREE>
--- a/model/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -285,17 +285,6 @@
 <!--800303-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800303--></AD_TEXTINTERFACES>
 
-<!--800304--><AD_TEXTINTERFACES>
-<!--800304-->  <AD_TEXTINTERFACES_ID><![CDATA[800304]]></AD_TEXTINTERFACES_ID>
-<!--800304-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--800304-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--800304-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--800304-->  <TEXT><![CDATA[Exclude all]]></TEXT>
-<!--800304-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/businessUtility/TabFilter.html]]></FILENAME>
-<!--800304-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--800304-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--800304--></AD_TEXTINTERFACES>
-
 <!--800311--><AD_TEXTINTERFACES>
 <!--800311-->  <AD_TEXTINTERFACES_ID><![CDATA[800311]]></AD_TEXTINTERFACES_ID>
 <!--800311-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -398,39 +387,6 @@
 <!--800390-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800390--></AD_TEXTINTERFACES>
 
-<!--800415--><AD_TEXTINTERFACES>
-<!--800415-->  <AD_TEXTINTERFACES_ID><![CDATA[800415]]></AD_TEXTINTERFACES_ID>
-<!--800415-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--800415-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--800415-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--800415-->  <TEXT><![CDATA[Select field order on the tab]]></TEXT>
-<!--800415-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/businessUtility/TabFilter.html]]></FILENAME>
-<!--800415-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--800415-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--800415--></AD_TEXTINTERFACES>
-
-<!--800416--><AD_TEXTINTERFACES>
-<!--800416-->  <AD_TEXTINTERFACES_ID><![CDATA[800416]]></AD_TEXTINTERFACES_ID>
-<!--800416-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--800416-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--800416-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--800416-->  <TEXT><![CDATA[test]]></TEXT>
-<!--800416-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/businessUtility/TabFilter.html]]></FILENAME>
-<!--800416-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--800416-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--800416--></AD_TEXTINTERFACES>
-
-<!--800417--><AD_TEXTINTERFACES>
-<!--800417-->  <AD_TEXTINTERFACES_ID><![CDATA[800417]]></AD_TEXTINTERFACES_ID>
-<!--800417-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--800417-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--800417-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--800417-->  <TEXT><![CDATA[Include all]]></TEXT>
-<!--800417-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/businessUtility/TabFilter.html]]></FILENAME>
-<!--800417-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--800417-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--800417--></AD_TEXTINTERFACES>
-
 <!--800418--><AD_TEXTINTERFACES>
 <!--800418-->  <AD_TEXTINTERFACES_ID><![CDATA[800418]]></AD_TEXTINTERFACES_ID>
 <!--800418-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3342,17 +3298,6 @@
 <!--805972-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--805972--></AD_TEXTINTERFACES>
 
-<!--805992--><AD_TEXTINTERFACES>
-<!--805992-->  <AD_TEXTINTERFACES_ID><![CDATA[805992]]></AD_TEXTINTERFACES_ID>
-<!--805992-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--805992-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--805992-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--805992-->  <TEXT><![CDATA[Filter window]]></TEXT>
-<!--805992-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/businessUtility/Buscador.html]]></FILENAME>
-<!--805992-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--805992-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--805992--></AD_TEXTINTERFACES>
-
 <!--805993--><AD_TEXTINTERFACES>
 <!--805993-->  <AD_TEXTINTERFACES_ID><![CDATA[805993]]></AD_TEXTINTERFACES_ID>
 <!--805993-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3602,17 +3547,6 @@
 <!--806339-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--806339--></AD_TEXTINTERFACES>
 
-<!--806340--><AD_TEXTINTERFACES>
-<!--806340-->  <AD_TEXTINTERFACES_ID><![CDATA[806340]]></AD_TEXTINTERFACES_ID>
-<!--806340-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--806340-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--806340-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--806340-->  <TEXT><![CDATA[Encrypted Buttons]]></TEXT>
-<!--806340-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_actionButton/EncryptedButtons.html]]></FILENAME>
-<!--806340-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--806340-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--806340--></AD_TEXTINTERFACES>
-
 <!--806342--><AD_TEXTINTERFACES>
 <!--806342-->  <AD_TEXTINTERFACES_ID><![CDATA[806342]]></AD_TEXTINTERFACES_ID>
 <!--806342-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -11514,61 +11448,6 @@
 <!--1005400011-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1005400011--></AD_TEXTINTERFACES>
 
-<!--1005400018--><AD_TEXTINTERFACES>
-<!--1005400018-->  <AD_TEXTINTERFACES_ID><![CDATA[1005400018]]></AD_TEXTINTERFACES_ID>
-<!--1005400018-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--1005400018-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--1005400018-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1005400018-->  <TEXT><![CDATA[Registration Confirmation]]></TEXT>
-<!--1005400018-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/RegistrationConfirm.html]]></FILENAME>
-<!--1005400018-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--1005400018-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1005400018--></AD_TEXTINTERFACES>
-
-<!--1005400019--><AD_TEXTINTERFACES>
-<!--1005400019-->  <AD_TEXTINTERFACES_ID><![CDATA[1005400019]]></AD_TEXTINTERFACES_ID>
-<!--1005400019-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--1005400019-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--1005400019-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1005400019-->  <TEXT><![CDATA[Registration Confirm]]></TEXT>
-<!--1005400019-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/RegistrationConfirm.html]]></FILENAME>
-<!--1005400019-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--1005400019-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1005400019--></AD_TEXTINTERFACES>
-
-<!--1005400022--><AD_TEXTINTERFACES>
-<!--1005400022-->  <AD_TEXTINTERFACES_ID><![CDATA[1005400022]]></AD_TEXTINTERFACES_ID>
-<!--1005400022-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--1005400022-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--1005400022-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1005400022-->  <TEXT><![CDATA[Close]]></TEXT>
-<!--1005400022-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/RegistrationConfirm.html]]></FILENAME>
-<!--1005400022-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--1005400022-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1005400022--></AD_TEXTINTERFACES>
-
-<!--1005400023--><AD_TEXTINTERFACES>
-<!--1005400023-->  <AD_TEXTINTERFACES_ID><![CDATA[1005400023]]></AD_TEXTINTERFACES_ID>
-<!--1005400023-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--1005400023-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--1005400023-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1005400023-->  <TEXT><![CDATA[Heartbeat Confirmation]]></TEXT>
-<!--1005400023-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/HeartbeatConfirm.html]]></FILENAME>
-<!--1005400023-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--1005400023-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1005400023--></AD_TEXTINTERFACES>
-
-<!--1005400024--><AD_TEXTINTERFACES>
-<!--1005400024-->  <AD_TEXTINTERFACES_ID><![CDATA[1005400024]]></AD_TEXTINTERFACES_ID>
-<!--1005400024-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--1005400024-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--1005400024-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1005400024-->  <TEXT><![CDATA[Close]]></TEXT>
-<!--1005400024-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/HeartbeatConfirm.html]]></FILENAME>
-<!--1005400024-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--1005400024-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1005400024--></AD_TEXTINTERFACES>
-
 <!--1005500011--><AD_TEXTINTERFACES>
 <!--1005500011-->  <AD_TEXTINTERFACES_ID><![CDATA[1005500011]]></AD_TEXTINTERFACES_ID>
 <!--1005500011-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -12340,6 +12219,17 @@
 <!--01CB59466E62429AA71D1FF4EE80FE8C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--01CB59466E62429AA71D1FF4EE80FE8C--></AD_TEXTINTERFACES>
 
+<!--023982B9A70C450DA2F5A9C8A8112574--><AD_TEXTINTERFACES>
+<!--023982B9A70C450DA2F5A9C8A8112574-->  <AD_TEXTINTERFACES_ID><![CDATA[023982B9A70C450DA2F5A9C8A8112574]]></AD_TEXTINTERFACES_ID>
+<!--023982B9A70C450DA2F5A9C8A8112574-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--023982B9A70C450DA2F5A9C8A8112574-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--023982B9A70C450DA2F5A9C8A8112574-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--023982B9A70C450DA2F5A9C8A8112574-->  <TEXT><![CDATA[Activate the instance with the Activation File you downloaded and the System Key you received upon purchasing of an Openbravo Professional/Enterprise Edition.]]></TEXT>
+<!--023982B9A70C450DA2F5A9C8A8112574-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateLocal.html]]></FILENAME>
+<!--023982B9A70C450DA2F5A9C8A8112574-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--023982B9A70C450DA2F5A9C8A8112574-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--023982B9A70C450DA2F5A9C8A8112574--></AD_TEXTINTERFACES>
+
 <!--023D343FA6294F3B9B0F8B1CA57712FB--><AD_TEXTINTERFACES>
 <!--023D343FA6294F3B9B0F8B1CA57712FB-->  <AD_TEXTINTERFACES_ID><![CDATA[023D343FA6294F3B9B0F8B1CA57712FB]]></AD_TEXTINTERFACES_ID>
 <!--023D343FA6294F3B9B0F8B1CA57712FB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -13077,6 +12967,17 @@
 <!--1AAE3A265FF94E2094B04B0C9C3F521E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1AAE3A265FF94E2094B04B0C9C3F521E--></AD_TEXTINTERFACES>
 
+<!--1B0061459D234054B9012D342E613EAE--><AD_TEXTINTERFACES>
+<!--1B0061459D234054B9012D342E613EAE-->  <AD_TEXTINTERFACES_ID><![CDATA[1B0061459D234054B9012D342E613EAE]]></AD_TEXTINTERFACES_ID>
+<!--1B0061459D234054B9012D342E613EAE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1B0061459D234054B9012D342E613EAE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1B0061459D234054B9012D342E613EAE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1B0061459D234054B9012D342E613EAE-->  <TEXT><![CDATA[To reactivate an expired Professional or Enterprise Edition, you need to refresh your Activation File.]]></TEXT>
+<!--1B0061459D234054B9012D342E613EAE-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
+<!--1B0061459D234054B9012D342E613EAE-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--1B0061459D234054B9012D342E613EAE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1B0061459D234054B9012D342E613EAE--></AD_TEXTINTERFACES>
+
 <!--1B14E1743A3D46C29DE783279D03259E--><AD_TEXTINTERFACES>
 <!--1B14E1743A3D46C29DE783279D03259E-->  <AD_TEXTINTERFACES_ID><![CDATA[1B14E1743A3D46C29DE783279D03259E]]></AD_TEXTINTERFACES_ID>
 <!--1B14E1743A3D46C29DE783279D03259E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -13879,6 +13780,17 @@
 <!--305C9A63368F4A23824C08B58050006B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--305C9A63368F4A23824C08B58050006B--></AD_TEXTINTERFACES>
 
+<!--30AF72F71DFD42879F6DB5C83C92B80D--><AD_TEXTINTERFACES>
+<!--30AF72F71DFD42879F6DB5C83C92B80D-->  <AD_TEXTINTERFACES_ID><![CDATA[30AF72F71DFD42879F6DB5C83C92B80D]]></AD_TEXTINTERFACES_ID>
+<!--30AF72F71DFD42879F6DB5C83C92B80D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--30AF72F71DFD42879F6DB5C83C92B80D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--30AF72F71DFD42879F6DB5C83C92B80D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--30AF72F71DFD42879F6DB5C83C92B80D-->  <TEXT><![CDATA[You need to renew the system’s Openbravo Professional/Enterprise Edition subscription. Users will not be able to login, until you do so.]]></TEXT>
+<!--30AF72F71DFD42879F6DB5C83C92B80D-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
+<!--30AF72F71DFD42879F6DB5C83C92B80D-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--30AF72F71DFD42879F6DB5C83C92B80D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--30AF72F71DFD42879F6DB5C83C92B80D--></AD_TEXTINTERFACES>
+
 <!--30E7BBBB26E54ABBBA0BFFFF6C3BB4FA--><AD_TEXTINTERFACES>
 <!--30E7BBBB26E54ABBBA0BFFFF6C3BB4FA-->  <AD_TEXTINTERFACES_ID><![CDATA[30E7BBBB26E54ABBBA0BFFFF6C3BB4FA]]></AD_TEXTINTERFACES_ID>
 <!--30E7BBBB26E54ABBBA0BFFFF6C3BB4FA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -14275,6 +14187,17 @@
 <!--3EC2EB86330611DEB65F3B051E6B5876-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--3EC2EB86330611DEB65F3B051E6B5876--></AD_TEXTINTERFACES>
 
+<!--3EF733B542E643C687677EC5718E2994--><AD_TEXTINTERFACES>
+<!--3EF733B542E643C687677EC5718E2994-->  <AD_TEXTINTERFACES_ID><![CDATA[3EF733B542E643C687677EC5718E2994]]></AD_TEXTINTERFACES_ID>
+<!--3EF733B542E643C687677EC5718E2994-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3EF733B542E643C687677EC5718E2994-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3EF733B542E643C687677EC5718E2994-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3EF733B542E643C687677EC5718E2994-->  <TEXT><![CDATA[Learn more about Openbravo Professional/Enterprise Edition subscription options]]></TEXT>
+<!--3EF733B542E643C687677EC5718E2994-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
+<!--3EF733B542E643C687677EC5718E2994-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--3EF733B542E643C687677EC5718E2994-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3EF733B542E643C687677EC5718E2994--></AD_TEXTINTERFACES>
+
 <!--3F1024E0A08D47CDA648DAE42FC3DBE3--><AD_TEXTINTERFACES>
 <!--3F1024E0A08D47CDA648DAE42FC3DBE3-->  <AD_TEXTINTERFACES_ID><![CDATA[3F1024E0A08D47CDA648DAE42FC3DBE3]]></AD_TEXTINTERFACES_ID>
 <!--3F1024E0A08D47CDA648DAE42FC3DBE3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -14319,6 +14242,17 @@
 <!--413F936C37AA4E0D865BD0109ECAE092-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--413F936C37AA4E0D865BD0109ECAE092--></AD_TEXTINTERFACES>
 
+<!--417D3E6C5D974E598485F0F5F321A70E--><AD_TEXTINTERFACES>
+<!--417D3E6C5D974E598485F0F5F321A70E-->  <AD_TEXTINTERFACES_ID><![CDATA[417D3E6C5D974E598485F0F5F321A70E]]></AD_TEXTINTERFACES_ID>
+<!--417D3E6C5D974E598485F0F5F321A70E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--417D3E6C5D974E598485F0F5F321A70E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--417D3E6C5D974E598485F0F5F321A70E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--417D3E6C5D974E598485F0F5F321A70E-->  <TEXT><![CDATA[A System Key is required to activate an Openbravo Professional or Enterprise Edition.]]></TEXT>
+<!--417D3E6C5D974E598485F0F5F321A70E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
+<!--417D3E6C5D974E598485F0F5F321A70E-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--417D3E6C5D974E598485F0F5F321A70E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--417D3E6C5D974E598485F0F5F321A70E--></AD_TEXTINTERFACES>
+
 <!--41A3D8E305BD4FC4A168828382BFA204--><AD_TEXTINTERFACES>
 <!--41A3D8E305BD4FC4A168828382BFA204-->  <AD_TEXTINTERFACES_ID><![CDATA[41A3D8E305BD4FC4A168828382BFA204]]></AD_TEXTINTERFACES_ID>
 <!--41A3D8E305BD4FC4A168828382BFA204-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -14495,6 +14429,17 @@
 <!--4716134EDEBA4F8FA5988CD14FDC00D9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4716134EDEBA4F8FA5988CD14FDC00D9--></AD_TEXTINTERFACES>
 
+<!--4749CEF51E3C433287A3BC85422C5510--><AD_TEXTINTERFACES>
+<!--4749CEF51E3C433287A3BC85422C5510-->  <AD_TEXTINTERFACES_ID><![CDATA[4749CEF51E3C433287A3BC85422C5510]]></AD_TEXTINTERFACES_ID>
+<!--4749CEF51E3C433287A3BC85422C5510-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4749CEF51E3C433287A3BC85422C5510-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4749CEF51E3C433287A3BC85422C5510-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4749CEF51E3C433287A3BC85422C5510-->  <TEXT><![CDATA[Openbravo Professional/Enterprise Edition subscription]]></TEXT>
+<!--4749CEF51E3C433287A3BC85422C5510-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
+<!--4749CEF51E3C433287A3BC85422C5510-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--4749CEF51E3C433287A3BC85422C5510-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4749CEF51E3C433287A3BC85422C5510--></AD_TEXTINTERFACES>
+
 <!--474B23E803BD4CD9B7831135989CEE75--><AD_TEXTINTERFACES>
 <!--474B23E803BD4CD9B7831135989CEE75-->  <AD_TEXTINTERFACES_ID><![CDATA[474B23E803BD4CD9B7831135989CEE75]]></AD_TEXTINTERFACES_ID>
 <!--474B23E803BD4CD9B7831135989CEE75-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -19104,6 +19049,17 @@
 <!--7F43B45FA64349EEB3B4D648D94C4D6D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7F43B45FA64349EEB3B4D648D94C4D6D--></AD_TEXTINTERFACES>
 
+<!--7FA2D56C897148E085888D78854A06C7--><AD_TEXTINTERFACES>
+<!--7FA2D56C897148E085888D78854A06C7-->  <AD_TEXTINTERFACES_ID><![CDATA[7FA2D56C897148E085888D78854A06C7]]></AD_TEXTINTERFACES_ID>
+<!--7FA2D56C897148E085888D78854A06C7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7FA2D56C897148E085888D78854A06C7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7FA2D56C897148E085888D78854A06C7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7FA2D56C897148E085888D78854A06C7-->  <TEXT><![CDATA[TRACE]]></TEXT>
+<!--7FA2D56C897148E085888D78854A06C7-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/utility/SetPriority.html]]></FILENAME>
+<!--7FA2D56C897148E085888D78854A06C7-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--7FA2D56C897148E085888D78854A06C7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7FA2D56C897148E085888D78854A06C7--></AD_TEXTINTERFACES>
+
 <!--7FCB6536AB0640BBBA45E7240C21E4BD--><AD_TEXTINTERFACES>
 <!--7FCB6536AB0640BBBA45E7240C21E4BD-->  <AD_TEXTINTERFACES_ID><![CDATA[7FCB6536AB0640BBBA45E7240C21E4BD]]></AD_TEXTINTERFACES_ID>
 <!--7FCB6536AB0640BBBA45E7240C21E4BD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -20433,17 +20389,6 @@
 <!--92F888AFA3FD4E8DBA0DAA44B6CC6A21-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--92F888AFA3FD4E8DBA0DAA44B6CC6A21--></AD_TEXTINTERFACES>
 
-<!--92F8938BA8B2D098E040007F01002E3E--><AD_TEXTINTERFACES>
-<!--92F8938BA8B2D098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8B2D098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
-<!--92F8938BA8B2D098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--92F8938BA8B2D098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--92F8938BA8B2D098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--92F8938BA8B2D098E040007F01002E3E-->  <TEXT><![CDATA[You need to renew the system’s Openbravo Professional/Basic Edition subscription. Users will not be able to login, until you do so.]]></TEXT>
-<!--92F8938BA8B2D098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
-<!--92F8938BA8B2D098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--92F8938BA8B2D098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--92F8938BA8B2D098E040007F01002E3E--></AD_TEXTINTERFACES>
-
 <!--92F8938BA8B5D098E040007F01002E3E--><AD_TEXTINTERFACES>
 <!--92F8938BA8B5D098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8B5D098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
 <!--92F8938BA8B5D098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -20455,61 +20400,6 @@
 <!--92F8938BA8B5D098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--92F8938BA8B5D098E040007F01002E3E--></AD_TEXTINTERFACES>
 
-<!--92F8938BA8B8D098E040007F01002E3E--><AD_TEXTINTERFACES>
-<!--92F8938BA8B8D098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8B8D098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
-<!--92F8938BA8B8D098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--92F8938BA8B8D098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--92F8938BA8B8D098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--92F8938BA8B8D098E040007F01002E3E-->  <TEXT><![CDATA[If you are looking for a professional supported system, you should upgrade to Openbravo Professional or Basic Edition.]]></TEXT>
-<!--92F8938BA8B8D098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
-<!--92F8938BA8B8D098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--92F8938BA8B8D098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--92F8938BA8B8D098E040007F01002E3E--></AD_TEXTINTERFACES>
-
-<!--92F8938BA8BBD098E040007F01002E3E--><AD_TEXTINTERFACES>
-<!--92F8938BA8BBD098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8BBD098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
-<!--92F8938BA8BBD098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--92F8938BA8BBD098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--92F8938BA8BBD098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--92F8938BA8BBD098E040007F01002E3E-->  <TEXT><![CDATA[Learn more about Openbravo Professional/Basic Edition subscription options]]></TEXT>
-<!--92F8938BA8BBD098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
-<!--92F8938BA8BBD098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--92F8938BA8BBD098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--92F8938BA8BBD098E040007F01002E3E--></AD_TEXTINTERFACES>
-
-<!--92F8938BA8BED098E040007F01002E3E--><AD_TEXTINTERFACES>
-<!--92F8938BA8BED098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8BED098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
-<!--92F8938BA8BED098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--92F8938BA8BED098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--92F8938BA8BED098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--92F8938BA8BED098E040007F01002E3E-->  <TEXT><![CDATA[A System Key is required to activate an Openbravo Professional or Basic Edition.]]></TEXT>
-<!--92F8938BA8BED098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
-<!--92F8938BA8BED098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--92F8938BA8BED098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--92F8938BA8BED098E040007F01002E3E--></AD_TEXTINTERFACES>
-
-<!--92F8938BA8C1D098E040007F01002E3E--><AD_TEXTINTERFACES>
-<!--92F8938BA8C1D098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8C1D098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
-<!--92F8938BA8C1D098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--92F8938BA8C1D098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--92F8938BA8C1D098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--92F8938BA8C1D098E040007F01002E3E-->  <TEXT><![CDATA[To reactivate an expired Professional or Basic Edition, you need to refresh your Activation File.]]></TEXT>
-<!--92F8938BA8C1D098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
-<!--92F8938BA8C1D098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--92F8938BA8C1D098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--92F8938BA8C1D098E040007F01002E3E--></AD_TEXTINTERFACES>
-
-<!--92F8938BA8C4D098E040007F01002E3E--><AD_TEXTINTERFACES>
-<!--92F8938BA8C4D098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8C4D098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
-<!--92F8938BA8C4D098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--92F8938BA8C4D098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--92F8938BA8C4D098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--92F8938BA8C4D098E040007F01002E3E-->  <TEXT><![CDATA[You may revert back to the Community Edition from your Professional/Basic Edition by pressing the Deactivate button.]]></TEXT>
-<!--92F8938BA8C4D098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
-<!--92F8938BA8C4D098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--92F8938BA8C4D098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--92F8938BA8C4D098E040007F01002E3E--></AD_TEXTINTERFACES>
-
 <!--92F8938BA8C7D098E040007F01002E3E--><AD_TEXTINTERFACES>
 <!--92F8938BA8C7D098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8C7D098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
 <!--92F8938BA8C7D098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -20521,116 +20411,6 @@
 <!--92F8938BA8C7D098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--92F8938BA8C7D098E040007F01002E3E--></AD_TEXTINTERFACES>
 
-<!--92F8938BA8CAD098E040007F01002E3E--><AD_TEXTINTERFACES>
-<!--92F8938BA8CAD098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8CAD098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
-<!--92F8938BA8CAD098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--92F8938BA8CAD098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--92F8938BA8CAD098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--92F8938BA8CAD098E040007F01002E3E-->  <TEXT><![CDATA[Your system will remain a Professional/Basic Edition and you will continue to be able to use your currently installed commercial modules but you will no longer able to install new commercial modules or update existing ones.]]></TEXT>
-<!--92F8938BA8CAD098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
-<!--92F8938BA8CAD098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--92F8938BA8CAD098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--92F8938BA8CAD098E040007F01002E3E--></AD_TEXTINTERFACES>
-
-<!--92F8938BA8D0D098E040007F01002E3E--><AD_TEXTINTERFACES>
-<!--92F8938BA8D0D098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8D0D098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
-<!--92F8938BA8D0D098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--92F8938BA8D0D098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--92F8938BA8D0D098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--92F8938BA8D0D098E040007F01002E3E-->  <TEXT><![CDATA[This action will cancel your Professional/Basic Edition. Your system will remain a Professional/Basic Edition and you will continue to be able to use your currently installed commercial modules but you will no longer able to install new commercial modules or update existing ones. Do you want to continue?]]></TEXT>
-<!--92F8938BA8D0D098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagementDeactivate.html]]></FILENAME>
-<!--92F8938BA8D0D098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--92F8938BA8D0D098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--92F8938BA8D0D098E040007F01002E3E--></AD_TEXTINTERFACES>
-
-<!--92F8938BA8D3D098E040007F01002E3E--><AD_TEXTINTERFACES>
-<!--92F8938BA8D3D098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8D3D098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
-<!--92F8938BA8D3D098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--92F8938BA8D3D098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--92F8938BA8D3D098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--92F8938BA8D3D098E040007F01002E3E-->  <TEXT><![CDATA[Activate the instance with the Activation File you downloaded and the System Key you received upon purchasing of an Openbravo Professional/Basic Edition.]]></TEXT>
-<!--92F8938BA8D3D098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateLocal.html]]></FILENAME>
-<!--92F8938BA8D3D098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--92F8938BA8D3D098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--92F8938BA8D3D098E040007F01002E3E--></AD_TEXTINTERFACES>
-
-<!--92F8938BA8D6D098E040007F01002E3E--><AD_TEXTINTERFACES>
-<!--92F8938BA8D6D098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8D6D098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
-<!--92F8938BA8D6D098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--92F8938BA8D6D098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--92F8938BA8D6D098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--92F8938BA8D6D098E040007F01002E3E-->  <TEXT><![CDATA[Activate the instance online with the System Key you received upon purchasing of an Openbravo Professional/Basic Edition.]]></TEXT>
-<!--92F8938BA8D6D098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateOnline.html]]></FILENAME>
-<!--92F8938BA8D6D098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--92F8938BA8D6D098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--92F8938BA8D6D098E040007F01002E3E--></AD_TEXTINTERFACES>
-
-<!--92F8938BA8D9D098E040007F01002E3E--><AD_TEXTINTERFACES>
-<!--92F8938BA8D9D098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8D9D098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
-<!--92F8938BA8D9D098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--92F8938BA8D9D098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--92F8938BA8D9D098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--92F8938BA8D9D098E040007F01002E3E-->  <TEXT><![CDATA[Automated click-thru update to this Core version is only available to Professional and Basic Edition subscribers.]]></TEXT>
-<!--92F8938BA8D9D098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html]]></FILENAME>
-<!--92F8938BA8D9D098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--92F8938BA8D9D098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--92F8938BA8D9D098E040007F01002E3E--></AD_TEXTINTERFACES>
-
-<!--92F8938BA8DCD098E040007F01002E3E--><AD_TEXTINTERFACES>
-<!--92F8938BA8DCD098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8DCD098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
-<!--92F8938BA8DCD098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--92F8938BA8DCD098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--92F8938BA8DCD098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--92F8938BA8DCD098E040007F01002E3E-->  <TEXT><![CDATA[You canceled your Professional/Basic Edition subscription and you are no longer entitled to update or install commercial modules. You cannot update or install the following module(s) which are released under a commercial license: ]]></TEXT>
-<!--92F8938BA8DCD098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html]]></FILENAME>
-<!--92F8938BA8DCD098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--92F8938BA8DCD098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--92F8938BA8DCD098E040007F01002E3E--></AD_TEXTINTERFACES>
-
-<!--92F8938BA8DFD098E040007F01002E3E--><AD_TEXTINTERFACES>
-<!--92F8938BA8DFD098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8DFD098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
-<!--92F8938BA8DFD098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--92F8938BA8DFD098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--92F8938BA8DFD098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--92F8938BA8DFD098E040007F01002E3E-->  <TEXT><![CDATA[Subscribe to Basic Edition]]></TEXT>
-<!--92F8938BA8DFD098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html]]></FILENAME>
-<!--92F8938BA8DFD098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--92F8938BA8DFD098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--92F8938BA8DFD098E040007F01002E3E--></AD_TEXTINTERFACES>
-
-<!--92F8938BA8E2D098E040007F01002E3E--><AD_TEXTINTERFACES>
-<!--92F8938BA8E2D098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8E2D098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
-<!--92F8938BA8E2D098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--92F8938BA8E2D098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--92F8938BA8E2D098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--92F8938BA8E2D098E040007F01002E3E-->  <TEXT><![CDATA[Subscribe to Professional Edition]]></TEXT>
-<!--92F8938BA8E2D098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html]]></FILENAME>
-<!--92F8938BA8E2D098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--92F8938BA8E2D098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--92F8938BA8E2D098E040007F01002E3E--></AD_TEXTINTERFACES>
-
-<!--92F8938BA8E5D098E040007F01002E3E--><AD_TEXTINTERFACES>
-<!--92F8938BA8E5D098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8E5D098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
-<!--92F8938BA8E5D098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--92F8938BA8E5D098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--92F8938BA8E5D098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--92F8938BA8E5D098E040007F01002E3E-->  <TEXT><![CDATA[Upgrade your Basic Edition subscription to Professional Edition]]></TEXT>
-<!--92F8938BA8E5D098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html]]></FILENAME>
-<!--92F8938BA8E5D098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--92F8938BA8E5D098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--92F8938BA8E5D098E040007F01002E3E--></AD_TEXTINTERFACES>
-
-<!--9335551AAB095FBAE040007F01000454--><AD_TEXTINTERFACES>
-<!--9335551AAB095FBAE040007F01000454-->  <AD_TEXTINTERFACES_ID><![CDATA[9335551AAB095FBAE040007F01000454]]></AD_TEXTINTERFACES_ID>
-<!--9335551AAB095FBAE040007F01000454-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--9335551AAB095FBAE040007F01000454-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--9335551AAB095FBAE040007F01000454-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--9335551AAB095FBAE040007F01000454-->  <TEXT><![CDATA[Openbravo Professional/Basic Edition subscription]]></TEXT>
-<!--9335551AAB095FBAE040007F01000454-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
-<!--9335551AAB095FBAE040007F01000454-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--9335551AAB095FBAE040007F01000454-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--9335551AAB095FBAE040007F01000454--></AD_TEXTINTERFACES>
-
 <!--9335C6A4F2B811DD9667001D09C4A2FE--><AD_TEXTINTERFACES>
 <!--9335C6A4F2B811DD9667001D09C4A2FE-->  <AD_TEXTINTERFACES_ID><![CDATA[9335C6A4F2B811DD9667001D09C4A2FE]]></AD_TEXTINTERFACES_ID>
 <!--9335C6A4F2B811DD9667001D09C4A2FE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21412,6 +21192,17 @@
 <!--A4337C45676B419EA61DCB7E88582CF0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--A4337C45676B419EA61DCB7E88582CF0--></AD_TEXTINTERFACES>
 
+<!--A46FC80291104CA58E0A4B8E7296157F--><AD_TEXTINTERFACES>
+<!--A46FC80291104CA58E0A4B8E7296157F-->  <AD_TEXTINTERFACES_ID><![CDATA[A46FC80291104CA58E0A4B8E7296157F]]></AD_TEXTINTERFACES_ID>
+<!--A46FC80291104CA58E0A4B8E7296157F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A46FC80291104CA58E0A4B8E7296157F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A46FC80291104CA58E0A4B8E7296157F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A46FC80291104CA58E0A4B8E7296157F-->  <TEXT><![CDATA[You canceled your Professional/Enterprise Edition subscription and you are no longer entitled to update or install commercial modules. You cannot update or install the following module(s) which are released under a commercial license: ]]></TEXT>
+<!--A46FC80291104CA58E0A4B8E7296157F-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html]]></FILENAME>
+<!--A46FC80291104CA58E0A4B8E7296157F-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--A46FC80291104CA58E0A4B8E7296157F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A46FC80291104CA58E0A4B8E7296157F--></AD_TEXTINTERFACES>
+
 <!--A4EDB3AA68A14937994C020502FAC8D1--><AD_TEXTINTERFACES>
 <!--A4EDB3AA68A14937994C020502FAC8D1-->  <AD_TEXTINTERFACES_ID><![CDATA[A4EDB3AA68A14937994C020502FAC8D1]]></AD_TEXTINTERFACES_ID>
 <!--A4EDB3AA68A14937994C020502FAC8D1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -22303,6 +22094,17 @@
 <!--B6F66C3B1C9F41DE94E147398E243482-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--B6F66C3B1C9F41DE94E147398E243482--></AD_TEXTINTERFACES>
 
+<!--B8D5D70B71564E1AA0B1B7584FA7C7B5--><AD_TEXTINTERFACES>
+<!--B8D5D70B71564E1AA0B1B7584FA7C7B5-->  <AD_TEXTINTERFACES_ID><![CDATA[B8D5D70B71564E1AA0B1B7584FA7C7B5]]></AD_TEXTINTERFACES_ID>
+<!--B8D5D70B71564E1AA0B1B7584FA7C7B5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B8D5D70B71564E1AA0B1B7584FA7C7B5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B8D5D70B71564E1AA0B1B7584FA7C7B5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B8D5D70B71564E1AA0B1B7584FA7C7B5-->  <TEXT><![CDATA[This action will cancel your Professional/Enterprise Edition. Your system will remain a Professional/Enterprise Edition and you will continue to be able to use your currently installed commercial modules but you will no longer able to install new commercial modules or update existing ones. Do you want to continue?]]></TEXT>
+<!--B8D5D70B71564E1AA0B1B7584FA7C7B5-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagementDeactivate.html]]></FILENAME>
+<!--B8D5D70B71564E1AA0B1B7584FA7C7B5-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--B8D5D70B71564E1AA0B1B7584FA7C7B5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B8D5D70B71564E1AA0B1B7584FA7C7B5--></AD_TEXTINTERFACES>
+
 <!--B905A1506E6E4851B193DEE8AE56F05B--><AD_TEXTINTERFACES>
 <!--B905A1506E6E4851B193DEE8AE56F05B-->  <AD_TEXTINTERFACES_ID><![CDATA[B905A1506E6E4851B193DEE8AE56F05B]]></AD_TEXTINTERFACES_ID>
 <!--B905A1506E6E4851B193DEE8AE56F05B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -22501,6 +22303,17 @@
 <!--C4EAA8E79A3A49F4B350620E29F30B12-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--C4EAA8E79A3A49F4B350620E29F30B12--></AD_TEXTINTERFACES>
 
+<!--C5FF04FA6D624D4995E7F622C0853F6D--><AD_TEXTINTERFACES>
+<!--C5FF04FA6D624D4995E7F622C0853F6D-->  <AD_TEXTINTERFACES_ID><![CDATA[C5FF04FA6D624D4995E7F622C0853F6D]]></AD_TEXTINTERFACES_ID>
+<!--C5FF04FA6D624D4995E7F622C0853F6D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C5FF04FA6D624D4995E7F622C0853F6D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C5FF04FA6D624D4995E7F622C0853F6D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C5FF04FA6D624D4995E7F622C0853F6D-->  <TEXT><![CDATA[Activate the instance online with the System Key you received upon purchasing of an Openbravo Professional/Enterprise Edition.]]></TEXT>
+<!--C5FF04FA6D624D4995E7F622C0853F6D-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateOnline.html]]></FILENAME>
+<!--C5FF04FA6D624D4995E7F622C0853F6D-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--C5FF04FA6D624D4995E7F622C0853F6D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C5FF04FA6D624D4995E7F622C0853F6D--></AD_TEXTINTERFACES>
+
 <!--C62BE991FD2C4427841F8EC7FD2D1FCE--><AD_TEXTINTERFACES>
 <!--C62BE991FD2C4427841F8EC7FD2D1FCE-->  <AD_TEXTINTERFACES_ID><![CDATA[C62BE991FD2C4427841F8EC7FD2D1FCE]]></AD_TEXTINTERFACES_ID>
 <!--C62BE991FD2C4427841F8EC7FD2D1FCE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -23029,6 +22842,17 @@
 <!--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>
+<!--D7433B706C6C4AFCA46E9EB1C61EAE07-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D7433B706C6C4AFCA46E9EB1C61EAE07-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D7433B706C6C4AFCA46E9EB1C61EAE07-->  <TEXT><![CDATA[Subscribe to Professional or Enterprise Edition]]></TEXT>
+<!--D7433B706C6C4AFCA46E9EB1C61EAE07-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html]]></FILENAME>
+<!--D7433B706C6C4AFCA46E9EB1C61EAE07-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--D7433B706C6C4AFCA46E9EB1C61EAE07-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D7433B706C6C4AFCA46E9EB1C61EAE07--></AD_TEXTINTERFACES>
+
 <!--D8B7530A1C114CC2B500FDCE13A0E748--><AD_TEXTINTERFACES>
 <!--D8B7530A1C114CC2B500FDCE13A0E748-->  <AD_TEXTINTERFACES_ID><![CDATA[D8B7530A1C114CC2B500FDCE13A0E748]]></AD_TEXTINTERFACES_ID>
 <!--D8B7530A1C114CC2B500FDCE13A0E748-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -23194,6 +23018,17 @@
 <!--DD1B34000B204BE183BB5DA8794166F7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--DD1B34000B204BE183BB5DA8794166F7--></AD_TEXTINTERFACES>
 
+<!--DD6BA8A99AF943CA947D8BC868DA9E81--><AD_TEXTINTERFACES>
+<!--DD6BA8A99AF943CA947D8BC868DA9E81-->  <AD_TEXTINTERFACES_ID><![CDATA[DD6BA8A99AF943CA947D8BC868DA9E81]]></AD_TEXTINTERFACES_ID>
+<!--DD6BA8A99AF943CA947D8BC868DA9E81-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DD6BA8A99AF943CA947D8BC868DA9E81-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DD6BA8A99AF943CA947D8BC868DA9E81-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DD6BA8A99AF943CA947D8BC868DA9E81-->  <TEXT><![CDATA[Your system will remain a Professional/Enterprise Edition and you will continue to be able to use your currently installed commercial modules but you will no longer able to install new commercial modules or update existing ones.]]></TEXT>
+<!--DD6BA8A99AF943CA947D8BC868DA9E81-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
+<!--DD6BA8A99AF943CA947D8BC868DA9E81-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--DD6BA8A99AF943CA947D8BC868DA9E81-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--DD6BA8A99AF943CA947D8BC868DA9E81--></AD_TEXTINTERFACES>
+
 <!--DDB68A140DF74CDDBB98D9735AAAB8BE--><AD_TEXTINTERFACES>
 <!--DDB68A140DF74CDDBB98D9735AAAB8BE-->  <AD_TEXTINTERFACES_ID><![CDATA[DDB68A140DF74CDDBB98D9735AAAB8BE]]></AD_TEXTINTERFACES_ID>
 <!--DDB68A140DF74CDDBB98D9735AAAB8BE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -23601,6 +23436,17 @@
 <!--E6894EE1CD7D4E58B3B2AD4A25B6ED2C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--E6894EE1CD7D4E58B3B2AD4A25B6ED2C--></AD_TEXTINTERFACES>
 
+<!--E6C8DC7F02104501B7F2B279EE8490CF--><AD_TEXTINTERFACES>
+<!--E6C8DC7F02104501B7F2B279EE8490CF-->  <AD_TEXTINTERFACES_ID><![CDATA[E6C8DC7F02104501B7F2B279EE8490CF]]></AD_TEXTINTERFACES_ID>
+<!--E6C8DC7F02104501B7F2B279EE8490CF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E6C8DC7F02104501B7F2B279EE8490CF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E6C8DC7F02104501B7F2B279EE8490CF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E6C8DC7F02104501B7F2B279EE8490CF-->  <TEXT><![CDATA[You may revert back to the Community Edition from your Professional/Enterprise Edition by pressing the Deactivate button.]]></TEXT>
+<!--E6C8DC7F02104501B7F2B279EE8490CF-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
+<!--E6C8DC7F02104501B7F2B279EE8490CF-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--E6C8DC7F02104501B7F2B279EE8490CF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E6C8DC7F02104501B7F2B279EE8490CF--></AD_TEXTINTERFACES>
+
 <!--E70338ADB72644CD95043855EE34329F--><AD_TEXTINTERFACES>
 <!--E70338ADB72644CD95043855EE34329F-->  <AD_TEXTINTERFACES_ID><![CDATA[E70338ADB72644CD95043855EE34329F]]></AD_TEXTINTERFACES_ID>
 <!--E70338ADB72644CD95043855EE34329F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -23799,6 +23645,17 @@
 <!--F1545D2619E44D6FB6B04985E5C6B049-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--F1545D2619E44D6FB6B04985E5C6B049--></AD_TEXTINTERFACES>
 
+<!--F159367C38B947F793B6C177BF8BEF3B--><AD_TEXTINTERFACES>
+<!--F159367C38B947F793B6C177BF8BEF3B-->  <AD_TEXTINTERFACES_ID><![CDATA[F159367C38B947F793B6C177BF8BEF3B]]></AD_TEXTINTERFACES_ID>
+<!--F159367C38B947F793B6C177BF8BEF3B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F159367C38B947F793B6C177BF8BEF3B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F159367C38B947F793B6C177BF8BEF3B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F159367C38B947F793B6C177BF8BEF3B-->  <TEXT><![CDATA[If you are looking for a professional supported system, you should upgrade to Openbravo Professional or Enterprise Edition.]]></TEXT>
+<!--F159367C38B947F793B6C177BF8BEF3B-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
+<!--F159367C38B947F793B6C177BF8BEF3B-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--F159367C38B947F793B6C177BF8BEF3B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F159367C38B947F793B6C177BF8BEF3B--></AD_TEXTINTERFACES>
+
 <!--F1FC00724373419B9687F4A13D2FE84F--><AD_TEXTINTERFACES>
 <!--F1FC00724373419B9687F4A13D2FE84F-->  <AD_TEXTINTERFACES_ID><![CDATA[F1FC00724373419B9687F4A13D2FE84F]]></AD_TEXTINTERFACES_ID>
 <!--F1FC00724373419B9687F4A13D2FE84F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -23931,6 +23788,17 @@
 <!--F5AD6EECB9894B6F8A06545BAAC74668-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--F5AD6EECB9894B6F8A06545BAAC74668--></AD_TEXTINTERFACES>
 
+<!--F5D27B7BA99F494AAFF06371E248C8FA--><AD_TEXTINTERFACES>
+<!--F5D27B7BA99F494AAFF06371E248C8FA-->  <AD_TEXTINTERFACES_ID><![CDATA[F5D27B7BA99F494AAFF06371E248C8FA]]></AD_TEXTINTERFACES_ID>
+<!--F5D27B7BA99F494AAFF06371E248C8FA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F5D27B7BA99F494AAFF06371E248C8FA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F5D27B7BA99F494AAFF06371E248C8FA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F5D27B7BA99F494AAFF06371E248C8FA-->  <TEXT><![CDATA[Automated click-thru update to this Core version is only available to Professional and Enterprise Edition subscribers.]]></TEXT>
+<!--F5D27B7BA99F494AAFF06371E248C8FA-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html]]></FILENAME>
+<!--F5D27B7BA99F494AAFF06371E248C8FA-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--F5D27B7BA99F494AAFF06371E248C8FA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F5D27B7BA99F494AAFF06371E248C8FA--></AD_TEXTINTERFACES>
+
 <!--F5EAFA2F130549CDBAEE22407DFD97ED--><AD_TEXTINTERFACES>
 <!--F5EAFA2F130549CDBAEE22407DFD97ED-->  <AD_TEXTINTERFACES_ID><![CDATA[F5EAFA2F130549CDBAEE22407DFD97ED]]></AD_TEXTINTERFACES_ID>
 <!--F5EAFA2F130549CDBAEE22407DFD97ED-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -24481,4 +24349,15 @@
 <!--FFF934E27245103EE040007F01010265-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--FFF934E27245103EE040007F01010265--></AD_TEXTINTERFACES>
 
+<!--FFFF66106A554591A23AABC6A28CE52D--><AD_TEXTINTERFACES>
+<!--FFFF66106A554591A23AABC6A28CE52D-->  <AD_TEXTINTERFACES_ID><![CDATA[FFFF66106A554591A23AABC6A28CE52D]]></AD_TEXTINTERFACES_ID>
+<!--FFFF66106A554591A23AABC6A28CE52D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FFFF66106A554591A23AABC6A28CE52D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FFFF66106A554591A23AABC6A28CE52D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FFFF66106A554591A23AABC6A28CE52D-->  <TEXT><![CDATA[Upgrade your Basic Edition subscription to Professional or Enterprise Edition]]></TEXT>
+<!--FFFF66106A554591A23AABC6A28CE52D-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html]]></FILENAME>
+<!--FFFF66106A554591A23AABC6A28CE52D-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--FFFF66106A554591A23AABC6A28CE52D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FFFF66106A554591A23AABC6A28CE52D--></AD_TEXTINTERFACES>
+
 </data>
--- a/model/src-db/database/sourcedata/AD_VAL_RULE.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/sourcedata/AD_VAL_RULE.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -2320,6 +2320,17 @@
 <!--D9463AFD77E44F619D396C19BF9E6A15-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--D9463AFD77E44F619D396C19BF9E6A15--></AD_VAL_RULE>
 
+<!--D9A3E30D0CCA43F487EC83756C33D435--><AD_VAL_RULE>
+<!--D9A3E30D0CCA43F487EC83756C33D435-->  <AD_VAL_RULE_ID><![CDATA[D9A3E30D0CCA43F487EC83756C33D435]]></AD_VAL_RULE_ID>
+<!--D9A3E30D0CCA43F487EC83756C33D435-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D9A3E30D0CCA43F487EC83756C33D435-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D9A3E30D0CCA43F487EC83756C33D435-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D9A3E30D0CCA43F487EC83756C33D435-->  <NAME><![CDATA[Available UOM's for Product for Logistics flow]]></NAME>
+<!--D9A3E30D0CCA43F487EC83756C33D435-->  <TYPE><![CDATA[S]]></TYPE>
+<!--D9A3E30D0CCA43F487EC83756C33D435-->  <CODE><![CDATA[(exists(select 1 from m_product p where p.m_product_id = @M_Product_ID@ and p.c_uom_id = td0.c_uom_id) or exists(select 1 from m_product_aum a where a.m_product_id = @M_Product_ID@ and a.logistics <> 'NA' and a.c_uom_id = td0.c_uom_id))  ]]></CODE>
+<!--D9A3E30D0CCA43F487EC83756C33D435-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D9A3E30D0CCA43F487EC83756C33D435--></AD_VAL_RULE>
+
 <!--DB85A30739C3487988921CE3FFFD3BAD--><AD_VAL_RULE>
 <!--DB85A30739C3487988921CE3FFFD3BAD-->  <AD_VAL_RULE_ID><![CDATA[DB85A30739C3487988921CE3FFFD3BAD]]></AD_VAL_RULE_ID>
 <!--DB85A30739C3487988921CE3FFFD3BAD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/M_INVENTORYSTATUS.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/sourcedata/M_INVENTORYSTATUS.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -55,7 +55,7 @@
 <!--3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3-->  <NAME><![CDATA[Transit]]></NAME>
-<!--3-->  <AVAILABLE><![CDATA[N]]></AVAILABLE>
+<!--3-->  <AVAILABLE><![CDATA[Y]]></AVAILABLE>
 <!--3-->  <NETTABLE><![CDATA[Y]]></NETTABLE>
 <!--3-->  <OVERISSUE><![CDATA[N]]></OVERISSUE>
 <!--3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
--- a/model/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -287,7 +287,7 @@
 <!--2675B41A099A45D5BAF62634634881EC-->  <HELP><![CDATA[A Business Partner is anyone with whom you transact.  This can include a customer, vendor, employee or any combination of these.]]></HELP>
 <!--2675B41A099A45D5BAF62634634881EC-->  <SEQNO><![CDATA[20]]></SEQNO>
 <!--2675B41A099A45D5BAF62634634881EC-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
-<!--2675B41A099A45D5BAF62634634881EC-->  <AD_REFERENCE_VALUE_ID><![CDATA[56DEFF37A33F46D1AC918C97C4447EAF]]></AD_REFERENCE_VALUE_ID>
+<!--2675B41A099A45D5BAF62634634881EC-->  <AD_REFERENCE_VALUE_ID><![CDATA[25400A74C902418B815D70EFDCD29153]]></AD_REFERENCE_VALUE_ID>
 <!--2675B41A099A45D5BAF62634634881EC-->  <COLUMNNAME><![CDATA[C_BPartner_ID]]></COLUMNNAME>
 <!--2675B41A099A45D5BAF62634634881EC-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--2675B41A099A45D5BAF62634634881EC-->  <FIELDLENGTH><![CDATA[40]]></FIELDLENGTH>
@@ -517,7 +517,7 @@
 <!--3DBAFE673E004477AD1426381A44134A-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
 <!--3DBAFE673E004477AD1426381A44134A-->  <SEQNO><![CDATA[10]]></SEQNO>
 <!--3DBAFE673E004477AD1426381A44134A-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
-<!--3DBAFE673E004477AD1426381A44134A-->  <AD_REFERENCE_VALUE_ID><![CDATA[100A788331734AE8BCC87BA0AC9E3406]]></AD_REFERENCE_VALUE_ID>
+<!--3DBAFE673E004477AD1426381A44134A-->  <AD_REFERENCE_VALUE_ID><![CDATA[06AB6C4089ED49C387779E28E0359F8C]]></AD_REFERENCE_VALUE_ID>
 <!--3DBAFE673E004477AD1426381A44134A-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
 <!--3DBAFE673E004477AD1426381A44134A-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--3DBAFE673E004477AD1426381A44134A-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
--- a/model/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -450,7 +450,7 @@
 <!--7DC2C8DC186B4C1DB18E147911950861-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--7DC2C8DC186B4C1DB18E147911950861-->  <ISMULTIRECORD><![CDATA[N]]></ISMULTIRECORD>
 <!--7DC2C8DC186B4C1DB18E147911950861-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
-<!--7DC2C8DC186B4C1DB18E147911950861-->  <ISGRIDLEGACY><![CDATA[Y]]></ISGRIDLEGACY>
+<!--7DC2C8DC186B4C1DB18E147911950861-->  <ISGRIDLEGACY><![CDATA[N]]></ISGRIDLEGACY>
 <!--7DC2C8DC186B4C1DB18E147911950861-->  <ISCANADDRECORDSTOSELECTOR><![CDATA[N]]></ISCANADDRECORDSTOSELECTOR>
 <!--7DC2C8DC186B4C1DB18E147911950861--></OBUIAPP_PROCESS>
 
@@ -562,7 +562,7 @@
 <!--A832A5DA28FB4BB391BDE883E928DFC5-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--A832A5DA28FB4BB391BDE883E928DFC5-->  <ISMULTIRECORD><![CDATA[Y]]></ISMULTIRECORD>
 <!--A832A5DA28FB4BB391BDE883E928DFC5-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
-<!--A832A5DA28FB4BB391BDE883E928DFC5-->  <ISGRIDLEGACY><![CDATA[Y]]></ISGRIDLEGACY>
+<!--A832A5DA28FB4BB391BDE883E928DFC5-->  <ISGRIDLEGACY><![CDATA[N]]></ISGRIDLEGACY>
 <!--A832A5DA28FB4BB391BDE883E928DFC5-->  <ISCANADDRECORDSTOSELECTOR><![CDATA[N]]></ISCANADDRECORDSTOSELECTOR>
 <!--A832A5DA28FB4BB391BDE883E928DFC5--></OBUIAPP_PROCESS>
 
--- a/model/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -525,6 +525,22 @@
 <!--784A05D3FE67483A85C8CB77AAEC5910-->  <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
 <!--784A05D3FE67483A85C8CB77AAEC5910--></OBUISEL_SELECTOR>
 
+<!--7875FD8CEC604CB3AF3ABDF9D9024CA3--><OBUISEL_SELECTOR>
+<!--7875FD8CEC604CB3AF3ABDF9D9024CA3-->  <OBUISEL_SELECTOR_ID><![CDATA[7875FD8CEC604CB3AF3ABDF9D9024CA3]]></OBUISEL_SELECTOR_ID>
+<!--7875FD8CEC604CB3AF3ABDF9D9024CA3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7875FD8CEC604CB3AF3ABDF9D9024CA3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7875FD8CEC604CB3AF3ABDF9D9024CA3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7875FD8CEC604CB3AF3ABDF9D9024CA3-->  <NAME><![CDATA[Order for invoicing]]></NAME>
+<!--7875FD8CEC604CB3AF3ABDF9D9024CA3-->  <AD_REFERENCE_ID><![CDATA[6DA294D48BF14CF691A301ADE4938411]]></AD_REFERENCE_ID>
+<!--7875FD8CEC604CB3AF3ABDF9D9024CA3-->  <AD_TABLE_ID><![CDATA[259]]></AD_TABLE_ID>
+<!--7875FD8CEC604CB3AF3ABDF9D9024CA3-->  <WHERECLAUSE><![CDATA[e.salesTransaction = true and e.documentStatus NOT IN ('DR','IP') AND ((e.invoiceTerms = 'O' AND NOT EXISTS (select 1 from OrderLine where salesOrder.id = e.id and orderedQuantity <> deliveredQuantity) AND EXISTS (select 1 from OrderLine where salesOrder.id = e.id and orderedQuantity <> invoicedQuantity)) OR (e.invoiceTerms = 'D' AND EXISTS (select 1 from OrderLine where salesOrder.id = e.id and orderedQuantity <> invoicedQuantity and invoicedQuantity <> deliveredQuantity)) OR (e.invoiceTerms = 'I' AND EXISTS (select 1 from OrderLine where salesOrder.id = e.id and orderedQuantity <> invoicedQuantity)))]]></WHERECLAUSE>
+<!--7875FD8CEC604CB3AF3ABDF9D9024CA3-->  <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
+<!--7875FD8CEC604CB3AF3ABDF9D9024CA3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7875FD8CEC604CB3AF3ABDF9D9024CA3-->  <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE>
+<!--7875FD8CEC604CB3AF3ABDF9D9024CA3-->  <POPUPTEXTMATCHSTYLE><![CDATA[startsWith]]></POPUPTEXTMATCHSTYLE>
+<!--7875FD8CEC604CB3AF3ABDF9D9024CA3-->  <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
+<!--7875FD8CEC604CB3AF3ABDF9D9024CA3--></OBUISEL_SELECTOR>
+
 <!--7B07F521E4804C89B7956E584989CC16--><OBUISEL_SELECTOR>
 <!--7B07F521E4804C89B7956E584989CC16-->  <OBUISEL_SELECTOR_ID><![CDATA[7B07F521E4804C89B7956E584989CC16]]></OBUISEL_SELECTOR_ID>
 <!--7B07F521E4804C89B7956E584989CC16-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1064,6 +1080,22 @@
 <!--E65052A724B3451CA643A0CC355CEA40-->  <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
 <!--E65052A724B3451CA643A0CC355CEA40--></OBUISEL_SELECTOR>
 
+<!--E80D7648BF3848BD9DD23B31287CC59B--><OBUISEL_SELECTOR>
+<!--E80D7648BF3848BD9DD23B31287CC59B-->  <OBUISEL_SELECTOR_ID><![CDATA[E80D7648BF3848BD9DD23B31287CC59B]]></OBUISEL_SELECTOR_ID>
+<!--E80D7648BF3848BD9DD23B31287CC59B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E80D7648BF3848BD9DD23B31287CC59B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E80D7648BF3848BD9DD23B31287CC59B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E80D7648BF3848BD9DD23B31287CC59B-->  <NAME><![CDATA[Context Role Direct Accessible Organizations]]></NAME>
+<!--E80D7648BF3848BD9DD23B31287CC59B-->  <AD_REFERENCE_ID><![CDATA[06AB6C4089ED49C387779E28E0359F8C]]></AD_REFERENCE_ID>
+<!--E80D7648BF3848BD9DD23B31287CC59B-->  <AD_TABLE_ID><![CDATA[155]]></AD_TABLE_ID>
+<!--E80D7648BF3848BD9DD23B31287CC59B-->  <FILTER_EXPRESSION><![CDATA[OB.getFilterExpression("org.openbravo.erpCommon.info.ContextRoleDirectAccessibleOrganizations")]]></FILTER_EXPRESSION>
+<!--E80D7648BF3848BD9DD23B31287CC59B-->  <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
+<!--E80D7648BF3848BD9DD23B31287CC59B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E80D7648BF3848BD9DD23B31287CC59B-->  <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE>
+<!--E80D7648BF3848BD9DD23B31287CC59B-->  <POPUPTEXTMATCHSTYLE><![CDATA[startsWith]]></POPUPTEXTMATCHSTYLE>
+<!--E80D7648BF3848BD9DD23B31287CC59B-->  <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
+<!--E80D7648BF3848BD9DD23B31287CC59B--></OBUISEL_SELECTOR>
+
 <!--E8F1B0721E104D07AAC532290C951C37--><OBUISEL_SELECTOR>
 <!--E8F1B0721E104D07AAC532290C951C37-->  <OBUISEL_SELECTOR_ID><![CDATA[E8F1B0721E104D07AAC532290C951C37]]></OBUISEL_SELECTOR_ID>
 <!--E8F1B0721E104D07AAC532290C951C37-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1230,7 +1262,7 @@
 <!--F3CDEE79343F4746A2FEE8C60EBEC0BF-->  <NAME><![CDATA[Receipts]]></NAME>
 <!--F3CDEE79343F4746A2FEE8C60EBEC0BF-->  <AD_REFERENCE_ID><![CDATA[E68CCF4495A34ED7902293A930386B93]]></AD_REFERENCE_ID>
 <!--F3CDEE79343F4746A2FEE8C60EBEC0BF-->  <AD_TABLE_ID><![CDATA[319]]></AD_TABLE_ID>
-<!--F3CDEE79343F4746A2FEE8C60EBEC0BF-->  <WHERECLAUSE><![CDATA[e.salesTransaction = false and e.documentStatus = 'CO' and exists (select 1 from MaterialMgmtShipmentInOutLine m where m.shipmentReceipt.id=e.id and m.movementQuantity >= 0) and exists (select 1 from MaterialMgmtMaterialTransaction t, CostingRule r where t.goodsShipmentLine.shipmentReceipt.id=e.id and r.validated = 'Y' and ad_org_isinnaturaltree(r.organization.id, t.organization.id, t.client.id) = 'Y' and r.endingDate is null and (r.startingDate is null or r.startingDate <= t.transactionProcessDate)) ]]></WHERECLAUSE>
+<!--F3CDEE79343F4746A2FEE8C60EBEC0BF-->  <WHERECLAUSE><![CDATA[e.salesTransaction = false and e.documentStatus = 'CO' and exists (select 1 from MaterialMgmtMaterialTransaction t join t.goodsShipmentLine iol where iol.shipmentReceipt.id = e.id and iol.movementQuantity >= 0 and exists (select 1 from CostingRule r where r.validated = 'Y' and ad_org_isinnaturaltree(r.organization.id, t.organization.id, t.client.id) = 'Y' and r.endingDate is null and (r.startingDate is null or r.startingDate <= t.transactionProcessDate)))]]></WHERECLAUSE>
 <!--F3CDEE79343F4746A2FEE8C60EBEC0BF-->  <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
 <!--F3CDEE79343F4746A2FEE8C60EBEC0BF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F3CDEE79343F4746A2FEE8C60EBEC0BF-->  <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE>
--- a/model/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Mon Dec 04 10:20:24 2017 +0100
+++ b/model/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Fri Dec 29 11:00:37 2017 +0000
@@ -1600,6 +1600,30 @@
 <!--54541B92159547FF9C306D4273B881E7-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--54541B92159547FF9C306D4273B881E7--></OBUISEL_SELECTOR_FIELD>
 
+<!--55115D1C6D0848CABAB22DCB01926D2F--><OBUISEL_SELECTOR_FIELD>
+<!--55115D1C6D0848CABAB22DCB01926D2F-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[55115D1C6D0848CABAB22DCB01926D2F]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--55115D1C6D0848CABAB22DCB01926D2F-->  <OBUISEL_SELECTOR_ID><![CDATA[DD09F01271C948EBA7A134A15E1DAAD6]]></OBUISEL_SELECTOR_ID>
+<!--55115D1C6D0848CABAB22DCB01926D2F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--55115D1C6D0848CABAB22DCB01926D2F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--55115D1C6D0848CABAB22DCB01926D2F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--55115D1C6D0848CABAB22DCB01926D2F-->  <AD_COLUMN_ID><![CDATA[2901]]></AD_COLUMN_ID>
+<!--55115D1C6D0848CABAB22DCB01926D2F-->  <NAME><![CDATA[Search Key]]></NAME>
+<!--55115D1C6D0848CABAB22DCB01926D2F-->  <DESCRIPTION><![CDATA[A fast method for finding a particular record.]]></DESCRIPTION>
+<!--55115D1C6D0848CABAB22DCB01926D2F-->  <HELP><![CDATA[A search key allows for a fast method of finding a particular record. If you leave the search key empty, the system automatically creates a numeric number originating from a document sequence defined in the  "Document Sequence" window. The sequence naming convention follows a rule "DocumentNo_TableName", where TableName is the actual name of the database table (e.g. C_Order).
+
+Usually, company's internal identifiers for various records (products, customers, etc) are stored here.]]></HELP>
+<!--55115D1C6D0848CABAB22DCB01926D2F-->  <PROPERTY><![CDATA[searchKey]]></PROPERTY>
+<!--55115D1C6D0848CABAB22DCB01926D2F-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--55115D1C6D0848CABAB22DCB01926D2F-->  <SORT><![CDATA[Y]]></SORT>
+<!--55115D1C6D0848CABAB22DCB01926D2F-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--55115D1C6D0848CABAB22DCB01926D2F-->  <SEARCHINSUGGESTIONBOX><![CDATA[Y]]></SEARCHINSUGGESTIONBOX>
+<!--55115D1C6D0848CABAB22DCB01926D2F-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--55115D1C6D0848CABAB22DCB01926D2F-->  <SORTNO><![CDATA[2]]></SORTNO>
+<!--55115D1C6D0848CABAB22DCB01926D2F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--55115D1C6D0848CABAB22DCB01926D2F-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--55115D1C6D0848CABAB22DCB01926D2F-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--55115D1C6D0848CABAB22DCB01926D2F--></OBUISEL_SELECTOR_FIELD>
+
 <!--55239E9BE9584D69A35D609143DEB47D--><OBUISEL_SELECTOR_FIELD>
 <!--55239E9BE9584D69A35D609143DEB47D-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[55239E9BE9584D69A35D609143DEB47D]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--55239E9BE9584D69A35D609143DEB47D-->  <OBUISEL_SELECTOR_ID><![CDATA[B9E2C11BDA924BF8ADF019BA15A11153]]></OBUISEL_SELECTOR_ID>
@@ -1792,6 +1816,28 @@
 <!--61468BCC79F14B0289A046060D119EC2-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--61468BCC79F14B0289A046060D119EC2--></OBUISEL_SELECTOR_FIELD>
 
+<!--61492056486D44F6B64A122CD166B735--><OBUISEL_SELECTOR_FIELD>
+<!--61492056486D44F6B64A122CD166B735-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[61492056486D44F6B64A122CD166B735]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--61492056486D44F6B64A122CD166B735-->  <OBUISEL_SELECTOR_ID><![CDATA[26FA611719154B5E808140E04BD58AB0]]></OBUISEL_SELECTOR_ID>
+<!--61492056486D44F6B64A122CD166B735-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--61492056486D44F6B64A122CD166B735-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--61492056486D44F6B64A122CD166B735-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--61492056486D44F6B64A122CD166B735-->  <AD_COLUMN_ID><![CDATA[2902]]></AD_COLUMN_ID>
+<!--61492056486D44F6B64A122CD166B735-->  <NAME><![CDATA[Commercial Name]]></NAME>
+<!--61492056486D44F6B64A122CD166B735-->  <DESCRIPTION><![CDATA[Commercial Name of the Business Partner]]></DESCRIPTION>
+<!--61492056486D44F6B64A122CD166B735-->  <HELP><![CDATA[Commercial Name of the Business Partner]]></HELP>
+<!--61492056486D44F6B64A122CD166B735-->  <PROPERTY><![CDATA[name]]></PROPERTY>
+<!--61492056486D44F6B64A122CD166B735-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--61492056486D44F6B64A122CD166B735-->  <SORT><![CDATA[Y]]></SORT>
+<!--61492056486D44F6B64A122CD166B735-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--61492056486D44F6B64A122CD166B735-->  <SEARCHINSUGGESTIONBOX><![CDATA[Y]]></SEARCHINSUGGESTIONBOX>
+<!--61492056486D44F6B64A122CD166B735-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--61492056486D44F6B64A122CD166B735-->  <SORTNO><![CDATA[1]]></SORTNO>
+<!--61492056486D44F6B64A122CD166B735-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--61492056486D44F6B64A122CD166B735-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--61492056486D44F6B64A122CD166B735-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--61492056486D44F6B64A122CD166B735--></OBUISEL_SELECTOR_FIELD>
+
 <!--6232D2B8EECC499EB2CFB853A184F3AB--><OBUISEL_SELECTOR_FIELD>
 <!--6232D2B8EECC499EB2CFB853A184F3AB-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[6232D2B8EECC499EB2CFB853A184F3AB]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--6232D2B8EECC499EB2CFB853A184F3AB-->  <OBUISEL_SELECTOR_ID><![CDATA[159A0EA5DE8844E9B0E7198E5525C854]]></OBUISEL_SELECTOR_ID>
@@ -2256,6 +2302,28 @@
 <!--7167B12683FD4B8C99FA777C92A39BC5-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--7167B12683FD4B8C99FA777C92A39BC5--></OBUISEL_SELECTOR_FIELD>
 
+<!--73505EC201C24951960E23E964E7DF5D--><OBUISEL_SELECTOR_FIELD>
+<!--73505EC201C24951960E23E964E7DF5D-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[73505EC201C24951960E23E964E7DF5D]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--73505EC201C24951960E23E964E7DF5D-->  <OBUISEL_SELECTOR_ID><![CDATA[26FA611719154B5E808140E04BD58AB0]]></OBUISEL_SELECTOR_ID>
+<!--73505EC201C24951960E23E964E7DF5D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--73505EC201C24951960E23E964E7DF5D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--73505EC201C24951960E23E964E7DF5D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--73505EC201C24951960E23E964E7DF5D-->  <AD_COLUMN_ID><![CDATA[4940]]></AD_COLUMN_ID>
+<!--73505EC201C24951960E23E964E7DF5D-->  <NAME><![CDATA[Business Partner Category]]></NAME>
+<!--73505EC201C24951960E23E964E7DF5D-->  <DESCRIPTION><![CDATA[A classification of business partners based on defined similarities.]]></DESCRIPTION>
+<!--73505EC201C24951960E23E964E7DF5D-->  <HELP><![CDATA[A way of grouping business partners together for classification and reporting purposes. Provides a method of defining certain defaults to be used when opening new business partners.]]></HELP>
+<!--73505EC201C24951960E23E964E7DF5D-->  <PROPERTY><![CDATA[businessPartnerCategory.name]]></PROPERTY>
+<!--73505EC201C24951960E23E964E7DF5D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--73505EC201C24951960E23E964E7DF5D-->  <SORT><![CDATA[Y]]></SORT>
+<!--73505EC201C24951960E23E964E7DF5D-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--73505EC201C24951960E23E964E7DF5D-->  <SEARCHINSUGGESTIONBOX><![CDATA[Y]]></SEARCHINSUGGESTIONBOX>
+<!--73505EC201C24951960E23E964E7DF5D-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--73505EC201C24951960E23E964E7DF5D-->  <SORTNO><![CDATA[3]]></SORTNO>
+<!--73505EC201C24951960E23E964E7DF5D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--73505EC201C24951960E23E964E7DF5D-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--73505EC201C24951960E23E964E7DF5D-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--73505EC201C24951960E23E964E7DF5D--></OBUISEL_SELECTOR_FIELD>
+
 <!--7408792B65234E049547D6C78BB074A4--><OBUISEL_SELECTOR_FIELD>
 <!--7408792B65234E049547D6C78BB074A4-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[7408792B65234E049547D6C78BB074A4]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--7408792B65234E049547D6C78BB074A4-->  <OBUISEL_SELECTOR_ID><![CDATA[5E026139F74D4FD5AC4FA23189A03C92]]></OBUISEL_SELECTOR_ID>
@@ -2278,6 +2346,28 @@
 <!--7408792B65234E049547D6C78BB074A4-->  <SHOWINPICKLIST><![CDATA[Y]]></SHOWINPICKLIST>
 <!--7408792B65234E049547D6C78BB074A4--></OBUISEL_SELECTOR_FIELD>
 
+<!--74A9A9D8D6464C7DB5A5AD5A80450697--><OBUISEL_SELECTOR_FIELD>
+<!--74A9A9D8D6464C7DB5A5AD5A80450697-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[74A9A9D8D6464C7DB5A5AD5A80450697]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--74A9A9D8D6464C7DB5A5AD5A80450697-->  <OBUISEL_SELECTOR_ID><![CDATA[06A43991412642449E511F495C408EC8]]></OBUISEL_SELECTOR_ID>
+<!--74A9A9D8D6464C7DB5A5AD5A80450697-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--74A9A9D8D6464C7DB5A5AD5A80450697-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--74A9A9D8D6464C7DB5A5AD5A80450697-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--74A9A9D8D6464C7DB5A5AD5A80450697-->  <AD_COLUMN_ID><![CDATA[800170]]></AD_COLUMN_ID>
+<!--74A9A9D8D6464C7DB5A5AD5A80450697-->  <NAME><![CDATA[First Name]]></NAME>
+<!--74A9A9D8D6464C7DB5A5AD5A80450697-->  <DESCRIPTION><![CDATA[Name of the contact]]></DESCRIPTION>
+<!--74A9A9D8D6464C7DB5A5AD5A80450697-->  <HELP><![CDATA[First Name of the contact]]></HELP>
+<!--74A9A9D8D6464C7DB5A5AD5A80450697-->  <PROPERTY><![CDATA[firstName]]></PROPERTY>
+<!--74A9A9D8D6464C7DB5A5AD5A80450697-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--74A9A9D8D6464C7DB5A5AD5A80450697-->  <SORT><![CDATA[Y]]></SORT>
+<!--74A9A9D8D6464C7DB5A5AD5A80450697-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--74A9A9D8D6464C7DB5A5AD5A80450697-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--74A9A9D8D6464C7DB5A5AD5A80450697-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--74A9A9D8D6464C7DB5A5AD5A80450697-->  <SORTNO><![CDATA[20]]></SORTNO>
+<!--74A9A9D8D6464C7DB5A5AD5A80450697-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--74A9A9D8D6464C7DB5A5AD5A80450697-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--74A9A9D8D6464C7DB5A5AD5A80450697-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--74A9A9D8D6464C7DB5A5AD5A80450697--></OBUISEL_SELECTOR_FIELD>
+
 <!--76225C69A4F24D84BCD98E177D16B99F--><OBUISEL_SELECTOR_FIELD>
 <!--76225C69A4F24D84BCD98E177D16B99F-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[76225C69A4F24D84BCD98E177D16B99F]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--76225C69A4F24D84BCD98E177D16B99F-->  <OBUISEL_SELECTOR_ID><![CDATA[1F9CEAB7298046CF8156462ED33006D5]]></OBUISEL_SELECTOR_ID>
@@ -3213,6 +3303,28 @@
 <!--A29D60CD276243789FCACA4D044318FE-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--A29D60CD276243789FCACA4D044318FE--></OBUISEL_SELECTOR_FIELD>
 
+<!--A42569D7B66A42BD8D89640542E587BD--><OBUISEL_SELECTOR_FIELD>
+<!--A42569D7B66A42BD8D89640542E587BD-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[A42569D7B66A42BD8D89640542E587BD]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--A42569D7B66A42BD8D89640542E587BD-->  <OBUISEL_SELECTOR_ID><![CDATA[06A43991412642449E511F495C408EC8]]></OBUISEL_SELECTOR_ID>
+<!--A42569D7B66A42BD8D89640542E587BD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A42569D7B66A42BD8D89640542E587BD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A42569D7B66A42BD8D89640542E587BD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A42569D7B66A42BD8D89640542E587BD-->  <AD_COLUMN_ID><![CDATA[801059]]></AD_COLUMN_ID>
+<!--A42569D7B66A42BD8D89640542E587BD-->  <NAME><![CDATA[Username]]></NAME>
+<!--A42569D7B66A42BD8D89640542E587BD-->  <DESCRIPTION><![CDATA[User Name]]></DESCRIPTION>
+<!--A42569D7B66A42BD8D89640542E587BD-->  <HELP><![CDATA[Name that identifies the user in the System]]></HELP>
+<!--A42569D7B66A42BD8D89640542E587BD-->  <PROPERTY><![CDATA[username]]></PROPERTY>
+<!--A42569D7B66A42BD8D89640542E587BD-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--A42569D7B66A42BD8D89640542E587BD-->  <SORT><![CDATA[Y]]></SORT>
+<!--A42569D7B66A42BD8D89640542E587BD-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--A42569D7B66A42BD8D89640542E587BD-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--A42569D7B66A42BD8D89640542E587BD-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--A42569D7B66A42BD8D89640542E587BD-->  <SORTNO><![CDATA[10]]></SORTNO>
+<!--A42569D7B66A42BD8D89640542E587BD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A42569D7B66A42BD8D89640542E587BD-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--A42569D7B66A42BD8D89640542E587BD-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--A42569D7B66A42BD8D89640542E587BD--></OBUISEL_SELECTOR_FIELD>
+
 <!--A70124FC61904F7BAD6F8BDF436931B4--><OBUISEL_SELECTOR_FIELD>
 <!--A70124FC61904F7BAD6F8BDF436931B4-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[A70124FC61904F7BAD6F8BDF436931B4]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--A70124FC61904F7BAD6F8BDF436931B4-->  <OBUISEL_SELECTOR_ID><![CDATA[F132874BE0954A9B8C1301BE20704730]]></OBUISEL_SELECTOR_ID>
@@ -3451,6 +3563,30 @@
 <!--B28A7C25C0834B9798EE00D5A4C845F3-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--B28A7C25C0834B9798EE00D5A4C845F3--></OBUISEL_SELECTOR_FIELD>
 
+<!--B4059CC0CC2847DA9B9F60513919B1DF--><OBUISEL_SELECTOR_FIELD>
+<!--B4059CC0CC2847DA9B9F60513919B1DF-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[B4059CC0CC2847DA9B9F60513919B1DF]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--B4059CC0CC2847DA9B9F60513919B1DF-->  <OBUISEL_SELECTOR_ID><![CDATA[26FA611719154B5E808140E04BD58AB0]]></OBUISEL_SELECTOR_ID>
+<!--B4059CC0CC2847DA9B9F60513919B1DF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B4059CC0CC2847DA9B9F60513919B1DF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B4059CC0CC2847DA9B9F60513919B1DF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B4059CC0CC2847DA9B9F60513919B1DF-->  <AD_COLUMN_ID><![CDATA[2901]]></AD_COLUMN_ID>
+<!--B4059CC0CC2847DA9B9F60513919B1DF-->  <NAME><![CDATA[Search Key]]></NAME>
+<!--B4059CC0CC2847DA9B9F60513919B1DF-->  <DESCRIPTION><![CDATA[A fast method for finding a particular record.]]></DESCRIPTION>
+<!--B4059CC0CC2847DA9B9F60513919B1DF-->  <HELP><![CDATA[A search key allows for a fast method of finding a particular record. If you leave the search key empty, the system automatically creates a numeric number originating from a document sequence defined in the  "Document Sequence" window. The sequence naming convention follows a rule "DocumentNo_TableName", where TableName is the actual name of the database table (e.g. C_Order).
+
+Usually, company's internal identifiers for various records (products, customers, etc) are stored here.]]></HELP>
+<!--B4059CC0CC2847DA9B9F60513919B1DF-->  <PROPERTY><![CDATA[searchKey]]></PROPERTY>
+<!--B4059CC0CC2847DA9B9F60513919B1DF-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--B4059CC0CC2847DA9B9F60513919B1DF-->  <SORT><![CDATA[Y]]></SORT>
+<!--B4059CC0CC2847DA9B9F60513919B1DF-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--B4059CC0CC2847DA9B9F60513919B1DF-->  <SEARCHINSUGGESTIONBOX><![CDATA[Y]]></SEARCHINSUGGESTIONBOX>
+<!--B4059CC0CC2847DA9B9F60513919B1DF-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--B4059CC0CC2847DA9B9F60513919B1DF-->  <SORTNO><![CDATA[2]]></SORTNO>
+<!--B4059CC0CC2847DA9B9F60513919B1DF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B4059CC0CC2847DA9B9F60513919B1DF-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--B4059CC0CC2847DA9B9F60513919B1DF-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--B4059CC0CC2847DA9B9F60513919B1DF--></OBUISEL_SELECTOR_FIELD>
+
 <!--B759B8BC264044D1A93CD79594A72F38--><OBUISEL_SELECTOR_FIELD>
 <!--B759B8BC264044D1A93CD79594A72F38-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[B759B8BC264044D1A93CD79594A72F38]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--B759B8BC264044D1A93CD79594A72F38-->  <OBUISEL_SELECTOR_ID><![CDATA[A35B6EC33A2243018915908AEB1B3F5E]]></OBUISEL_SELECTOR_ID>
@@ -3758,6 +3894,28 @@
 <!--C68D5472E5C94D01AD29C3AA4946B698-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--C68D5472E5C94D01AD29C3AA4946B698--></OBUISEL_SELECTOR_FIELD>
 
+<!--C822ACC9CBB042B2B6569F9A92C59F3D--><OBUISEL_SELECTOR_FIELD>
+<!--C822ACC9CBB042B2B6569F9A92C59F3D-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[C822ACC9CBB042B2B6569F9A92C59F3D]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--C822ACC9CBB042B2B6569F9A92C59F3D-->  <OBUISEL_SELECTOR_ID><![CDATA[06A43991412642449E511F495C408EC8]]></OBUISEL_SELECTOR_ID>
+<!--C822ACC9CBB042B2B6569F9A92C59F3D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C822ACC9CBB042B2B6569F9A92C59F3D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C822ACC9CBB042B2B6569F9A92C59F3D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C822ACC9CBB042B2B6569F9A92C59F3D-->  <AD_COLUMN_ID><![CDATA[800171]]></AD_COLUMN_ID>
+<!--C822ACC9CBB042B2B6569F9A92C59F3D-->  <NAME><![CDATA[Last Name]]></NAME>
+<!--C822ACC9CBB042B2B6569F9A92C59F3D-->  <DESCRIPTION><![CDATA[Last name of the contact]]></DESCRIPTION>
+<!--C822ACC9CBB042B2B6569F9A92C59F3D-->  <HELP><![CDATA[Last name of the contact]]></HELP>
+<!--C822ACC9CBB042B2B6569F9A92C59F3D-->  <PROPERTY><![CDATA[lastName]]></PROPERTY>
+<!--C822ACC9CBB042B2B6569F9A92C59F3D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--C822ACC9CBB042B2B6569F9A92C59F3D-->  <SORT><![CDATA[Y]]></SORT>
+<!--C822ACC9CBB042B2B6569F9A92C59F3D-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--C822ACC9CBB042B2B6569F9A92C59F3D-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--C822ACC9CBB042B2B6569F9A92C59F3D-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--C822ACC9CBB042B2B6569F9A92C59F3D-->  <SORTNO><![CDATA[30]]></SORTNO>
+<!--C822ACC9CBB042B2B6569F9A92C59F3D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C822ACC9CBB042B2B6569F9A92C59F3D-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--C822ACC9CBB042B2B6569F9A92C59F3D-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--C822ACC9CBB042B2B6569F9A92C59F3D--></OBUISEL_SELECTOR_FIELD>
+
 <!--C8D400B2F068460C882BB44977BEAAEF--><OBUISEL_SELECTOR_FIELD>
 <!--C8D400B2F068460C882BB44977BEAAEF-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[C8D400B2F068460C882BB44977BEAAEF]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--C8D400B2F068460C882BB44977BEAAEF-->  <OBUISEL_SELECTOR_ID><![CDATA[F132874BE0954A9B8C1301BE20704730]]></OBUISEL_SELECTOR_ID>
@@ -3885,6 +4043,28 @@
 <!--CE3444074D3F43518BC6F9B779BF07F5-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--CE3444074D3F43518BC6F9B779BF07F5--></OBUISEL_SELECTOR_FIELD>
 
+<!--D0312D3859134068BDA64EE247DEEAEB--><OBUISEL_SELECTOR_FIELD>
+<!--D0312D3859134068BDA64EE247DEEAEB-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[D0312D3859134068BDA64EE247DEEAEB]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--D0312D3859134068BDA64EE247DEEAEB-->  <OBUISEL_SELECTOR_ID><![CDATA[DD09F01271C948EBA7A134A15E1DAAD6]]></OBUISEL_SELECTOR_ID>
+<!--D0312D3859134068BDA64EE247DEEAEB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D0312D3859134068BDA64EE247DEEAEB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D0312D3859134068BDA64EE247DEEAEB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D0312D3859134068BDA64EE247DEEAEB-->  <AD_COLUMN_ID><![CDATA[2902]]></AD_COLUMN_ID>
+<!--D0312D3859134068BDA64EE247DEEAEB-->  <NAME><![CDATA[Commercial Name]]></NAME>
+<!--D0312D3859134068BDA64EE247DEEAEB-->  <DESCRIPTION><![CDATA[Commercial Name of the Business Partner]]></DESCRIPTION>
+<!--D0312D3859134068BDA64EE247DEEAEB-->  <HELP><![CDATA[Commercial Name of the Business Partner]]></HELP>
+<!--D0312D3859134068BDA64EE247DEEAEB-->  <PROPERTY><![CDATA[name]]></PROPERTY>
+<!--D0312D3859134068BDA64EE247DEEAEB-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--D0312D3859134068BDA64EE247DEEAEB-->  <SORT><![CDATA[Y]]></SORT>
+<!--D0312D3859134068BDA64EE247DEEAEB-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--D0312D3859134068BDA64EE247DEEAEB-->  <SEARCHINSUGGESTIONBOX><![CDATA[Y]]></SEARCHINSUGGESTIONBOX>
+<!--D0312D3859134068BDA64EE247DEEAEB-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--D0312D3859134068BDA64EE247DEEAEB-->  <SORTNO><![CDATA[1]]></SORTNO>
+<!--D0312D3859134068BDA64EE247DEEAEB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D0312D3859134068BDA64EE247DEEAEB-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--D0312D3859134068BDA64EE247DEEAEB-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--D0312D3859134068BDA64EE247DEEAEB--></OBUISEL_SELECTOR_FIELD>
+
 <!--D149E770E87D45709FF0C7DAE2C8B777--><OBUISEL_SELECTOR_FIELD>
 <!--D149E770E87D45709FF0C7DAE2C8B777-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[D149E770E87D45709FF0C7DAE2C8B777]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--D149E770E87D45709FF0C7DAE2C8B777-->  <OBUISEL_SELECTOR_ID><![CDATA[E8F1B0721E104D07AAC532290C951C37]]></OBUISEL_SELECTOR_ID>
@@ -4504,6 +4684,28 @@
 <!--F0DB30CF17844041AE30FF506441B1A9-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--F0DB30CF17844041AE30FF506441B1A9--></OBUISEL_SELECTOR_FIELD>
 
+<!--F45832C19CF74134A46EA5C26F649A60--><OBUISEL_SELECTOR_FIELD>
+<!--F45832C19CF74134A46EA5C26F649A60-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[F45832C19CF74134A46EA5C26F649A60]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--F45832C19CF74134A46EA5C26F649A60-->  <OBUISEL_SELECTOR_ID><![CDATA[DD09F01271C948EBA7A134A15E1DAAD6]]></OBUISEL_SELECTOR_ID>
+<!--F45832C19CF74134A46EA5C26F649A60-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F45832C19CF74134A46EA5C26F649A60-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F45832C19CF74134A46EA5C26F649A60-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F45832C19CF74134A46EA5C26F649A60-->  <AD_COLUMN_ID><![CDATA[4940]]></AD_COLUMN_ID>
+<!--F45832C19CF74134A46EA5C26F649A60-->  <NAME><![CDATA[Business Partner Category]]></NAME>
+<!--F45832C19CF74134A46EA5C26F649A60-->  <DESCRIPTION><![CDATA[A classification of business partners based on defined similarities.]]></DESCRIPTION>
+<!--F45832C19CF74134A46EA5C26F649A60-->  <HELP><![CDATA[A way of grouping business partners together for classification and reporting purposes. Provides a method of defining certain defaults to be used when opening new business partners.]]></HELP>
+<!--F45832C19CF74134A46EA5C26F649A60-->  <PROPERTY><![CDATA[businessPartnerCategory.name]]></PROPERTY>
+<!--F45832C19CF74134A46EA5C26F649A60-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--F45832C19CF74134A46EA5C26F649A60-->  <SORT><![CDATA[Y]]></SORT>
+<!--F45832C19CF74134A46EA5C26F649A60-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--F45832C19CF74134A46EA5C26F649A60-->  <SEARCHINSUGGESTIONBOX><![CDATA[Y]]></SEARCHINSUGGESTIONBOX>
+<!--F45832C19CF74134A46EA5C26F649A60-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--F45832C19CF74134A46EA5C26F649A60-->  <SORTNO><![CDATA[3]]></SORTNO>
+<!--F45832C19CF74134A46EA5C26F649A60-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F45832C19CF74134A46EA5C26F649A60-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--F45832C19CF74134A46EA5C26F649A60-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--F45832C19CF74134A46EA5C26F649A60--></OBUISEL_SELECTOR_FIELD>
+
 <!--F4626A8044754C09B1961E6956B0B6C4--><OBUISEL_SELECTOR_FIELD>
 <!--F4626A8044754C09B1961E6956B0B6C4-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[F4626A8044754C09B1961E6956B0B6C4]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--F4626A8044754C09B1961E6956B0B6C4-->  <OBUISEL_SELECTOR_ID><![CDATA[B8321631F57E463EB617289E936BAF3A]]></OBUISEL_SELECTOR_ID>