Update to 3.0PR17Q3 3.0PR17Q3
authorRM packaging bot <staff.rm@openbravo.com>
Thu, 21 Sep 2017 04:04:15 +0000
changeset 758 eba8990c3e4a
parent 757 3810d5900d72
child 759 90d7cf872ea1
Update to 3.0PR17Q3
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/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.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_TAB.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_NAVBAR_COMPONENT.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.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.application/src-db/database/sourcedata/OBCLKER_TEMPLATE.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/OBUIAPP_NAVBAR_COMPONENT.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.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_DATASET.xml
model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_DATASET_TABLE.xml
model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/src-db/database/model/functions/AD_ISORGINCLUDED.xml
model/src-db/database/model/functions/AD_ISORGINCLUDED_TREENODE.xml
model/src-db/database/model/functions/AD_ORG_CHK_CALENDAR.xml
model/src-db/database/model/functions/AD_ORG_READY.xml
model/src-db/database/model/functions/C_COMMISSION_COPY.xml
model/src-db/database/model/functions/C_COMMISSION_PROCESS.xml
model/src-db/database/model/functions/C_INVOICE_CREATE.xml
model/src-db/database/model/functions/C_INVOICE_POST.xml
model/src-db/database/model/functions/C_ORDER_POST1.xml
model/src-db/database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml
model/src-db/database/model/functions/MA_PRODUCTION_COST.xml
model/src-db/database/model/functions/MRP_PROCESSPLAN_PLAN.xml
model/src-db/database/model/functions/MRP_RUN_EXPLODE.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_GET_STOCK.xml
model/src-db/database/model/functions/M_GET_STOCK_PARAM.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_MOVEMENT_POST.xml
model/src-db/database/model/functions/M_PRODUCTION_RUN.xml
model/src-db/database/model/functions/M_RAPPEL_INVOICE_CREATE.xml
model/src-db/database/model/functions/M_RESERVATION_REALLOCATE.xml
model/src-db/database/model/functions/M_RESERVE_STOCK_AUTO.xml
model/src-db/database/model/tables/AD_ORG_TREE.xml
model/src-db/database/model/tables/AD_USER.xml
model/src-db/database/model/tables/C_BPARTNER.xml
model/src-db/database/model/tables/FACT_ACCT.xml
model/src-db/database/model/tables/FIN_PAYMENT.xml
model/src-db/database/model/triggers/AD_PROCESS_REQUEST_TRG.xml
model/src-db/database/model/triggers/C_INVOICELINE_BEFORE_TRG.xml
model/src-db/database/model/triggers/C_ORDERLINE2_TRG.xml
model/src-db/database/model/triggers/M_INVENTORYSTATUS_TRG.xml
model/src-db/database/model/views/M_RM_RECEIPT_PICK_EDIT.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_DATASET.xml
model/src-db/database/sourcedata/AD_DATASET_TABLE.xml
model/src-db/database/sourcedata/AD_ELEMENT.xml
model/src-db/database/sourcedata/AD_FIELD.xml
model/src-db/database/sourcedata/AD_MENU.xml
model/src-db/database/sourcedata/AD_MESSAGE.xml
model/src-db/database/sourcedata/AD_MODEL_OBJECT.xml
model/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
model/src-db/database/sourcedata/AD_MODEL_OBJECT_PARA.xml
model/src-db/database/sourcedata/AD_MODULE.xml
model/src-db/database/sourcedata/AD_REFERENCE.xml
model/src-db/database/sourcedata/AD_REF_LIST.xml
model/src-db/database/sourcedata/AD_TAB.xml
model/src-db/database/sourcedata/AD_TABLE.xml
model/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
model/src-db/database/sourcedata/AD_TREENODE.xml
model/src-db/database/sourcedata/AD_WINDOW.xml
model/src-db/database/sourcedata/M_INVENTORYSTATUS.xml
model/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
model/src-db/database/sourcedata/OBUIAPP_PROCESS.xml
model/src-db/database/sourcedata/OBUIAPP_REPORT.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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -489,6 +489,8 @@
                 WHERE fin_payment_scheduledetail_id = v_scheduledetailid;
 
                 v_scheduledetailamount := v_scheduledetailamount - v_differenceamount;
+              ELSE
+                v_differenceamount := 0;
               END IF;
 
               IF (v_differenceamount = 0 OR (v_count <> 0 AND NOT v_psdbreakbypartialpayment)) THEN
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml	Thu Sep 21 04:04:15 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) 2014 Openbravo SLU
+* All portions are Copyright (C) 2014-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -25,6 +25,7 @@
   v_referencelist VARCHAR2(32):='575BCB88A4694C27BC013DE9C73E6FE7';
 
 BEGIN
+
   -- Check if the status exists
   SELECT count(*) INTO v_count FROM DUAL
   WHERE EXISTS (SELECT 1 FROM ad_ref_list
@@ -32,7 +33,8 @@
                       AND value = status);
 
   IF (v_count = 0) THEN
-    RETURN 'N';
+    -- If status is null, return minimum value for invoice paid status (RPR or PPM)
+    RETURN '40';
   END IF;
   
   SELECT seqno 
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Thu Sep 21 04:04:15 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.31787]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.32403]]></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[PR17Q2]]></VERSION_LABEL>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION_LABEL><![CDATA[PR17Q3]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Sep 21 04:04:15 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.31787]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.32403]]></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.31787]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.32403]]></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_TAB.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -90,7 +90,7 @@
 <!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
 <!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
-<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <HQLWHERECLAUSE><![CDATA[e.status in ('RPR', 'PPM') and e.amount <>0 and exists ( select 1 from FinancialMgmtFinAccPaymentMethod as  fapm join fapm.account as fa where fapm.paymentMethod = e.paymentMethod and fa.id = @FIN_Financial_Account.id@ and (case when e.receipt = true then fapm.payinAllow else fapm.payoutAllow end) = true and fa.currency = e.account.currency) and not exists (select 1 from FIN_Finacc_Transaction as ft where e = ft.finPayment) and AD_ISORGINCLUDED(e.organization.id, @FIN_Financial_Account.organization@, e.client.id)<>-1]]></HQLWHERECLAUSE>
+<!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <HQLWHERECLAUSE><![CDATA[e.status in ('RPR', 'PPM') and e.amount <> 0 and exists (select 1 from FinancialMgmtFinAccPaymentMethod as fapm join fapm.account as fa where fapm.paymentMethod = e.paymentMethod and fa.id = @FIN_Financial_Account.id@ and (case when e.receipt = true then fapm.payinAllow else fapm.payoutAllow end) = true and fa.currency = e.account.currency) and not exists (select 1 from FIN_Finacc_Transaction as ft where e = ft.finPayment) and exists (select 1 from OrganizationTree as ot where ot.organization.id = e.organization.id and ot.parentOrganization.id = @FIN_Financial_Account.organization@ and ot.client.id = e.client.id)]]></HQLWHERECLAUSE>
 <!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <HQLORDERBYCLAUSE><![CDATA[paymentDate, documentNo]]></HQLORDERBYCLAUSE>
 <!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <HQLFILTERCLAUSE><![CDATA[e.account.id = @FIN_Financial_Account.id@]]></HQLFILTERCLAUSE>
 <!--2700A962BC484D4C9B3E30B1C3C66BFB-->  <FILTERNAME><![CDATA[Payments are filtered by the selected Financial Account]]></FILTERNAME>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -1841,6 +1841,7 @@
 <!--BF4F039785D24BA6B93A2494B89F0C47-->  <OBUIAPP_PROCESS_ID><![CDATA[CC73C4845CDC487395804946EACB225F]]></OBUIAPP_PROCESS_ID>
 <!--BF4F039785D24BA6B93A2494B89F0C47-->  <STARTINNEWLINE><![CDATA[Y]]></STARTINNEWLINE>
 <!--BF4F039785D24BA6B93A2494B89F0C47-->  <DISPLAYLOGIC><![CDATA[(@c_currency_to_id@ ! @c_currency_from_id@) & @c_currency_to_id@!undefined]]></DISPLAYLOGIC>
+<!--BF4F039785D24BA6B93A2494B89F0C47-->  <READONLYLOGIC><![CDATA[OB.PropertyStore.get('NotAllowChangeExchange')='Y']]></READONLYLOGIC>
 <!--BF4F039785D24BA6B93A2494B89F0C47-->  <DISPLAYEDROWS><![CDATA[5]]></DISPLAYEDROWS>
 <!--BF4F039785D24BA6B93A2494B89F0C47-->  <DISPLAYTITLE><![CDATA[Y]]></DISPLAYTITLE>
 <!--BF4F039785D24BA6B93A2494B89F0C47-->  <ATT_SHOWINDESCRIPTION><![CDATA[N]]></ATT_SHOWINDESCRIPTION>
--- a/model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Thu Sep 21 04:04:15 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.31787]]></VERSION>
+<!--8A098711BB324335A19833286BDB093D-->  <VERSION><![CDATA[1.0.32403]]></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[PR17Q2]]></VERSION_LABEL>
+<!--8A098711BB324335A19833286BDB093D-->  <VERSION_LABEL><![CDATA[PR17Q3]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Sep 21 04:04:15 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.31787]]></STARTVERSION>
+<!--1467C397BC5F4999A5606F39CD6FF8A4-->  <STARTVERSION><![CDATA[2.1.32403]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Thu Sep 21 04:04:15 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.31787]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.32403]]></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[PR17Q2]]></VERSION_LABEL>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION_LABEL><![CDATA[PR17Q3]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Sep 21 04:04:15 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.31787]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.32403]]></STARTVERSION>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_NAVBAR_COMPONENT.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_NAVBAR_COMPONENT.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -61,6 +61,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="ISSTATICCOMPONENT" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="OBUIAPP_T_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -80,5 +84,6 @@
       </unique>
       <check name="OBUIAPP_ALLROLES_CHECK"><![CDATA[ALLROLES IN ('Y', 'N')]]></check>
       <check name="OBUIAPP_CT_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+      <check name="OBUIAPP_NAVBAR_COMPONT_STATIC"><![CDATA[ISSTATICCOMPONENT IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -1313,6 +1313,45 @@
 <!--1593FFD78DB544FE84B647F803900C37-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--1593FFD78DB544FE84B647F803900C37--></AD_COLUMN>
 
+<!--1607384316B843BFA61D43E41D7EC171--><AD_COLUMN>
+<!--1607384316B843BFA61D43E41D7EC171-->  <AD_COLUMN_ID><![CDATA[1607384316B843BFA61D43E41D7EC171]]></AD_COLUMN_ID>
+<!--1607384316B843BFA61D43E41D7EC171-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1607384316B843BFA61D43E41D7EC171-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1607384316B843BFA61D43E41D7EC171-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1607384316B843BFA61D43E41D7EC171-->  <NAME><![CDATA[Isstaticcomponent]]></NAME>
+<!--1607384316B843BFA61D43E41D7EC171-->  <DESCRIPTION><![CDATA[Defines whether a navigation bar component is static or not.]]></DESCRIPTION>
+<!--1607384316B843BFA61D43E41D7EC171-->  <HELP><![CDATA[Defines whether a navigation bar component is static or not. Static components are generated in the same request of the session dynamic resources. Non static components requires an extra request call to generate its content.]]></HELP>
+<!--1607384316B843BFA61D43E41D7EC171-->  <COLUMNNAME><![CDATA[Isstaticcomponent]]></COLUMNNAME>
+<!--1607384316B843BFA61D43E41D7EC171-->  <AD_TABLE_ID><![CDATA[6EDC4A262444493BAE672E7E144A36F7]]></AD_TABLE_ID>
+<!--1607384316B843BFA61D43E41D7EC171-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--1607384316B843BFA61D43E41D7EC171-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--1607384316B843BFA61D43E41D7EC171-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--1607384316B843BFA61D43E41D7EC171-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--1607384316B843BFA61D43E41D7EC171-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--1607384316B843BFA61D43E41D7EC171-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--1607384316B843BFA61D43E41D7EC171-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--1607384316B843BFA61D43E41D7EC171-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--1607384316B843BFA61D43E41D7EC171-->  <SEQNO><![CDATA[160]]></SEQNO>
+<!--1607384316B843BFA61D43E41D7EC171-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--1607384316B843BFA61D43E41D7EC171-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--1607384316B843BFA61D43E41D7EC171-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--1607384316B843BFA61D43E41D7EC171-->  <AD_ELEMENT_ID><![CDATA[C1AA24FDF3714201BD68237D38243ACA]]></AD_ELEMENT_ID>
+<!--1607384316B843BFA61D43E41D7EC171-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--1607384316B843BFA61D43E41D7EC171-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--1607384316B843BFA61D43E41D7EC171-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--1607384316B843BFA61D43E41D7EC171-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--1607384316B843BFA61D43E41D7EC171-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--1607384316B843BFA61D43E41D7EC171-->  <POSITION><![CDATA[16]]></POSITION>
+<!--1607384316B843BFA61D43E41D7EC171-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--1607384316B843BFA61D43E41D7EC171-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--1607384316B843BFA61D43E41D7EC171-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--1607384316B843BFA61D43E41D7EC171-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--1607384316B843BFA61D43E41D7EC171-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--1607384316B843BFA61D43E41D7EC171-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--1607384316B843BFA61D43E41D7EC171-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--1607384316B843BFA61D43E41D7EC171-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--1607384316B843BFA61D43E41D7EC171--></AD_COLUMN>
+
 <!--16B673DBB07D41D1BEB97E7D18A44DD9--><AD_COLUMN>
 <!--16B673DBB07D41D1BEB97E7D18A44DD9-->  <AD_COLUMN_ID><![CDATA[16B673DBB07D41D1BEB97E7D18A44DD9]]></AD_COLUMN_ID>
 <!--16B673DBB07D41D1BEB97E7D18A44DD9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -795,6 +795,20 @@
 <!--BAF19AAC391C420E9BA1E54641D563D9-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--BAF19AAC391C420E9BA1E54641D563D9--></AD_ELEMENT>
 
+<!--C1AA24FDF3714201BD68237D38243ACA--><AD_ELEMENT>
+<!--C1AA24FDF3714201BD68237D38243ACA-->  <AD_ELEMENT_ID><![CDATA[C1AA24FDF3714201BD68237D38243ACA]]></AD_ELEMENT_ID>
+<!--C1AA24FDF3714201BD68237D38243ACA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C1AA24FDF3714201BD68237D38243ACA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C1AA24FDF3714201BD68237D38243ACA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C1AA24FDF3714201BD68237D38243ACA-->  <COLUMNNAME><![CDATA[Isstaticcomponent]]></COLUMNNAME>
+<!--C1AA24FDF3714201BD68237D38243ACA-->  <NAME><![CDATA[Static Component]]></NAME>
+<!--C1AA24FDF3714201BD68237D38243ACA-->  <PRINTNAME><![CDATA[Static Component]]></PRINTNAME>
+<!--C1AA24FDF3714201BD68237D38243ACA-->  <DESCRIPTION><![CDATA[Defines whether a navigation bar component is static or not.]]></DESCRIPTION>
+<!--C1AA24FDF3714201BD68237D38243ACA-->  <HELP><![CDATA[Defines whether a navigation bar component is static or not. Static components are generated in the same request of the session dynamic resources. Non static components requires an extra request call to generate its content.]]></HELP>
+<!--C1AA24FDF3714201BD68237D38243ACA-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--C1AA24FDF3714201BD68237D38243ACA-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--C1AA24FDF3714201BD68237D38243ACA--></AD_ELEMENT>
+
 <!--C39954911E27408CBF8F44743A1A0F51--><AD_ELEMENT>
 <!--C39954911E27408CBF8F44743A1A0F51-->  <AD_ELEMENT_ID><![CDATA[C39954911E27408CBF8F44743A1A0F51]]></AD_ELEMENT_ID>
 <!--C39954911E27408CBF8F44743A1A0F51-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -2670,7 +2670,7 @@
 <!--3813306379C949A6A78A775E3130B2AB-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--3813306379C949A6A78A775E3130B2AB-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--3813306379C949A6A78A775E3130B2AB-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--3813306379C949A6A78A775E3130B2AB-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--3813306379C949A6A78A775E3130B2AB-->  <SEQNO><![CDATA[90]]></SEQNO>
 <!--3813306379C949A6A78A775E3130B2AB-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--3813306379C949A6A78A775E3130B2AB-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3813306379C949A6A78A775E3130B2AB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -7964,6 +7964,34 @@
 <!--E649C05D297F48C3B55C8F93991AE2C5-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--E649C05D297F48C3B55C8F93991AE2C5--></AD_FIELD>
 
+<!--E6F5AFAE18DD408B817977955778E81B--><AD_FIELD>
+<!--E6F5AFAE18DD408B817977955778E81B-->  <AD_FIELD_ID><![CDATA[E6F5AFAE18DD408B817977955778E81B]]></AD_FIELD_ID>
+<!--E6F5AFAE18DD408B817977955778E81B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E6F5AFAE18DD408B817977955778E81B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E6F5AFAE18DD408B817977955778E81B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E6F5AFAE18DD408B817977955778E81B-->  <NAME><![CDATA[Static Component]]></NAME>
+<!--E6F5AFAE18DD408B817977955778E81B-->  <DESCRIPTION><![CDATA[Defines whether a navigation bar component is static or not.]]></DESCRIPTION>
+<!--E6F5AFAE18DD408B817977955778E81B-->  <HELP><![CDATA[Defines whether a navigation bar component is static or not. Static components are generated in the same request of the session dynamic resources. Non static components requires an extra request call to generate its content.]]></HELP>
+<!--E6F5AFAE18DD408B817977955778E81B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--E6F5AFAE18DD408B817977955778E81B-->  <AD_TAB_ID><![CDATA[25EB9212730C4E88B95C75BFCD6F5EBF]]></AD_TAB_ID>
+<!--E6F5AFAE18DD408B817977955778E81B-->  <AD_COLUMN_ID><![CDATA[1607384316B843BFA61D43E41D7EC171]]></AD_COLUMN_ID>
+<!--E6F5AFAE18DD408B817977955778E81B-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--E6F5AFAE18DD408B817977955778E81B-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--E6F5AFAE18DD408B817977955778E81B-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--E6F5AFAE18DD408B817977955778E81B-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--E6F5AFAE18DD408B817977955778E81B-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--E6F5AFAE18DD408B817977955778E81B-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--E6F5AFAE18DD408B817977955778E81B-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--E6F5AFAE18DD408B817977955778E81B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E6F5AFAE18DD408B817977955778E81B-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--E6F5AFAE18DD408B817977955778E81B-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--E6F5AFAE18DD408B817977955778E81B-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--E6F5AFAE18DD408B817977955778E81B-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--E6F5AFAE18DD408B817977955778E81B-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--E6F5AFAE18DD408B817977955778E81B-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--E6F5AFAE18DD408B817977955778E81B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--E6F5AFAE18DD408B817977955778E81B--></AD_FIELD>
+
 <!--E78C1117FDE742F8A566278AD2E0591C--><AD_FIELD>
 <!--E78C1117FDE742F8A566278AD2E0591C-->  <AD_FIELD_ID><![CDATA[E78C1117FDE742F8A566278AD2E0591C]]></AD_FIELD_ID>
 <!--E78C1117FDE742F8A566278AD2E0591C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Thu Sep 21 04:04:15 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.31787]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.32403]]></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[PR17Q2]]></VERSION_LABEL>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION_LABEL><![CDATA[PR17Q3]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Sep 21 04:04:15 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.31787]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.32403]]></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.31787]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.32403]]></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.31787]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.32403]]></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.31787]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.32403]]></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.application/src-db/database/sourcedata/OBCLKER_TEMPLATE.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/OBCLKER_TEMPLATE.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -32,12 +32,28 @@
 <!--08074180655340F0B67E2BA3BA087062-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--08074180655340F0B67E2BA3BA087062-->  <NAME><![CDATA[Navbar Alert Icon ]]></NAME>
 <!--08074180655340F0B67E2BA3BA087062-->  <DESCRIPTION><![CDATA[Template to create the navbar alert icon]]></DESCRIPTION>
-<!--08074180655340F0B67E2BA3BA087062-->  <TEMPLATE><![CDATA[OBAlertIcon.create({})]]></TEMPLATE>
+<!--08074180655340F0B67E2BA3BA087062-->  <TEMPLATE><![CDATA[{
+  className: 'OBAlertIcon',
+  properties: {}
+}]]></TEMPLATE>
 <!--08074180655340F0B67E2BA3BA087062-->  <TEMPLATE_LANGUAGE><![CDATA[OBCLFRE_Freemarker]]></TEMPLATE_LANGUAGE>
 <!--08074180655340F0B67E2BA3BA087062-->  <COMPONENT_TYPE><![CDATA[OBUIAPP_NavigationBar]]></COMPONENT_TYPE>
 <!--08074180655340F0B67E2BA3BA087062-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--08074180655340F0B67E2BA3BA087062--></OBCLKER_TEMPLATE>
 
+<!--0A9FD7B8976645A380920FF6411AB4A6--><OBCLKER_TEMPLATE>
+<!--0A9FD7B8976645A380920FF6411AB4A6-->  <OBCLKER_TEMPLATE_ID><![CDATA[0A9FD7B8976645A380920FF6411AB4A6]]></OBCLKER_TEMPLATE_ID>
+<!--0A9FD7B8976645A380920FF6411AB4A6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0A9FD7B8976645A380920FF6411AB4A6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0A9FD7B8976645A380920FF6411AB4A6-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--0A9FD7B8976645A380920FF6411AB4A6-->  <NAME><![CDATA[Navigation Bar template]]></NAME>
+<!--0A9FD7B8976645A380920FF6411AB4A6-->  <DESCRIPTION><![CDATA[Template that generates the navigation bar components]]></DESCRIPTION>
+<!--0A9FD7B8976645A380920FF6411AB4A6-->  <TEMPLATECLASSPATHLOCATION><![CDATA[/org/openbravo/client/application/templates/navigation-bar.js.ftl]]></TEMPLATECLASSPATHLOCATION>
+<!--0A9FD7B8976645A380920FF6411AB4A6-->  <TEMPLATE_LANGUAGE><![CDATA[OBCLFRE_Freemarker]]></TEMPLATE_LANGUAGE>
+<!--0A9FD7B8976645A380920FF6411AB4A6-->  <COMPONENT_TYPE><![CDATA[OBUIAPP_MainLayout]]></COMPONENT_TYPE>
+<!--0A9FD7B8976645A380920FF6411AB4A6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0A9FD7B8976645A380920FF6411AB4A6--></OBCLKER_TEMPLATE>
+
 <!--33E04D0799794C6F95F05149D2E04E78--><OBCLKER_TEMPLATE>
 <!--33E04D0799794C6F95F05149D2E04E78-->  <OBCLKER_TEMPLATE_ID><![CDATA[33E04D0799794C6F95F05149D2E04E78]]></OBCLKER_TEMPLATE_ID>
 <!--33E04D0799794C6F95F05149D2E04E78-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -51,6 +67,53 @@
 <!--33E04D0799794C6F95F05149D2E04E78-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--33E04D0799794C6F95F05149D2E04E78--></OBCLKER_TEMPLATE>
 
+<!--34752CBCF4AF48E59E1283317EB0674C--><OBCLKER_TEMPLATE>
+<!--34752CBCF4AF48E59E1283317EB0674C-->  <OBCLKER_TEMPLATE_ID><![CDATA[34752CBCF4AF48E59E1283317EB0674C]]></OBCLKER_TEMPLATE_ID>
+<!--34752CBCF4AF48E59E1283317EB0674C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--34752CBCF4AF48E59E1283317EB0674C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--34752CBCF4AF48E59E1283317EB0674C-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--34752CBCF4AF48E59E1283317EB0674C-->  <NAME><![CDATA[Quick Create template]]></NAME>
+<!--34752CBCF4AF48E59E1283317EB0674C-->  <DESCRIPTION><![CDATA[Creates the quick create component]]></DESCRIPTION>
+<!--34752CBCF4AF48E59E1283317EB0674C-->  <TEMPLATE><![CDATA[{
+  className: 'OBQuickLaunch',
+  properties: {
+    title: '',
+    itemPrompt: 'UINAVBA_CREATE_NEW',
+    buttonType: 'createNew',
+    prefixLabel: 'UINAVBA_NEW',
+    keyboardShortcutId: 'NavBar_OBQuickCreate',
+    recentPropertyName: 'UINAVBA_RecentCreateList',
+    titleLabel: 'UINAVBA_CREATE_NEW',
+    command: 'NEW',
+    initWidget: function() {
+      if (this.createNew_src) {
+        this.setSrc(this.createNew_src);
+      }
+      this.Super('initWidget', arguments);
+    },
+    isValidMenuItem: function(menuItem) {
+      return this.isWindowAndCanCreateNewRecord(menuItem);
+    }
+  }
+}]]></TEMPLATE>
+<!--34752CBCF4AF48E59E1283317EB0674C-->  <TEMPLATE_LANGUAGE><![CDATA[OBCLFRE_Freemarker]]></TEMPLATE_LANGUAGE>
+<!--34752CBCF4AF48E59E1283317EB0674C-->  <COMPONENT_TYPE><![CDATA[OBUIAPP_NavigationBar]]></COMPONENT_TYPE>
+<!--34752CBCF4AF48E59E1283317EB0674C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--34752CBCF4AF48E59E1283317EB0674C--></OBCLKER_TEMPLATE>
+
+<!--4C6825EEBF2C440CA6F97C8A042CCB5F--><OBCLKER_TEMPLATE>
+<!--4C6825EEBF2C440CA6F97C8A042CCB5F-->  <OBCLKER_TEMPLATE_ID><![CDATA[4C6825EEBF2C440CA6F97C8A042CCB5F]]></OBCLKER_TEMPLATE_ID>
+<!--4C6825EEBF2C440CA6F97C8A042CCB5F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4C6825EEBF2C440CA6F97C8A042CCB5F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4C6825EEBF2C440CA6F97C8A042CCB5F-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--4C6825EEBF2C440CA6F97C8A042CCB5F-->  <NAME><![CDATA[Application Menu]]></NAME>
+<!--4C6825EEBF2C440CA6F97C8A042CCB5F-->  <DESCRIPTION><![CDATA[The template creating the Application menu options]]></DESCRIPTION>
+<!--4C6825EEBF2C440CA6F97C8A042CCB5F-->  <TEMPLATECLASSPATHLOCATION><![CDATA[/org/openbravo/client/application/navigationbarcomponents/templates/application-menu.js.ftl]]></TEMPLATECLASSPATHLOCATION>
+<!--4C6825EEBF2C440CA6F97C8A042CCB5F-->  <TEMPLATE_LANGUAGE><![CDATA[OBCLFRE_Freemarker]]></TEMPLATE_LANGUAGE>
+<!--4C6825EEBF2C440CA6F97C8A042CCB5F-->  <COMPONENT_TYPE><![CDATA[OBUIAPP_MainLayout]]></COMPONENT_TYPE>
+<!--4C6825EEBF2C440CA6F97C8A042CCB5F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4C6825EEBF2C440CA6F97C8A042CCB5F--></OBCLKER_TEMPLATE>
+
 <!--582D107C03FD4B56A4BEDCF4CAABBB55--><OBCLKER_TEMPLATE>
 <!--582D107C03FD4B56A4BEDCF4CAABBB55-->  <OBCLKER_TEMPLATE_ID><![CDATA[582D107C03FD4B56A4BEDCF4CAABBB55]]></OBCLKER_TEMPLATE_ID>
 <!--582D107C03FD4B56A4BEDCF4CAABBB55-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -58,7 +121,14 @@
 <!--582D107C03FD4B56A4BEDCF4CAABBB55-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--582D107C03FD4B56A4BEDCF4CAABBB55-->  <NAME><![CDATA[User info Navigation Bar template]]></NAME>
 <!--582D107C03FD4B56A4BEDCF4CAABBB55-->  <DESCRIPTION><![CDATA[Template generating jscript which shows user info in the navigation bar]]></DESCRIPTION>
-<!--582D107C03FD4B56A4BEDCF4CAABBB55-->  <TEMPLATECLASSPATHLOCATION><![CDATA[/org/openbravo/client/application/navigationbarcomponents/templates/user-info.js.ftl]]></TEMPLATECLASSPATHLOCATION>
+<!--582D107C03FD4B56A4BEDCF4CAABBB55-->  <TEMPLATE><![CDATA[{
+  className: 'OBUserProfile',
+  properties: {}
+},
+{
+  className: 'OBLogout',
+  properties: {}
+}]]></TEMPLATE>
 <!--582D107C03FD4B56A4BEDCF4CAABBB55-->  <TEMPLATE_LANGUAGE><![CDATA[OBCLFRE_Freemarker]]></TEMPLATE_LANGUAGE>
 <!--582D107C03FD4B56A4BEDCF4CAABBB55-->  <COMPONENT_TYPE><![CDATA[OBUIAPP_NavigationBar]]></COMPONENT_TYPE>
 <!--582D107C03FD4B56A4BEDCF4CAABBB55-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
@@ -71,7 +141,10 @@
 <!--614A1413D97B4392AA3C1AF486D8D76A-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--614A1413D97B4392AA3C1AF486D8D76A-->  <NAME><![CDATA[Help About Navigation Bar Widget]]></NAME>
 <!--614A1413D97B4392AA3C1AF486D8D76A-->  <DESCRIPTION><![CDATA[Help About Navigation Bar Widget]]></DESCRIPTION>
-<!--614A1413D97B4392AA3C1AF486D8D76A-->  <TEMPLATECLASSPATHLOCATION><![CDATA[/org/openbravo/client/application/navigationbarcomponents/templates/help-about.js.ftl]]></TEMPLATECLASSPATHLOCATION>
+<!--614A1413D97B4392AA3C1AF486D8D76A-->  <TEMPLATE><![CDATA[{
+  className: 'OBHelpAbout',
+  properties: {}
+}]]></TEMPLATE>
 <!--614A1413D97B4392AA3C1AF486D8D76A-->  <TEMPLATE_LANGUAGE><![CDATA[OBCLFRE_Freemarker]]></TEMPLATE_LANGUAGE>
 <!--614A1413D97B4392AA3C1AF486D8D76A-->  <COMPONENT_TYPE><![CDATA[OBUIAPP_NavigationBar]]></COMPONENT_TYPE>
 <!--614A1413D97B4392AA3C1AF486D8D76A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
@@ -83,8 +156,17 @@
 <!--66A2AD8595D1479E904ED0D9999E2842-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--66A2AD8595D1479E904ED0D9999E2842-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--66A2AD8595D1479E904ED0D9999E2842-->  <NAME><![CDATA[Menu template]]></NAME>
-<!--66A2AD8595D1479E904ED0D9999E2842-->  <DESCRIPTION><![CDATA[The template creating a menu]]></DESCRIPTION>
-<!--66A2AD8595D1479E904ED0D9999E2842-->  <TEMPLATECLASSPATHLOCATION><![CDATA[/org/openbravo/client/application/navigationbarcomponents/templates/application-menu.js.ftl]]></TEMPLATECLASSPATHLOCATION>
+<!--66A2AD8595D1479E904ED0D9999E2842-->  <DESCRIPTION><![CDATA[The template creating the Application menu]]></DESCRIPTION>
+<!--66A2AD8595D1479E904ED0D9999E2842-->  <TEMPLATE><![CDATA[{
+  className: 'OBApplicationMenuButton',
+  properties: {
+    title: 'UINAVBA_APPLICATION_MENU',
+    initWidget: function () {
+      this.Super('initWidget', arguments);
+      this.baseData = isc.clone(OB.Application.menu);
+    }
+  }
+}]]></TEMPLATE>
 <!--66A2AD8595D1479E904ED0D9999E2842-->  <TEMPLATE_LANGUAGE><![CDATA[OBCLFRE_Freemarker]]></TEMPLATE_LANGUAGE>
 <!--66A2AD8595D1479E904ED0D9999E2842-->  <COMPONENT_TYPE><![CDATA[OBUIAPP_NavigationBar]]></COMPONENT_TYPE>
 <!--66A2AD8595D1479E904ED0D9999E2842-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
@@ -197,6 +279,19 @@
 <!--C1D176407A354A40815DC46D24D70EB8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C1D176407A354A40815DC46D24D70EB8--></OBCLKER_TEMPLATE>
 
+<!--CB89E38CF75545499BF0B91FA6B233E5--><OBCLKER_TEMPLATE>
+<!--CB89E38CF75545499BF0B91FA6B233E5-->  <OBCLKER_TEMPLATE_ID><![CDATA[CB89E38CF75545499BF0B91FA6B233E5]]></OBCLKER_TEMPLATE_ID>
+<!--CB89E38CF75545499BF0B91FA6B233E5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CB89E38CF75545499BF0B91FA6B233E5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CB89E38CF75545499BF0B91FA6B233E5-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--CB89E38CF75545499BF0B91FA6B233E5-->  <NAME><![CDATA[User info Navigation Bar Data template]]></NAME>
+<!--CB89E38CF75545499BF0B91FA6B233E5-->  <DESCRIPTION><![CDATA[Template generating the session data shown by the user info navigation bar element]]></DESCRIPTION>
+<!--CB89E38CF75545499BF0B91FA6B233E5-->  <TEMPLATECLASSPATHLOCATION><![CDATA[/org/openbravo/client/application/navigationbarcomponents/templates/user-info.js.ftl]]></TEMPLATECLASSPATHLOCATION>
+<!--CB89E38CF75545499BF0B91FA6B233E5-->  <TEMPLATE_LANGUAGE><![CDATA[OBCLFRE_Freemarker]]></TEMPLATE_LANGUAGE>
+<!--CB89E38CF75545499BF0B91FA6B233E5-->  <COMPONENT_TYPE><![CDATA[OBUIAPP_NavigationBar]]></COMPONENT_TYPE>
+<!--CB89E38CF75545499BF0B91FA6B233E5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CB89E38CF75545499BF0B91FA6B233E5--></OBCLKER_TEMPLATE>
+
 <!--CCA227AA8C4944E88B3EB23BA491222A--><OBCLKER_TEMPLATE>
 <!--CCA227AA8C4944E88B3EB23BA491222A-->  <OBCLKER_TEMPLATE_ID><![CDATA[CCA227AA8C4944E88B3EB23BA491222A]]></OBCLKER_TEMPLATE_ID>
 <!--CCA227AA8C4944E88B3EB23BA491222A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -204,7 +299,28 @@
 <!--CCA227AA8C4944E88B3EB23BA491222A-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--CCA227AA8C4944E88B3EB23BA491222A-->  <NAME><![CDATA[Quick Launch template]]></NAME>
 <!--CCA227AA8C4944E88B3EB23BA491222A-->  <DESCRIPTION><![CDATA[Creates the quick launch component]]></DESCRIPTION>
-<!--CCA227AA8C4944E88B3EB23BA491222A-->  <TEMPLATECLASSPATHLOCATION><![CDATA[/org/openbravo/client/application/navigationbarcomponents/templates/quick-launch.js.ftl]]></TEMPLATECLASSPATHLOCATION>
+<!--CCA227AA8C4944E88B3EB23BA491222A-->  <TEMPLATE><![CDATA[{
+  className: 'OBQuickLaunch',
+  properties: {
+    title: '',
+    itemPrompt: 'UINAVBA_QUICK_LAUNCH',
+    buttonType: 'quickLaunch',
+    prefixLabel: '',
+    keyboardShortcutId: 'NavBar_OBQuickLaunch',
+    recentPropertyName: 'UINAVBA_RecentLaunchList',
+    titleLabel: 'UINAVBA_QUICK_LAUNCH',
+    command: 'DEFAULT',
+    initWidget: function() {
+      if (this.quickLaunch_src) {
+        this.setSrc(this.quickLaunch_src);
+      }
+      this.Super('initWidget', arguments);
+    },
+    isValidMenuItem: function(menuItem) {
+      return !this.isFolder(menuItem);
+    }
+  }
+}]]></TEMPLATE>
 <!--CCA227AA8C4944E88B3EB23BA491222A-->  <TEMPLATE_LANGUAGE><![CDATA[OBCLFRE_Freemarker]]></TEMPLATE_LANGUAGE>
 <!--CCA227AA8C4944E88B3EB23BA491222A-->  <COMPONENT_TYPE><![CDATA[OBUIAPP_NavigationBar]]></COMPONENT_TYPE>
 <!--CCA227AA8C4944E88B3EB23BA491222A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
@@ -266,6 +382,19 @@
 <!--EE3A4F4E485D47CB8057B90C40D134A0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--EE3A4F4E485D47CB8057B90C40D134A0--></OBCLKER_TEMPLATE>
 
+<!--EE5CEC203AEA4B039CCDAD0BE8E07E3C--><OBCLKER_TEMPLATE>
+<!--EE5CEC203AEA4B039CCDAD0BE8E07E3C-->  <OBCLKER_TEMPLATE_ID><![CDATA[EE5CEC203AEA4B039CCDAD0BE8E07E3C]]></OBCLKER_TEMPLATE_ID>
+<!--EE5CEC203AEA4B039CCDAD0BE8E07E3C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EE5CEC203AEA4B039CCDAD0BE8E07E3C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EE5CEC203AEA4B039CCDAD0BE8E07E3C-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--EE5CEC203AEA4B039CCDAD0BE8E07E3C-->  <NAME><![CDATA[Heartbeat Registration]]></NAME>
+<!--EE5CEC203AEA4B039CCDAD0BE8E07E3C-->  <DESCRIPTION><![CDATA[Template used to generate the function that decides to show (or not) the heartbeat or registration popups]]></DESCRIPTION>
+<!--EE5CEC203AEA4B039CCDAD0BE8E07E3C-->  <TEMPLATECLASSPATHLOCATION><![CDATA[/org/openbravo/client/application/templates/ob-heartbeat-registration.js.ftl]]></TEMPLATECLASSPATHLOCATION>
+<!--EE5CEC203AEA4B039CCDAD0BE8E07E3C-->  <TEMPLATE_LANGUAGE><![CDATA[OBCLFRE_Freemarker]]></TEMPLATE_LANGUAGE>
+<!--EE5CEC203AEA4B039CCDAD0BE8E07E3C-->  <COMPONENT_TYPE><![CDATA[OBUIAPP_MainLayout]]></COMPONENT_TYPE>
+<!--EE5CEC203AEA4B039CCDAD0BE8E07E3C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EE5CEC203AEA4B039CCDAD0BE8E07E3C--></OBCLKER_TEMPLATE>
+
 <!--FF808181317B723B01317B7453E90006--><OBCLKER_TEMPLATE>
 <!--FF808181317B723B01317B7453E90006-->  <OBCLKER_TEMPLATE_ID><![CDATA[FF808181317B723B01317B7453E90006]]></OBCLKER_TEMPLATE_ID>
 <!--FF808181317B723B01317B7453E90006-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/OBUIAPP_NAVBAR_COMPONENT.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/OBUIAPP_NAVBAR_COMPONENT.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -11,6 +11,7 @@
 <!--0FB5D32155C84680B9B02CD8E9C81EE9-->  <ALLROLES><![CDATA[Y]]></ALLROLES>
 <!--0FB5D32155C84680B9B02CD8E9C81EE9-->  <SORTNO><![CDATA[60]]></SORTNO>
 <!--0FB5D32155C84680B9B02CD8E9C81EE9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0FB5D32155C84680B9B02CD8E9C81EE9-->  <ISSTATICCOMPONENT><![CDATA[Y]]></ISSTATICCOMPONENT>
 <!--0FB5D32155C84680B9B02CD8E9C81EE9--></OBUIAPP_NAVBAR_COMPONENT>
 
 <!--112AFEB9A5604C349CB3D6644EAE4992--><OBUIAPP_NAVBAR_COMPONENT>
@@ -18,13 +19,14 @@
 <!--112AFEB9A5604C349CB3D6644EAE4992-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--112AFEB9A5604C349CB3D6644EAE4992-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--112AFEB9A5604C349CB3D6644EAE4992-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
-<!--112AFEB9A5604C349CB3D6644EAE4992-->  <OBCLKER_TEMPLATE_ID><![CDATA[CCA227AA8C4944E88B3EB23BA491222A]]></OBCLKER_TEMPLATE_ID>
+<!--112AFEB9A5604C349CB3D6644EAE4992-->  <OBCLKER_TEMPLATE_ID><![CDATA[34752CBCF4AF48E59E1283317EB0674C]]></OBCLKER_TEMPLATE_ID>
 <!--112AFEB9A5604C349CB3D6644EAE4992-->  <NAME><![CDATA[Quick Create]]></NAME>
 <!--112AFEB9A5604C349CB3D6644EAE4992-->  <DESCRIPTION><![CDATA[Opens a classic OB window in insert/create mode]]></DESCRIPTION>
-<!--112AFEB9A5604C349CB3D6644EAE4992-->  <CLASSNAME><![CDATA[org.openbravo.client.application.navigationbarcomponents.QuickCreateComponent]]></CLASSNAME>
+<!--112AFEB9A5604C349CB3D6644EAE4992-->  <CLASSNAME><![CDATA[org.openbravo.client.kernel.BaseTemplateComponent]]></CLASSNAME>
 <!--112AFEB9A5604C349CB3D6644EAE4992-->  <ALLROLES><![CDATA[Y]]></ALLROLES>
 <!--112AFEB9A5604C349CB3D6644EAE4992-->  <SORTNO><![CDATA[10]]></SORTNO>
 <!--112AFEB9A5604C349CB3D6644EAE4992-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--112AFEB9A5604C349CB3D6644EAE4992-->  <ISSTATICCOMPONENT><![CDATA[Y]]></ISSTATICCOMPONENT>
 <!--112AFEB9A5604C349CB3D6644EAE4992--></OBUIAPP_NAVBAR_COMPONENT>
 
 <!--5AC86E8BB0464025887B6544F175177C--><OBUIAPP_NAVBAR_COMPONENT>
@@ -35,10 +37,11 @@
 <!--5AC86E8BB0464025887B6544F175177C-->  <OBCLKER_TEMPLATE_ID><![CDATA[582D107C03FD4B56A4BEDCF4CAABBB55]]></OBCLKER_TEMPLATE_ID>
 <!--5AC86E8BB0464025887B6544F175177C-->  <NAME><![CDATA[User Information]]></NAME>
 <!--5AC86E8BB0464025887B6544F175177C-->  <DESCRIPTION><![CDATA[Shows user information]]></DESCRIPTION>
-<!--5AC86E8BB0464025887B6544F175177C-->  <CLASSNAME><![CDATA[org.openbravo.client.application.navigationbarcomponents.UserInfoComponent]]></CLASSNAME>
+<!--5AC86E8BB0464025887B6544F175177C-->  <CLASSNAME><![CDATA[org.openbravo.client.kernel.BaseTemplateComponent]]></CLASSNAME>
 <!--5AC86E8BB0464025887B6544F175177C-->  <ALLROLES><![CDATA[Y]]></ALLROLES>
 <!--5AC86E8BB0464025887B6544F175177C-->  <SORTNO><![CDATA[70]]></SORTNO>
 <!--5AC86E8BB0464025887B6544F175177C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5AC86E8BB0464025887B6544F175177C-->  <ISSTATICCOMPONENT><![CDATA[Y]]></ISSTATICCOMPONENT>
 <!--5AC86E8BB0464025887B6544F175177C--></OBUIAPP_NAVBAR_COMPONENT>
 
 <!--B2CD049FB8E34CE9B35A6F2C39A3A1F1--><OBUIAPP_NAVBAR_COMPONENT>
@@ -53,6 +56,7 @@
 <!--B2CD049FB8E34CE9B35A6F2C39A3A1F1-->  <ALLROLES><![CDATA[Y]]></ALLROLES>
 <!--B2CD049FB8E34CE9B35A6F2C39A3A1F1-->  <SORTNO><![CDATA[50]]></SORTNO>
 <!--B2CD049FB8E34CE9B35A6F2C39A3A1F1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B2CD049FB8E34CE9B35A6F2C39A3A1F1-->  <ISSTATICCOMPONENT><![CDATA[Y]]></ISSTATICCOMPONENT>
 <!--B2CD049FB8E34CE9B35A6F2C39A3A1F1--></OBUIAPP_NAVBAR_COMPONENT>
 
 <!--DD54C8A48D5A4E48BC92648B9BE19474--><OBUIAPP_NAVBAR_COMPONENT>
@@ -63,10 +67,11 @@
 <!--DD54C8A48D5A4E48BC92648B9BE19474-->  <OBCLKER_TEMPLATE_ID><![CDATA[CCA227AA8C4944E88B3EB23BA491222A]]></OBCLKER_TEMPLATE_ID>
 <!--DD54C8A48D5A4E48BC92648B9BE19474-->  <NAME><![CDATA[Quick Launch component]]></NAME>
 <!--DD54C8A48D5A4E48BC92648B9BE19474-->  <DESCRIPTION><![CDATA[Opens an class OB Window]]></DESCRIPTION>
-<!--DD54C8A48D5A4E48BC92648B9BE19474-->  <CLASSNAME><![CDATA[org.openbravo.client.application.navigationbarcomponents.QuickLaunchComponent]]></CLASSNAME>
+<!--DD54C8A48D5A4E48BC92648B9BE19474-->  <CLASSNAME><![CDATA[org.openbravo.client.kernel.BaseTemplateComponent]]></CLASSNAME>
 <!--DD54C8A48D5A4E48BC92648B9BE19474-->  <ALLROLES><![CDATA[Y]]></ALLROLES>
 <!--DD54C8A48D5A4E48BC92648B9BE19474-->  <SORTNO><![CDATA[20]]></SORTNO>
 <!--DD54C8A48D5A4E48BC92648B9BE19474-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DD54C8A48D5A4E48BC92648B9BE19474-->  <ISSTATICCOMPONENT><![CDATA[Y]]></ISSTATICCOMPONENT>
 <!--DD54C8A48D5A4E48BC92648B9BE19474--></OBUIAPP_NAVBAR_COMPONENT>
 
 <!--E404869052A44BC99AE27BDBAE1D6062--><OBUIAPP_NAVBAR_COMPONENT>
@@ -77,10 +82,11 @@
 <!--E404869052A44BC99AE27BDBAE1D6062-->  <OBCLKER_TEMPLATE_ID><![CDATA[66A2AD8595D1479E904ED0D9999E2842]]></OBCLKER_TEMPLATE_ID>
 <!--E404869052A44BC99AE27BDBAE1D6062-->  <NAME><![CDATA[Application Menu]]></NAME>
 <!--E404869052A44BC99AE27BDBAE1D6062-->  <DESCRIPTION><![CDATA[The application menu navigation bar component]]></DESCRIPTION>
-<!--E404869052A44BC99AE27BDBAE1D6062-->  <CLASSNAME><![CDATA[org.openbravo.client.application.navigationbarcomponents.ApplicationMenuComponent]]></CLASSNAME>
+<!--E404869052A44BC99AE27BDBAE1D6062-->  <CLASSNAME><![CDATA[org.openbravo.client.kernel.BaseTemplateComponent]]></CLASSNAME>
 <!--E404869052A44BC99AE27BDBAE1D6062-->  <ALLROLES><![CDATA[Y]]></ALLROLES>
 <!--E404869052A44BC99AE27BDBAE1D6062-->  <SORTNO><![CDATA[30]]></SORTNO>
 <!--E404869052A44BC99AE27BDBAE1D6062-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E404869052A44BC99AE27BDBAE1D6062-->  <ISSTATICCOMPONENT><![CDATA[Y]]></ISSTATICCOMPONENT>
 <!--E404869052A44BC99AE27BDBAE1D6062--></OBUIAPP_NAVBAR_COMPONENT>
 
 </data>
--- a/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Thu Sep 21 04:04:15 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.31787]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.32403]]></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[PR17Q2]]></VERSION_LABEL>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION_LABEL><![CDATA[PR17Q3]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Sep 21 04:04:15 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.31787]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.32403]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Thu Sep 21 04:04:15 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.31787]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.32403]]></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[PR17Q2]]></VERSION_LABEL>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION_LABEL><![CDATA[PR17Q3]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Sep 21 04:04:15 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.31787]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.32403]]></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.31787]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.32403]]></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.31787]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.32403]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Thu Sep 21 04:04:15 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.31787]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.32403]]></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[PR17Q2]]></VERSION_LABEL>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION_LABEL><![CDATA[PR17Q3]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Sep 21 04:04:15 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.31787]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.32403]]></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.31787]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.32403]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Thu Sep 21 04:04:15 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.31787]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.32403]]></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[PR17Q2]]></VERSION_LABEL>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION_LABEL><![CDATA[PR17Q3]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Sep 21 04:04:15 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.31787]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.32403]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Thu Sep 21 04:04:15 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.31787]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.32403]]></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[PR17Q2]]></VERSION_LABEL>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION_LABEL><![CDATA[PR17Q3]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Sep 21 04:04:15 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.31787]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.32403]]></STARTVERSION>
 <!--FF8080812D842086012D845002070046-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--FF8080812D842086012D845002070046-->  <DEPENDANT_MODULE_NAME><![CDATA[Workspace & Widgets]]></DEPENDANT_MODULE_NAME>
 <!--FF8080812D842086012D845002070046-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Thu Sep 21 04:04:15 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.31787]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.32403]]></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[PR17Q2]]></VERSION_LABEL>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION_LABEL><![CDATA[PR17Q3]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Sep 21 04:04:15 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.31787]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.32403]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Thu Sep 21 04:04:15 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.31787]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.32403]]></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[PR17Q2]]></VERSION_LABEL>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION_LABEL><![CDATA[PR17Q3]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Sep 21 04:04:15 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.31787]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.32403]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Thu Sep 21 04:04:15 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.31787]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.32403]]></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[PR17Q2]]></VERSION_LABEL>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION_LABEL><![CDATA[PR17Q3]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Sep 21 04:04:15 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.31787]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.32403]]></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.31787]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.32403]]></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.31787]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.32403]]></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.31787]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.32403]]></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.31787]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.32403]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Thu Sep 21 04:04:15 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.31787]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.32403]]></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[PR17Q2]]></VERSION_LABEL>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION_LABEL><![CDATA[PR17Q3]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Sep 21 04:04:15 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.31787]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.32403]]></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.31787]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.32403]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Thu Sep 21 04:04:15 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.31787]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.32403]]></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[PR17Q2]]></VERSION_LABEL>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION_LABEL><![CDATA[PR17Q3]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Sep 21 04:04:15 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.31787]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.32403]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Thu Sep 21 04:04:15 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.31787]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.32403]]></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[PR17Q2]]></VERSION_LABEL>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION_LABEL><![CDATA[PR17Q3]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Sep 21 04:04:15 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.31787]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.32403]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Thu Sep 21 04:04:15 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.31787]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.32403]]></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[PR17Q2]]></VERSION_LABEL>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION_LABEL><![CDATA[PR17Q3]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Sep 21 04:04:15 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.31787]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.32403]]></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.31787]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.32403]]></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.31787]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.32403]]></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.31787]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.32403]]></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.31787]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.32403]]></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.31787]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.32403]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Thu Sep 21 04:04:15 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.31787]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.32403]]></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[PR17Q2]]></VERSION_LABEL>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION_LABEL><![CDATA[PR17Q3]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Sep 21 04:04:15 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.31787]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.32403]]></STARTVERSION>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Thu Sep 21 04:04:15 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.31787]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.32403]]></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[PR17Q2]]></VERSION_LABEL>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION_LABEL><![CDATA[PR17Q3]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Sep 21 04:04:15 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.31787]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.32403]]></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.31787]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.32403]]></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.31787]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.32403]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Thu Sep 21 04:04:15 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.31787]]></VERSION>
+<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION><![CDATA[1.0.32403]]></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[PR17Q2]]></VERSION_LABEL>
+<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION_LABEL><![CDATA[PR17Q3]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Sep 21 04:04:15 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.31787]]></STARTVERSION>
+<!--86EBD30DEB8045508185B457896C9F6D-->  <STARTVERSION><![CDATA[2.1.32403]]></STARTVERSION>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_DATASET.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_DATASET.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -12,7 +12,7 @@
 <!--49446AB3B19D4DD2AD0320D171EC2760-->  <EXPORT><![CDATA[N]]></EXPORT>
 <!--49446AB3B19D4DD2AD0320D171EC2760-->  <ACCESSLEVEL><![CDATA[6]]></ACCESSLEVEL>
 <!--49446AB3B19D4DD2AD0320D171EC2760-->  <EXPORTALLOWED><![CDATA[Y]]></EXPORTALLOWED>
-<!--49446AB3B19D4DD2AD0320D171EC2760-->  <CHECKSUM><![CDATA[281949768489412648962353822266799178366]]></CHECKSUM>
+<!--49446AB3B19D4DD2AD0320D171EC2760-->  <CHECKSUM><![CDATA[204546209368682899496776916815840853745]]></CHECKSUM>
 <!--49446AB3B19D4DD2AD0320D171EC2760-->  <ISDEFAULTVALUESDATASET><![CDATA[N]]></ISDEFAULTVALUESDATASET>
 <!--49446AB3B19D4DD2AD0320D171EC2760--></AD_DATASET>
 
--- a/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_DATASET_TABLE.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_DATASET_TABLE.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -56,6 +56,20 @@
 <!--9770EECC121C4171A76489A5EF8BA770-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--9770EECC121C4171A76489A5EF8BA770--></AD_DATASET_TABLE>
 
+<!--B4B4B03266E942F9A0D66FD53B156F9F--><AD_DATASET_TABLE>
+<!--B4B4B03266E942F9A0D66FD53B156F9F-->  <AD_DATASET_TABLE_ID><![CDATA[B4B4B03266E942F9A0D66FD53B156F9F]]></AD_DATASET_TABLE_ID>
+<!--B4B4B03266E942F9A0D66FD53B156F9F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B4B4B03266E942F9A0D66FD53B156F9F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B4B4B03266E942F9A0D66FD53B156F9F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B4B4B03266E942F9A0D66FD53B156F9F-->  <AD_DATASET_ID><![CDATA[49446AB3B19D4DD2AD0320D171EC2760]]></AD_DATASET_ID>
+<!--B4B4B03266E942F9A0D66FD53B156F9F-->  <AD_TABLE_ID><![CDATA[FF80818132D85DB50132D860924E0004]]></AD_TABLE_ID>
+<!--B4B4B03266E942F9A0D66FD53B156F9F-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
+<!--B4B4B03266E942F9A0D66FD53B156F9F-->  <WHERECLAUSE><![CDATA[role='FF8081812250326E012250353BDE0006' or role='FF808181259DADEB01259DDDA4BB01E5' or role='FF808181259DADEB01259DDDA4C201E6' or role='FF808181259DADEB01259DDDA4C201E7' or role='FF8081812250326E012250353BDE0005'  or role='CA5B7FB2C95740E499C0F102343D51AD' or role='D7D7D228E4594ACE8D00FD0E08B333DE']]></WHERECLAUSE>
+<!--B4B4B03266E942F9A0D66FD53B156F9F-->  <EXCLUDEAUDITINFO><![CDATA[N]]></EXCLUDEAUDITINFO>
+<!--B4B4B03266E942F9A0D66FD53B156F9F-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
+<!--B4B4B03266E942F9A0D66FD53B156F9F-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
+<!--B4B4B03266E942F9A0D66FD53B156F9F--></AD_DATASET_TABLE>
+
 <!--B56E7DC2C2CA4229826A6C7B45FC35C5--><AD_DATASET_TABLE>
 <!--B56E7DC2C2CA4229826A6C7B45FC35C5-->  <AD_DATASET_TABLE_ID><![CDATA[B56E7DC2C2CA4229826A6C7B45FC35C5]]></AD_DATASET_TABLE_ID>
 <!--B56E7DC2C2CA4229826A6C7B45FC35C5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Thu Sep 21 04:04:15 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.31787]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.32403]]></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[PR17Q2]]></VERSION_LABEL>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION_LABEL><![CDATA[PR17Q3]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Sep 21 04:04:15 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.31787]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.32403]]></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.31787]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.32403]]></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.31787]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.32403]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Thu Sep 21 04:04:15 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.31787]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.32403]]></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[PR17Q2]]></VERSION_LABEL>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION_LABEL><![CDATA[PR17Q3]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Sep 21 04:04:15 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.31787]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.32403]]></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.31787]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.32403]]></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.31787]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.32403]]></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.31787]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.32403]]></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.31787]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.32403]]></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.31787]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.32403]]></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.31787]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.32403]]></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.31787]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.32403]]></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.31787]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.32403]]></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.31787]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.32403]]></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.31787]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.32403]]></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.31787]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.32403]]></STARTVERSION>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <DEPENDANT_MODULE_NAME><![CDATA[JSON REST Webservice]]></DEPENDANT_MODULE_NAME>
 <!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Thu Sep 21 04:04:15 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.31787]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.32403]]></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[PR17Q2]]></VERSION_LABEL>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[PR17Q3]]></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	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Thu Sep 21 04:04:15 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.31787]]></STARTVERSION>
+<!--48D556894CE54CF998DC97882E904CBD-->  <STARTVERSION><![CDATA[1.0.32403]]></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.31787]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.32403]]></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.31787]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.32403]]></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.31787]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.32403]]></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.31787]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.32403]]></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.31787]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.32403]]></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.31787]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.32403]]></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.31787]]></STARTVERSION>
+<!--FEF6E40F244A4061B7C62CB755663712-->  <STARTVERSION><![CDATA[1.0.32403]]></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.31787]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.32403]]></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.31787]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.32403]]></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.31787]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.32403]]></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/functions/AD_ISORGINCLUDED.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/functions/AD_ISORGINCLUDED.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -22,39 +22,42 @@
 * 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) 2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
 /*************************************************************************
 * Title: Return 'Org Level' if orgID is a leaf of the org tree
 *    where parentOrgID is the root. Else return -1
+*
+* This function is based on AD_Org_Tree table, which is populated only 
+* for the organizations set as ready. For the flows where the organization
+* is not set as ready yet, please use AD_ISORGINCLUDED_TREENODE instead.
 ************************************************************************/
-  v_Level NUMBER:=0;
-  v_treeID varchar2(32) ;
-  v_Parent VARCHAR(32) ;
-  v_Node   VARCHAR(32) ;
+  V_RETURN AD_ORG_TREE.LEVELNO%TYPE:=-1 ;
 BEGIN
-  SELECT MAX(AD_TREE_ORG_ID)
-  INTO v_treeID
-  FROM AD_CLIENTINFO
-  WHERE AD_CLIENT_ID=p_clientID;
-  v_Parent:=p_OrgID;
-  WHILE v_Parent IS NOT NULL
-  LOOP
-    v_Level:=v_Level + 1;
-    SELECT MAX(NODE_ID),
-      MAX(PARENT_ID)
-    INTO v_Node,
-      v_Parent
-    FROM AD_TREENODE
-    WHERE AD_TREE_ID=v_treeID
-      AND NODE_ID=v_Parent;
-    IF v_Node=p_parentOrgID THEN
-      RETURN v_Level;
-    END IF;
-  END LOOP;
-  RETURN(-1) ;
+
+  -- Special case for * org
+  IF (p_orgid='0' and p_parentorgid='0' and p_clientid is not null) THEN
+    SELECT 1
+    INTO V_RETURN
+    FROM AD_CLIENT
+    WHERE AD_CLIENT_ID = p_clientid;
+    RETURN COALESCE(V_RETURN, -1);
+  END IF;
+
+  -- Take advantage of AD_ORG_TREE.AD_ORG_TREE_ORGPARENTCLIENTLEV unique constraint
+  SELECT LEVELNO
+  INTO V_RETURN
+  FROM AD_ORG_TREE
+  WHERE AD_ORG_ID = p_orgid
+  AND AD_PARENT_ORG_ID = p_parentorgid
+  AND AD_CLIENT_ID = p_clientid;
+ 
+  RETURN COALESCE(V_RETURN, -1);
+EXCEPTION
+WHEN OTHERS THEN
+  RETURN -1;
 END AD_ISORGINCLUDED
 ]]></body>
     </function>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/functions/AD_ISORGINCLUDED_TREENODE.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+  <database name="FUNCTION AD_ISORGINCLUDED_TREENODE">
+    <function name="AD_ISORGINCLUDED_TREENODE" type="NUMERIC">
+      <parameter name="p_orgid" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_parentorgid" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_clientid" type="VARCHAR" mode="in">
+        <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) 2001-2006 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+/*************************************************************************
+* Title: Return 'Org Level' if orgID is a leaf of the org tree
+*    where parentOrgID is the root. Else return -1
+*
+* This function has very important performance issues and it should only 
+* be used in flows involving organizations not set as ready yet.
+* For other flows it is highly recommended to use AD_ISORGINCLUDED instead.
+************************************************************************/
+  v_Level NUMBER:=0;
+  v_treeID varchar2(32) ;
+  v_Parent VARCHAR(32) ;
+  v_Node   VARCHAR(32) ;
+BEGIN
+  SELECT MAX(AD_TREE_ORG_ID)
+  INTO v_treeID
+  FROM AD_CLIENTINFO
+  WHERE AD_CLIENT_ID=p_clientID;
+  v_Parent:=p_OrgID;
+  WHILE v_Parent IS NOT NULL
+  LOOP
+    v_Level:=v_Level + 1;
+    SELECT MAX(NODE_ID),
+      MAX(PARENT_ID)
+    INTO v_Node,
+      v_Parent
+    FROM AD_TREENODE
+    WHERE AD_TREE_ID=v_treeID
+      AND NODE_ID=v_Parent;
+    IF v_Node=p_parentOrgID THEN
+      RETURN v_Level;
+    END IF;
+  END LOOP;
+  RETURN(-1) ;
+END AD_ISORGINCLUDED_TREENODE
+]]></body>
+    </function>
+  </database>
--- a/model/src-db/database/model/functions/AD_ORG_CHK_CALENDAR.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/functions/AD_ORG_CHK_CALENDAR.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -13,7 +13,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) 2008-2014 Openbravo SLU
+* All portions are Copyright (C) 2008-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/      
@@ -48,7 +48,7 @@
     SELECT COUNT(DISTINCT c_calendar_id), COALESCE(MAX(c_calendar_id), 'NO CALENDAR')
     INTO v_num_calendars, v_calendar_id
     FROM ad_org
-    WHERE AD_ISORGINCLUDED(ad_org.ad_org_id, cur_org_le.ad_org_id, ad_org.ad_client_id)<>-1
+    WHERE AD_ISORGINCLUDED_TREENODE(ad_org.ad_org_id, cur_org_le.ad_org_id, ad_org.ad_client_id)<>-1
     AND IsReady='Y';
     
     IF (v_num_calendars>1) THEN
--- a/model/src-db/database/model/functions/AD_ORG_READY.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/functions/AD_ORG_READY.xml	Thu Sep 21 04:04:15 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) 2008-2012 Openbravo SLU
+* All portions are Copyright (C) 2008-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -64,7 +64,7 @@
     IF (v_IsRecursive='Y') THEN
       UPDATE AD_ORG
       SET ISREADY='Y'
-      WHERE AD_ISORGINCLUDED(ad_org.ad_org_id, v_Record_ID, ad_org.ad_client_id)<>-1
+      WHERE AD_ISORGINCLUDED_TREENODE(ad_org.ad_org_id, v_Record_ID, ad_org.ad_client_id)<>-1
       AND IsReady='N';      
     ELSE
       UPDATE AD_ORG
@@ -123,6 +123,51 @@
       v_Result:=0;
       RAISE_APPLICATION_ERROR(-20000, '@20539@');
     END IF;
+
+    
+    -- Populate AD_Org_Tree
+    IF (v_IsRecursive='Y') THEN
+       FOR Cur_Org IN
+        (SELECT AD_Org_ID
+        FROM AD_Org
+        WHERE AD_ISORGINCLUDED_TREENODE(AD_Org_ID, v_Record_ID, AD_Client_ID)<>-1
+        )
+      LOOP
+        INSERT INTO ad_org_tree
+        (
+        ad_org_tree_id, ad_client_id, 
+        ad_org_id, ad_parent_org_id, 
+        levelno,  isactive,
+        created, createdby, updated, updatedby
+        )
+        select get_uuid(), oc.ad_client_id, 
+        oc.ad_org_id, op.ad_org_id, 
+        ad_isorgincluded_treenode(oc.ad_org_id, op.ad_org_id, oc.ad_client_id), 'Y', 
+        now(), '100', now(), '100'
+        from ad_org op
+        cross join ad_org oc
+        where (oc.ad_client_id = op.ad_client_id or op.ad_org_id = '0')
+        and oc.ad_org_id = Cur_Org.AD_Org_ID
+        and ad_isorgincluded_treenode(oc.ad_org_id, op.ad_org_id, oc.ad_client_id) > 0;
+      END LOOP;
+    ELSE 
+      INSERT INTO ad_org_tree
+      (
+      ad_org_tree_id, ad_client_id, 
+      ad_org_id, ad_parent_org_id, 
+      levelno,  isactive,
+      created, createdby, updated, updatedby
+      )
+      select get_uuid(), oc.ad_client_id, 
+      oc.ad_org_id, op.ad_org_id, 
+      ad_isorgincluded_treenode(oc.ad_org_id, op.ad_org_id, oc.ad_client_id), 'Y', 
+      now(), '100', now(), '100'
+      from ad_org op
+      cross join ad_org oc
+      where (oc.ad_client_id = op.ad_client_id or op.ad_org_id = '0')
+      and oc.ad_org_id = v_Record_ID
+      and ad_isorgincluded_treenode(oc.ad_org_id, op.ad_org_id, oc.ad_client_id) > 0;
+    END IF;
     
     -- Create PeriodControl for the organization
     IF (v_IsRecursive='N') THEN
--- a/model/src-db/database/model/functions/C_COMMISSION_COPY.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/functions/C_COMMISSION_COPY.xml	Thu Sep 21 04:04:15 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-2008 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.
@@ -97,7 +97,7 @@
             QtyMultiplier, IsPositiveOnly,
             M_Product_Category_ID, M_Product_ID,
             C_BP_Group_ID, C_BPartner_ID,
-            C_SalesRegion_ID
+            C_SalesRegion_ID, Org_Id, CommissionOrders
           )
           VALUES
           (
@@ -111,7 +111,7 @@
             CUR_Commission.QtyMultiplier, CUR_Commission.IsPositiveOnly,
             CUR_Commission.M_Product_Category_ID, CUR_Commission.M_Product_ID,
             CUR_Commission.C_BP_Group_ID, CUR_Commission.C_BPartner_ID,
-            CUR_Commission.C_SalesRegion_ID
+            CUR_Commission.C_SalesRegion_ID, CUR_Commission.Org_Id, CUR_Commission.CommissionOrders
           )
           ;
       END LOOP;
--- a/model/src-db/database/model/functions/C_COMMISSION_PROCESS.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/functions/C_COMMISSION_PROCESS.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -350,6 +350,8 @@
         -- Organization
         IF(CUR_CLine.Org_ID IS NOT NULL) THEN
           v_Cmd:=v_Cmd || ' AND h.AD_Org_ID=''' || CUR_CLine.Org_ID || '''';
+        ELSE
+          v_Cmd:=v_Cmd || ' AND AD_ISORGINCLUDED(h.AD_Org_ID, ''' || v_AD_Org_ID || ''', h.AD_Client_ID) <> -1';
         END IF;
         -- BPartner
         IF(CUR_CLine.C_BPartner_ID IS NOT NULL) THEN
--- a/model/src-db/database/model/functions/C_INVOICE_CREATE.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/functions/C_INVOICE_CREATE.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -25,7 +25,7 @@
   * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
   * All Rights Reserved.
   * Contributor(s): Openbravo SLU
-  * Contributions are Copyright (C) 2001-2016 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.
@@ -68,8 +68,6 @@
     v_Qty NUMBER;
     --MODIFIED BY F.IRIAZABAL
     v_QtyOrder NUMBER;
-    v_Reference VARCHAR2(2000):='';
-    v_ReferenceOrder CHAR(1) ;
     v_DocSubTypeSO VARCHAR2(60) ;
     --
     v_LineNo NUMBER:=0;
@@ -364,34 +362,6 @@
                 DBMS_OUTPUT.PUT_LINE('- No Lines -') ;
                 Next_Order:=TRUE;
               END IF;
-              IF(NOT Next_Order) THEN
-                -- Shipment Reference (optional)
-                DECLARE
-                  Cur_DocTypeCOrder RECORD;
-                BEGIN
-                  FOR Cur_DocTypeCOrder IN
-                    (SELECT dt.PrintName || ' ' || ox.DocumentNo||' '||(
-                      CASE
-                        WHEN ox.PoReference IS NULL
-                        THEN NULL
-                        ELSE '('||ox.PoReference||')'
-                      END
-                      ) AS Reference
-                    FROM C_DOCTYPE dt,
-                      C_ORDER ox
-                    WHERE dt.C_DocType_ID=ox.C_Order_ID
-                      AND ox.C_Order_ID=Cur_Order.C_Order_ID
-                    ORDER BY ox.DocumentNo DESC
-                    )
-                  LOOP -- last shipment
-                    v_Reference:=Cur_DocTypeCOrder.Reference;
-                    EXIT;
-                  END LOOP;
-                EXCEPTION
-                WHEN OTHERS THEN
-                  DBMS_OUTPUT.PUT_LINE('- No ShipReference -') ;
-                END;
-              END IF;--Next_Order
               -- After (D)elivery   -- Check M_InOut for invoice quantity
               -- After (O)rder completely delivered
             ELSIF((Cur_Order.InvoiceRule IN('D', 'O'))) THEN
@@ -416,51 +386,6 @@
                   Next_Order:=TRUE;
                 END IF;
               END IF;--Next_Order
-              IF(NOT Next_Order) THEN
-                -- Shipment Reference
-                v_ResultStr:='Ship Reference Order_ID=' || Cur_Order.C_Order_ID;
-                SELECT REFERENCE_ORDER
-                INTO v_ReferenceOrder
-                FROM AD_ORGINFO
-                WHERE AD_Org_ID=ptr_sl.AD_Org_ID;
-                IF(v_ReferenceOrder='Y') THEN
-                  DECLARE
-                    Cur_CDoctypeCOrder RECORD;
-                  BEGIN
-                    -- last shipment
-                    FOR Cur_CDoctypeCOrder IN
-                      (SELECT dt.PrintName || ' ' || ox.DocumentNo||' '||(
-                        CASE
-                          WHEN ox.PoReference IS NULL
-                          THEN NULL
-                          ELSE '('||ox.PoReference||')'
-                        END
-                        ) AS Reference
-                      FROM C_DOCTYPE dt,
-                        C_ORDER ox
-                      WHERE dt.C_DocType_ID=ox.C_Order_ID
-                        AND ox.C_Order_ID=Cur_Order.C_Order_ID
-                      ORDER BY ox.DocumentNo DESC
-                      )
-                    LOOP
-                      v_Reference:=Cur_CDoctypeCOrder.Reference;
-                      EXIT;
-                    END LOOP;
-                  END;
-                ELSE  SELECT dt.PrintName || ' ' || m.DocumentNo||' '||(
-                    CASE
-                      WHEN m.PoReference IS NULL
-                      THEN NULL
-                      ELSE '('||m.PoReference||')'
-                    END
-                    )
-                  INTO v_Reference
-                  FROM M_INOUT m,
-                    C_DOCTYPE dt
-                  WHERE m.C_DocType_ID=dt.C_DocType_ID
-                    AND m.M_InOut_ID=ptr_sl.M_InOut_ID;
-                END IF;
-              END IF;--Next_Order
               -- Do not invoice
             ELSIF(Cur_Order.InvoiceRule='N') THEN
               DBMS_OUTPUT.PUT_LINE('Invoice Rule: Do not invoice') ;
@@ -540,47 +465,6 @@
               --
               v_NoRecords:=v_NoRecords + 1;
               v_LineNo:=0;
-              -- Insert Reference/Comment to Shipment for Warehouse Order/Pickup
-
-		IF(v_Reference IS NOT NULL AND TRIM(v_Reference)!=''
-                /*AND v_DocSubTypeSO = 'WP'*/
-                ) THEN
-                v_ResultStr:='InsertShipmentReference';
-                Ad_Sequence_Next('C_InvoiceLine', Cur_Order.C_Order_ID, v_NextNo) ;
-               INSERT
-                INTO C_INVOICELINE
-                  (
-                    C_InvoiceLine_ID, AD_Client_ID, AD_Org_ID, IsActive,
-                    Created, CreatedBy, Updated, UpdatedBy,
-                    C_Invoice_ID, C_OrderLine_ID, M_InOutLine_ID, Line,
-                    Description, M_Product_ID, QtyInvoiced, PriceList,
-                    PriceActual, PriceLimit, LineNetAmt, C_Charge_ID,
-                    ChargeAmt, C_UOM_ID, C_Tax_ID, PriceStd, 
-                    AUMQTY, C_AUM,
-                    explode, bom_parent_id,
-                    C_Project_ID, C_Bpartner_ID, A_Asset_ID,
-                    C_Costcenter_ID, User1_ID, User2_ID
-                  )
-                  VALUES
-                  (
-                    v_NextNo, Cur_Order.AD_Client_ID, Cur_Order.AD_Org_ID, 'Y',
-                    now(), v_ADUserId, now(), v_ADUserId,
-                    p_Invoice_ID, NULL, NULL, v_LineNo,
-                    v_Reference, NULL, 0, 0,
-                    0, 0, 0, NULL,
-                    0, NULL, NULL, 0, 
-                    NULL, NULL,
-                    ptr_sl.explode, (SELECT c_invoiceline_id 
-                                            FROM c_invoiceline 
-                                            WHERE c_invoice_id=p_Invoice_ID 
-                                               and c_orderline_id = (SELECT BOM_parent_id 
-                                                                     FROM c_orderline 
-                                                                     WHERE c_orderline_id = ptr_sl.c_orderline_id)),
-                    ptr_sl.C_Project_ID, ptr_sl.C_Bpartner_ID, ptr_sl.A_Asset_ID,
-                    ptr_sl.C_Costcenter_ID, ptr_sl.User1_ID, ptr_sl.User2_ID
-                  )
-                  ;
-              END IF;
             END IF;--Next_Order
             IF(NOT Next_Order) THEN
               /**
--- a/model/src-db/database/model/functions/C_INVOICE_POST.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/functions/C_INVOICE_POST.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -174,8 +174,8 @@
   v_iscashvat C_Invoice.IsCashVat%TYPE;
   v_invoiceline_qtysum NUMBER;
   v_prepaymentamt NUMBER;
-  v_prepayment_inorders NUMBER;
   v_hasTaxes NUMBER;
+  v_calendarId C_CALENDAR.C_CALENDAR_ID%TYPE;
    
 BEGIN
   IF (p_PInstance_ID IS NOT NULL) THEN
@@ -344,6 +344,7 @@
     /*
      * 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,
               MIN(P.STARTDATE) AS PERIODSTARTDATE, MAX(P.ENDDATE) AS PERIODENDDATE
@@ -351,9 +352,7 @@
           WHERE Y.C_YEAR_ID = P.C_YEAR_ID
             AND Y.ISACTIVE = 'Y'
             AND P.ISACTIVE = 'Y'
-            AND Y.C_CALENDAR_ID = (SELECT O.C_CALENDAR_ID 
-                                   FROM AD_ORG O
-                                   WHERE AD_ORG_ID = AD_ORG_GETCALENDAROWNER(v_Org_ID))
+            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 ;
@@ -366,9 +365,7 @@
             WHERE Y.C_YEAR_ID = P.C_YEAR_ID
               AND Y.ISACTIVE = 'Y'
               AND P.ISACTIVE = 'Y'
-              AND Y.C_CALENDAR_ID = (SELECT O.C_CALENDAR_ID 
-                                     FROM AD_ORG O
-                                     WHERE AD_ORG_ID = AD_ORG_GETCALENDAROWNER(v_Org_ID))
+              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 ;
@@ -1275,6 +1272,7 @@
         END IF;        
         v_InvoiceLineSeqNo:=10 + v_InvoiceLineSeqNo;
         v_InvoiceLine:=get_uuid();
+        v_Discount := ROUND(v_Discount, v_stdPrecision);
         INSERT INTO C_INVOICELINE
           (
            C_INVOICELINE_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE,
@@ -1798,21 +1796,22 @@
     END IF;
   END IF;--FINISH_PROCESS
   IF (NOT FINISH_PROCESS AND NOT END_PROCESSING) THEN
-    --Update the prepayment amount from orders related to the invoice lines.
-    SELECT COALESCE(SUM(fps.paidamt),0)
-      INTO v_prepayment_inorders
-    FROM fin_payment_schedule fps
-      JOIN c_order o ON o.c_order_id=fps.c_order_id
-      JOIN c_orderline ol ON ol.c_order_id = o.c_order_id
-      JOIN c_invoiceline il ON il.c_orderline_id = ol.c_orderline_id
-    WHERE il.c_invoice_id = v_Record_ID;
+    -- Update prepayment amount for invoice related to order
+    UPDATE C_Invoice i
+    SET prepaymentamt = (
+      SELECT COALESCE(SUM(fps.paidamt), 0)
+      FROM FIN_Payment_Schedule fps
+      WHERE fps.C_Order_ID = i.C_Order_ID
+    )
+    WHERE i.C_Invoice_ID = v_Record_ID;
+  END IF;--FINISH_PROCESS
+  IF (NOT FINISH_PROCESS AND NOT END_PROCESSING) THEN
 
     -- Finish up -------------------------------------------------------------
     UPDATE C_INVOICE
     SET DocStatus='CO',
         Processed='Y',
         DocAction='RE',
-        PrepaymentAmt=v_prepayment_inorders,
         Updated=now(),
         UpdatedBy=v_UpdatedBy
     WHERE C_Invoice_ID=v_Record_ID;
--- a/model/src-db/database/model/functions/C_ORDER_POST1.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/functions/C_ORDER_POST1.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -784,7 +784,7 @@
                     ), 0)
             )
             LOOP
-              v_QtyOrdered := COALESCE(CASE WHEN (Cur_Inventory.QtyDelivered < 0) THEN LEAST(Cur_Inventory.QtyDelivered, Cur_Inventory.QtyInvoiced) ELSE GREATEST(Cur_Inventory.QtyDelivered, Cur_Inventory.QtyInvoiced) END, 0);
+              v_QtyOrdered := COALESCE(CASE WHEN (Cur_Inventory.QtyDelivered < 0) THEN LEAST(Cur_Inventory.QtyDelivered, Cur_Inventory.QtyInvoiced) ELSE CASE WHEN (Cur_Inventory.QtyDelivered = 0) THEN Cur_Inventory.QtyInvoiced ELSE GREATEST(Cur_Inventory.QtyDelivered, Cur_Inventory.QtyInvoiced) END END, 0);
               v_QtyAum := M_GET_CONVERTED_AUMQTY(Cur_Inventory.M_Product_ID, v_QtyOrdered, Cur_Inventory.C_AUM);
               v_linenetamt := ROUND(COALESCE(v_QtyOrdered, 0) * Cur_Inventory.priceactual, C_GET_CURRENCY_PRECISION(Cur_Inventory.C_Currency_ID, 'A'));
               v_linegrossamt := ROUND(COALESCE(v_QtyOrdered, 0) * Cur_Inventory.gross_unit_price, C_GET_CURRENCY_PRECISION(Cur_Inventory.C_Currency_ID, 'A'));
@@ -1327,13 +1327,15 @@
                     IF (v_pendingtounreserve > 0) THEN
                       RAISE_APPLICATION_ERROR(-20000, '@CouldNotUnreserveNeededQty@');
                     END IF;
-                    -- Delete reservation lines with zero releasedqty
-                    DELETE FROM m_reservation_stock
-                    WHERE COALESCE(releasedqty, 0) = 0
+                    IF (v_DocAction <> 'CO') THEN
+                      -- Delete reservation lines with zero releasedqty
+                      DELETE FROM m_reservation_stock
+                      WHERE COALESCE(releasedqty, 0) = 0
                       AND m_reservation_id = v_reservation_id;
+                    END IF;
                   END IF;
                   -- Order line orderedqty greater than reservation releasedqty
-                  IF (cur_orderline.qtyordered > v_releasedqty) THEN
+                  IF (cur_orderline.qtyordered > v_releasedqty AND v_DocAction <> 'CO') THEN
                     UPDATE m_reservation_stock
                     SET quantity = releasedqty,
                         updated = now(),
@@ -1342,11 +1344,11 @@
                   END IF;
                   UPDATE m_reservation
                   SET quantity = cur_orderline.qtyordered,
-                      res_status = 'CL',
+                      res_status = CASE WHEN v_DocAction <> 'CO' THEN 'CL' ELSE res_status END,
                       updated = now(),
                       updatedby = v_user
                   WHERE m_reservation_id = v_reservation_id;
-                  IF (v_quantity < cur_orderline.qtyordered AND v_res_status = 'CO') THEN
+                  IF (v_quantity < cur_orderline.qtyordered AND v_res_status = 'CO' AND v_DocAction <> 'CO') THEN
                     --Reservation processed with higher quantity. Try to reserve the new quantity.
                     M_RESERVE_STOCK_AUTO(v_reservation_id, v_user, v_reservedqty);
                   END IF;
--- a/model/src-db/database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml	Thu Sep 21 04:04:15 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-2016 Openbravo SLU
+* All portions are Copyright (C) 2001-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -56,12 +56,13 @@
   v_UseStdPrecisionInProduction CHAR(1);
   v_PlanLine NUMBER;
   v_CostCenterUse NUMBER;
-  v_allownegativestock CHAR(1);
   v_Calculated CHAR(1);
   v_ByDefault CHAR(1);
   v_PendingQty NUMBER; 
   v_InsertQty NUMBER;
   v_AD_Pinstance_ID VARCHAR2(32);
+  v_NegStockLocator VARCHAR2(32);
+  v_NegStockWarehosue VARCHAR2(32);
   --  Toolset Types to process
   Cur_ToolsetProcess RECORD;
   --  WRPhase products created
@@ -74,11 +75,13 @@
   CURSOR Cur_Stock (v_AD_Pinstance_ID VARCHAR)IS
     SELECT T.M_PRODUCT_ID, T.C_UOM_ID, T.M_LOCATOR_ID, T.M_ATTRIBUTESETINSTANCE_ID,
       T.M_PRODUCT_UOM_ID, MS.QUANTITY AS Qty, MS.QTYORDER AS QtyOrder,
-      U.STDPRECISION, MS.PRIORITY
+      U.STDPRECISION, MS.PRIORITY, INVS.OVERISSUE
     FROM M_STOCK_PROPOSED MS 
             LEFT JOIN M_STORAGE_DETAIL T ON MS.M_STORAGE_DETAIL_ID = T.M_STORAGE_DETAIL_ID
             LEFT JOIN M_PRODUCT_UOM PU ON T.M_PRODUCT_UOM_ID = PU.M_PRODUCT_UOM_ID
             LEFT JOIN C_UOM U ON PU.C_UOM_ID = U.C_UOM_ID
+            JOIN M_LOCATOR L ON L.M_LOCATOR_ID = T.M_LOCATOR_ID
+            JOIN M_INVENTORYSTATUS INVS ON INVS.M_INVENTORYSTATUS_ID = L.M_INVENTORYSTATUS_ID
     WHERE MS.AD_PINSTANCE_ID = v_AD_Pinstance_ID
     ORDER BY MS.PRIORITY;
     v_storage CUR_STOCK%ROWTYPE;
@@ -108,10 +111,6 @@
       DBMS_OUTPUT.PUT_LINE('--<<MA_ProductionRun_Standard>>') ;
     END IF;
   BEGIN --BODY
-    SELECT ad_clientinfo.allownegativestock
-      INTO v_allownegativestock
-    FROM ad_clientinfo
-    WHERE ad_clientinfo.ad_client_id = v_Client_ID;
     
     v_ResultStr:='Getting DoneQuantity and process_ID';
     SELECT M_ProductionPlan.AD_Org_ID, M_ProductionPlan.MA_WRPhase_ID,
@@ -296,6 +295,7 @@
         -- Get StdPrecision for Uom of product to be used in Production Line
         SELECT StdPrecision, UseinProduction INTO v_StdPrecision, v_UseStdPrecisionInProduction
         FROM C_Uom WHERE C_Uom_ID = Cur_WRPUsed.C_Uom_ID;
+                                  
         IF (Cur_WRPUsed.IsStocked='Y') THEN
           v_QtyAcumulated:=0;
           IF (NOT Cur_Stock_ISOPEN) OR (v_Product_old<>Cur_WRPUsed.M_Product_ID OR v_UOM_old<>Cur_WRPUsed.C_UOM_ID) THEN
@@ -326,7 +326,7 @@
               END;
 
               --Review no warehouse as parameter
-              M_GET_STOCK_PARAM(v_AD_Pinstance_ID, v_Record_ID, v_DoneQuantity*Cur_WRPUsed.MovementQty, v_Product_old, null, null, null, v_PlanOrg_ID, null, v_User_ID, v_Client_ID, v_warehouse_rule_id, v_UOM_old, v_Product_UOM_old, '325', v_Production_ID, v_PlanLine, '800105', null, 'N', v_pinstance_result, v_pinstance_msg);
+              M_GET_STOCK_PARAM(v_AD_Pinstance_ID, v_Record_ID, v_DoneQuantity*Cur_WRPUsed.MovementQty, v_Product_old, null, null, null, v_PlanOrg_ID, null, v_User_ID, v_Client_ID, v_warehouse_rule_id, v_UOM_old, v_Product_UOM_old, '325', v_Production_ID, v_PlanLine, '800105', null, 'N', v_pinstance_result, v_pinstance_msg, 'Y', null, null);
 
               -- Check result
               BEGIN
@@ -357,6 +357,9 @@
           END IF;
           IF (NOT NEXT_PRODUCT) THEN
             LOOP
+              IF (v_storage.OVERISSUE = 'Y' AND v_NegStockLocator IS NULL) THEN
+                v_NegStockLocator:= v_storage.m_locator_id;
+              END IF;
               v_Qty:=LEAST(v_QtyStorage, v_DoneQuantity*Cur_WRPUsed.MovementQty - v_QtyAcumulated) ;
               v_QtyStorage:=v_QtyStorage - v_Qty;
               v_QtyAcumulated:=v_QtyAcumulated + v_Qty;
@@ -430,7 +433,28 @@
             END LOOP;
           END IF; --NEXT_PRODUCT
           IF (v_QtyAcumulated < v_DoneQuantity*Cur_WRPUsed.MovementQty) THEN
-            IF (v_allownegativestock = 'Y') THEN
+            IF (v_NegStockLocator IS NULL) THEN
+              -- Get Locator with negative Stock that belongs to the same Warehosue
+              SELECT m_warehouse_id
+              INTO v_NegStockWarehosue
+              FROM m_locator
+              WHERE m_locator_id = Cur_WRPUsed.m_locator_id;
+        
+              SELECT MIN(l.m_locator_id)
+              INTO v_NegStockLocator
+              FROM m_locator l
+              JOIN m_inventorystatus invs ON l.m_inventorystatus_id = invs.m_inventorystatus_id
+              WHERE l.m_warehouse_id = v_NegStockWarehosue
+              AND invs.overissue = 'Y'
+              AND l.isactive= 'Y'
+              AND priorityno = (SELECT MIN(priorityno)
+                                FROM m_locator l
+                                JOIN m_inventorystatus invs ON l.m_inventorystatus_id = invs.m_inventorystatus_id
+                                WHERE l.m_warehouse_id = v_NegStockWarehosue
+                                AND invs.overissue = 'Y'
+                                AND l.isactive='Y');
+            END IF;
+            IF (v_NegStockLocator IS NOT NULL) THEN
               IF (v_GlobalUse='Y') THEN
                 SELECT count(*)
                   INTO v_Count
@@ -447,7 +471,7 @@
                        GET_UUID(), Cur_WRPUsed.M_Production_ID, Cur_WRPUsed.Client_ID, Cur_WRPUsed.Org_ID,
                        'Y', now(), v_User_ID, now(),
                         v_User_ID, Cur_WRPUsed.M_Product_ID, Cur_WRPUsed.C_UOM_ID, 0,
-                        Cur_WRPUsed.M_Locator_ID
+                        v_NegStockLocator
                   );
                 END IF;
               ELSE
@@ -462,7 +486,7 @@
                     GET_UUID(), v_Record_ID, v_Line, Cur_WRPUsed.Client_ID,
                     Cur_WRPUsed.Org_ID, 'Y', now(), v_User_ID,
                     now(), v_User_ID, Cur_WRPUsed.M_Product_ID, CASE WHEN v_UseStdPrecisionInProduction = 'Y' THEN ROUND(( CASE v_NoQty WHEN 'Y' THEN 0 ELSE v_DoneQuantity*Cur_WRPUsed.MovementQty - v_QtyAcumulated END),v_StdPrecision) ELSE ( CASE v_NoQty WHEN 'Y' THEN 0 ELSE v_DoneQuantity*Cur_WRPUsed.MovementQty - v_QtyAcumulated END) END,
-                    '-', Cur_WRPUsed.C_UOM_ID, Cur_WRPUsed.M_Locator_ID, Cur_WRPUsed.M_Product_UOM_ID, Cur_WRPUsed.QuantityOrder,
+                    '-', Cur_WRPUsed.C_UOM_ID, v_NegStockLocator, Cur_WRPUsed.M_Product_UOM_ID, Cur_WRPUsed.QuantityOrder,
                     Cur_WRPUsed.MA_WRPhaseProduct_ID
                 );
               END IF;
--- a/model/src-db/database/model/functions/MA_PRODUCTION_COST.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/functions/MA_PRODUCTION_COST.xml	Thu Sep 21 04:04:15 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) 2001-2016 Openbravo SLU
+ * All portions are Copyright (C) 2001-2017 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  ************************************************************************/
@@ -186,7 +186,7 @@
         v_ResultStr := 'WIP cost';
         v_ProductionCost_Tmp := 0;
 
-        FOR Cur_WIP IN (SELECT c.COST*ppl.MOVEMENTQTY AS cost, ppl.M_PRODUCTIONLINE_ID
+        FOR Cur_WIP IN (SELECT min(c.COST) * ppl.MOVEMENTQTY AS cost, ppl.M_PRODUCTIONLINE_ID
                         FROM M_COSTING c, M_PRODUCTIONLINE ppl
                         WHERE c.M_PRODUCT_ID = ppl.M_PRODUCT_ID
                           AND TRUNC(c.DATEFROM) <= v_CostingDate
@@ -195,7 +195,8 @@
                           AND ppl.M_PRODUCTIONPLAN_ID = Cur_ProductionPlan.M_PRODUCTIONPLAN_ID
                           AND c.ISPRODUCTION='Y'
                           AND ((c.COSTTYPE = (CASE WHEN (SELECT COUNT(1) FROM M_PRODUCT WHERE M_PRODUCT_ID = ppl.M_PRODUCT_ID AND PRODUCTTYPE = 'I' AND ISSTOCKED = 'Y') > 0 THEN 'AVA' ELSE 'STA' END) AND v_iscostmigrated = 'Y')
-				OR (c.COSTTYPE IN ('AV','ST') AND v_iscostmigrated = 'N'))) LOOP
+				OR (c.COSTTYPE IN ('AV','ST') AND v_iscostmigrated = 'N'))
+                        GROUP BY ppl.M_PRODUCTIONLINE_ID, ppl.MOVEMENTQTY) LOOP
           v_ProductionCost_Tmp := v_ProductionCost_Tmp + COALESCE(Cur_WIP.cost,0);
           UPDATE M_PRODUCTIONLINE
           SET calccost = COALESCE(Cur_WIP.cost, 0)
@@ -205,7 +206,7 @@
         v_ProductionCost_Tmp := 0;
         --Second sum of raw materials that had not been added previously as WIP
         v_ResultStr := 'Raw Material cost';
-        FOR Cur_RawMaterial IN (SELECT c.COST*ppl.MOVEMENTQTY AS cost, ppl.M_PRODUCTIONLINE_ID
+        FOR Cur_RawMaterial IN (SELECT min(c.COST) * ppl.MOVEMENTQTY AS cost, ppl.M_PRODUCTIONLINE_ID
                                 FROM M_COSTING c, M_PRODUCTIONLINE ppl
                                 WHERE c.M_PRODUCT_ID = ppl.M_PRODUCT_ID
                                   AND TRUNC(c.DATEFROM) <= v_CostingDate
@@ -224,7 +225,8 @@
                                                     AND M_PRODUCTIONLINE.M_PRODUCT_ID = c.M_Product_ID
                                                     AND M_COSTING.ISPRODUCTION='Y'
 						    AND ((M_COSTING.COSTTYPE = (CASE WHEN (SELECT COUNT(1) FROM M_PRODUCT WHERE M_PRODUCT_ID = ppl.M_PRODUCT_ID AND PRODUCTTYPE = 'I' AND ISSTOCKED = 'Y') > 0 THEN 'AVA' ELSE 'STA' END) AND v_iscostmigrated = 'Y')
-							OR (M_COSTING.COSTTYPE IN ('AV','ST') AND v_iscostmigrated = 'N')))) LOOP
+							OR (M_COSTING.COSTTYPE IN ('AV','ST') AND v_iscostmigrated = 'N')))
+                                GROUP BY ppl.M_PRODUCTIONLINE_ID, ppl.MOVEMENTQTY) LOOP
           v_ProductionCost_Tmp := v_ProductionCost_Tmp + COALESCE(Cur_RawMaterial.cost,0);
           UPDATE M_PRODUCTIONLINE
           SET calccost = COALESCE(Cur_RawMaterial.cost, 0)
--- a/model/src-db/database/model/functions/MRP_PROCESSPLAN_PLAN.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/functions/MRP_PROCESSPLAN_PLAN.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -31,7 +31,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-2016 Openbravo SLU
+* All portions are Copyright (C) 2001-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -72,16 +72,20 @@
 
       v_Qty_New := Cur_Lines.qty;
       IF (Cur_Lines.ISFIXED = 'N' AND v_Qty_New > 0) THEN
-
-        v_neededQty_New := Cur_Lines.qty - v_AvailableStock;
-        IF (v_neededQty_New > 0) THEN
-          v_Qty_New := GREATEST(v_neededqty_New, Cur_Lines.qtymin);
-          IF (Cur_Lines.qtytype = 'M') THEN --Multiple lot qty
-            v_Qty_new := CEIL(v_qty_new/Cur_Lines.qtystd)*Cur_Lines.qtystd;
+        IF (Cur_Lines.qtytype = 'E' AND Cur_Lines.qty <> Cur_Lines.neededQty) THEN
+          v_Qty_New := Cur_Lines.qtystd;
+          v_neededQty_New := Cur_Lines.neededQty;
+        ELSE
+          v_neededQty_New := Cur_Lines.qty - v_AvailableStock;
+          IF (v_neededQty_New > 0) THEN
+            v_Qty_New := GREATEST(v_neededqty_New, Cur_Lines.qtymin);
+            IF (Cur_Lines.qtytype = 'M') THEN --Multiple lot qty
+              v_Qty_new := CEIL(v_qty_new/Cur_Lines.qtystd)*Cur_Lines.qtystd;
+            END IF;
+          ELSE
+            v_qty_new := 0;
+            v_neededQty_New := 0;
           END IF;
-        ELSE
-          v_qty_new := 0;
-          v_neededQty_New := 0;
         END IF;
 
         v_plannedorderdate_new := Cur_Lines.planneddate -
--- a/model/src-db/database/model/functions/MRP_RUN_EXPLODE.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/functions/MRP_RUN_EXPLODE.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -37,7 +37,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-2016 Openbravo SLU
+* All portions are Copyright (C) 2001-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -87,7 +87,8 @@
                M_PRODUCT.MA_PROCESSPLAN_ID, MRP_RUN_PRODUCTIONLINE.PLANNEDDATE,
                MRP_RUN_PRODUCTIONLINE.PLANNEDORDERDATE,
                COALESCE(M_PRODUCT_ORG.CAPACITY, M_PRODUCT.CAPACITY) AS CAPACITY,
-               COALESCE(M_PRODUCT_ORG.DELAYMIN, M_PRODUCT.DELAYMIN, 0) AS DELAYMIN
+               COALESCE(M_PRODUCT_ORG.DELAYMIN, M_PRODUCT.DELAYMIN, 0) AS DELAYMIN,
+               M_PRODUCT_ORG.Qtytype, M_PRODUCT_ORG.Qtystd, M_PRODUCT_ORG.Qtymin
         FROM MRP_RUN_PRODUCTIONLINE,
              M_PRODUCT LEFT JOIN M_PRODUCT_ORG ON M_PRODUCT.M_PRODUCT_ID = M_PRODUCT_ORG.M_PRODUCT_ID
                                               AND M_PRODUCT_ORG.AD_ORG_ID = p_Org_ID
@@ -106,7 +107,13 @@
 	      v_planneddate:= p_planningdate;
 	    END IF;
 	  END IF;
-	  Mrp_Run_Insertlines(p_Client_ID, p_Org_ID, p_User_ID, p_Run_ID, Cur_Run_Lines.M_Product_ID, -1*Cur_Run_Lines.Qty, -1*Cur_Run_Lines.Qty, Cur_Run_Lines.MRP_RUN_Line_ID, (CASE Cur_Run_Lines.ispurchased WHEN 'Y' THEN 'MP' ELSE 'WP' END), 'N', NULL, NULL, NULL, NULL, Cur_Run_Lines.MA_Processplan_ID, v_planneddate, (CASE Cur_Run_Lines.ispurchased WHEN 'Y' THEN (v_planneddate) ELSE v_planneddate - (CASE Cur_Run_Lines.DELAYMIN > (CASE WHEN Cur_Run_Lines.CAPACITY IS NULL THEN 0 ELSE CEIL(Cur_Run_Lines.Qty/Cur_Run_Lines.CAPACITY) END) WHEN true THEN Cur_Run_Lines.DELAYMIN ELSE (CASE WHEN Cur_Run_Lines.CAPACITY IS NULL THEN 0 ELSE CEIL(Cur_Run_Lines.Qty/Cur_Run_Lines.CAPACITY) END) END) END), 'Y', (CASE WHEN Cur_Run_Lines.ispurchased = 'Y' THEN 'Y' ELSE 'N' END), NULL, v_Aux_ID);
+	  IF (Cur_Run_Lines.Qtytype = 'E' AND COALESCE(Cur_Run_Lines.Qtystd, 0) > 0 AND CEIL(GREATEST(-1*Cur_Run_Lines.Qty, COALESCE(Cur_Run_Lines.Qtymin, 0))/Cur_Run_Lines.Qtystd) > 0) THEN
+           FOR i IN 1..CEIL(GREATEST(-1*Cur_Run_Lines.Qty, COALESCE(Cur_Run_Lines.Qtymin, 0))/Cur_Run_Lines.Qtystd) LOOP
+	      Mrp_Run_Insertlines(p_Client_ID, p_Org_ID, p_User_ID, p_Run_ID, Cur_Run_Lines.M_Product_ID, Cur_Run_Lines.Qtystd, -1*Cur_Run_Lines.Qty, Cur_Run_Lines.MRP_RUN_Line_ID, (CASE Cur_Run_Lines.ispurchased WHEN 'Y' THEN 'MP' ELSE 'WP' END), 'N', NULL, NULL, NULL, NULL, Cur_Run_Lines.MA_Processplan_ID, v_planneddate, (CASE Cur_Run_Lines.ispurchased WHEN 'Y' THEN (v_planneddate) ELSE v_planneddate - (CASE Cur_Run_Lines.DELAYMIN > (CASE WHEN Cur_Run_Lines.CAPACITY IS NULL THEN 0 ELSE CEIL(Cur_Run_Lines.Qty/Cur_Run_Lines.CAPACITY) END) WHEN true THEN Cur_Run_Lines.DELAYMIN ELSE (CASE WHEN Cur_Run_Lines.CAPACITY IS NULL THEN 0 ELSE CEIL(Cur_Run_Lines.Qty/Cur_Run_Lines.CAPACITY) END) END) END), 'Y', (CASE WHEN Cur_Run_Lines.ispurchased = 'Y' THEN 'Y' ELSE 'N' END), NULL, v_Aux_ID);
+	    END LOOP;
+	  ELSE
+	    Mrp_Run_Insertlines(p_Client_ID, p_Org_ID, p_User_ID, p_Run_ID, Cur_Run_Lines.M_Product_ID, -1*Cur_Run_Lines.Qty, -1*Cur_Run_Lines.Qty, Cur_Run_Lines.MRP_RUN_Line_ID, (CASE Cur_Run_Lines.ispurchased WHEN 'Y' THEN 'MP' ELSE 'WP' END), 'N', NULL, NULL, NULL, NULL, Cur_Run_Lines.MA_Processplan_ID, v_planneddate, (CASE Cur_Run_Lines.ispurchased WHEN 'Y' THEN (v_planneddate) ELSE v_planneddate - (CASE Cur_Run_Lines.DELAYMIN > (CASE WHEN Cur_Run_Lines.CAPACITY IS NULL THEN 0 ELSE CEIL(Cur_Run_Lines.Qty/Cur_Run_Lines.CAPACITY) END) WHEN true THEN Cur_Run_Lines.DELAYMIN ELSE (CASE WHEN Cur_Run_Lines.CAPACITY IS NULL THEN 0 ELSE CEIL(Cur_Run_Lines.Qty/Cur_Run_Lines.CAPACITY) END) END) END), 'Y', (CASE WHEN Cur_Run_Lines.ispurchased = 'Y' THEN 'Y' ELSE 'N' END), NULL, v_Aux_ID);
+	  END IF;
         ELSE
           v_ResultStr := 'Explode dependant products';
           FOR Cur_ProcessPlanVersion IN (
--- a/model/src-db/database/model/functions/MRP_RUN_INITIALIZE.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/functions/MRP_RUN_INITIALIZE.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -52,7 +52,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-2016 Openbravo SLU
+* All portions are Copyright (C) 2001-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -180,7 +180,7 @@
     BEGIN
       v_ad_pinstance_id := GET_UUID();
 
-      M_GET_STOCK_PARAM(v_ad_pinstance_id, p_run, null, Cur_Product.M_Product_ID, null, null, null, p_org_id, null, p_user_id, p_client_id, null, null, null, '800219', p_Run, null, case when p_production = 'Y' then '800162' else '800164' end, null, 'N', v_pinstance_result, v_pinstance_msg);
+      M_GET_STOCK_PARAM(v_ad_pinstance_id, p_run, null, Cur_Product.M_Product_ID, null, null, null, p_org_id, null, p_user_id, p_client_id, null, null, null, '800219', p_Run, null, case when p_production = 'Y' then '800162' else '800164' end, null, 'N', v_pinstance_result, v_pinstance_msg, null, 'Y', null);
       -- Check result
       IF (v_pinstance_result = 0) THEN
         -- Error on m_get_stock
--- a/model/src-db/database/model/functions/M_CHECK_STOCK.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/functions/M_CHECK_STOCK.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -28,37 +28,33 @@
 * 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-2014 Openbravo SLU
+* All portions are Copyright (C) 2001-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
   v_ResultStr VARCHAR2(2000):='';
   v_ExistsNegativeStock NUMBER;
-  v_AllowsNegativeStock CHAR:='N';
 BEGIN
   v_ResultStr:='Checking stock';
   p_Result:=1;
-  SELECT ALLOWNEGATIVESTOCK
-  INTO v_AllowsNegativeStock
-  FROM AD_CLIENTINFO
-  WHERE AD_CLIENT_ID=p_AD_Client_ID;
-  IF v_AllowsNegativeStock='N' THEN
-    SELECT count(1)
-    INTO v_ExistsNegativeStock
-    FROM DUAL
-    WHERE EXISTS
-      ( SELECT 1
-      FROM M_STORAGE_DETAIL
+  SELECT count(1)
+  INTO v_ExistsNegativeStock
+  FROM DUAL
+  WHERE EXISTS
+    ( SELECT 1
+      FROM M_STORAGE_DETAIL SD
+      JOIN M_LOCATOR L ON (L.M_LOCATOR_ID = SD.M_LOCATOR_ID)
+      JOIN M_INVENTORYSTATUS INVS ON (INVS.M_INVENTORYSTATUS_ID = L.M_INVENTORYSTATUS_ID)
       WHERE M_PRODUCT_ID=p_M_Product_ID
-        AND AD_CLIENT_ID=p_AD_Client_ID
-        AND AD_ORG_ID=p_AD_Org_ID
-      AND (QTYONHAND<0 OR COALESCE(QTYORDERONHAND,0)<0));    
-    IF(v_ExistsNegativeStock <> 0) THEN
-      p_Result:=0;
-      p_Message:='@NotEnoughStocked@';
-    END IF;
+      AND SD.AD_CLIENT_ID=p_AD_Client_ID
+      AND SD.AD_ORG_ID=p_AD_Org_ID
+      AND (QTYONHAND<0 OR COALESCE(QTYORDERONHAND,0)<0)
+      AND INVS.OVERISSUE='N');    
+  IF(v_ExistsNegativeStock <> 0) THEN
+    p_Result:=0;
+    p_Message:='@NotEnoughStocked@';
   END IF;
-  RETURN;
+RETURN;
 EXCEPTION
 WHEN OTHERS THEN
   v_ResultStr:= '@ERROR=' || SQLERRM;
--- a/model/src-db/database/model/functions/M_GET_STOCK.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/functions/M_GET_STOCK.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -19,7 +19,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) 2011-2016 Openbravo SLU
+* All portions are Copyright (C) 2011-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -51,6 +51,9 @@
   v_LineNo NUMBER;
   v_ProcessID VARCHAR2(32) ;
   v_Reservation_ID VARCHAR2(32);
+  v_avail CHAR;
+  v_nett CHAR;
+  v_overissue CHAR;
   
 BEGIN
   --  Update AD_PInstance
@@ -119,13 +122,22 @@
     ELSIF (Cur_Parameter.ParameterName = 'M_Reservation_ID') THEN
       v_reservation_id:=Cur_Parameter.P_String;
       DBMS_OUTPUT.PUT_LINE(' M_Reservation_ID=' || v_reservation_id);
+    ELSIF (Cur_Parameter.ParameterName = 'Available') THEN
+      v_avail:=Cur_Parameter.P_String;
+      DBMS_OUTPUT.PUT_LINE(' v_avail=' || v_avail);
+    ELSIF (Cur_Parameter.ParameterName = 'Nettable') THEN
+      v_nett:=Cur_Parameter.P_String;
+      DBMS_OUTPUT.PUT_LINE(' v_nett=' || v_nett);
+    ELSIF (Cur_Parameter.ParameterName = 'OverIssue') THEN
+      v_overissue:=Cur_Parameter.P_String;
+      DBMS_OUTPUT.PUT_LINE(' v_overissue=' || v_overissue);
     ELSE
       DBMS_OUTPUT.PUT_LINE('*** Unknown Parameter=' || Cur_Parameter.ParameterName) ;
     END IF;
   END LOOP; -- Get Parameter
   DBMS_OUTPUT.PUT_LINE('  Record_ID=' || v_Record_ID) ;
 
-  M_GET_STOCK_PARAM(PInstance_ID, v_Record_ID, v_Quantity, v_ProductID, v_LocatorID, v_WarehouseID, v_PriorityWarehouseID, v_OrgID, v_AttributesetinstanceID, v_AD_User_ID, v_ClientID, v_warehouse_rule_id, v_UomID, v_ProductUomID, v_TableID, v_AuxID, v_LineNo, v_ProcessID, v_reservation_id, p_calledfromapp, v_result, v_Message);
+  M_GET_STOCK_PARAM(PInstance_ID, v_Record_ID, v_Quantity, v_ProductID, v_LocatorID, v_WarehouseID, v_PriorityWarehouseID, v_OrgID, v_AttributesetinstanceID, v_AD_User_ID, v_ClientID, v_warehouse_rule_id, v_UomID, v_ProductUomID, v_TableID, v_AuxID, v_LineNo, v_ProcessID, v_reservation_id, p_calledfromapp, v_result, v_Message, v_avail, v_nett, v_overissue);
  
 
   --  Update AD_PInstance
--- a/model/src-db/database/model/functions/M_GET_STOCK_PARAM.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/functions/M_GET_STOCK_PARAM.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -68,7 +68,7 @@
         <default/>
       </parameter>
       <parameter name="p_avail" type="CHAR" mode="in">
-        <default><![CDATA[NULL]]></default>
+        <default><![CDATA[Y]]></default>
       </parameter>
       <parameter name="p_nett" type="CHAR" mode="in">
         <default><![CDATA[NULL]]></default>
@@ -335,10 +335,7 @@
 	      AD_PINSTANCE_PARA_INSERT(p_uuid, '160', 'Available', v_avail, null, null, null, null, null);
 	      AD_PINSTANCE_PARA_INSERT(p_uuid, '170', 'Nettable', v_nett, null, null, null, null, null);
 	      AD_PINSTANCE_PARA_INSERT(p_uuid, '180', 'OverIssue', v_overissue, null, null, null, null, null);
-	      /*
-	      * ADD PROPER PROCESS ID!
-	      */
-	      AD_PINSTANCE_PARA_INSERT(p_uuid, '160', 'ProcessID', '---', null, null, null, null, null);
+	      AD_PINSTANCE_PARA_INSERT(p_uuid, '190', 'ProcessID', v_ProcessID, null, null, null, null, null);
       END IF;
       v_ep_instance := get_uuid();
 
@@ -468,13 +465,11 @@
   	      AD_PINSTANCE_PARA_INSERT(p_uuid, '140', 'LineNo', null, null, v_LineNo, null, null, null);
   	      AD_PINSTANCE_PARA_INSERT(p_uuid, '150', 'M_Reservation_ID', v_reservation_id, null, null, null, null, null);
   	      AD_PINSTANCE_PARA_INSERT(p_uuid, '160', 'Available', v_avail, null, null, null, null, null);
-	        AD_PINSTANCE_PARA_INSERT(p_uuid, '170', 'Nettable', v_nett, null, null, null, null, null);
-	        AD_PINSTANCE_PARA_INSERT(p_uuid, '180', 'OverIssue', v_overissue, null, null, null, null, null);
-  	      /*
-  	      * ADD PROPER PROCESS ID!
-  	      */
-  	      AD_PINSTANCE_PARA_INSERT(p_uuid, '160', 'ProcessID', '---', null, null, null, null, null);
-          AD_UPDATE_PINSTANCE(p_uuid, NULL, 'N', 1, '', p_calledfromapp) ;
+  	      AD_PINSTANCE_PARA_INSERT(p_uuid, '170', 'Nettable', v_nett, null, null, null, null, null);
+  	      AD_PINSTANCE_PARA_INSERT(p_uuid, '180', 'OverIssue', v_overissue, null, null, null, null, null);
+  	      AD_PINSTANCE_PARA_INSERT(p_uuid, '190', 'ProcessID', v_ProcessID, null, null, null, null, null);
+
+  	      AD_UPDATE_PINSTANCE(p_uuid, NULL, 'N', 1, '', p_calledfromapp) ;
         END IF;
         IF (AD_GET_RDBMS() = 'ORACLE') THEN
           v_Sql := 'CALL ' || cur_warehouse.procedurename || '('''||p_uuid||''', '''||cur_warehouse.m_warehouse_id||''')';
--- a/model/src-db/database/model/functions/M_INOUT_CREATE.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/functions/M_INOUT_CREATE.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -34,7 +34,7 @@
   * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
   * All Rights Reserved.
   * Contributor(s): Openbravo SLU
-  * Contributions are Copyright (C) 2001-2016 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.
@@ -92,7 +92,7 @@
       SELECT sd.m_product_id, sd.m_locator_id, sd.m_attributesetinstance_id,
           sd.c_uom_id, sd.m_product_uom_id, u.stdprecision,
           ms.quantity - COALESCE(SUM(iol.movementqty), 0) AS qtyonhand, ms.qtyorder AS qtyorder,
-          ms.priority
+          ms.priority, invs.overissue
       FROM m_stock_proposed ms 
             LEFT JOIN m_storage_detail sd ON ms.m_storage_detail_id = sd.m_storage_detail_id
             LEFT JOIN m_product_uom pu ON sd.m_product_uom_id = pu.m_product_uom_id
@@ -103,9 +103,10 @@
                                          AND COALESCE(iol.m_product_uom_id, '-1') = COALESCE(sd.m_product_uom_id, '-1')
                                          AND COALESCE(iol.m_attributesetinstance_id, '0') = COALESCE(sd.m_attributesetinstance_id, '0')
                                          AND iol.m_inout_id = v_inout_id
+            JOIN m_inventorystatus invs ON invs.m_inventorystatus_id = l.m_inventorystatus_id
       WHERE ms.ad_pinstance_id = v_ad_pinstance_id
       GROUP BY sd.m_product_id, sd.m_locator_id, sd.m_attributesetinstance_id, sd.c_uom_id,
-          sd.m_product_uom_id, u.stdprecision, ms.quantity, ms.qtyorder, ms.priority, iol.c_aum, iol.aumqty
+          sd.m_product_uom_id, u.stdprecision, ms.quantity, ms.qtyorder, ms.priority, iol.c_aum, iol.aumqty, invs.overissue
       HAVING ms.quantity - COALESCE(SUM(iol.movementqty), 0) > 0
       ORDER BY ms.priority;
 
@@ -114,7 +115,7 @@
   -- Record Info
   v_AD_Org_ID VARCHAR2(32);
   v_AD_Client_ID VARCHAR2(32);
-  v_allownegativestock CHAR(1);
+  v_NegStockLocator VARCHAR2(32);
   v_order_count NUMBER:=0;
   v_order_delivered_count NUMBER:=0;
   v_order_partial_count NUMBER:= 0;
@@ -173,7 +174,7 @@
     v_ResultStr:='ReadingParameters';
     FOR Cur_Parameter IN (
         SELECT i.Record_ID, p.ParameterName, p.P_String, p.P_Number, p.P_Date,
-            p.AD_CLIENT_ID, ci.allownegativestock, i.AD_User_ID
+            p.AD_CLIENT_ID, i.AD_User_ID
         FROM AD_ClientInfo ci, AD_PInstance i LEFT JOIN AD_PInstance_Para p ON i.AD_PInstance_ID=p.AD_PInstance_ID
         WHERE i.AD_PInstance_ID=p_PInstance_ID
           AND p.ad_client_id = ci.ad_client_id
@@ -189,23 +190,22 @@
         DBMS_OUTPUT.PUT_LINE('*** Unknown Parameter=' || Cur_Parameter.ParameterName) ;
       END IF;
       v_AD_Client_ID:=Cur_Parameter.AD_CLIENT_ID;
-      v_allownegativestock := cur_parameter.allownegativestock;
       v_Record_ID:=Cur_Parameter.Record_ID;
       v_User_ID:=Cur_Parameter.AD_User_ID;
     END LOOP; -- Get Parameter
     DBMS_OUTPUT.PUT_LINE('  v_Record_ID=' || v_Record_ID) ;
   ELSIF(p_Invoice_ID IS NOT NULL) THEN
     CREATE_FROM_INVOICE:=true;
-    SELECT c_invoice.ad_client_id, ad_clientinfo.allownegativestock, c_invoice.updatedby
-      INTO v_ad_client_id, v_allownegativestock, v_user_id
+    SELECT c_invoice.ad_client_id, c_invoice.updatedby
+      INTO v_ad_client_id, v_user_id
     FROM ad_clientinfo, c_invoice
     WHERE ad_clientinfo.ad_client_id = c_invoice.ad_client_id
       AND c_invoice_id = p_invoice_id;
   ELSE
     v_Record_ID:=p_Order_ID;
     DBMS_OUTPUT.PUT_LINE('--<<M_InOut_Create>> Order_ID=' || v_Record_ID);
-    SELECT c_order.ad_client_id, ad_clientinfo.allownegativestock,c_order.updatedby
-    INTO v_ad_client_id, v_allownegativestock, v_user_id
+    SELECT c_order.ad_client_id, c_order.updatedby
+    INTO v_ad_client_id, v_user_id
      FROM ad_clientinfo, c_order
     WHERE ad_clientinfo.ad_client_id = c_order.ad_client_id
     AND c_order_id = v_record_id;
@@ -517,7 +517,7 @@
                       AND c_orderline_id = ol.c_orderline_id;
                   END IF;
 
-                  M_GET_STOCK_PARAM(v_pinstance_ID, v_record_id, v_Qty, v_Product_old, null, null, v_Warehouse_old, Cur_Order.AD_Org_ID, v_Attribute_old, v_User_ID, v_ad_client_id, v_warehouse_rule_id, v_UOM_old, v_Product_UOM_old, null, null, null, 'FF80818132C964E30132C9747257002E', v_reservation_id, 'N', v_pinstance_result, v_pinstance_msg);
+                  M_GET_STOCK_PARAM(v_pinstance_ID, v_record_id, v_Qty, v_Product_old, null, null, v_Warehouse_old, Cur_Order.AD_Org_ID, v_Attribute_old, v_User_ID, v_ad_client_id, v_warehouse_rule_id, v_UOM_old, v_Product_UOM_old, null, null, null, '199', v_reservation_id, 'N', v_pinstance_result, v_pinstance_msg, 'Y', null, null);
                   -- Check result
                   IF (v_pinstance_result = 0) THEN
                     -- Error on m_get_stock
@@ -538,6 +538,11 @@
                 END IF;
 
                 IF (NOT NEXT_PRODUCT) THEN
+                
+                IF (v_storage.OVERISSUE = 'Y' AND v_NegStockLocator IS NULL) THEN
+                  v_NegStockLocator:= v_storage.m_locator_id;
+                END IF;
+
                   v_QtyStorage:=v_storage.QtyOnHand;
                   LOOP
                     -- How much do we deliver from here?
@@ -616,7 +621,25 @@
                 END IF;--NEXT_PRODUCT
                 --<<NEXT_PRODUCT>>
                 NEXT_PRODUCT:=false;
-                IF (v_Qty<>0 AND (v_ForceDelivery='Y' OR v_allownegativestock = 'Y')) THEN
+                
+                IF (v_NegStockLocator IS NULL) THEN
+                -- Get Locator with negative Stock that belongs to the same Warehosue      
+                  SELECT MIN(l.m_locator_id)
+                  INTO v_NegStockLocator
+                  FROM m_locator l
+                  JOIN m_inventorystatus invs ON l.m_inventorystatus_id = invs.m_inventorystatus_id
+                  WHERE l.m_warehouse_id = ol.M_Warehouse_ID
+                  AND invs.overissue = 'Y'
+                  AND l.isactive= 'Y'
+                  AND priorityno = (SELECT MIN(priorityno)
+                                    FROM m_locator l
+                                    JOIN m_inventorystatus invs ON l.m_inventorystatus_id = invs.m_inventorystatus_id
+                                    WHERE l.m_warehouse_id = ol.M_Warehouse_ID
+                                    AND invs.overissue = 'Y'
+                                    AND l.isactive='Y');
+                END IF;
+
+                IF (v_Qty<>0 AND (v_ForceDelivery='Y' OR v_NegStockLocator IS NOT NULL)) THEN
                   -- Create InOut Line
                   Ad_Sequence_Next('M_InOutLine', Cur_Order.C_Order_ID, v_NextNo) ;
                   IF (v_ProductUOM IS NOT NULL) THEN
@@ -625,16 +648,6 @@
                     v_ActualQty:=NULL;
                   END IF;
 
-		  SELECT MIN(M_LOCATOR_ID)
-		  INTO v_Locator_ID
-                  FROM M_LOCATOR
-                  WHERE M_WAREHOUSE_ID=ol.M_Warehouse_ID
-                  AND M_LOCATOR.ISACTIVE = 'Y'
-                  AND priorityno = (SELECT min(priorityno) 
-					FROM M_LOCATOR  
-					WHERE M_WAREHOUSE_ID=ol.M_Warehouse_ID
-					AND M_LOCATOR.ISACTIVE = 'Y');
-
                   DBMS_OUTPUT.PUT_LINE('    Line ' || ol.Line || '  Qty=' || v_LocatorQty) ;
                   v_ResultStr:='CreateInOutLine';
 
@@ -664,7 +677,7 @@
                     (v_NextNo, v_lines, p_InOut_ID, ol.C_OrderLine_ID,
                     ol.AD_Client_ID, ol.AD_Org_ID, 'Y', now(),
                     v_User_ID, now(), v_User_ID, ol.M_Product_ID,
-                    ol.C_UOM_ID, v_Locator_ID, v_Qty, ol.Description,
+                    ol.C_UOM_ID, v_NegStockLocator, v_Qty, ol.Description,
                     'N',
                     --MODIFIED BY F.IRIAZABAL
                     v_ActualQty, ol.M_PRODUCT_UOM_ID, ol.M_AttributeSetInstance_ID,
--- a/model/src-db/database/model/functions/M_INOUT_POST.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/functions/M_INOUT_POST.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -228,6 +228,29 @@
              RAISE_APPLICATION_ERROR(-20000, '@Inline@ '||v_Message_Qty||' '||'@ProductNotNullAndMovementQtyZero@') ;
           END IF;
 	     End ;
+	     Declare
+       v_Message_NotAvail VARCHAR(2000) :='';
+	     BEGIN
+					FOR Cur_Lines IN (
+                             SELECT M.line
+                             FROM M_InOut I
+                             JOIN M_InOutLine M ON (M.M_InOut_ID = I.M_InOut_ID)
+                             JOIN M_Locator L ON (M.M_Locator_ID = L.M_Locator_ID)
+                             JOIN M_InventoryStatus INVS ON (INVS.M_InventoryStatus_ID = L.M_InventoryStatus_ID)
+                             WHERE I.M_INOUT_ID=v_Record_ID
+                             AND INVS.Available = 'N'
+                             -- Check only Outgoing documents (Goods Shipment and Return to Vendor Shipment)
+                             AND ((I.issotrx = 'Y' AND v_isreturndoctype = 'N')
+                                   OR
+                                  (I.issotrx = 'N' AND v_isreturndoctype = 'Y'))
+                             ORDER BY M.line
+                            ) LOOP
+          v_Message_NotAvail:=v_Message_NotAvail||Cur_Lines.line||', ';
+          END LOOP;
+          IF v_Message_NotAvail != '' THEN
+             RAISE_APPLICATION_ERROR(-20000, '@Inline@ '||v_Message_NotAvail||' '||'@LocatorWithNotAvailableStatus@') ;
+          END IF;
+	     End ;
       DECLARE
       v_Message_Inactive_Products VARCHAR(2000) :='';
       BEGIN
@@ -832,14 +855,15 @@
                -- Normal Scenario
                UPDATE C_Order o
                SET IsDelivered = 'Y'
-               WHERE o.c_order_id = Cur_Order.c_order_id
+               WHERE o.c_order_id = Cur_Order.c_order_id 
                AND o.IsDelivered = 'N'
-               AND EXISTS (SELECT 1
-                           FROM C_ORDERLINE ol
-                           WHERE ol.C_Order_ID = o.C_Order_ID
-                           AND ol.c_order_discount_id IS NULL
-                           GROUP BY ol.C_Order_ID
-                           HAVING SUM(ol.QTYORDERED) = SUM(ol.QTYDELIVERED));
+               AND o.processed = 'Y'                
+               AND NOT EXISTS (SELECT 1
+                               FROM c_orderline ol
+                               WHERE ol.C_Order_ID = o.C_Order_ID
+                               AND ol.c_order_discount_id IS NULL
+                               AND ol.QTYORDERED <> ol.QTYDELIVERED
+                              );
              ELSIF (v_IsReversedDoc = 'Y') THEN
                -- Void Scenario
                UPDATE C_Order o
--- a/model/src-db/database/model/functions/M_MOVEMENT_POST.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/functions/M_MOVEMENT_POST.xml	Thu Sep 21 04:04:15 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-2016 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.
@@ -55,6 +55,8 @@
     v_org_bule_id AD_Org.AD_Org_ID%TYPE;
     END_PROCESS BOOLEAN:=false;
     v_productname m_product.name%TYPE;
+    v_overIssueFrom m_inventorystatus.overissue%TYPE;
+    v_overIssueTo m_inventorystatus.overissue%TYPE;
   BEGIN
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Processing ' || PInstance_ID) ;
@@ -189,8 +191,21 @@
           (SELECT *  FROM M_MovementLine  WHERE M_Movement_ID=v_Record_ID  ORDER BY Line)
         LOOP
           v_ResultStr:='Transaction for line' || Cur_MoveLine.Line;
+          
+          SELECT overissue
+          INTO v_overIssueFrom
+          FROM M_InventoryStatus
+          WHERE M_InventoryStatus_ID = (SELECT M_InventoryStatus_ID
+                                        FROM M_Locator
+                                        WHERE M_Locator_ID = Cur_MoveLine.M_Locator_ID);                               
+          SELECT overissue
+          INTO v_overIssueTo
+          FROM M_InventoryStatus
+          WHERE M_InventoryStatus_ID = (SELECT M_InventoryStatus_ID
+                                        FROM M_Locator
+                                        WHERE M_Locator_ID = Cur_MoveLine.M_LocatorTo_ID);
 
-          IF (Cur_MoveLine.MovementQty <= 0) THEN
+          IF (Cur_MoveLine.MovementQty <= 0 AND (v_overIssueFrom = 'N' OR v_overIssueTo = 'N')) THEN
             RAISE_APPLICATION_ERROR(-20000,'@GoodsMovementsWithNegativeQty@' || ' @Inline@ ' || Cur_MoveLine.line) ;
           END IF;
           
--- a/model/src-db/database/model/functions/M_PRODUCTION_RUN.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/functions/M_PRODUCTION_RUN.xml	Thu Sep 21 04:04:15 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.
@@ -61,7 +61,8 @@
   v_Line NUMBER;
   v_Count NUMBER;
   p_User VARCHAR2(32);
-  v_allownegativestock CHAR(1);
+  v_NegStockLocator VARCHAR2(32);
+  v_NegStockWarehosue VARCHAR2(32);
   v_Product_Name m_product.name%TYPE;
   -- Stocked BOMs
   -- Proposed stock from given warehouse is priorized.
@@ -69,12 +70,13 @@
       SELECT sd.m_product_id, sd.m_locator_id, sd.m_attributesetinstance_id,
           sd.c_uom_id, sd.m_product_uom_id, u.stdprecision,
           ms.quantity AS qty, ms.qtyorder AS qtyorder,
-          ms.priority
+          ms.priority, invs.overissue
       FROM m_stock_proposed ms 
             LEFT JOIN m_storage_detail sd ON ms.m_storage_detail_id = sd.m_storage_detail_id
             LEFT JOIN m_product_uom pu ON sd.m_product_uom_id = pu.m_product_uom_id
             LEFT JOIN c_uom u ON pu.c_uom_id = u.c_uom_id
             LEFT JOIN m_locator l ON sd.m_locator_id = l.m_locator_id
+            JOIN m_inventorystatus invs ON invs.m_inventorystatus_id = l.m_inventorystatus_id
       WHERE ms.ad_pinstance_id = v_ad_pinstance_id
       ORDER BY ms.priority;
   v_storage CUR_STOCK%ROWTYPE;
@@ -90,7 +92,7 @@
   v_ResultStr:='ReadingParameters';
   FOR Cur_Parameter IN (
       SELECT i.Record_ID, i.AD_User_ID, p.ParameterName,
-          p.P_String, p.P_Number, p.P_Date, ci.allownegativestock
+          p.P_String, p.P_Number, p.P_Date
       FROM AD_ClientInfo ci JOIN AD_PInstance i ON ci.ad_client_id=i.ad_client_id
             LEFT JOIN AD_PInstance_Para p ON i.AD_PInstance_ID=p.AD_PInstance_ID
       WHERE i.AD_PInstance_ID=PInstance_ID
@@ -98,7 +100,6 @@
   ) LOOP
     v_Record_ID := Cur_Parameter.Record_ID;
     p_User := Cur_Parameter.AD_User_ID;
-    v_allownegativestock := Cur_Parameter.allownegativestock;
     IF (Cur_Parameter.ParameterName = 'MustBeStocked') THEN
       MustBeStocked:=Cur_Parameter.P_String;
       DBMS_OUTPUT.PUT_LINE('  MustBeStocked=' || MustBeStocked) ;
@@ -254,7 +255,7 @@
               v_pinstance_msg AD_PInstance.errormsg%TYPE;
             BEGIN
               v_pinstance_id := get_uuid();
-             M_GET_STOCK_PARAM(v_pinstance_id, v_record_id, null, v_Product_old, null, null, v_Warehouse_old, cur_bom.org_id, null, p_user, v_client_id, null, v_UOM_old, null, null, null, 10, '137', null, 'N', v_pinstance_result, v_pinstance_msg);
+             M_GET_STOCK_PARAM(v_pinstance_id, v_record_id, null, v_Product_old, null, null, v_Warehouse_old, cur_bom.org_id, null, p_user, v_client_id, null, v_UOM_old, null, null, null, 10, '137', null, 'N', v_pinstance_result, v_pinstance_msg, 'Y', null, null);
               -- Check result
               IF (v_pinstance_result = 0) THEN
                 -- Error on m_get_stock
@@ -271,7 +272,11 @@
             v_qtystorage:=v_storage.qty;
           END IF;
           IF (NOT NEXT_PRODUCT) THEN
-            LOOP
+            LOOP           
+              IF (v_storage.OVERISSUE = 'Y' AND v_NegStockLocator IS NULL) THEN
+                v_NegStockLocator:= v_storage.m_locator_id;
+              END IF;
+
               v_Qty := LEAST(v_QtyStorage, CUR_BOM.ProductionQty * CUR_BOM.BOMQty - v_QtyAcumulated) ;
               v_QtyStorage := v_QtyStorage - v_Qty;
               v_QtyAcumulated := v_QtyAcumulated + v_Qty;
@@ -334,15 +339,33 @@
             v_Message := '@NotEnoughStocked@: ' || CUR_BOM.pname || ' ' || v_QtyAcumulated || ' / '|| CUR_BOM.BOMQTY*CUR_BOM.ProductionQty;
             RAISE_APPLICATION_ERROR(-20000, v_Message);
           ELSE
-            -- If AllowNegativeStock is enabled and MustBeStocked is disabled and there is not enough stock,
+            IF (v_NegStockLocator IS NULL) THEN
+              -- Get Locator with negative Stock that belongs to the same Warehosue
+              SELECT m_warehouse_id
+              INTO v_NegStockWarehosue
+              FROM m_locator
+             WHERE m_locator_id = (SELECT m_locator_id
+                                   FROM M_PRODUCTIONPLAN
+                                   WHERE M_ProductionPlan_ID=CUR_BOM.M_ProductionPlan_ID);
+        
+              SELECT MIN(l.m_locator_id)
+              INTO v_NegStockLocator
+              FROM m_locator l
+              JOIN m_inventorystatus invs ON l.m_inventorystatus_id = invs.m_inventorystatus_id
+              WHERE l.m_warehouse_id = v_NegStockWarehosue
+              AND invs.overissue = 'Y'
+              AND l.isactive= 'Y'
+              AND priorityno = (SELECT MIN(priorityno)
+                                FROM m_locator l
+                                JOIN m_inventorystatus invs ON l.m_inventorystatus_id = invs.m_inventorystatus_id
+                                WHERE l.m_warehouse_id = v_NegStockWarehosue
+                                AND invs.overissue = 'Y'
+                                AND l.isactive='Y');
+            END IF;         
+            
+            -- If there is a Storage Bin that allows negative stock and MustBeStocked is disabled and there is not enough stock,
             -- pending quantity will be created for the same locator as production plan product, keeping a negative stock
-            IF (v_allownegativestock='Y') THEN   
-            
-              -- Get the locator of the production plan
-              SELECT M_Locator_ID
-              INTO v_Locator_ID
-              FROM M_PRODUCTIONPLAN
-              WHERE M_ProductionPlan_ID=CUR_BOM.M_ProductionPlan_ID;
+            IF (v_NegStockLocator IS NOT NULL) THEN   
             
               -- Check if exists a production line for this product with the same locator
               SELECT count(M_ProductionLine_ID)
@@ -350,7 +373,7 @@
               FROM M_PRODUCTIONLINE
               WHERE M_ProductionPlan_ID=CUR_BOM.M_ProductionPlan_ID
               AND M_Product_ID=CUR_BOM.M_ProductBOM_ID
-              AND M_Locator_ID=v_Locator_ID;
+              AND M_Locator_ID=v_NegStockLocator;
 
               -- If exists update it            
               IF (v_ProductionLineCount <> 0) THEN
@@ -360,14 +383,14 @@
                 FROM M_PRODUCTIONLINE
                 WHERE M_ProductionPlan_ID=CUR_BOM.M_ProductionPlan_ID
                 AND M_Product_ID=CUR_BOM.M_ProductBOM_ID
-                AND M_Locator_ID=v_Locator_ID;               
+                AND M_Locator_ID=v_NegStockLocator;               
                 
                 UPDATE M_PRODUCTIONLINE
                 SET MovementQty = MovementQty - (CUR_BOM.BOMQTY*CUR_BOM.ProductionQty - v_QtyAcumulated),
                 QuantityOrder = v_QtyOrderRate * (MovementQty - (CUR_BOM.BOMQTY*CUR_BOM.ProductionQty - v_QtyAcumulated))
                 WHERE M_ProductionPlan_ID=CUR_BOM.M_ProductionPlan_ID
                 AND M_Product_ID=CUR_BOM.M_ProductBOM_ID
-                AND M_Locator_ID=v_Locator_ID;
+                AND M_Locator_ID=v_NegStockLocator;
 
               -- If not exists, insert a new production line
               ELSE
@@ -385,7 +408,7 @@
                   get_uuid(), CUR_BOM.M_ProductionPlan_ID, v_Line, CUR_BOM.Client_ID,
                   CUR_BOM.Org_ID, 'Y', now(), p_User,
                   now(), p_User, CUR_BOM.M_ProductBOM_ID, CUR_BOM.C_UOM_ID,
-                  - (CUR_BOM.BOMQTY*CUR_BOM.ProductionQty - v_QtyAcumulated), v_Locator_ID                  
+                  - (CUR_BOM.BOMQTY*CUR_BOM.ProductionQty - v_QtyAcumulated), v_NegStockLocator                  
               );
               
               END IF;          
@@ -602,9 +625,11 @@
         SELECT pl.M_ProductionLine_ID, pl.AD_Client_ID, pl.AD_Org_ID, p.MovementDate,
             pl.M_Product_ID, pl.M_AttributeSetInstance_ID, pl.MovementQty, pl.M_Locator_ID,
             pl.M_Product_UOM_ID, pl.QuantityOrder, pl.C_UOM_ID, pl.LINE
-        FROM M_PRODUCTION p, M_PRODUCTIONLINE pl, M_PRODUCTIONPLAN pp
+        FROM M_PRODUCTION p, M_PRODUCTIONLINE pl, M_PRODUCTIONPLAN pp, M_PRODUCT pro
         WHERE p.M_Production_ID=pp.M_Production_ID
           AND pp.M_ProductionPlan_ID=pl.M_ProductionPlan_ID
+          AND pl.M_PRODUCT_ID = pro.M_PRODUCT_ID
+          AND pro.ISSTOCKED = 'Y'
           AND pp.M_Production_ID=v_Record_ID
         ORDER BY pp.Line, pl.Line
     ) LOOP
--- a/model/src-db/database/model/functions/M_RAPPEL_INVOICE_CREATE.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/functions/M_RAPPEL_INVOICE_CREATE.xml	Thu Sep 21 04:04:15 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-2016 Openbravo SLU
+* All portions are Copyright (C) 2001-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -269,6 +269,7 @@
         IL.C_TAX_ID,
         TO_NUMBER(NULL) AS RAPPELINVOICED,
         (-v_Discount) *SUM(IL.LINENETAMT) /100 AS LINENET, --    SUM(IL.LINENETAMT)
+        (-v_Discount) *SUM(IL.LINE_GROSS_AMOUNT) /100 AS GROSS_AMOUNT,
         COALESCE(IL.C_PROJECT_ID, I.C_PROJECT_ID) AS C_PROJECT_ID,
         COALESCE(IL.USER1_ID, I.USER1_ID) AS USER1_ID,
         COALESCE(IL.USER2_ID, I.USER2_ID) AS USER2_ID,
@@ -467,7 +468,7 @@
           CREATED, CREATEDBY, UPDATED, UPDATEDBY,
           C_INVOICE_ID, C_ORDERLINE_ID, M_INOUTLINE_ID, LINE,
           DESCRIPTION, M_PRODUCT_ID, QTYINVOICED, PRICELIST,
-          PRICEACTUAL, PRICELIMIT, LINENETAMT, C_CHARGE_ID,
+          PRICEACTUAL, PRICELIMIT, LINENETAMT, LINE_GROSS_AMOUNT, C_CHARGE_ID,
           CHARGEAMT, C_UOM_ID, C_TAX_ID, S_RESOURCEASSIGNMENT_ID,
           TAXAMT, M_ATTRIBUTESETINSTANCE_ID, ISDESCRIPTION,
           QUANTITYORDER, M_PRODUCT_UOM_ID, PRICESTD, M_OFFER_ID,
@@ -481,7 +482,7 @@
           now(), v_AD_User_ID, now(), v_AD_User_ID,
           v_invoiceId, NULL, NULL, v_line,
           v_description, CUR_INVOICE.M_PRODUCT_ID, 0, 0,
-          0, 0, CUR_INVOICE.LINENET, NULL,
+          0, 0, CUR_INVOICE.LINENET, CUR_INVOICE.GROSS_AMOUNT, NULL,
           0, CUR_INVOICE.C_UOM_ID, CUR_INVOICE.C_TAX_ID, NULL,
           0, NULL, 'N',
           NULL, NULL, 0, NULL,
--- a/model/src-db/database/model/functions/M_RESERVATION_REALLOCATE.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/functions/M_RESERVATION_REALLOCATE.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -34,7 +34,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) 2013-2016 Openbravo SLU
+* All portions are Copyright (C) 2013-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -292,7 +292,7 @@
       WHERE c_orderline_id = cur_not_allocated_stock.c_orderline_id;
     END IF;
 
-    m_get_stock_param(v_pinstance_ID, p_reservation_id, cur_not_allocated_stock.quantitytoreserve, cur_not_allocated_stock.m_product_id, cur_not_allocated_stock.m_locator_id, cur_not_allocated_stock.m_warehouse_id, null, cur_not_allocated_stock.ad_org_id, cur_not_allocated_stock.m_attributesetinstance_id, p_User_ID, cur_not_allocated_stock.ad_client_id, v_warehouse_rule_id, cur_not_allocated_stock.c_uom_id, null, null, null, null, '---', p_reservation_id, 'N', v_Result, v_Message);
+    m_get_stock_param(v_pinstance_ID, p_reservation_id, cur_not_allocated_stock.quantitytoreserve, cur_not_allocated_stock.m_product_id, cur_not_allocated_stock.m_locator_id, cur_not_allocated_stock.m_warehouse_id, null, cur_not_allocated_stock.ad_org_id, cur_not_allocated_stock.m_attributesetinstance_id, p_User_ID, cur_not_allocated_stock.ad_client_id, v_warehouse_rule_id, cur_not_allocated_stock.c_uom_id, null, null, null, null, '---', p_reservation_id, 'N', v_Result, v_Message, 'Y', null, null);
     IF (v_Result = 0) THEN
       -- Error on m_get_stock
       RAISE_APPLICATION_ERROR(-20000, v_Message);
--- a/model/src-db/database/model/functions/M_RESERVE_STOCK_AUTO.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/functions/M_RESERVE_STOCK_AUTO.xml	Thu Sep 21 04:04:15 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):  ______________________________________.
 ************************************************************************/
@@ -77,7 +77,7 @@
       WHERE c_orderline_id = v_soline_id;
     END IF;
 
-    M_GET_STOCK_PARAM(v_pinstance_id, p_reservation_id, v_pendingtoreserveqty, v_product_id, v_locator_id, v_warehouse_id, v_prioritywarehouse_id, v_org_id, v_asi_id, p_User_ID, v_client_id, v_warehouse_rule_id, v_uom_id, null, null, null, null, '---', null, 'N', v_pinstance_result, v_pinstance_msg);
+    M_GET_STOCK_PARAM(v_pinstance_id, p_reservation_id, v_pendingtoreserveqty, v_product_id, v_locator_id, v_warehouse_id, v_prioritywarehouse_id, v_org_id, v_asi_id, p_User_ID, v_client_id, v_warehouse_rule_id, v_uom_id, null, null, null, null, '---', null, 'N', v_pinstance_result, v_pinstance_msg, 'Y', null, null);
     -- Check result
     IF (v_pinstance_result = 0) THEN
       -- Error on m_get_stock
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/tables/AD_ORG_TREE.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+  <database name="TABLE AD_ORG_TREE">
+    <table name="AD_ORG_TREE" primaryKey="AD_ORG_TREE_KEY">
+      <column name="AD_ORG_TREE_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_PARENT_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="LEVELNO" primaryKey="false" required="true" type="DECIMAL" size="10,0" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="AD_CLIENT" name="AD_ORG_TREE_AD_CLIENT">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="AD_ORG_TREE_AD_ORG">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="AD_ORG_TREE_AD_PARENT_ORG">
+        <reference local="AD_PARENT_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <unique name="AD_ORG_TREE_ORGPARENTCLIENTLEV">
+        <unique-column name="AD_ORG_ID"/>
+        <unique-column name="AD_PARENT_ORG_ID"/>
+        <unique-column name="AD_CLIENT_ID"/>
+        <unique-column name="LEVELNO"/>
+      </unique>
+      <check name="AD_ORG_TREE_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+      <check name="AD_ORG_TREE_LEVELNO_CHK"><![CDATA[LEVELNO > 0]]></check>
+    </table>
+  </database>
--- a/model/src-db/database/model/tables/AD_USER.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/tables/AD_USER.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -208,9 +208,9 @@
         <index-column name="EMAIL"/>
         <whereClause><![CDATA[EMAIL IS NOT NULL]]></whereClause>
       </index>
-      <index name="AD_USER_NAME" unique="false">
-        <index-column name="AD_CLIENT_ID"/>
+      <index name="AD_USER_NAME_ID" unique="false">
         <index-column name="NAME"/>
+        <index-column name="AD_USER_ID"/>
       </index>
       <index name="AD_USER_PARTNER" unique="false">
         <index-column name="C_BPARTNER_ID"/>
--- a/model/src-db/database/model/tables/C_BPARTNER.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/tables/C_BPARTNER.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -460,23 +460,29 @@
       <foreign-key foreignTable="C_SALARY_CATEGORY" name="C_SALARY_CATEGORY_CBPARTNER">
         <reference local="C_SALARY_CATEGORY_ID" foreign="C_SALARY_CATEGORY_ID"/>
       </foreign-key>
-      <index name="C_BPARTNER_IDSALESREP" unique="false">
-        <index-column name="C_BPARTNER_ID"/>
-        <index-column name="ISSALESREP"/>
-      </index>
       <index name="C_BPARTNER_NAME_ID" unique="false">
         <index-column name="NAME"/>
         <index-column name="C_BPARTNER_ID"/>
       </index>
+      <index name="C_BPARTNER_NAME_TRGM" unique="false" containsSearch="true">
+        <index-column name="functionBasedColumn" functionExpression="UPPER(NAME)"/>
+      </index>
       <index name="C_BPARTNER_REFNO_ID" unique="false">
         <index-column name="REFERENCENO"/>
         <index-column name="C_BPARTNER_ID"/>
         <whereClause><![CDATA[REFERENCENO IS NOT NULL]]></whereClause>
       </index>
+      <index name="C_BPARTNER_SALESREP_ID" unique="false">
+        <index-column name="ISSALESREP"/>
+        <index-column name="C_BPARTNER_ID"/>
+      </index>
       <index name="C_BPARTNER_VALUE_ID" unique="false">
         <index-column name="VALUE"/>
         <index-column name="C_BPARTNER_ID"/>
       </index>
+      <index name="C_BPARTNER_VALUE_TRGM" unique="false" containsSearch="true">
+        <index-column name="functionBasedColumn" functionExpression="UPPER(VALUE)"/>
+      </index>
       <unique name="C_BPARTNER_VALUE">
         <unique-column name="AD_CLIENT_ID"/>
         <unique-column name="AD_ORG_ID"/>
--- a/model/src-db/database/model/tables/FACT_ACCT.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/tables/FACT_ACCT.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -288,7 +288,6 @@
         <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
       </foreign-key>
       <index name="FACT_ACCT_ACCOUNT" unique="false">
-        <index-column name="AD_CLIENT_ID"/>
         <index-column name="AD_ORG_ID"/>
         <index-column name="C_ACCTSCHEMA_ID"/>
         <index-column name="ACCOUNT_ID"/>
--- a/model/src-db/database/model/tables/FIN_PAYMENT.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/tables/FIN_PAYMENT.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -198,6 +198,9 @@
         <index-column name="FIN_REV_PAYMENT_ID"/>
         <whereClause><![CDATA[FIN_REV_PAYMENT_ID IS NOT NULL]]></whereClause>
       </index>
+      <index name="FIN_PAYMENT_STATUS" unique="false">
+        <index-column name="STATUS"/>
+      </index>
       <check name="FIN_PAYMENT_BP_CREDIT_CHECK"><![CDATA[C_BPARTNER_ID IS NULL AND COALESCE(GENERATED_CREDIT, 0) = 0 OR C_BPARTNER_ID IS NOT NULL]]></check>
       <check name="FIN_PAYMENT_CREATE_ALGORIT_CHK"><![CDATA[CREATEDBYALGORITHM IN ('Y', 'N')]]></check>
       <check name="FIN_PAYMENT_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
--- a/model/src-db/database/model/triggers/AD_PROCESS_REQUEST_TRG.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/triggers/AD_PROCESS_REQUEST_TRG.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -15,7 +15,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-2010 Openbravo SLU
+* All portions are Copyright (C) 2001-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -46,8 +46,42 @@
       RAISE_APPLICATION_ERROR(-20000,'@InvalidProcessRequest@');
     END IF;
 
+    IF (:NEW.FREQUENCY = '6') THEN -- MONTHLY
+
+      IF (:NEW.MONTHLY_OPTION IS NULL) THEN
+        RAISE_APPLICATION_ERROR(-20000,'@InvalidProcessRequestMonthly@');
+      ELSE
+
+	IF (:NEW.MONTHLY_OPTION = '1' AND :NEW.MONTHLY_DAY_OF_WEEK IS NULL) THEN
+	  RAISE_APPLICATION_ERROR(-20000,'@InvalidProcessRequestMonthly@');
+	END IF;
+
+	IF (:NEW.MONTHLY_OPTION = '2' AND :NEW.MONTHLY_DAY_OF_WEEK IS NULL) THEN
+	  RAISE_APPLICATION_ERROR(-20000,'@InvalidProcessRequestMonthly@');
+	END IF;
+
+	IF (:NEW.MONTHLY_OPTION = '3' AND :NEW.MONTHLY_DAY_OF_WEEK IS NULL) THEN
+	  RAISE_APPLICATION_ERROR(-20000,'@InvalidProcessRequestMonthly@');
+	END IF;
+
+	IF (:NEW.MONTHLY_OPTION = '4' AND :NEW.MONTHLY_DAY_OF_WEEK IS NULL) THEN
+	  RAISE_APPLICATION_ERROR(-20000,'@InvalidProcessRequestMonthly@');
+	END IF;
+
+	IF (:NEW.MONTHLY_OPTION = 'S' AND :NEW.MONTHLY_SPECIFIC_DAY IS NULL) THEN  -- SPECIFIC DAY OF THE MONTH
+	  RAISE_APPLICATION_ERROR(-20000,'@InvalidProcessRequestMonthly@');
+	END IF;
+
+      END IF;
+
+    END IF;
+
+    IF (:NEW.FREQUENCY = '7' AND :NEW.CRON IS NULL) THEN -- CRON EXPRESSION
+      RAISE_APPLICATION_ERROR(-20000,'@InvalidProcessRequestCron@');
+    END IF;
+
     IF(:NEW.FINISHES = 'Y' AND (:NEW.FINISHES_DATE IS NULL OR :NEW.FINISHES_TIME IS NULL)) THEN
-      RAISE_APPLICATION_ERROR(-20000,'@InvalidProcessRequest@');
+      RAISE_APPLICATION_ERROR(-20000,'@InvalidProcessRequestFinish@');
     END IF;
 
   END IF;
--- a/model/src-db/database/model/triggers/C_INVOICELINE_BEFORE_TRG.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/triggers/C_INVOICELINE_BEFORE_TRG.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -78,7 +78,9 @@
     IF (v_execute='Y') THEN
   
       -- If tax included taxes recalculate net price / amounts
-      :new.line_gross_amount := ROUND(:new.gross_unit_price * :new.Qtyinvoiced, v_std_prec);
+      IF (:new.qtyinvoiced <> 0) THEN
+        :new.line_gross_amount := ROUND(:new.gross_unit_price * :new.Qtyinvoiced, v_std_prec);
+      END IF;
       
       SELECT tc.ASBOM INTO v_AsBOM FROM C_TAXCATEGORY tc, C_tax t WHERE tc.C_TAXCATEGORY_ID = t.C_TAXCATEGORY_ID AND t.C_TAX_ID = :new.C_Tax_ID;
       IF (v_AsBOM = 'Y') THEN
--- a/model/src-db/database/model/triggers/C_ORDERLINE2_TRG.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/triggers/C_ORDERLINE2_TRG.xml	Thu Sep 21 04:04:15 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-2016 Openbravo SLU
+* All portions are Copyright (C) 2001-2017 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -43,23 +43,28 @@
   IF(UPDATING) THEN
     IF(:NEW.M_PRODUCT_ID IS NOT NULL) THEN
     v_ID:=:old.C_Order_ID;
-    SELECT DocStatus
-    INTO v_DocStatus
+    SELECT DocStatus, isSOTrx
+    INTO v_DocStatus, v_isSOTrx
     FROM c_Order
     WHERE c_order_id = v_ID;
       IF(v_DocStatus <> 'DR') THEN
         IF((COALESCE(:old.QtyDelivered, 0) <> COALESCE(:NEW.QtyDelivered, 0))) THEN
           -- Get ID
           v_ID:=:new.C_Order_ID;
-          v_QtyReserved:=-(:new.qtydelivered - :old.qtydelivered) ;
-          IF :old.qtydelivered=0 AND :new.qtydelivered=:new.qtyordered THEN
-            v_QtyOrderReserved:=-:new.QuantityOrder;
-          ELSIF :new.M_Product_UOM_ID IS NOT NULL THEN
-            SELECT c_uom_id
-            INTO v_UOM_ID
-            FROM m_product_uom
-            WHERE m_product_uom_id = :new.m_product_uom_id;
-            v_QtyOrderReserved:=C_Uom_Convert(v_QtyReserved, :new.C_UOM_ID, v_UOM_ID, 'Y') ;
+          IF (v_isSOTrx = 'Y') THEN
+            v_QtyReserved := -(:new.qtydelivered - :old.qtydelivered);
+            IF (:old.qtydelivered=0 AND :new.qtydelivered=:new.qtyordered) THEN
+              v_QtyOrderReserved := -:new.QuantityOrder;
+            ELSIF (:new.M_Product_UOM_ID IS NOT NULL) THEN
+              SELECT c_uom_id
+              INTO v_UOM_ID
+              FROM m_product_uom
+              WHERE m_product_uom_id = :new.m_product_uom_id;
+              v_QtyOrderReserved := C_Uom_Convert(v_QtyReserved, :new.C_UOM_ID, v_UOM_ID, 'Y');
+            END IF;
+          ELSE
+            v_QtyReserved := 0;
+            v_QtyOrderReserved := null;
           END IF;
           SELECT COUNT(*)
           INTO V_STOCKED
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/triggers/M_INVENTORYSTATUS_TRG.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+  <database name="TRIGGER M_INVENTORYSTATUS_TRG">
+    <trigger name="M_INVENTORYSTATUS_TRG" table="M_INVENTORYSTATUS" fires="after" insert="true" update="true" delete="false" foreach="row">
+      <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):  ______________________________________.
+************************************************************************/
+
+/**
+* Manage Inventory Status translations
+*/
+v_existLocatorWithInvStatus VARCHAR2(32);
+BEGIN
+
+IF AD_isTriggerEnabled()='N' THEN RETURN;
+END IF;
+
+IF INSERTING THEN
+
+ INSERT INTO M_InventoryStatus_Trl
+  (M_InventoryStatus_Trl_ID, M_InventoryStatus_ID, AD_Language, AD_Client_ID, AD_Org_ID,
+  IsActive, Created, CreatedBy, Updated, UpdatedBy,
+  name, Description, IsTranslated)
+ SELECT get_uuid(), :new.M_InventoryStatus_ID, AD_Language, :new.AD_Client_ID, :new.AD_Org_ID,
+   :new.IsActive, :new.Created, :new.CreatedBy, :new.Updated, :new.UpdatedBy,
+   :new.name, :new.Description, 'N' 
+  FROM  AD_Language
+  WHERE IsActive = 'Y' AND IsSystemLanguage = 'Y'
+  AND EXISTS (SELECT * FROM AD_Client
+   WHERE AD_Client_ID=:new.AD_Client_ID AND IsMultiLingualDocument='Y');
+
+ELSIF UPDATING THEN
+
+ IF (:new.available <> :old.available or :new.nettable <> :old.nettable or :new.overissue <> :old.overissue) THEN
+  select 1 into v_existLocatorWithInvStatus from m_locator l where l.m_inventorystatus_id = :new.m_inventorystatus_id;
+  IF (v_existLocatorWithInvStatus IS NOT NULL) THEN
+        RAISE_APPLICATION_ERROR(-20000, '@InventoryStatusUsed@');
+  END IF;
+ END IF;
+
+ IF (COALESCE(:old.name, '.') <> COALESCE(:new.name, '.')) or (COALESCE(:old.description, '.') <> COALESCE(:new.description, '.')) THEN
+  UPDATE m_inventorystatus_trl
+  SET istranslated = 'N'
+  WHERE m_inventorystatus_id = :new.m_inventorystatus_id;
+ END IF;
+END IF;
+
+END M_INVENTORYSTATUS_TRG
+]]></body>
+    </trigger>
+  </database>
--- a/model/src-db/database/model/views/M_RM_RECEIPT_PICK_EDIT.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/views/M_RM_RECEIPT_PICK_EDIT.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
   <database name="VIEW M_RM_RECEIPT_PICK_EDIT">
-    <view name="M_RM_RECEIPT_PICK_EDIT"><![CDATA[SELECT ol.c_orderline_id AS m_rm_receipt_pick_edit_id, ol.ad_client_id, COALESCE(iol.ad_org_id, ol.ad_org_id) AS ad_org_id, ol.isactive, ol.created, ol.createdby, COALESCE(iol.updated, ol.updated) AS updated, ol.updatedby, iol.m_inout_id, CASE WHEN iol.m_inoutline_id IS NOT NULL THEN 'Y' ELSE 'N' END AS ob_selected, ol.c_orderline_id, ol.m_product_id, ol.c_uom_id, ol.m_attributesetinstance_id, (-1) * ol.qtyordered AS returned, (-1) * (ol.qtyordered - ol.qtydelivered) AS pendingqty, (-1) * COALESCE(iol.aumqty, iol.movementqty) AS receivingqty, iol.m_condition_goods_id, iol.m_locator_id, o.documentno AS returnorderno, o.issotrx, ol.line, iol.m_inoutline_id, ol.c_aum, (-1) * ol.aumqty AS aumqty, (-1) * m_get_converted_aumqty(ol.m_product_id, ol.qtyordered - ol.qtydelivered, ol.c_aum) AS pendingaumqty, CASE WHEN iol.m_inoutline_id IS NULL THEN COALESCE(ol.c_aum, ol.c_uom_id) ELSE COALESCE(iol.c_aum, iol.c_uom_id) END AS returneduom FROM c_orderline ol JOIN c_order o ON o.c_order_id = ol.c_order_id JOIN m_product p ON ol.m_product_id = p.m_product_id JOIN c_doctype dt ON dt.c_doctype_id = o.c_doctypetarget_id AND dt.isreturn = 'Y' LEFT JOIN (SELECT il2.m_inoutline_id, il2.ad_client_id, il2.ad_org_id, il2.isactive, il2.created, il2.createdby, il2.updated, il2.updatedby, il2.line, il2.description, il2.m_inout_id, il2.c_orderline_id, il2.m_locator_id, il2.m_product_id, il2.c_uom_id, il2.movementqty, il2.isinvoiced, il2.m_attributesetinstance_id, il2.isdescription, il2.quantityorder, il2.m_product_uom_id, il2.m_condition_goods_id, il2.c_aum, il2.aumqty FROM m_inoutline il2 JOIN m_inout i2 ON il2.m_inout_id = i2.m_inout_id AND i2.processed = 'N') iol ON iol.c_orderline_id = ol.c_orderline_id WHERE (ol.qtyordered - ol.qtydelivered) <> 0 AND o.docstatus = 'CO']]></view>
+    <view name="M_RM_RECEIPT_PICK_EDIT"><![CDATA[SELECT ol.c_orderline_id AS m_rm_receipt_pick_edit_id, ol.ad_client_id, COALESCE(iol.ad_org_id, ol.ad_org_id) AS ad_org_id, ol.isactive, ol.created, ol.createdby, COALESCE(iol.updated, ol.updated) AS updated, ol.updatedby, iol.m_inout_id, CASE WHEN iol.m_inoutline_id IS NOT NULL THEN 'Y' ELSE 'N' END AS ob_selected, ol.c_orderline_id, ol.m_product_id, ol.c_uom_id, ol.m_attributesetinstance_id, (-1) * ol.qtyordered AS returned, (-1) * CASE WHEN uom_pref.property IS NOT NULL AND ol.c_uom_id IS NOT NULL THEN m_get_converted_aumqty(ol.m_product_id, ol.qtyordered - ol.qtydelivered, ol.c_aum) ELSE ol.qtyordered - ol.qtydelivered END AS pendingqty, (-1) * COALESCE(iol.aumqty, iol.movementqty) AS receivingqty, iol.m_condition_goods_id, iol.m_locator_id, o.documentno AS returnorderno, o.issotrx, ol.line, iol.m_inoutline_id, ol.c_aum, (-1) * ol.aumqty AS aumqty, (-1) * CASE WHEN uom_pref.property IS NOT NULL AND ol.c_uom_id IS NOT NULL THEN ol.qtyordered - ol.qtydelivered ELSE m_get_converted_aumqty(ol.m_product_id, ol.qtyordered - ol.qtydelivered, ol.c_aum) END AS pendingaumqty, CASE WHEN iol.m_inoutline_id IS NULL THEN COALESCE(ol.c_aum, ol.c_uom_id) ELSE COALESCE(iol.c_aum, iol.c_uom_id) END AS returneduom FROM c_orderline ol JOIN c_order o ON o.c_order_id = ol.c_order_id JOIN m_product p ON ol.m_product_id = p.m_product_id JOIN c_doctype dt ON dt.c_doctype_id = o.c_doctypetarget_id AND dt.isreturn = 'Y' LEFT JOIN (SELECT il2.m_inoutline_id, il2.ad_client_id, il2.ad_org_id, il2.isactive, il2.created, il2.createdby, il2.updated, il2.updatedby, il2.line, il2.description, il2.m_inout_id, il2.c_orderline_id, il2.m_locator_id, il2.m_product_id, il2.c_uom_id, il2.movementqty, il2.isinvoiced, il2.m_attributesetinstance_id, il2.isdescription, il2.quantityorder, il2.m_product_uom_id, il2.m_condition_goods_id, il2.c_aum, il2.aumqty FROM m_inoutline il2 JOIN m_inout i2 ON il2.m_inout_id = i2.m_inout_id AND i2.processed = 'N') iol ON iol.c_orderline_id = ol.c_orderline_id LEFT JOIN (SELECT pref.property FROM ad_preference pref WHERE pref.property = 'UomManagement' AND to_char(pref.value) = 'Y' AND pref.ad_client_id = '0' AND pref.ad_org_id = '0' AND pref.visibleat_client_id IS NULL AND pref.visibleat_org_id IS NULL AND pref.visibleat_role_id IS NULL AND pref.ad_user_id IS NULL) uom_pref ON 1 = 1 WHERE (ol.qtyordered - ol.qtydelivered) <> 0 AND o.docstatus = 'CO']]></view>
   </database>
--- a/model/src-db/database/model/views/M_RM_SHIPMENT_PICK_EDIT.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/model/views/M_RM_SHIPMENT_PICK_EDIT.xml	Thu Sep 21 04:04:15 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) * (ol.qtyordered - ol.qtydelivered) 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) * m_get_converted_aumqty(ol.m_product_id, ol.qtyordered - to_number(COALESCE((SELECT to_char(sum(COALESCE(iol3.movementqty, 0))) AS sum FROM m_inoutline iol3 JOIN m_inout io3 ON iol3.m_inout_id = io3.m_inout_id AND io3.processed = 'Y' WHERE iol3.c_orderline_id = ol.c_orderline_id), '0')), ol.c_aum) 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 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 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>
   </database>
--- a/model/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -1236,6 +1236,17 @@
 <!--2394571515C643119770FD8A5DCBC1C5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2394571515C643119770FD8A5DCBC1C5--></AD_AUXILIARINPUT>
 
+<!--246613E973C240C584E821D02A64AB16--><AD_AUXILIARINPUT>
+<!--246613E973C240C584E821D02A64AB16-->  <AD_AUXILIARINPUT_ID><![CDATA[246613E973C240C584E821D02A64AB16]]></AD_AUXILIARINPUT_ID>
+<!--246613E973C240C584E821D02A64AB16-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--246613E973C240C584E821D02A64AB16-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--246613E973C240C584E821D02A64AB16-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--246613E973C240C584E821D02A64AB16-->  <AD_TAB_ID><![CDATA[AF4090093D471431E040007F010048A5]]></AD_TAB_ID>
+<!--246613E973C240C584E821D02A64AB16-->  <NAME><![CDATA[DOCBASETYPE]]></NAME>
+<!--246613E973C240C584E821D02A64AB16-->  <CODE><![CDATA[SOO]]></CODE>
+<!--246613E973C240C584E821D02A64AB16-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--246613E973C240C584E821D02A64AB16--></AD_AUXILIARINPUT>
+
 <!--24824516BC4A40CB8E81F52301EF5F8E--><AD_AUXILIARINPUT>
 <!--24824516BC4A40CB8E81F52301EF5F8E-->  <AD_AUXILIARINPUT_ID><![CDATA[24824516BC4A40CB8E81F52301EF5F8E]]></AD_AUXILIARINPUT_ID>
 <!--24824516BC4A40CB8E81F52301EF5F8E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2186,6 +2197,17 @@
 <!--59A80385C31048AEBFED1D3B8E90DB62-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--59A80385C31048AEBFED1D3B8E90DB62--></AD_AUXILIARINPUT>
 
+<!--5A4ABAFCF4E948DC98097649BBC38F7D--><AD_AUXILIARINPUT>
+<!--5A4ABAFCF4E948DC98097649BBC38F7D-->  <AD_AUXILIARINPUT_ID><![CDATA[5A4ABAFCF4E948DC98097649BBC38F7D]]></AD_AUXILIARINPUT_ID>
+<!--5A4ABAFCF4E948DC98097649BBC38F7D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5A4ABAFCF4E948DC98097649BBC38F7D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5A4ABAFCF4E948DC98097649BBC38F7D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5A4ABAFCF4E948DC98097649BBC38F7D-->  <AD_TAB_ID><![CDATA[A92960D20BB64BBB9C4E88FF58991D6F]]></AD_TAB_ID>
+<!--5A4ABAFCF4E948DC98097649BBC38F7D-->  <NAME><![CDATA[EXISTS_CONVERSION]]></NAME>
+<!--5A4ABAFCF4E948DC98097649BBC38F7D-->  <CODE><![CDATA[@SQL=SELECT 'Y' FROM dual WHERE EXISTS (SELECT 1 FROM c_uom_conversion WHERE c_uom_id = @C_UOM_ID@ AND c_uom_to_id = (SELECT c_uom_id FROM m_product WHERE m_product_id = @M_PRODUCT_ID@)) OR EXISTS (SELECT 1 FROM c_uom_conversion WHERE c_uom_id = (SELECT c_uom_id FROM m_product WHERE m_product_id = @M_PRODUCT_ID@) AND c_uom_to_id = @C_UOM_ID@)]]></CODE>
+<!--5A4ABAFCF4E948DC98097649BBC38F7D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--5A4ABAFCF4E948DC98097649BBC38F7D--></AD_AUXILIARINPUT>
+
 <!--5AA02067B7A046B39F6C1D0D5072CC9F--><AD_AUXILIARINPUT>
 <!--5AA02067B7A046B39F6C1D0D5072CC9F-->  <AD_AUXILIARINPUT_ID><![CDATA[5AA02067B7A046B39F6C1D0D5072CC9F]]></AD_AUXILIARINPUT_ID>
 <!--5AA02067B7A046B39F6C1D0D5072CC9F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2315,6 +2337,17 @@
 <!--61773E6A1D7249AB9D0390A0DCE4EA6B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--61773E6A1D7249AB9D0390A0DCE4EA6B--></AD_AUXILIARINPUT>
 
+<!--6351A2D1288F4F36A8B08F92374C7D2B--><AD_AUXILIARINPUT>
+<!--6351A2D1288F4F36A8B08F92374C7D2B-->  <AD_AUXILIARINPUT_ID><![CDATA[6351A2D1288F4F36A8B08F92374C7D2B]]></AD_AUXILIARINPUT_ID>
+<!--6351A2D1288F4F36A8B08F92374C7D2B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6351A2D1288F4F36A8B08F92374C7D2B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6351A2D1288F4F36A8B08F92374C7D2B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6351A2D1288F4F36A8B08F92374C7D2B-->  <AD_TAB_ID><![CDATA[C0750AE251D14450963D2932BB581546]]></AD_TAB_ID>
+<!--6351A2D1288F4F36A8B08F92374C7D2B-->  <NAME><![CDATA[InventoryStatusUsed]]></NAME>
+<!--6351A2D1288F4F36A8B08F92374C7D2B-->  <CODE><![CDATA[@SQL=select (exists (select 1 from m_locator l where l.m_inventorystatus_id = @M_INVENTORYSTATUS_ID@)) from dual]]></CODE>
+<!--6351A2D1288F4F36A8B08F92374C7D2B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6351A2D1288F4F36A8B08F92374C7D2B--></AD_AUXILIARINPUT>
+
 <!--637CCFE37ADD45B5810D3490DF33CF2E--><AD_AUXILIARINPUT>
 <!--637CCFE37ADD45B5810D3490DF33CF2E-->  <AD_AUXILIARINPUT_ID><![CDATA[637CCFE37ADD45B5810D3490DF33CF2E]]></AD_AUXILIARINPUT_ID>
 <!--637CCFE37ADD45B5810D3490DF33CF2E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2451,6 +2484,17 @@
 <!--69B122EAEF3B42398D27D5FF0F44AD40-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--69B122EAEF3B42398D27D5FF0F44AD40--></AD_AUXILIARINPUT>
 
+<!--6A9EA0D5165148B9B23E2CB13AAB1A34--><AD_AUXILIARINPUT>
+<!--6A9EA0D5165148B9B23E2CB13AAB1A34-->  <AD_AUXILIARINPUT_ID><![CDATA[6A9EA0D5165148B9B23E2CB13AAB1A34]]></AD_AUXILIARINPUT_ID>
+<!--6A9EA0D5165148B9B23E2CB13AAB1A34-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6A9EA0D5165148B9B23E2CB13AAB1A34-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6A9EA0D5165148B9B23E2CB13AAB1A34-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6A9EA0D5165148B9B23E2CB13AAB1A34-->  <AD_TAB_ID><![CDATA[C9BD6AF9E06F4BE4B4799D09965481DC]]></AD_TAB_ID>
+<!--6A9EA0D5165148B9B23E2CB13AAB1A34-->  <NAME><![CDATA[DOCBASETYPE]]></NAME>
+<!--6A9EA0D5165148B9B23E2CB13AAB1A34-->  <CODE><![CDATA[MMR]]></CODE>
+<!--6A9EA0D5165148B9B23E2CB13AAB1A34-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6A9EA0D5165148B9B23E2CB13AAB1A34--></AD_AUXILIARINPUT>
+
 <!--6BDE684AC58045218FAEB2A11221911B--><AD_AUXILIARINPUT>
 <!--6BDE684AC58045218FAEB2A11221911B-->  <AD_AUXILIARINPUT_ID><![CDATA[6BDE684AC58045218FAEB2A11221911B]]></AD_AUXILIARINPUT_ID>
 <!--6BDE684AC58045218FAEB2A11221911B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3742,6 +3786,17 @@
 <!--CA8005C0F23945E89C4AD3C7899E5E89-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--CA8005C0F23945E89C4AD3C7899E5E89--></AD_AUXILIARINPUT>
 
+<!--CB11DE3DAD9D40B4A404A8E6DFF6F8EC--><AD_AUXILIARINPUT>
+<!--CB11DE3DAD9D40B4A404A8E6DFF6F8EC-->  <AD_AUXILIARINPUT_ID><![CDATA[CB11DE3DAD9D40B4A404A8E6DFF6F8EC]]></AD_AUXILIARINPUT_ID>
+<!--CB11DE3DAD9D40B4A404A8E6DFF6F8EC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CB11DE3DAD9D40B4A404A8E6DFF6F8EC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CB11DE3DAD9D40B4A404A8E6DFF6F8EC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CB11DE3DAD9D40B4A404A8E6DFF6F8EC-->  <AD_TAB_ID><![CDATA[387B6179438D4C4CB40769A77F4C304C]]></AD_TAB_ID>
+<!--CB11DE3DAD9D40B4A404A8E6DFF6F8EC-->  <NAME><![CDATA[DOCBASETYPE]]></NAME>
+<!--CB11DE3DAD9D40B4A404A8E6DFF6F8EC-->  <CODE><![CDATA[POO]]></CODE>
+<!--CB11DE3DAD9D40B4A404A8E6DFF6F8EC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--CB11DE3DAD9D40B4A404A8E6DFF6F8EC--></AD_AUXILIARINPUT>
+
 <!--CB5CB14F0303493BB276552C8CEC8F12--><AD_AUXILIARINPUT>
 <!--CB5CB14F0303493BB276552C8CEC8F12-->  <AD_AUXILIARINPUT_ID><![CDATA[CB5CB14F0303493BB276552C8CEC8F12]]></AD_AUXILIARINPUT_ID>
 <!--CB5CB14F0303493BB276552C8CEC8F12-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -4322,6 +4377,17 @@
 <!--F5D52BE5281A4969946A5332D641DE93-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--F5D52BE5281A4969946A5332D641DE93--></AD_AUXILIARINPUT>
 
+<!--F67494AD9D9F43758A90021292822EF4--><AD_AUXILIARINPUT>
+<!--F67494AD9D9F43758A90021292822EF4-->  <AD_AUXILIARINPUT_ID><![CDATA[F67494AD9D9F43758A90021292822EF4]]></AD_AUXILIARINPUT_ID>
+<!--F67494AD9D9F43758A90021292822EF4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F67494AD9D9F43758A90021292822EF4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F67494AD9D9F43758A90021292822EF4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F67494AD9D9F43758A90021292822EF4-->  <AD_TAB_ID><![CDATA[CF6D6C7B85EB473CB88E757E14D1D022]]></AD_TAB_ID>
+<!--F67494AD9D9F43758A90021292822EF4-->  <NAME><![CDATA[DOCBASETYPE]]></NAME>
+<!--F67494AD9D9F43758A90021292822EF4-->  <CODE><![CDATA[MMS]]></CODE>
+<!--F67494AD9D9F43758A90021292822EF4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F67494AD9D9F43758A90021292822EF4--></AD_AUXILIARINPUT>
+
 <!--F77560579B7E4105A0C8455FCFB1B333--><AD_AUXILIARINPUT>
 <!--F77560579B7E4105A0C8455FCFB1B333-->  <AD_AUXILIARINPUT_ID><![CDATA[F77560579B7E4105A0C8455FCFB1B333]]></AD_AUXILIARINPUT_ID>
 <!--F77560579B7E4105A0C8455FCFB1B333-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_COLUMN.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/sourcedata/AD_COLUMN.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -37575,7 +37575,7 @@
 <!--2465-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--2465-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--2465-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--2465-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--2465-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
 <!--2465-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--2465-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--2465-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -146390,7 +146390,7 @@
 <!--800595-->  <AD_COLUMN_ID><![CDATA[800595]]></AD_COLUMN_ID>
 <!--800595-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--800595-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--800595-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--800595-->  <ISACTIVE><![CDATA[N]]></ISACTIVE>
 <!--800595-->  <NAME><![CDATA[Allow Negative Stock]]></NAME>
 <!--800595-->  <DESCRIPTION><![CDATA[Allow negative stock]]></DESCRIPTION>
 <!--800595-->  <HELP><![CDATA[Allow negative stock]]></HELP>
@@ -146602,7 +146602,7 @@
 <!--800634-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--800634-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
 <!--800634-->  <AD_ELEMENT_ID><![CDATA[448]]></AD_ELEMENT_ID>
-<!--800634-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--800634-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--800634-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--800634-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--800634-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
@@ -146640,7 +146640,7 @@
 <!--800635-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--800635-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
 <!--800635-->  <AD_ELEMENT_ID><![CDATA[2019]]></AD_ELEMENT_ID>
-<!--800635-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--800635-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--800635-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--800635-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--800635-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
@@ -146678,7 +146678,7 @@
 <!--800636-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--800636-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
 <!--800636-->  <AD_ELEMENT_ID><![CDATA[215]]></AD_ELEMENT_ID>
-<!--800636-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--800636-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--800636-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--800636-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--800636-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
@@ -245320,6 +245320,44 @@
 <!--088302F39B3A4605B47AD2E15B5276AD-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--088302F39B3A4605B47AD2E15B5276AD--></AD_COLUMN>
 
+<!--08F702FFB2654A13B6B2AE42509D7094--><AD_COLUMN>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <AD_COLUMN_ID><![CDATA[08F702FFB2654A13B6B2AE42509D7094]]></AD_COLUMN_ID>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <NAME><![CDATA[Created By]]></NAME>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <COLUMNNAME><![CDATA[Createdby]]></COLUMNNAME>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <AD_TABLE_ID><![CDATA[4523F40FF3F746D690EC2AAD90F6171D]]></AD_TABLE_ID>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <POSITION><![CDATA[6]]></POSITION>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--08F702FFB2654A13B6B2AE42509D7094-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--08F702FFB2654A13B6B2AE42509D7094--></AD_COLUMN>
+
 <!--092CF046FA8449BEA46985EC61C654EB--><AD_COLUMN>
 <!--092CF046FA8449BEA46985EC61C654EB-->  <AD_COLUMN_ID><![CDATA[092CF046FA8449BEA46985EC61C654EB]]></AD_COLUMN_ID>
 <!--092CF046FA8449BEA46985EC61C654EB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -245584,6 +245622,47 @@
 <!--09D03507F43447C8AEC3B6EADADA36B5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--09D03507F43447C8AEC3B6EADADA36B5--></AD_COLUMN>
 
+<!--09D231548E1A4625BFB56529003281C5--><AD_COLUMN>
+<!--09D231548E1A4625BFB56529003281C5-->  <AD_COLUMN_ID><![CDATA[09D231548E1A4625BFB56529003281C5]]></AD_COLUMN_ID>
+<!--09D231548E1A4625BFB56529003281C5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--09D231548E1A4625BFB56529003281C5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--09D231548E1A4625BFB56529003281C5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--09D231548E1A4625BFB56529003281C5-->  <NAME><![CDATA[Active]]></NAME>
+<!--09D231548E1A4625BFB56529003281C5-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--09D231548E1A4625BFB56529003281C5-->  <HELP><![CDATA[There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reporting. There are two reasons for de-activating and not deleting records: 
+(1) The system requires the record for auditing purposes.
+(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are existing invoices for it. By de-activating the Business Partner you prevent it from being used in future transactions.]]></HELP>
+<!--09D231548E1A4625BFB56529003281C5-->  <COLUMNNAME><![CDATA[Isactive]]></COLUMNNAME>
+<!--09D231548E1A4625BFB56529003281C5-->  <AD_TABLE_ID><![CDATA[95FE1A1DCB1948AD8E2D5AFE4E95521C]]></AD_TABLE_ID>
+<!--09D231548E1A4625BFB56529003281C5-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--09D231548E1A4625BFB56529003281C5-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--09D231548E1A4625BFB56529003281C5-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--09D231548E1A4625BFB56529003281C5-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--09D231548E1A4625BFB56529003281C5-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--09D231548E1A4625BFB56529003281C5-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--09D231548E1A4625BFB56529003281C5-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--09D231548E1A4625BFB56529003281C5-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--09D231548E1A4625BFB56529003281C5-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--09D231548E1A4625BFB56529003281C5-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--09D231548E1A4625BFB56529003281C5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--09D231548E1A4625BFB56529003281C5-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--09D231548E1A4625BFB56529003281C5-->  <AD_ELEMENT_ID><![CDATA[348]]></AD_ELEMENT_ID>
+<!--09D231548E1A4625BFB56529003281C5-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--09D231548E1A4625BFB56529003281C5-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--09D231548E1A4625BFB56529003281C5-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--09D231548E1A4625BFB56529003281C5-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--09D231548E1A4625BFB56529003281C5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--09D231548E1A4625BFB56529003281C5-->  <POSITION><![CDATA[4]]></POSITION>
+<!--09D231548E1A4625BFB56529003281C5-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--09D231548E1A4625BFB56529003281C5-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--09D231548E1A4625BFB56529003281C5-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--09D231548E1A4625BFB56529003281C5-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--09D231548E1A4625BFB56529003281C5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--09D231548E1A4625BFB56529003281C5-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--09D231548E1A4625BFB56529003281C5-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--09D231548E1A4625BFB56529003281C5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--09D231548E1A4625BFB56529003281C5--></AD_COLUMN>
+
 <!--09F17AA5567744C3A39B5E60B8D7DA72--><AD_COLUMN>
 <!--09F17AA5567744C3A39B5E60B8D7DA72-->  <AD_COLUMN_ID><![CDATA[09F17AA5567744C3A39B5E60B8D7DA72]]></AD_COLUMN_ID>
 <!--09F17AA5567744C3A39B5E60B8D7DA72-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -245816,6 +245895,45 @@
 <!--0ABEEFADB4C04B7F9EAA2720A35E2A5C-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--0ABEEFADB4C04B7F9EAA2720A35E2A5C--></AD_COLUMN>
 
+<!--0AF824DB2FEE49E89226FD69B18A0FE0--><AD_COLUMN>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <AD_COLUMN_ID><![CDATA[0AF824DB2FEE49E89226FD69B18A0FE0]]></AD_COLUMN_ID>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <NAME><![CDATA[Translation]]></NAME>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <DESCRIPTION><![CDATA[An indication that an item is translated.]]></DESCRIPTION>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <HELP><![CDATA[The Translated checkbox indicates if this column is translated.]]></HELP>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <COLUMNNAME><![CDATA[Istranslated]]></COLUMNNAME>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <AD_TABLE_ID><![CDATA[4523F40FF3F746D690EC2AAD90F6171D]]></AD_TABLE_ID>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <SEQNO><![CDATA[130]]></SEQNO>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <AD_ELEMENT_ID><![CDATA[420]]></AD_ELEMENT_ID>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <POSITION><![CDATA[16]]></POSITION>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--0AF824DB2FEE49E89226FD69B18A0FE0--></AD_COLUMN>
+
 <!--0B4FBF30851F4D609A6B169292D91173--><AD_COLUMN>
 <!--0B4FBF30851F4D609A6B169292D91173-->  <AD_COLUMN_ID><![CDATA[0B4FBF30851F4D609A6B169292D91173]]></AD_COLUMN_ID>
 <!--0B4FBF30851F4D609A6B169292D91173-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -246007,6 +246125,45 @@
 <!--0BB2DC8FE20842089DA5809ED1AE82FE-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--0BB2DC8FE20842089DA5809ED1AE82FE--></AD_COLUMN>
 
+<!--0BB5330F2A474D9490091C2EB56C53FD--><AD_COLUMN>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <AD_COLUMN_ID><![CDATA[0BB5330F2A474D9490091C2EB56C53FD]]></AD_COLUMN_ID>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <NAME><![CDATA[Organization]]></NAME>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <AD_TABLE_ID><![CDATA[95FE1A1DCB1948AD8E2D5AFE4E95521C]]></AD_TABLE_ID>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <POSITION><![CDATA[3]]></POSITION>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--0BB5330F2A474D9490091C2EB56C53FD-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--0BB5330F2A474D9490091C2EB56C53FD--></AD_COLUMN>
+
 <!--0BD260C46B9547BDB318DEBBDAB70536--><AD_COLUMN>
 <!--0BD260C46B9547BDB318DEBBDAB70536-->  <AD_COLUMN_ID><![CDATA[0BD260C46B9547BDB318DEBBDAB70536]]></AD_COLUMN_ID>
 <!--0BD260C46B9547BDB318DEBBDAB70536-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -246063,6 +246220,7 @@
 <!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <READONLYLOGIC><![CDATA[@EXISTS_CONVERSION@='Y']]></READONLYLOGIC>
 <!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <SEQNO><![CDATA[110]]></SEQNO>
 <!--0BF27F0F6BEB4C9EA30BE0F4E63D271F-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -246741,6 +246899,45 @@
 <!--0E018D6C892D4CF39458C13715AE0670-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--0E018D6C892D4CF39458C13715AE0670--></AD_COLUMN>
 
+<!--0E23BB61C93D4D579D894DF902F457CC--><AD_COLUMN>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <AD_COLUMN_ID><![CDATA[0E23BB61C93D4D579D894DF902F457CC]]></AD_COLUMN_ID>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <NAME><![CDATA[Module]]></NAME>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <DESCRIPTION><![CDATA[Module]]></DESCRIPTION>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <HELP><![CDATA[Indicates the module the element forms part of.]]></HELP>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <COLUMNNAME><![CDATA[AD_Module_ID]]></COLUMNNAME>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <AD_TABLE_ID><![CDATA[95FE1A1DCB1948AD8E2D5AFE4E95521C]]></AD_TABLE_ID>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <DEFAULTVALUE><![CDATA[0]]></DEFAULTVALUE>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <AD_ELEMENT_ID><![CDATA[565E666A619A2693E040007F01002851]]></AD_ELEMENT_ID>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <POSITION><![CDATA[14]]></POSITION>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--0E23BB61C93D4D579D894DF902F457CC-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--0E23BB61C93D4D579D894DF902F457CC--></AD_COLUMN>
+
 <!--0E6D266DCF4E426CB56909D792732DA9--><AD_COLUMN>
 <!--0E6D266DCF4E426CB56909D792732DA9-->  <AD_COLUMN_ID><![CDATA[0E6D266DCF4E426CB56909D792732DA9]]></AD_COLUMN_ID>
 <!--0E6D266DCF4E426CB56909D792732DA9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -247205,6 +247402,44 @@
 <!--1057799CBF9311DDB9CF001B388C61A4-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--1057799CBF9311DDB9CF001B388C61A4--></AD_COLUMN>
 
+<!--105F248682334D0E9D4E59F4F7D34504--><AD_COLUMN>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <AD_COLUMN_ID><![CDATA[105F248682334D0E9D4E59F4F7D34504]]></AD_COLUMN_ID>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <NAME><![CDATA[Updated By]]></NAME>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <DESCRIPTION><![CDATA[User who updated this records]]></DESCRIPTION>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <HELP><![CDATA[The Updated By field indicates the user who updated this record.]]></HELP>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <COLUMNNAME><![CDATA[Updatedby]]></COLUMNNAME>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <AD_TABLE_ID><![CDATA[95FE1A1DCB1948AD8E2D5AFE4E95521C]]></AD_TABLE_ID>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <AD_ELEMENT_ID><![CDATA[608]]></AD_ELEMENT_ID>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <POSITION><![CDATA[8]]></POSITION>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--105F248682334D0E9D4E59F4F7D34504-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--105F248682334D0E9D4E59F4F7D34504--></AD_COLUMN>
+
 <!--1069D95874C84B26A862536F083035C1--><AD_COLUMN>
 <!--1069D95874C84B26A862536F083035C1-->  <AD_COLUMN_ID><![CDATA[1069D95874C84B26A862536F083035C1]]></AD_COLUMN_ID>
 <!--1069D95874C84B26A862536F083035C1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -248784,6 +249019,44 @@
 <!--15C9F8F0DCBB4867A8D20A717A82EB18-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--15C9F8F0DCBB4867A8D20A717A82EB18--></AD_COLUMN>
 
+<!--1609DDAB26674864B36542C5D654CB7C--><AD_COLUMN>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <AD_COLUMN_ID><![CDATA[1609DDAB26674864B36542C5D654CB7C]]></AD_COLUMN_ID>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <NAME><![CDATA[Created By]]></NAME>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <COLUMNNAME><![CDATA[Createdby]]></COLUMNNAME>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <AD_TABLE_ID><![CDATA[3277BAAF6B7249BA972D99D351BD08CC]]></AD_TABLE_ID>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <POSITION><![CDATA[5]]></POSITION>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--1609DDAB26674864B36542C5D654CB7C-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--1609DDAB26674864B36542C5D654CB7C--></AD_COLUMN>
+
 <!--1626D36E50004283B914198AA4E5F13D--><AD_COLUMN>
 <!--1626D36E50004283B914198AA4E5F13D-->  <AD_COLUMN_ID><![CDATA[1626D36E50004283B914198AA4E5F13D]]></AD_COLUMN_ID>
 <!--1626D36E50004283B914198AA4E5F13D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -250460,6 +250733,45 @@
 <!--1A6C225DE493487A980018E20CCC23F2-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--1A6C225DE493487A980018E20CCC23F2--></AD_COLUMN>
 
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193--><AD_COLUMN>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <AD_COLUMN_ID><![CDATA[1A8D880E944D4B0EB8CFD36B3C0A2193]]></AD_COLUMN_ID>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <NAME><![CDATA[Updated]]></NAME>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <AD_TABLE_ID><![CDATA[4523F40FF3F746D690EC2AAD90F6171D]]></AD_TABLE_ID>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <AD_ELEMENT_ID><![CDATA[607]]></AD_ELEMENT_ID>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <POSITION><![CDATA[7]]></POSITION>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--1A8D880E944D4B0EB8CFD36B3C0A2193--></AD_COLUMN>
+
 <!--1A9F7DF1AE7249FAAEE77D5DDEBF172E--><AD_COLUMN>
 <!--1A9F7DF1AE7249FAAEE77D5DDEBF172E-->  <AD_COLUMN_ID><![CDATA[1A9F7DF1AE7249FAAEE77D5DDEBF172E]]></AD_COLUMN_ID>
 <!--1A9F7DF1AE7249FAAEE77D5DDEBF172E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -254472,6 +254784,47 @@
 <!--26444BCC8D2B46C3A46496D1FED081F4-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--26444BCC8D2B46C3A46496D1FED081F4--></AD_COLUMN>
 
+<!--26590AC5F69847B8957049F5ED115267--><AD_COLUMN>
+<!--26590AC5F69847B8957049F5ED115267-->  <AD_COLUMN_ID><![CDATA[26590AC5F69847B8957049F5ED115267]]></AD_COLUMN_ID>
+<!--26590AC5F69847B8957049F5ED115267-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--26590AC5F69847B8957049F5ED115267-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--26590AC5F69847B8957049F5ED115267-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--26590AC5F69847B8957049F5ED115267-->  <NAME><![CDATA[Active]]></NAME>
+<!--26590AC5F69847B8957049F5ED115267-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--26590AC5F69847B8957049F5ED115267-->  <HELP><![CDATA[There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reporting. There are two reasons for de-activating and not deleting records: 
+(1) The system requires the record for auditing purposes.
+(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are existing invoices for it. By de-activating the Business Partner you prevent it from being used in future transactions.]]></HELP>
+<!--26590AC5F69847B8957049F5ED115267-->  <COLUMNNAME><![CDATA[Isactive]]></COLUMNNAME>
+<!--26590AC5F69847B8957049F5ED115267-->  <AD_TABLE_ID><![CDATA[3277BAAF6B7249BA972D99D351BD08CC]]></AD_TABLE_ID>
+<!--26590AC5F69847B8957049F5ED115267-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--26590AC5F69847B8957049F5ED115267-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--26590AC5F69847B8957049F5ED115267-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--26590AC5F69847B8957049F5ED115267-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--26590AC5F69847B8957049F5ED115267-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--26590AC5F69847B8957049F5ED115267-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--26590AC5F69847B8957049F5ED115267-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--26590AC5F69847B8957049F5ED115267-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--26590AC5F69847B8957049F5ED115267-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--26590AC5F69847B8957049F5ED115267-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--26590AC5F69847B8957049F5ED115267-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--26590AC5F69847B8957049F5ED115267-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--26590AC5F69847B8957049F5ED115267-->  <AD_ELEMENT_ID><![CDATA[348]]></AD_ELEMENT_ID>
+<!--26590AC5F69847B8957049F5ED115267-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--26590AC5F69847B8957049F5ED115267-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--26590AC5F69847B8957049F5ED115267-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--26590AC5F69847B8957049F5ED115267-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--26590AC5F69847B8957049F5ED115267-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--26590AC5F69847B8957049F5ED115267-->  <POSITION><![CDATA[3]]></POSITION>
+<!--26590AC5F69847B8957049F5ED115267-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--26590AC5F69847B8957049F5ED115267-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--26590AC5F69847B8957049F5ED115267-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--26590AC5F69847B8957049F5ED115267-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--26590AC5F69847B8957049F5ED115267-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--26590AC5F69847B8957049F5ED115267-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--26590AC5F69847B8957049F5ED115267-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--26590AC5F69847B8957049F5ED115267-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--26590AC5F69847B8957049F5ED115267--></AD_COLUMN>
+
 <!--26684F9855B64C9189052F01BA13592D--><AD_COLUMN>
 <!--26684F9855B64C9189052F01BA13592D-->  <AD_COLUMN_ID><![CDATA[26684F9855B64C9189052F01BA13592D]]></AD_COLUMN_ID>
 <!--26684F9855B64C9189052F01BA13592D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -254625,6 +254978,46 @@
 <!--26B6C690FE9643EBB1F3E1D6FC9D9A3B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--26B6C690FE9643EBB1F3E1D6FC9D9A3B--></AD_COLUMN>
 
+<!--26CCB4D9EB514A7F9F80054677A808D6--><AD_COLUMN>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <AD_COLUMN_ID><![CDATA[26CCB4D9EB514A7F9F80054677A808D6]]></AD_COLUMN_ID>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <NAME><![CDATA[Client]]></NAME>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <AD_TABLE_ID><![CDATA[4523F40FF3F746D690EC2AAD90F6171D]]></AD_TABLE_ID>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <AD_VAL_RULE_ID><![CDATA[103]]></AD_VAL_RULE_ID>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <POSITION><![CDATA[2]]></POSITION>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--26CCB4D9EB514A7F9F80054677A808D6-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--26CCB4D9EB514A7F9F80054677A808D6--></AD_COLUMN>
+
 <!--26D75DD294F7469489673CBA815BBE04--><AD_COLUMN>
 <!--26D75DD294F7469489673CBA815BBE04-->  <AD_COLUMN_ID><![CDATA[26D75DD294F7469489673CBA815BBE04]]></AD_COLUMN_ID>
 <!--26D75DD294F7469489673CBA815BBE04-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -257097,6 +257490,44 @@
 <!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--2F1DF5F2C6654FA9BC8CD5D94EBCA48A--></AD_COLUMN>
 
+<!--2F1DFDFD6D144F078FB37B5C881F0F87--><AD_COLUMN>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <AD_COLUMN_ID><![CDATA[2F1DFDFD6D144F078FB37B5C881F0F87]]></AD_COLUMN_ID>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <NAME><![CDATA[Name]]></NAME>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <DESCRIPTION><![CDATA[A non-unique identifier for a record/document often used as a search tool.]]></DESCRIPTION>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <HELP><![CDATA[A more descriptive identifier (that does need to be unique) of a record/document that is used as a default search option along with the search key (that is unique and mostly shorter). It is up to 60 characters in length.]]></HELP>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <COLUMNNAME><![CDATA[Name]]></COLUMNNAME>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <AD_TABLE_ID><![CDATA[4523F40FF3F746D690EC2AAD90F6171D]]></AD_TABLE_ID>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <FIELDLENGTH><![CDATA[40]]></FIELDLENGTH>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <AD_ELEMENT_ID><![CDATA[469]]></AD_ELEMENT_ID>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <POSITION><![CDATA[9]]></POSITION>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--2F1DFDFD6D144F078FB37B5C881F0F87--></AD_COLUMN>
+
 <!--2F682DC6DBA541CB8DDDEA54D4FC9A11--><AD_COLUMN>
 <!--2F682DC6DBA541CB8DDDEA54D4FC9A11-->  <AD_COLUMN_ID><![CDATA[2F682DC6DBA541CB8DDDEA54D4FC9A11]]></AD_COLUMN_ID>
 <!--2F682DC6DBA541CB8DDDEA54D4FC9A11-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -260009,6 +260440,47 @@
 <!--3958F2FE6BD54288B69FF3D175C19480-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--3958F2FE6BD54288B69FF3D175C19480--></AD_COLUMN>
 
+<!--39845E09B015496BAA1FDCFE39DFAAF0--><AD_COLUMN>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <AD_COLUMN_ID><![CDATA[39845E09B015496BAA1FDCFE39DFAAF0]]></AD_COLUMN_ID>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <NAME><![CDATA[Active]]></NAME>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <HELP><![CDATA[There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reporting. There are two reasons for de-activating and not deleting records: 
+(1) The system requires the record for auditing purposes.
+(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are existing invoices for it. By de-activating the Business Partner you prevent it from being used in future transactions.]]></HELP>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <COLUMNNAME><![CDATA[Isactive]]></COLUMNNAME>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <AD_TABLE_ID><![CDATA[4523F40FF3F746D690EC2AAD90F6171D]]></AD_TABLE_ID>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <AD_ELEMENT_ID><![CDATA[348]]></AD_ELEMENT_ID>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <POSITION><![CDATA[4]]></POSITION>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--39845E09B015496BAA1FDCFE39DFAAF0-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--39845E09B015496BAA1FDCFE39DFAAF0--></AD_COLUMN>
+
 <!--39E68AB00DEA43D1B68302BE844FEE81--><AD_COLUMN>
 <!--39E68AB00DEA43D1B68302BE844FEE81-->  <AD_COLUMN_ID><![CDATA[39E68AB00DEA43D1B68302BE844FEE81]]></AD_COLUMN_ID>
 <!--39E68AB00DEA43D1B68302BE844FEE81-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -261588,6 +262060,45 @@
 <!--3EE5C3FA006A425AAA45B703B30A516B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--3EE5C3FA006A425AAA45B703B30A516B--></AD_COLUMN>
 
+<!--3FABF813C52A47D9835CA4401104EA15--><AD_COLUMN>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <AD_COLUMN_ID><![CDATA[3FABF813C52A47D9835CA4401104EA15]]></AD_COLUMN_ID>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <NAME><![CDATA[Organization]]></NAME>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <AD_TABLE_ID><![CDATA[3277BAAF6B7249BA972D99D351BD08CC]]></AD_TABLE_ID>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <ISPARENT><![CDATA[Y]]></ISPARENT>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <AD_ELEMENT_ID><![CDATA[4E3326D8537849D2BBB20D1779080C93]]></AD_ELEMENT_ID>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <POSITION><![CDATA[8]]></POSITION>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--3FABF813C52A47D9835CA4401104EA15-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--3FABF813C52A47D9835CA4401104EA15--></AD_COLUMN>
+
 <!--3FE2EA6C9F474DE79421734AD8174FBA--><AD_COLUMN>
 <!--3FE2EA6C9F474DE79421734AD8174FBA-->  <AD_COLUMN_ID><![CDATA[3FE2EA6C9F474DE79421734AD8174FBA]]></AD_COLUMN_ID>
 <!--3FE2EA6C9F474DE79421734AD8174FBA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -269067,7 +269578,7 @@
 <!--539C4E45B3FB477BAD74E46CD96F6B33-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--539C4E45B3FB477BAD74E46CD96F6B33-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--539C4E45B3FB477BAD74E46CD96F6B33-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--539C4E45B3FB477BAD74E46CD96F6B33-->  <POSITION><![CDATA[36]]></POSITION>
+<!--539C4E45B3FB477BAD74E46CD96F6B33-->  <POSITION><![CDATA[33]]></POSITION>
 <!--539C4E45B3FB477BAD74E46CD96F6B33-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--539C4E45B3FB477BAD74E46CD96F6B33-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--539C4E45B3FB477BAD74E46CD96F6B33-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -269537,6 +270048,44 @@
 <!--54C42E22809F46969BC384584EA4C692-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--54C42E22809F46969BC384584EA4C692--></AD_COLUMN>
 
+<!--54D9654065504D0296D071B41B9BF5CA--><AD_COLUMN>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <AD_COLUMN_ID><![CDATA[54D9654065504D0296D071B41B9BF5CA]]></AD_COLUMN_ID>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <NAME><![CDATA[Inventory Status]]></NAME>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <DESCRIPTION><![CDATA[Condition of a specific inventory]]></DESCRIPTION>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <HELP><![CDATA[The inventory status refers to the condition of a specific inventory (such as AVAILABLE, RETURN, DEFECT, TRANSIT) that is stored in a specific organization, warehouse and bin and for a product with a specific lot/serial and quantity. The inventory status can allow or disallow certain business processes.]]></HELP>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <COLUMNNAME><![CDATA[M_Inventorystatus_ID]]></COLUMNNAME>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <AD_TABLE_ID><![CDATA[4523F40FF3F746D690EC2AAD90F6171D]]></AD_TABLE_ID>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <ISPARENT><![CDATA[Y]]></ISPARENT>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <SEQNO><![CDATA[120]]></SEQNO>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <AD_ELEMENT_ID><![CDATA[69A474773BFB48E39E23DEBFDCDA2A13]]></AD_ELEMENT_ID>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <POSITION><![CDATA[15]]></POSITION>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--54D9654065504D0296D071B41B9BF5CA-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--54D9654065504D0296D071B41B9BF5CA--></AD_COLUMN>
+
 <!--5502AEFEFC29441197D3C4473C1C6C68--><AD_COLUMN>
 <!--5502AEFEFC29441197D3C4473C1C6C68-->  <AD_COLUMN_ID><![CDATA[5502AEFEFC29441197D3C4473C1C6C68]]></AD_COLUMN_ID>
 <!--5502AEFEFC29441197D3C4473C1C6C68-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -272494,6 +273043,7 @@
 <!--573D452F04CD243FE040007F01012792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--573D452F04CD243FE040007F01012792-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--573D452F04CD243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--573D452F04CD243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F04CD243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--573D452F04CD243FE040007F01012792-->  <SEQNO><![CDATA[20]]></SEQNO>
 <!--573D452F04CD243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -272534,6 +273084,7 @@
 <!--573D452F04CE243FE040007F01012792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--573D452F04CE243FE040007F01012792-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--573D452F04CE243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--573D452F04CE243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F04CE243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--573D452F04CE243FE040007F01012792-->  <SEQNO><![CDATA[30]]></SEQNO>
 <!--573D452F04CE243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -272575,6 +273126,7 @@
 <!--573D452F04CF243FE040007F01012792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--573D452F04CF243FE040007F01012792-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--573D452F04CF243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--573D452F04CF243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F04CF243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--573D452F04CF243FE040007F01012792-->  <SEQNO><![CDATA[40]]></SEQNO>
 <!--573D452F04CF243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -272768,6 +273320,7 @@
 <!--573D452F04D4243FE040007F01012792-->  <ISPARENT><![CDATA[Y]]></ISPARENT>
 <!--573D452F04D4243FE040007F01012792-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--573D452F04D4243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--573D452F04D4243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F04D4243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
 <!--573D452F04D4243FE040007F01012792-->  <SEQNO><![CDATA[90]]></SEQNO>
 <!--573D452F04D4243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -272807,6 +273360,7 @@
 <!--573D452F04D5243FE040007F01012792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--573D452F04D5243FE040007F01012792-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--573D452F04D5243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--573D452F04D5243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F04D5243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--573D452F04D5243FE040007F01012792-->  <SEQNO><![CDATA[100]]></SEQNO>
 <!--573D452F04D5243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -272846,6 +273400,7 @@
 <!--573D452F04D6243FE040007F01012792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--573D452F04D6243FE040007F01012792-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--573D452F04D6243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--573D452F04D6243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F04D6243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--573D452F04D6243FE040007F01012792-->  <SEQNO><![CDATA[110]]></SEQNO>
 <!--573D452F04D6243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -272924,6 +273479,7 @@
 <!--573D452F04D9243FE040007F01012792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--573D452F04D9243FE040007F01012792-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--573D452F04D9243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--573D452F04D9243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F04D9243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--573D452F04D9243FE040007F01012792-->  <SEQNO><![CDATA[140]]></SEQNO>
 <!--573D452F04D9243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -272963,6 +273519,7 @@
 <!--573D452F04DA243FE040007F01012792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--573D452F04DA243FE040007F01012792-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--573D452F04DA243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--573D452F04DA243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F04DA243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--573D452F04DA243FE040007F01012792-->  <SEQNO><![CDATA[150]]></SEQNO>
 <!--573D452F04DA243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -273003,6 +273560,7 @@
 <!--573D452F04DB243FE040007F01012792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--573D452F04DB243FE040007F01012792-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--573D452F04DB243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--573D452F04DB243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F04DB243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--573D452F04DB243FE040007F01012792-->  <SEQNO><![CDATA[160]]></SEQNO>
 <!--573D452F04DB243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -273041,6 +273599,7 @@
 <!--573D452F04DC243FE040007F01012792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--573D452F04DC243FE040007F01012792-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--573D452F04DC243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--573D452F04DC243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F04DC243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--573D452F04DC243FE040007F01012792-->  <SEQNO><![CDATA[170]]></SEQNO>
 <!--573D452F04DC243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -273079,6 +273638,7 @@
 <!--573D452F04DD243FE040007F01012792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--573D452F04DD243FE040007F01012792-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--573D452F04DD243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--573D452F04DD243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F04DD243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--573D452F04DD243FE040007F01012792-->  <SEQNO><![CDATA[180]]></SEQNO>
 <!--573D452F04DD243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -273117,6 +273677,7 @@
 <!--573D452F04DE243FE040007F01012792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--573D452F04DE243FE040007F01012792-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--573D452F04DE243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--573D452F04DE243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F04DE243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--573D452F04DE243FE040007F01012792-->  <SEQNO><![CDATA[190]]></SEQNO>
 <!--573D452F04DE243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -273156,6 +273717,7 @@
 <!--573D452F04DF243FE040007F01012792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--573D452F04DF243FE040007F01012792-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--573D452F04DF243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--573D452F04DF243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F04DF243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--573D452F04DF243FE040007F01012792-->  <SEQNO><![CDATA[200]]></SEQNO>
 <!--573D452F04DF243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -273194,6 +273756,7 @@
 <!--573D452F04E0243FE040007F01012792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--573D452F04E0243FE040007F01012792-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--573D452F04E0243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--573D452F04E0243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F04E0243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--573D452F04E0243FE040007F01012792-->  <SEQNO><![CDATA[210]]></SEQNO>
 <!--573D452F04E0243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -273232,6 +273795,7 @@
 <!--573D452F04E1243FE040007F01012792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--573D452F04E1243FE040007F01012792-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--573D452F04E1243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--573D452F04E1243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F04E1243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--573D452F04E1243FE040007F01012792-->  <SEQNO><![CDATA[220]]></SEQNO>
 <!--573D452F04E1243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -273270,6 +273834,7 @@
 <!--573D452F04E2243FE040007F01012792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--573D452F04E2243FE040007F01012792-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--573D452F04E2243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--573D452F04E2243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F04E2243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--573D452F04E2243FE040007F01012792-->  <SEQNO><![CDATA[230]]></SEQNO>
 <!--573D452F04E2243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -273308,6 +273873,7 @@
 <!--573D452F04E3243FE040007F01012792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--573D452F04E3243FE040007F01012792-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--573D452F04E3243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--573D452F04E3243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F04E3243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--573D452F04E3243FE040007F01012792-->  <SEQNO><![CDATA[240]]></SEQNO>
 <!--573D452F04E3243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -273346,6 +273912,7 @@
 <!--573D452F04E4243FE040007F01012792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--573D452F04E4243FE040007F01012792-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--573D452F04E4243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--573D452F04E4243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F04E4243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--573D452F04E4243FE040007F01012792-->  <SEQNO><![CDATA[250]]></SEQNO>
 <!--573D452F04E4243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -273384,6 +273951,7 @@
 <!--573D452F04E5243FE040007F01012792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--573D452F04E5243FE040007F01012792-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--573D452F04E5243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--573D452F04E5243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F04E5243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--573D452F04E5243FE040007F01012792-->  <SEQNO><![CDATA[260]]></SEQNO>
 <!--573D452F04E5243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -273422,6 +273990,7 @@
 <!--573D452F04E6243FE040007F01012792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--573D452F04E6243FE040007F01012792-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--573D452F04E6243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--573D452F04E6243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F04E6243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--573D452F04E6243FE040007F01012792-->  <SEQNO><![CDATA[270]]></SEQNO>
 <!--573D452F04E6243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -273462,6 +274031,7 @@
 <!--573D452F04E8243FE040007F01012792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--573D452F04E8243FE040007F01012792-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--573D452F04E8243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--573D452F04E8243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F04E8243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--573D452F04E8243FE040007F01012792-->  <SEQNO><![CDATA[290]]></SEQNO>
 <!--573D452F04E8243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -273500,6 +274070,7 @@
 <!--573D452F04E9243FE040007F01012792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--573D452F04E9243FE040007F01012792-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--573D452F04E9243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--573D452F04E9243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F04E9243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--573D452F04E9243FE040007F01012792-->  <SEQNO><![CDATA[300]]></SEQNO>
 <!--573D452F04E9243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -273539,6 +274110,7 @@
 <!--573D452F04EA243FE040007F01012792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--573D452F04EA243FE040007F01012792-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--573D452F04EA243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--573D452F04EA243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F04EA243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--573D452F04EA243FE040007F01012792-->  <SEQNO><![CDATA[310]]></SEQNO>
 <!--573D452F04EA243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -273577,6 +274149,7 @@
 <!--573D452F04EE243FE040007F01012792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--573D452F04EE243FE040007F01012792-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--573D452F04EE243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--573D452F04EE243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F04EE243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--573D452F04EE243FE040007F01012792-->  <SEQNO><![CDATA[350]]></SEQNO>
 <!--573D452F04EE243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -273615,6 +274188,7 @@
 <!--573D452F04EF243FE040007F01012792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--573D452F04EF243FE040007F01012792-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--573D452F04EF243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--573D452F04EF243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F04EF243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--573D452F04EF243FE040007F01012792-->  <SEQNO><![CDATA[360]]></SEQNO>
 <!--573D452F04EF243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -273653,6 +274227,7 @@
 <!--573D452F04F2243FE040007F01012792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--573D452F04F2243FE040007F01012792-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--573D452F04F2243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--573D452F04F2243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F04F2243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--573D452F04F2243FE040007F01012792-->  <SEQNO><![CDATA[390]]></SEQNO>
 <!--573D452F04F2243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -273693,6 +274268,7 @@
 <!--573D452F0504243FE040007F01012792-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--573D452F0504243FE040007F01012792-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--573D452F0504243FE040007F01012792-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--573D452F0504243FE040007F01012792-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--573D452F0504243FE040007F01012792-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--573D452F0504243FE040007F01012792-->  <SEQNO><![CDATA[400]]></SEQNO>
 <!--573D452F0504243FE040007F01012792-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -274000,6 +274576,7 @@
 <!--578063C571E772CAE040007F0101088F-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--578063C571E772CAE040007F0101088F-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--578063C571E772CAE040007F0101088F-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--578063C571E772CAE040007F0101088F-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--578063C571E772CAE040007F0101088F-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--578063C571E772CAE040007F0101088F-->  <SEQNO><![CDATA[440]]></SEQNO>
 <!--578063C571E772CAE040007F0101088F-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -274040,6 +274617,7 @@
 <!--578EB3CA2989604EE040007F01012AD0-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--578EB3CA2989604EE040007F01012AD0-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--578EB3CA2989604EE040007F01012AD0-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--578EB3CA2989604EE040007F01012AD0-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--578EB3CA2989604EE040007F01012AD0-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--578EB3CA2989604EE040007F01012AD0-->  <SEQNO><![CDATA[450]]></SEQNO>
 <!--578EB3CA2989604EE040007F01012AD0-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -274078,6 +274656,7 @@
 <!--5791B82BEAD213D8E040007F010160B1-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--5791B82BEAD213D8E040007F010160B1-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--5791B82BEAD213D8E040007F010160B1-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--5791B82BEAD213D8E040007F010160B1-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--5791B82BEAD213D8E040007F010160B1-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--5791B82BEAD213D8E040007F010160B1-->  <SEQNO><![CDATA[460]]></SEQNO>
 <!--5791B82BEAD213D8E040007F010160B1-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -274194,6 +274773,7 @@
 <!--579FC427CBEC9889E040007F01013019-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--579FC427CBEC9889E040007F01013019-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--579FC427CBEC9889E040007F01013019-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--579FC427CBEC9889E040007F01013019-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--579FC427CBEC9889E040007F01013019-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--579FC427CBEC9889E040007F01013019-->  <SEQNO><![CDATA[490]]></SEQNO>
 <!--579FC427CBEC9889E040007F01013019-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -276917,6 +277497,7 @@
 <!--5807449695A38D81E040007F010127AB-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--5807449695A38D81E040007F010127AB-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--5807449695A38D81E040007F010127AB-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--5807449695A38D81E040007F010127AB-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--5807449695A38D81E040007F010127AB-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--5807449695A38D81E040007F010127AB-->  <SEQNO><![CDATA[530]]></SEQNO>
 <!--5807449695A38D81E040007F010127AB-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -277506,6 +278087,7 @@
 <!--58483D9BA18415CEE040007F010156C1-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--58483D9BA18415CEE040007F010156C1-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--58483D9BA18415CEE040007F010156C1-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--58483D9BA18415CEE040007F010156C1-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--58483D9BA18415CEE040007F010156C1-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--58483D9BA18415CEE040007F010156C1-->  <SEQNO><![CDATA[540]]></SEQNO>
 <!--58483D9BA18415CEE040007F010156C1-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -279370,6 +279952,7 @@
 <!--58866B56AA0CDDF4E040007F01014048-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--58866B56AA0CDDF4E040007F01014048-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--58866B56AA0CDDF4E040007F01014048-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--58866B56AA0CDDF4E040007F01014048-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--58866B56AA0CDDF4E040007F01014048-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--58866B56AA0CDDF4E040007F01014048-->  <SEQNO><![CDATA[560]]></SEQNO>
 <!--58866B56AA0CDDF4E040007F01014048-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -279447,6 +280030,7 @@
 <!--58955DB3E07738CEE040007F01015E15-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--58955DB3E07738CEE040007F01015E15-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--58955DB3E07738CEE040007F01015E15-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--58955DB3E07738CEE040007F01015E15-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--58955DB3E07738CEE040007F01015E15-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--58955DB3E07738CEE040007F01015E15-->  <SEQNO><![CDATA[570]]></SEQNO>
 <!--58955DB3E07738CEE040007F01015E15-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -279485,6 +280069,7 @@
 <!--58955DB3E07838CEE040007F01015E15-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--58955DB3E07838CEE040007F01015E15-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--58955DB3E07838CEE040007F01015E15-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--58955DB3E07838CEE040007F01015E15-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--58955DB3E07838CEE040007F01015E15-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--58955DB3E07838CEE040007F01015E15-->  <SEQNO><![CDATA[580]]></SEQNO>
 <!--58955DB3E07838CEE040007F01015E15-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -279523,6 +280108,7 @@
 <!--58955DB3E07938CEE040007F01015E15-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--58955DB3E07938CEE040007F01015E15-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--58955DB3E07938CEE040007F01015E15-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--58955DB3E07938CEE040007F01015E15-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--58955DB3E07938CEE040007F01015E15-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--58955DB3E07938CEE040007F01015E15-->  <SEQNO><![CDATA[590]]></SEQNO>
 <!--58955DB3E07938CEE040007F01015E15-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -279583,6 +280169,45 @@
 <!--58A13FB2504E48148D883D0144AFC244-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--58A13FB2504E48148D883D0144AFC244--></AD_COLUMN>
 
+<!--58A51EFE26634B4AB7865CBC3B6859AE--><AD_COLUMN>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <AD_COLUMN_ID><![CDATA[58A51EFE26634B4AB7865CBC3B6859AE]]></AD_COLUMN_ID>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <NAME><![CDATA[Language]]></NAME>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <DESCRIPTION><![CDATA[A method of communication being used.]]></DESCRIPTION>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <HELP><![CDATA[The Language identifies the language to use for display]]></HELP>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <COLUMNNAME><![CDATA[AD_Language]]></COLUMNNAME>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <AD_TABLE_ID><![CDATA[4523F40FF3F746D690EC2AAD90F6171D]]></AD_TABLE_ID>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <AD_REFERENCE_VALUE_ID><![CDATA[106]]></AD_REFERENCE_VALUE_ID>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <FIELDLENGTH><![CDATA[6]]></FIELDLENGTH>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <AD_ELEMENT_ID><![CDATA[109]]></AD_ELEMENT_ID>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <POSITION><![CDATA[14]]></POSITION>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--58A51EFE26634B4AB7865CBC3B6859AE-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--58A51EFE26634B4AB7865CBC3B6859AE--></AD_COLUMN>
+
 <!--58B4C5C1D80A4AE0969F9FE284B9C479--><AD_COLUMN>
 <!--58B4C5C1D80A4AE0969F9FE284B9C479-->  <AD_COLUMN_ID><![CDATA[58B4C5C1D80A4AE0969F9FE284B9C479]]></AD_COLUMN_ID>
 <!--58B4C5C1D80A4AE0969F9FE284B9C479-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -282189,7 +282814,7 @@
 <!--5A02BD2E7E2C4C0497524E2748B11BBE-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--5A02BD2E7E2C4C0497524E2748B11BBE-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--5A02BD2E7E2C4C0497524E2748B11BBE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--5A02BD2E7E2C4C0497524E2748B11BBE-->  <POSITION><![CDATA[34]]></POSITION>
+<!--5A02BD2E7E2C4C0497524E2748B11BBE-->  <POSITION><![CDATA[32]]></POSITION>
 <!--5A02BD2E7E2C4C0497524E2748B11BBE-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--5A02BD2E7E2C4C0497524E2748B11BBE-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--5A02BD2E7E2C4C0497524E2748B11BBE-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -288530,7 +289155,7 @@
 <!--635D11B14B0C43859DFA5E2D0A89F969-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--635D11B14B0C43859DFA5E2D0A89F969-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--635D11B14B0C43859DFA5E2D0A89F969-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--635D11B14B0C43859DFA5E2D0A89F969-->  <POSITION><![CDATA[33]]></POSITION>
+<!--635D11B14B0C43859DFA5E2D0A89F969-->  <POSITION><![CDATA[31]]></POSITION>
 <!--635D11B14B0C43859DFA5E2D0A89F969-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--635D11B14B0C43859DFA5E2D0A89F969-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--635D11B14B0C43859DFA5E2D0A89F969-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -292288,6 +292913,44 @@
 <!--688D207B4C354868A9D84CBDA5349A0A-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--688D207B4C354868A9D84CBDA5349A0A--></AD_COLUMN>
 
+<!--688D3458869D4383938E39F3381D5F17--><AD_COLUMN>
+<!--688D3458869D4383938E39F3381D5F17-->  <AD_COLUMN_ID><![CDATA[688D3458869D4383938E39F3381D5F17]]></AD_COLUMN_ID>
+<!--688D3458869D4383938E39F3381D5F17-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--688D3458869D4383938E39F3381D5F17-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--688D3458869D4383938E39F3381D5F17-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--688D3458869D4383938E39F3381D5F17-->  <NAME><![CDATA[Nettable]]></NAME>
+<!--688D3458869D4383938E39F3381D5F17-->  <COLUMNNAME><![CDATA[Nettable]]></COLUMNNAME>
+<!--688D3458869D4383938E39F3381D5F17-->  <AD_TABLE_ID><![CDATA[95FE1A1DCB1948AD8E2D5AFE4E95521C]]></AD_TABLE_ID>
+<!--688D3458869D4383938E39F3381D5F17-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--688D3458869D4383938E39F3381D5F17-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--688D3458869D4383938E39F3381D5F17-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--688D3458869D4383938E39F3381D5F17-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--688D3458869D4383938E39F3381D5F17-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--688D3458869D4383938E39F3381D5F17-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--688D3458869D4383938E39F3381D5F17-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--688D3458869D4383938E39F3381D5F17-->  <READONLYLOGIC><![CDATA[@InventoryStatusUsed@]]></READONLYLOGIC>
+<!--688D3458869D4383938E39F3381D5F17-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--688D3458869D4383938E39F3381D5F17-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--688D3458869D4383938E39F3381D5F17-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--688D3458869D4383938E39F3381D5F17-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--688D3458869D4383938E39F3381D5F17-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--688D3458869D4383938E39F3381D5F17-->  <AD_ELEMENT_ID><![CDATA[B3CCAA626BB948C2A65BF5F8303DDB0C]]></AD_ELEMENT_ID>
+<!--688D3458869D4383938E39F3381D5F17-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--688D3458869D4383938E39F3381D5F17-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--688D3458869D4383938E39F3381D5F17-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--688D3458869D4383938E39F3381D5F17-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--688D3458869D4383938E39F3381D5F17-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--688D3458869D4383938E39F3381D5F17-->  <POSITION><![CDATA[12]]></POSITION>
+<!--688D3458869D4383938E39F3381D5F17-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--688D3458869D4383938E39F3381D5F17-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--688D3458869D4383938E39F3381D5F17-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--688D3458869D4383938E39F3381D5F17-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--688D3458869D4383938E39F3381D5F17-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--688D3458869D4383938E39F3381D5F17-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--688D3458869D4383938E39F3381D5F17-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--688D3458869D4383938E39F3381D5F17-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--688D3458869D4383938E39F3381D5F17--></AD_COLUMN>
+
 <!--68CC47B1AD4F45F68002BF9241C633DC--><AD_COLUMN>
 <!--68CC47B1AD4F45F68002BF9241C633DC-->  <AD_COLUMN_ID><![CDATA[68CC47B1AD4F45F68002BF9241C633DC]]></AD_COLUMN_ID>
 <!--68CC47B1AD4F45F68002BF9241C633DC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -296213,6 +296876,44 @@
 <!--7079E2FD4AA7799EE040007F010104AD-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--7079E2FD4AA7799EE040007F010104AD--></AD_COLUMN>
 
+<!--708B76D274F14D8CB3E12283FFC1C779--><AD_COLUMN>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <AD_COLUMN_ID><![CDATA[708B76D274F14D8CB3E12283FFC1C779]]></AD_COLUMN_ID>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <NAME><![CDATA[Inventory Status]]></NAME>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <DESCRIPTION><![CDATA[Condition of a specific inventory]]></DESCRIPTION>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <HELP><![CDATA[The inventory status refers to the condition of a specific inventory (such as AVAILABLE, RETURN, DEFECT, TRANSIT) that is stored in a specific organization, warehouse and bin and for a product with a specific lot/serial and quantity. The inventory status can allow or disallow certain business processes.]]></HELP>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <COLUMNNAME><![CDATA[M_Inventorystatus_ID]]></COLUMNNAME>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <AD_TABLE_ID><![CDATA[95FE1A1DCB1948AD8E2D5AFE4E95521C]]></AD_TABLE_ID>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <ISKEY><![CDATA[Y]]></ISKEY>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <AD_ELEMENT_ID><![CDATA[69A474773BFB48E39E23DEBFDCDA2A13]]></AD_ELEMENT_ID>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <POSITION><![CDATA[1]]></POSITION>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--708B76D274F14D8CB3E12283FFC1C779-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--708B76D274F14D8CB3E12283FFC1C779--></AD_COLUMN>
+
 <!--70BA08AD70E84EB99EA0693BCD9CEEC5--><AD_COLUMN>
 <!--70BA08AD70E84EB99EA0693BCD9CEEC5-->  <AD_COLUMN_ID><![CDATA[70BA08AD70E84EB99EA0693BCD9CEEC5]]></AD_COLUMN_ID>
 <!--70BA08AD70E84EB99EA0693BCD9CEEC5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -296613,6 +297314,7 @@
 <!--725CA414537E4AE7A10C9B5632C92838-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--725CA414537E4AE7A10C9B5632C92838-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--725CA414537E4AE7A10C9B5632C92838-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--725CA414537E4AE7A10C9B5632C92838-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--725CA414537E4AE7A10C9B5632C92838-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--725CA414537E4AE7A10C9B5632C92838-->  <SEQNO><![CDATA[630]]></SEQNO>
 <!--725CA414537E4AE7A10C9B5632C92838-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -312037,6 +312739,45 @@
 <!--80F1BCD61F0F11DE8BE5DF56446CB1D8-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--80F1BCD61F0F11DE8BE5DF56446CB1D8--></AD_COLUMN>
 
+<!--80F6C5D60AEC4E82A9B7D462DD644027--><AD_COLUMN>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <AD_COLUMN_ID><![CDATA[80F6C5D60AEC4E82A9B7D462DD644027]]></AD_COLUMN_ID>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <NAME><![CDATA[Updated]]></NAME>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <AD_TABLE_ID><![CDATA[95FE1A1DCB1948AD8E2D5AFE4E95521C]]></AD_TABLE_ID>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <AD_ELEMENT_ID><![CDATA[607]]></AD_ELEMENT_ID>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <POSITION><![CDATA[7]]></POSITION>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--80F6C5D60AEC4E82A9B7D462DD644027-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--80F6C5D60AEC4E82A9B7D462DD644027--></AD_COLUMN>
+
 <!--810B5214AD343BC3E040007F01015013--><AD_COLUMN>
 <!--810B5214AD343BC3E040007F01015013-->  <AD_COLUMN_ID><![CDATA[810B5214AD343BC3E040007F01015013]]></AD_COLUMN_ID>
 <!--810B5214AD343BC3E040007F01015013-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -313298,7 +314039,7 @@
 <!--8189F49FFEC36E56E040007F01003E83-->  <COLUMNNAME><![CDATA[C_Bpartner_ID]]></COLUMNNAME>
 <!--8189F49FFEC36E56E040007F01003E83-->  <AD_TABLE_ID><![CDATA[84203CBEBDA349C38319C0E549751546]]></AD_TABLE_ID>
 <!--8189F49FFEC36E56E040007F01003E83-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
-<!--8189F49FFEC36E56E040007F01003E83-->  <AD_REFERENCE_VALUE_ID><![CDATA[4028E61131FB4B1B0131FB5226C90008]]></AD_REFERENCE_VALUE_ID>
+<!--8189F49FFEC36E56E040007F01003E83-->  <AD_REFERENCE_VALUE_ID><![CDATA[488E4BF765294DD8A7A943BDED4BA6E6]]></AD_REFERENCE_VALUE_ID>
 <!--8189F49FFEC36E56E040007F01003E83-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8189F49FFEC36E56E040007F01003E83-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--8189F49FFEC36E56E040007F01003E83-->  <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -317161,7 +317902,7 @@
 <!--828EE0AE80475FA1E040007F010067C7-->  <COLUMNNAME><![CDATA[C_Bpartner_ID]]></COLUMNNAME>
 <!--828EE0AE80475FA1E040007F010067C7-->  <AD_TABLE_ID><![CDATA[B129E53BC0E747879F7BA17F0AECEC32]]></AD_TABLE_ID>
 <!--828EE0AE80475FA1E040007F010067C7-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
-<!--828EE0AE80475FA1E040007F010067C7-->  <AD_REFERENCE_VALUE_ID><![CDATA[4028E61131FB4B1B0131FB5226C90008]]></AD_REFERENCE_VALUE_ID>
+<!--828EE0AE80475FA1E040007F010067C7-->  <AD_REFERENCE_VALUE_ID><![CDATA[488E4BF765294DD8A7A943BDED4BA6E6]]></AD_REFERENCE_VALUE_ID>
 <!--828EE0AE80475FA1E040007F010067C7-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--828EE0AE80475FA1E040007F010067C7-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--828EE0AE80475FA1E040007F010067C7-->  <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -319468,6 +320209,44 @@
 <!--86A49F4CBE2C42B7A1508536F031D2D5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--86A49F4CBE2C42B7A1508536F031D2D5--></AD_COLUMN>
 
+<!--86DEC1F7085840D7A4E15DB49894C6FA--><AD_COLUMN>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <AD_COLUMN_ID><![CDATA[86DEC1F7085840D7A4E15DB49894C6FA]]></AD_COLUMN_ID>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <NAME><![CDATA[Levelno]]></NAME>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <DESCRIPTION><![CDATA[Level of the Organization under its Parent Organization in the Organization Tree.]]></DESCRIPTION>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <HELP><![CDATA[Level of the Organization under its Parent Organization in the Organization Tree.]]></HELP>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <COLUMNNAME><![CDATA[Levelno]]></COLUMNNAME>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <AD_TABLE_ID><![CDATA[3277BAAF6B7249BA972D99D351BD08CC]]></AD_TABLE_ID>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <AD_ELEMENT_ID><![CDATA[79E9E5C902894B5AA45B80D5EA297D64]]></AD_ELEMENT_ID>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <POSITION><![CDATA[10]]></POSITION>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--86DEC1F7085840D7A4E15DB49894C6FA-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--86DEC1F7085840D7A4E15DB49894C6FA--></AD_COLUMN>
+
 <!--86DF0DF2E002BFFEE040007F010175A6--><AD_COLUMN>
 <!--86DF0DF2E002BFFEE040007F010175A6-->  <AD_COLUMN_ID><![CDATA[86DF0DF2E002BFFEE040007F010175A6]]></AD_COLUMN_ID>
 <!--86DF0DF2E002BFFEE040007F010175A6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -324330,6 +325109,7 @@
 <!--8B042E0FE87E44F68B30A31E67C1E158-->  <COLUMNNAME><![CDATA[Fin_Financial_Account_ID]]></COLUMNNAME>
 <!--8B042E0FE87E44F68B30A31E67C1E158-->  <AD_TABLE_ID><![CDATA[B9437A72163445C59A0A585209C8ECE5]]></AD_TABLE_ID>
 <!--8B042E0FE87E44F68B30A31E67C1E158-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--8B042E0FE87E44F68B30A31E67C1E158-->  <AD_VAL_RULE_ID><![CDATA[6910516E0A54432CA2E6A0C058346F92]]></AD_VAL_RULE_ID>
 <!--8B042E0FE87E44F68B30A31E67C1E158-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8B042E0FE87E44F68B30A31E67C1E158-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--8B042E0FE87E44F68B30A31E67C1E158-->  <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -325266,6 +326046,45 @@
 <!--8C8D3DD4EB154303A09DA7019D5F42F7-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8C8D3DD4EB154303A09DA7019D5F42F7--></AD_COLUMN>
 
+<!--8C9DD59B87CF4230861E048941D96F50--><AD_COLUMN>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <AD_COLUMN_ID><![CDATA[8C9DD59B87CF4230861E048941D96F50]]></AD_COLUMN_ID>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <NAME><![CDATA[Creation Date]]></NAME>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <COLUMNNAME><![CDATA[Created]]></COLUMNNAME>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <AD_TABLE_ID><![CDATA[4523F40FF3F746D690EC2AAD90F6171D]]></AD_TABLE_ID>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <AD_ELEMENT_ID><![CDATA[245]]></AD_ELEMENT_ID>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <POSITION><![CDATA[5]]></POSITION>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8C9DD59B87CF4230861E048941D96F50-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--8C9DD59B87CF4230861E048941D96F50--></AD_COLUMN>
+
 <!--8CAD7261EEDA4B9399990094D1D285FB--><AD_COLUMN>
 <!--8CAD7261EEDA4B9399990094D1D285FB-->  <AD_COLUMN_ID><![CDATA[8CAD7261EEDA4B9399990094D1D285FB]]></AD_COLUMN_ID>
 <!--8CAD7261EEDA4B9399990094D1D285FB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -325344,6 +326163,45 @@
 <!--8CB5DC6518FB4BCB932DB421F7279EE3-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8CB5DC6518FB4BCB932DB421F7279EE3--></AD_COLUMN>
 
+<!--8CC5E74832EB4227A5F4CC21E38A48D0--><AD_COLUMN>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <AD_COLUMN_ID><![CDATA[8CC5E74832EB4227A5F4CC21E38A48D0]]></AD_COLUMN_ID>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <NAME><![CDATA[Client]]></NAME>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <AD_TABLE_ID><![CDATA[3277BAAF6B7249BA972D99D351BD08CC]]></AD_TABLE_ID>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <POSITION><![CDATA[2]]></POSITION>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--8CC5E74832EB4227A5F4CC21E38A48D0--></AD_COLUMN>
+
 <!--8CE66FCEB3404B3AB0559EE2BD6A6C31--><AD_COLUMN>
 <!--8CE66FCEB3404B3AB0559EE2BD6A6C31-->  <AD_COLUMN_ID><![CDATA[8CE66FCEB3404B3AB0559EE2BD6A6C31]]></AD_COLUMN_ID>
 <!--8CE66FCEB3404B3AB0559EE2BD6A6C31-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -326998,6 +327856,45 @@
 <!--905AB9A1B3614382854CB0C686746F71-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--905AB9A1B3614382854CB0C686746F71--></AD_COLUMN>
 
+<!--908CA63C575548EAA1660037A249BE42--><AD_COLUMN>
+<!--908CA63C575548EAA1660037A249BE42-->  <AD_COLUMN_ID><![CDATA[908CA63C575548EAA1660037A249BE42]]></AD_COLUMN_ID>
+<!--908CA63C575548EAA1660037A249BE42-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--908CA63C575548EAA1660037A249BE42-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--908CA63C575548EAA1660037A249BE42-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--908CA63C575548EAA1660037A249BE42-->  <NAME><![CDATA[Parent Organization]]></NAME>
+<!--908CA63C575548EAA1660037A249BE42-->  <DESCRIPTION><![CDATA[Parent Organization of the Organization in the Organization Tree.]]></DESCRIPTION>
+<!--908CA63C575548EAA1660037A249BE42-->  <HELP><![CDATA[Parent Organization of the Organization in the Organization Tree.]]></HELP>
+<!--908CA63C575548EAA1660037A249BE42-->  <COLUMNNAME><![CDATA[AD_Parent_Org_ID]]></COLUMNNAME>
+<!--908CA63C575548EAA1660037A249BE42-->  <AD_TABLE_ID><![CDATA[3277BAAF6B7249BA972D99D351BD08CC]]></AD_TABLE_ID>
+<!--908CA63C575548EAA1660037A249BE42-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
+<!--908CA63C575548EAA1660037A249BE42-->  <AD_REFERENCE_VALUE_ID><![CDATA[276]]></AD_REFERENCE_VALUE_ID>
+<!--908CA63C575548EAA1660037A249BE42-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--908CA63C575548EAA1660037A249BE42-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--908CA63C575548EAA1660037A249BE42-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--908CA63C575548EAA1660037A249BE42-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--908CA63C575548EAA1660037A249BE42-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--908CA63C575548EAA1660037A249BE42-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--908CA63C575548EAA1660037A249BE42-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--908CA63C575548EAA1660037A249BE42-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--908CA63C575548EAA1660037A249BE42-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--908CA63C575548EAA1660037A249BE42-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--908CA63C575548EAA1660037A249BE42-->  <AD_ELEMENT_ID><![CDATA[5EC499A180BB4BE3A29513CB710F96FC]]></AD_ELEMENT_ID>
+<!--908CA63C575548EAA1660037A249BE42-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--908CA63C575548EAA1660037A249BE42-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--908CA63C575548EAA1660037A249BE42-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--908CA63C575548EAA1660037A249BE42-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--908CA63C575548EAA1660037A249BE42-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--908CA63C575548EAA1660037A249BE42-->  <POSITION><![CDATA[9]]></POSITION>
+<!--908CA63C575548EAA1660037A249BE42-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--908CA63C575548EAA1660037A249BE42-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--908CA63C575548EAA1660037A249BE42-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--908CA63C575548EAA1660037A249BE42-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--908CA63C575548EAA1660037A249BE42-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--908CA63C575548EAA1660037A249BE42-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--908CA63C575548EAA1660037A249BE42-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--908CA63C575548EAA1660037A249BE42-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--908CA63C575548EAA1660037A249BE42--></AD_COLUMN>
+
 <!--90AF0FEC96674CAF824844EA7690357E--><AD_COLUMN>
 <!--90AF0FEC96674CAF824844EA7690357E-->  <AD_COLUMN_ID><![CDATA[90AF0FEC96674CAF824844EA7690357E]]></AD_COLUMN_ID>
 <!--90AF0FEC96674CAF824844EA7690357E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -328645,6 +329542,81 @@
 <!--919249865C132A93E040007F01004B67-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--919249865C132A93E040007F01004B67--></AD_COLUMN>
 
+<!--91951F56599F470B8858B0A84C3814F2--><AD_COLUMN>
+<!--91951F56599F470B8858B0A84C3814F2-->  <AD_COLUMN_ID><![CDATA[91951F56599F470B8858B0A84C3814F2]]></AD_COLUMN_ID>
+<!--91951F56599F470B8858B0A84C3814F2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--91951F56599F470B8858B0A84C3814F2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--91951F56599F470B8858B0A84C3814F2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--91951F56599F470B8858B0A84C3814F2-->  <NAME><![CDATA[Updated]]></NAME>
+<!--91951F56599F470B8858B0A84C3814F2-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
+<!--91951F56599F470B8858B0A84C3814F2-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
+<!--91951F56599F470B8858B0A84C3814F2-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
+<!--91951F56599F470B8858B0A84C3814F2-->  <AD_TABLE_ID><![CDATA[3277BAAF6B7249BA972D99D351BD08CC]]></AD_TABLE_ID>
+<!--91951F56599F470B8858B0A84C3814F2-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--91951F56599F470B8858B0A84C3814F2-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--91951F56599F470B8858B0A84C3814F2-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--91951F56599F470B8858B0A84C3814F2-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--91951F56599F470B8858B0A84C3814F2-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--91951F56599F470B8858B0A84C3814F2-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--91951F56599F470B8858B0A84C3814F2-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--91951F56599F470B8858B0A84C3814F2-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--91951F56599F470B8858B0A84C3814F2-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--91951F56599F470B8858B0A84C3814F2-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--91951F56599F470B8858B0A84C3814F2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--91951F56599F470B8858B0A84C3814F2-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--91951F56599F470B8858B0A84C3814F2-->  <AD_ELEMENT_ID><![CDATA[607]]></AD_ELEMENT_ID>
+<!--91951F56599F470B8858B0A84C3814F2-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--91951F56599F470B8858B0A84C3814F2-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--91951F56599F470B8858B0A84C3814F2-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--91951F56599F470B8858B0A84C3814F2-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--91951F56599F470B8858B0A84C3814F2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--91951F56599F470B8858B0A84C3814F2-->  <POSITION><![CDATA[6]]></POSITION>
+<!--91951F56599F470B8858B0A84C3814F2-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--91951F56599F470B8858B0A84C3814F2-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--91951F56599F470B8858B0A84C3814F2-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--91951F56599F470B8858B0A84C3814F2-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--91951F56599F470B8858B0A84C3814F2-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--91951F56599F470B8858B0A84C3814F2-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--91951F56599F470B8858B0A84C3814F2-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--91951F56599F470B8858B0A84C3814F2-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--91951F56599F470B8858B0A84C3814F2--></AD_COLUMN>
+
+<!--91A48E7CF85F4EBFBEE55152AC509588--><AD_COLUMN>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <AD_COLUMN_ID><![CDATA[91A48E7CF85F4EBFBEE55152AC509588]]></AD_COLUMN_ID>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <NAME><![CDATA[M_Inventorystatus_Trl_ID]]></NAME>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <COLUMNNAME><![CDATA[M_Inventorystatus_Trl_ID]]></COLUMNNAME>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <AD_TABLE_ID><![CDATA[4523F40FF3F746D690EC2AAD90F6171D]]></AD_TABLE_ID>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <ISKEY><![CDATA[Y]]></ISKEY>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <AD_ELEMENT_ID><![CDATA[FDFD7A0A032B43678BC163E348EA95B5]]></AD_ELEMENT_ID>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <POSITION><![CDATA[1]]></POSITION>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--91A48E7CF85F4EBFBEE55152AC509588-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--91A48E7CF85F4EBFBEE55152AC509588--></AD_COLUMN>
+
 <!--91A58CF045A8429881ECFFB7CE2FF099--><AD_COLUMN>
 <!--91A58CF045A8429881ECFFB7CE2FF099-->  <AD_COLUMN_ID><![CDATA[91A58CF045A8429881ECFFB7CE2FF099]]></AD_COLUMN_ID>
 <!--91A58CF045A8429881ECFFB7CE2FF099-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -331336,6 +332308,46 @@
 <!--95228909B4A44702B0D71D14DBBB2E44-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--95228909B4A44702B0D71D14DBBB2E44--></AD_COLUMN>
 
+<!--95526AE7B9724362BE063FB8F93A12B9--><AD_COLUMN>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <AD_COLUMN_ID><![CDATA[95526AE7B9724362BE063FB8F93A12B9]]></AD_COLUMN_ID>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <NAME><![CDATA[Client]]></NAME>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <AD_TABLE_ID><![CDATA[95FE1A1DCB1948AD8E2D5AFE4E95521C]]></AD_TABLE_ID>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <AD_VAL_RULE_ID><![CDATA[103]]></AD_VAL_RULE_ID>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <POSITION><![CDATA[2]]></POSITION>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--95526AE7B9724362BE063FB8F93A12B9-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--95526AE7B9724362BE063FB8F93A12B9--></AD_COLUMN>
+
 <!--95739380D42B490D9CD70B8D1CF623D9--><AD_COLUMN>
 <!--95739380D42B490D9CD70B8D1CF623D9-->  <AD_COLUMN_ID><![CDATA[95739380D42B490D9CD70B8D1CF623D9]]></AD_COLUMN_ID>
 <!--95739380D42B490D9CD70B8D1CF623D9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -331909,6 +332921,44 @@
 <!--97A2FEDE582441F0A1DD51D3C82795FE-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--97A2FEDE582441F0A1DD51D3C82795FE--></AD_COLUMN>
 
+<!--97A9246AB6834E96831983794F08D504--><AD_COLUMN>
+<!--97A9246AB6834E96831983794F08D504-->  <AD_COLUMN_ID><![CDATA[97A9246AB6834E96831983794F08D504]]></AD_COLUMN_ID>
+<!--97A9246AB6834E96831983794F08D504-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--97A9246AB6834E96831983794F08D504-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--97A9246AB6834E96831983794F08D504-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--97A9246AB6834E96831983794F08D504-->  <NAME><![CDATA[Description]]></NAME>
+<!--97A9246AB6834E96831983794F08D504-->  <DESCRIPTION><![CDATA[A space to write additional related information.]]></DESCRIPTION>
+<!--97A9246AB6834E96831983794F08D504-->  <HELP><![CDATA[A description is limited to 255 characters.]]></HELP>
+<!--97A9246AB6834E96831983794F08D504-->  <COLUMNNAME><![CDATA[Description]]></COLUMNNAME>
+<!--97A9246AB6834E96831983794F08D504-->  <AD_TABLE_ID><![CDATA[4523F40FF3F746D690EC2AAD90F6171D]]></AD_TABLE_ID>
+<!--97A9246AB6834E96831983794F08D504-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--97A9246AB6834E96831983794F08D504-->  <FIELDLENGTH><![CDATA[255]]></FIELDLENGTH>
+<!--97A9246AB6834E96831983794F08D504-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--97A9246AB6834E96831983794F08D504-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--97A9246AB6834E96831983794F08D504-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--97A9246AB6834E96831983794F08D504-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--97A9246AB6834E96831983794F08D504-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--97A9246AB6834E96831983794F08D504-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--97A9246AB6834E96831983794F08D504-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--97A9246AB6834E96831983794F08D504-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--97A9246AB6834E96831983794F08D504-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--97A9246AB6834E96831983794F08D504-->  <AD_ELEMENT_ID><![CDATA[275]]></AD_ELEMENT_ID>
+<!--97A9246AB6834E96831983794F08D504-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--97A9246AB6834E96831983794F08D504-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--97A9246AB6834E96831983794F08D504-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--97A9246AB6834E96831983794F08D504-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--97A9246AB6834E96831983794F08D504-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--97A9246AB6834E96831983794F08D504-->  <POSITION><![CDATA[10]]></POSITION>
+<!--97A9246AB6834E96831983794F08D504-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--97A9246AB6834E96831983794F08D504-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--97A9246AB6834E96831983794F08D504-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--97A9246AB6834E96831983794F08D504-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--97A9246AB6834E96831983794F08D504-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--97A9246AB6834E96831983794F08D504-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--97A9246AB6834E96831983794F08D504-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--97A9246AB6834E96831983794F08D504-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--97A9246AB6834E96831983794F08D504--></AD_COLUMN>
+
 <!--983E80EFA97649ECB849DE2AB6D7578A--><AD_COLUMN>
 <!--983E80EFA97649ECB849DE2AB6D7578A-->  <AD_COLUMN_ID><![CDATA[983E80EFA97649ECB849DE2AB6D7578A]]></AD_COLUMN_ID>
 <!--983E80EFA97649ECB849DE2AB6D7578A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -335401,6 +336451,44 @@
 <!--9F1044EB393B4D60895532DB5D568BEE-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--9F1044EB393B4D60895532DB5D568BEE--></AD_COLUMN>
 
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6--><AD_COLUMN>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <AD_COLUMN_ID><![CDATA[9F2578506ED143C7A0F7E05BF9C9DAC6]]></AD_COLUMN_ID>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <NAME><![CDATA[Updated By]]></NAME>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <DESCRIPTION><![CDATA[User who updated this records]]></DESCRIPTION>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <HELP><![CDATA[The Updated By field indicates the user who updated this record.]]></HELP>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <COLUMNNAME><![CDATA[Updatedby]]></COLUMNNAME>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <AD_TABLE_ID><![CDATA[4523F40FF3F746D690EC2AAD90F6171D]]></AD_TABLE_ID>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <AD_ELEMENT_ID><![CDATA[608]]></AD_ELEMENT_ID>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <POSITION><![CDATA[8]]></POSITION>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--9F2578506ED143C7A0F7E05BF9C9DAC6--></AD_COLUMN>
+
 <!--9F3ADE0CE0734BE2BD059AAEFCF1D51C--><AD_COLUMN>
 <!--9F3ADE0CE0734BE2BD059AAEFCF1D51C-->  <AD_COLUMN_ID><![CDATA[9F3ADE0CE0734BE2BD059AAEFCF1D51C]]></AD_COLUMN_ID>
 <!--9F3ADE0CE0734BE2BD059AAEFCF1D51C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -339563,6 +340651,44 @@
 <!--A8E0EFA2BF6D4E128511145F94072638-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--A8E0EFA2BF6D4E128511145F94072638--></AD_COLUMN>
 
+<!--A8F2EE6D868C424F84D34C047EDF07BE--><AD_COLUMN>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <AD_COLUMN_ID><![CDATA[A8F2EE6D868C424F84D34C047EDF07BE]]></AD_COLUMN_ID>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <NAME><![CDATA[Change_Status]]></NAME>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <COLUMNNAME><![CDATA[Change_Status]]></COLUMNNAME>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <AD_TABLE_ID><![CDATA[207]]></AD_TABLE_ID>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <AD_REFERENCE_ID><![CDATA[28]]></AD_REFERENCE_ID>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <SEQNO><![CDATA[101]]></SEQNO>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <AD_ELEMENT_ID><![CDATA[1C8F2CAE187242BBA9D5A34A29A20B81]]></AD_ELEMENT_ID>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <POSITION><![CDATA[18]]></POSITION>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--A8F2EE6D868C424F84D34C047EDF07BE-->  <EM_OBUIAPP_PROCESS_ID><![CDATA[3A4E13B0AB764F188CB062DDE2A9B685]]></EM_OBUIAPP_PROCESS_ID>
+<!--A8F2EE6D868C424F84D34C047EDF07BE--></AD_COLUMN>
+
 <!--A908EA6CF218F9C9E040007F01011582--><AD_COLUMN>
 <!--A908EA6CF218F9C9E040007F01011582-->  <AD_COLUMN_ID><![CDATA[A908EA6CF218F9C9E040007F01011582]]></AD_COLUMN_ID>
 <!--A908EA6CF218F9C9E040007F01011582-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -343707,6 +344833,7 @@
 <!--B0EE6852CD814BAA9E1538AFEC7341CE-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--B0EE6852CD814BAA9E1538AFEC7341CE-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--B0EE6852CD814BAA9E1538AFEC7341CE-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--B0EE6852CD814BAA9E1538AFEC7341CE-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--B0EE6852CD814BAA9E1538AFEC7341CE-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
 <!--B0EE6852CD814BAA9E1538AFEC7341CE-->  <SEQNO><![CDATA[95]]></SEQNO>
 <!--B0EE6852CD814BAA9E1538AFEC7341CE-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -346118,6 +347245,44 @@
 <!--B515858C2040417D9BC41BA12F936B78-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--B515858C2040417D9BC41BA12F936B78--></AD_COLUMN>
 
+<!--B51F688A8F9144B2AF9E336AEBD5293B--><AD_COLUMN>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <AD_COLUMN_ID><![CDATA[B51F688A8F9144B2AF9E336AEBD5293B]]></AD_COLUMN_ID>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <NAME><![CDATA[Description]]></NAME>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <DESCRIPTION><![CDATA[A space to write additional related information.]]></DESCRIPTION>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <HELP><![CDATA[A description is limited to 255 characters.]]></HELP>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <COLUMNNAME><![CDATA[Description]]></COLUMNNAME>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <AD_TABLE_ID><![CDATA[95FE1A1DCB1948AD8E2D5AFE4E95521C]]></AD_TABLE_ID>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <FIELDLENGTH><![CDATA[255]]></FIELDLENGTH>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <AD_ELEMENT_ID><![CDATA[275]]></AD_ELEMENT_ID>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <POSITION><![CDATA[10]]></POSITION>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--B51F688A8F9144B2AF9E336AEBD5293B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--B51F688A8F9144B2AF9E336AEBD5293B--></AD_COLUMN>
+
 <!--B554D33CA43C4FDBB15E6B79E1D5A116--><AD_COLUMN>
 <!--B554D33CA43C4FDBB15E6B79E1D5A116-->  <AD_COLUMN_ID><![CDATA[B554D33CA43C4FDBB15E6B79E1D5A116]]></AD_COLUMN_ID>
 <!--B554D33CA43C4FDBB15E6B79E1D5A116-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -346296,7 +347461,7 @@
 <!--B6233AB4306E4857897F734B6081AC22-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--B6233AB4306E4857897F734B6081AC22-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--B6233AB4306E4857897F734B6081AC22-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--B6233AB4306E4857897F734B6081AC22-->  <POSITION><![CDATA[28]]></POSITION>
+<!--B6233AB4306E4857897F734B6081AC22-->  <POSITION><![CDATA[27]]></POSITION>
 <!--B6233AB4306E4857897F734B6081AC22-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--B6233AB4306E4857897F734B6081AC22-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--B6233AB4306E4857897F734B6081AC22-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -353155,6 +354320,83 @@
 <!--C1EFF0F3A7284E06BFAD3A39CDB83B4B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--C1EFF0F3A7284E06BFAD3A39CDB83B4B--></AD_COLUMN>
 
+<!--C1FD96DB0E434CC6AA99164B1430EAAB--><AD_COLUMN>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <AD_COLUMN_ID><![CDATA[C1FD96DB0E434CC6AA99164B1430EAAB]]></AD_COLUMN_ID>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <NAME><![CDATA[Available]]></NAME>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <COLUMNNAME><![CDATA[Available]]></COLUMNNAME>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <AD_TABLE_ID><![CDATA[95FE1A1DCB1948AD8E2D5AFE4E95521C]]></AD_TABLE_ID>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <READONLYLOGIC><![CDATA[@InventoryStatusUsed@]]></READONLYLOGIC>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <AD_ELEMENT_ID><![CDATA[0FD37224984F45608788C44A5ED9C885]]></AD_ELEMENT_ID>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <POSITION><![CDATA[11]]></POSITION>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--C1FD96DB0E434CC6AA99164B1430EAAB--></AD_COLUMN>
+
+<!--C1FE0ECC8543489DA27D25A60B371028--><AD_COLUMN>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <AD_COLUMN_ID><![CDATA[C1FE0ECC8543489DA27D25A60B371028]]></AD_COLUMN_ID>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <NAME><![CDATA[Organization]]></NAME>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <AD_TABLE_ID><![CDATA[4523F40FF3F746D690EC2AAD90F6171D]]></AD_TABLE_ID>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <POSITION><![CDATA[3]]></POSITION>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--C1FE0ECC8543489DA27D25A60B371028-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--C1FE0ECC8543489DA27D25A60B371028--></AD_COLUMN>
+
 <!--C1FFBF60B529448A853F90CA91B27A64--><AD_COLUMN>
 <!--C1FFBF60B529448A853F90CA91B27A64-->  <AD_COLUMN_ID><![CDATA[C1FFBF60B529448A853F90CA91B27A64]]></AD_COLUMN_ID>
 <!--C1FFBF60B529448A853F90CA91B27A64-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -354375,6 +355617,45 @@
 <!--C5B48143197D42D2A50EB784A9DCF7EB-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--C5B48143197D42D2A50EB784A9DCF7EB--></AD_COLUMN>
 
+<!--C5C1C35152D84CDAA081CFD84A123B05--><AD_COLUMN>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <AD_COLUMN_ID><![CDATA[C5C1C35152D84CDAA081CFD84A123B05]]></AD_COLUMN_ID>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <NAME><![CDATA[Creation Date]]></NAME>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <COLUMNNAME><![CDATA[Created]]></COLUMNNAME>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <AD_TABLE_ID><![CDATA[3277BAAF6B7249BA972D99D351BD08CC]]></AD_TABLE_ID>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <AD_ELEMENT_ID><![CDATA[245]]></AD_ELEMENT_ID>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <POSITION><![CDATA[4]]></POSITION>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--C5C1C35152D84CDAA081CFD84A123B05-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--C5C1C35152D84CDAA081CFD84A123B05--></AD_COLUMN>
+
 <!--C5CABD48EA774B8289401E670504371C--><AD_COLUMN>
 <!--C5CABD48EA774B8289401E670504371C-->  <AD_COLUMN_ID><![CDATA[C5CABD48EA774B8289401E670504371C]]></AD_COLUMN_ID>
 <!--C5CABD48EA774B8289401E670504371C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -356733,7 +358014,7 @@
 <!--CA9E531DC5CFEB11E040007F0100672C-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--CA9E531DC5CFEB11E040007F0100672C-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--CA9E531DC5CFEB11E040007F0100672C-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--CA9E531DC5CFEB11E040007F0100672C-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--CA9E531DC5CFEB11E040007F0100672C-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--CA9E531DC5CFEB11E040007F0100672C-->  <SEQNO><![CDATA[130]]></SEQNO>
 <!--CA9E531DC5CFEB11E040007F0100672C-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--CA9E531DC5CFEB11E040007F0100672C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -362134,6 +363415,44 @@
 <!--D0C775ACDFFE43E0B9ECE73CEBE31D4B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--D0C775ACDFFE43E0B9ECE73CEBE31D4B--></AD_COLUMN>
 
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396--><AD_COLUMN>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <AD_COLUMN_ID><![CDATA[D0FA4FA3D5CD407995F3A64DFCAA3396]]></AD_COLUMN_ID>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <NAME><![CDATA[Created By]]></NAME>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <COLUMNNAME><![CDATA[Createdby]]></COLUMNNAME>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <AD_TABLE_ID><![CDATA[95FE1A1DCB1948AD8E2D5AFE4E95521C]]></AD_TABLE_ID>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <POSITION><![CDATA[6]]></POSITION>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--D0FA4FA3D5CD407995F3A64DFCAA3396--></AD_COLUMN>
+
 <!--D10341F87FE84D33A6C94FD353D13E5A--><AD_COLUMN>
 <!--D10341F87FE84D33A6C94FD353D13E5A-->  <AD_COLUMN_ID><![CDATA[D10341F87FE84D33A6C94FD353D13E5A]]></AD_COLUMN_ID>
 <!--D10341F87FE84D33A6C94FD353D13E5A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -365651,6 +366970,7 @@
 <!--D6B46E8DC7F64127B682C90F60DAB7EC-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--D6B46E8DC7F64127B682C90F60DAB7EC-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--D6B46E8DC7F64127B682C90F60DAB7EC-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--D6B46E8DC7F64127B682C90F60DAB7EC-->  <READONLYLOGIC><![CDATA[@Status@='SCH'|@Status@='PRC']]></READONLYLOGIC>
 <!--D6B46E8DC7F64127B682C90F60DAB7EC-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--D6B46E8DC7F64127B682C90F60DAB7EC-->  <SEQNO><![CDATA[620]]></SEQNO>
 <!--D6B46E8DC7F64127B682C90F60DAB7EC-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -367100,6 +368420,46 @@
 <!--D7192114A6A6B6B7E040007F01001270-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--D7192114A6A6B6B7E040007F01001270--></AD_COLUMN>
 
+<!--D7422D1734144D74A852896F6DB8EADA--><AD_COLUMN>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <AD_COLUMN_ID><![CDATA[D7422D1734144D74A852896F6DB8EADA]]></AD_COLUMN_ID>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <NAME><![CDATA[Inventory Status]]></NAME>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <DESCRIPTION><![CDATA[Condition of a specific inventory]]></DESCRIPTION>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <HELP><![CDATA[The inventory status refers to the condition of a specific inventory (such as AVAILABLE, RETURN, DEFECT, TRANSIT) that is stored in a specific organization, warehouse and bin and for a product with a specific lot/serial and quantity. The inventory status can allow or disallow certain business processes.]]></HELP>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <COLUMNNAME><![CDATA[M_InventoryStatus_ID]]></COLUMNNAME>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <AD_TABLE_ID><![CDATA[207]]></AD_TABLE_ID>
+<!--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-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <SEQNO><![CDATA[21]]></SEQNO>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <AD_ELEMENT_ID><![CDATA[69A474773BFB48E39E23DEBFDCDA2A13]]></AD_ELEMENT_ID>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <POSITION><![CDATA[17]]></POSITION>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--D7422D1734144D74A852896F6DB8EADA-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--D7422D1734144D74A852896F6DB8EADA--></AD_COLUMN>
+
 <!--D781BB443D72453A8CB89BE9B210F206--><AD_COLUMN>
 <!--D781BB443D72453A8CB89BE9B210F206-->  <AD_COLUMN_ID><![CDATA[D781BB443D72453A8CB89BE9B210F206]]></AD_COLUMN_ID>
 <!--D781BB443D72453A8CB89BE9B210F206-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -368479,6 +369839,44 @@
 <!--DA19506EAA6BF8C9E040007F010076AB-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--DA19506EAA6BF8C9E040007F010076AB--></AD_COLUMN>
 
+<!--DA20DE12AB9844989407945206E74F66--><AD_COLUMN>
+<!--DA20DE12AB9844989407945206E74F66-->  <AD_COLUMN_ID><![CDATA[DA20DE12AB9844989407945206E74F66]]></AD_COLUMN_ID>
+<!--DA20DE12AB9844989407945206E74F66-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DA20DE12AB9844989407945206E74F66-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DA20DE12AB9844989407945206E74F66-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DA20DE12AB9844989407945206E74F66-->  <NAME><![CDATA[Overissue]]></NAME>
+<!--DA20DE12AB9844989407945206E74F66-->  <COLUMNNAME><![CDATA[Overissue]]></COLUMNNAME>
+<!--DA20DE12AB9844989407945206E74F66-->  <AD_TABLE_ID><![CDATA[95FE1A1DCB1948AD8E2D5AFE4E95521C]]></AD_TABLE_ID>
+<!--DA20DE12AB9844989407945206E74F66-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--DA20DE12AB9844989407945206E74F66-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--DA20DE12AB9844989407945206E74F66-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--DA20DE12AB9844989407945206E74F66-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--DA20DE12AB9844989407945206E74F66-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--DA20DE12AB9844989407945206E74F66-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--DA20DE12AB9844989407945206E74F66-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--DA20DE12AB9844989407945206E74F66-->  <READONLYLOGIC><![CDATA[@InventoryStatusUsed@]]></READONLYLOGIC>
+<!--DA20DE12AB9844989407945206E74F66-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--DA20DE12AB9844989407945206E74F66-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--DA20DE12AB9844989407945206E74F66-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--DA20DE12AB9844989407945206E74F66-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--DA20DE12AB9844989407945206E74F66-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--DA20DE12AB9844989407945206E74F66-->  <AD_ELEMENT_ID><![CDATA[CAB8F2F8F561428798131BDC024EC36F]]></AD_ELEMENT_ID>
+<!--DA20DE12AB9844989407945206E74F66-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--DA20DE12AB9844989407945206E74F66-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--DA20DE12AB9844989407945206E74F66-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--DA20DE12AB9844989407945206E74F66-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--DA20DE12AB9844989407945206E74F66-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--DA20DE12AB9844989407945206E74F66-->  <POSITION><![CDATA[13]]></POSITION>
+<!--DA20DE12AB9844989407945206E74F66-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--DA20DE12AB9844989407945206E74F66-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--DA20DE12AB9844989407945206E74F66-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--DA20DE12AB9844989407945206E74F66-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--DA20DE12AB9844989407945206E74F66-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--DA20DE12AB9844989407945206E74F66-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--DA20DE12AB9844989407945206E74F66-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--DA20DE12AB9844989407945206E74F66-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--DA20DE12AB9844989407945206E74F66--></AD_COLUMN>
+
 <!--DA2DB20456AB11DE9BB80FC471DFC7FA--><AD_COLUMN>
 <!--DA2DB20456AB11DE9BB80FC471DFC7FA-->  <AD_COLUMN_ID><![CDATA[DA2DB20456AB11DE9BB80FC471DFC7FA]]></AD_COLUMN_ID>
 <!--DA2DB20456AB11DE9BB80FC471DFC7FA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -371243,6 +372641,43 @@
 <!--E14015BFC96448C3886B3CFFEBF03885-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--E14015BFC96448C3886B3CFFEBF03885--></AD_COLUMN>
 
+<!--E14BE46008804B3C930F86AEEC91C4F2--><AD_COLUMN>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <AD_COLUMN_ID><![CDATA[E14BE46008804B3C930F86AEEC91C4F2]]></AD_COLUMN_ID>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <NAME><![CDATA[Isvirtual]]></NAME>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <COLUMNNAME><![CDATA[Isvirtual]]></COLUMNNAME>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <AD_TABLE_ID><![CDATA[207]]></AD_TABLE_ID>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <SEQNO><![CDATA[111]]></SEQNO>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <AD_ELEMENT_ID><![CDATA[24C8375A1CF740449A29D93DFE72BCBD]]></AD_ELEMENT_ID>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <POSITION><![CDATA[26]]></POSITION>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--E14BE46008804B3C930F86AEEC91C4F2-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--E14BE46008804B3C930F86AEEC91C4F2--></AD_COLUMN>
+
 <!--E152E3E3441D469C811BA2D79810817F--><AD_COLUMN>
 <!--E152E3E3441D469C811BA2D79810817F-->  <AD_COLUMN_ID><![CDATA[E152E3E3441D469C811BA2D79810817F]]></AD_COLUMN_ID>
 <!--E152E3E3441D469C811BA2D79810817F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -371578,7 +373013,7 @@
 <!--E1AC511FFA9841BFBCB6626E78E26FAF-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--E1AC511FFA9841BFBCB6626E78E26FAF-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--E1AC511FFA9841BFBCB6626E78E26FAF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--E1AC511FFA9841BFBCB6626E78E26FAF-->  <POSITION><![CDATA[30]]></POSITION>
+<!--E1AC511FFA9841BFBCB6626E78E26FAF-->  <POSITION><![CDATA[29]]></POSITION>
 <!--E1AC511FFA9841BFBCB6626E78E26FAF-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--E1AC511FFA9841BFBCB6626E78E26FAF-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--E1AC511FFA9841BFBCB6626E78E26FAF-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -371702,6 +373137,43 @@
 <!--E1EC54D6DF4E4AD3969A2B16F82A79DC-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--E1EC54D6DF4E4AD3969A2B16F82A79DC--></AD_COLUMN>
 
+<!--E22A7CA32E7F4A688877E0D1400099FD--><AD_COLUMN>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <AD_COLUMN_ID><![CDATA[E22A7CA32E7F4A688877E0D1400099FD]]></AD_COLUMN_ID>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <NAME><![CDATA[Inventory Status]]></NAME>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <DESCRIPTION><![CDATA[Condition of a specific inventory]]></DESCRIPTION>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <HELP><![CDATA[The inventory status refers to the condition of a specific inventory (such as AVAILABLE, RETURN, DEFECT, TRANSIT) that is stored in a specific organization, warehouse and bin and for a product with a specific lot/serial and quantity. The inventory status can allow or disallow certain business processes.]]></HELP>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <COLUMNNAME><![CDATA[M_InventoryStatus_ID]]></COLUMNNAME>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <AD_TABLE_ID><![CDATA[7BDAC914CA60418795E453BC0E8C89DC]]></AD_TABLE_ID>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <SEQNO><![CDATA[250]]></SEQNO>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <AD_ELEMENT_ID><![CDATA[69A474773BFB48E39E23DEBFDCDA2A13]]></AD_ELEMENT_ID>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--E22A7CA32E7F4A688877E0D1400099FD-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--E22A7CA32E7F4A688877E0D1400099FD--></AD_COLUMN>
+
 <!--E2733E7C7BEC449690D8C9D6E9F33C97--><AD_COLUMN>
 <!--E2733E7C7BEC449690D8C9D6E9F33C97-->  <AD_COLUMN_ID><![CDATA[E2733E7C7BEC449690D8C9D6E9F33C97]]></AD_COLUMN_ID>
 <!--E2733E7C7BEC449690D8C9D6E9F33C97-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -371973,6 +373445,45 @@
 <!--E30E4E5B99734191B97AC24D9FF68F80-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--E30E4E5B99734191B97AC24D9FF68F80--></AD_COLUMN>
 
+<!--E32DC81BF5B14A0899D707E24522036E--><AD_COLUMN>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <AD_COLUMN_ID><![CDATA[E32DC81BF5B14A0899D707E24522036E]]></AD_COLUMN_ID>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <NAME><![CDATA[Creation Date]]></NAME>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <COLUMNNAME><![CDATA[Created]]></COLUMNNAME>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <AD_TABLE_ID><![CDATA[95FE1A1DCB1948AD8E2D5AFE4E95521C]]></AD_TABLE_ID>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <AD_ELEMENT_ID><![CDATA[245]]></AD_ELEMENT_ID>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <POSITION><![CDATA[5]]></POSITION>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--E32DC81BF5B14A0899D707E24522036E-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--E32DC81BF5B14A0899D707E24522036E--></AD_COLUMN>
+
 <!--E32E95F2C73F4DF1907A59B83DF08650--><AD_COLUMN>
 <!--E32E95F2C73F4DF1907A59B83DF08650-->  <AD_COLUMN_ID><![CDATA[E32E95F2C73F4DF1907A59B83DF08650]]></AD_COLUMN_ID>
 <!--E32E95F2C73F4DF1907A59B83DF08650-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -372746,6 +374257,44 @@
 <!--E67EE8ADC57543CF8B65000D0FD978F8-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--E67EE8ADC57543CF8B65000D0FD978F8--></AD_COLUMN>
 
+<!--E6C6226F5DD040A4BC8AD9BC43658724--><AD_COLUMN>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <AD_COLUMN_ID><![CDATA[E6C6226F5DD040A4BC8AD9BC43658724]]></AD_COLUMN_ID>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <NAME><![CDATA[Name]]></NAME>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <DESCRIPTION><![CDATA[A non-unique identifier for a record/document often used as a search tool.]]></DESCRIPTION>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <HELP><![CDATA[A more descriptive identifier (that does need to be unique) of a record/document that is used as a default search option along with the search key (that is unique and mostly shorter). It is up to 60 characters in length.]]></HELP>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <COLUMNNAME><![CDATA[Name]]></COLUMNNAME>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <AD_TABLE_ID><![CDATA[95FE1A1DCB1948AD8E2D5AFE4E95521C]]></AD_TABLE_ID>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <FIELDLENGTH><![CDATA[40]]></FIELDLENGTH>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <AD_ELEMENT_ID><![CDATA[469]]></AD_ELEMENT_ID>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <POSITION><![CDATA[9]]></POSITION>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--E6C6226F5DD040A4BC8AD9BC43658724-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--E6C6226F5DD040A4BC8AD9BC43658724--></AD_COLUMN>
+
 <!--E6CB7938B2AB40EDB5BE6BFEEA6AFE53--><AD_COLUMN>
 <!--E6CB7938B2AB40EDB5BE6BFEEA6AFE53-->  <AD_COLUMN_ID><![CDATA[E6CB7938B2AB40EDB5BE6BFEEA6AFE53]]></AD_COLUMN_ID>
 <!--E6CB7938B2AB40EDB5BE6BFEEA6AFE53-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -374089,6 +375638,44 @@
 <!--EAA0128F7AF34632AB9215AF7EACE95E-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--EAA0128F7AF34632AB9215AF7EACE95E--></AD_COLUMN>
 
+<!--EAB7DE2580E546B79DDBAE1E812E95CA--><AD_COLUMN>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <AD_COLUMN_ID><![CDATA[EAB7DE2580E546B79DDBAE1E812E95CA]]></AD_COLUMN_ID>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <NAME><![CDATA[Updated By]]></NAME>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <DESCRIPTION><![CDATA[User who updated this records]]></DESCRIPTION>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <HELP><![CDATA[The Updated By field indicates the user who updated this record.]]></HELP>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <COLUMNNAME><![CDATA[Updatedby]]></COLUMNNAME>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <AD_TABLE_ID><![CDATA[3277BAAF6B7249BA972D99D351BD08CC]]></AD_TABLE_ID>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <AD_ELEMENT_ID><![CDATA[608]]></AD_ELEMENT_ID>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <POSITION><![CDATA[7]]></POSITION>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--EAB7DE2580E546B79DDBAE1E812E95CA--></AD_COLUMN>
+
 <!--EACD73D12ACB4B32B8DA8E015C59205A--><AD_COLUMN>
 <!--EACD73D12ACB4B32B8DA8E015C59205A-->  <AD_COLUMN_ID><![CDATA[EACD73D12ACB4B32B8DA8E015C59205A]]></AD_COLUMN_ID>
 <!--EACD73D12ACB4B32B8DA8E015C59205A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -375315,7 +376902,7 @@
 <!--EDE3D71386EA45EDA6F3DCB0D700A0A0-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--EDE3D71386EA45EDA6F3DCB0D700A0A0-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--EDE3D71386EA45EDA6F3DCB0D700A0A0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--EDE3D71386EA45EDA6F3DCB0D700A0A0-->  <POSITION><![CDATA[31]]></POSITION>
+<!--EDE3D71386EA45EDA6F3DCB0D700A0A0-->  <POSITION><![CDATA[30]]></POSITION>
 <!--EDE3D71386EA45EDA6F3DCB0D700A0A0-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--EDE3D71386EA45EDA6F3DCB0D700A0A0-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--EDE3D71386EA45EDA6F3DCB0D700A0A0-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -376206,6 +377793,43 @@
 <!--F038FDD2AAEC47AAA752573384DF5DCB-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--F038FDD2AAEC47AAA752573384DF5DCB--></AD_COLUMN>
 
+<!--F0AE8CC323DA4C389F508CCA7686EE6D--><AD_COLUMN>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <AD_COLUMN_ID><![CDATA[F0AE8CC323DA4C389F508CCA7686EE6D]]></AD_COLUMN_ID>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <NAME><![CDATA[Parent_Locator_ID]]></NAME>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <COLUMNNAME><![CDATA[Parent_Locator_ID]]></COLUMNNAME>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <AD_TABLE_ID><![CDATA[207]]></AD_TABLE_ID>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <AD_REFERENCE_VALUE_ID><![CDATA[31]]></AD_REFERENCE_VALUE_ID>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <SEQNO><![CDATA[121]]></SEQNO>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <AD_ELEMENT_ID><![CDATA[1E7063D3AEF04320A4234FBABCA8EA3C]]></AD_ELEMENT_ID>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <POSITION><![CDATA[27]]></POSITION>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--F0AE8CC323DA4C389F508CCA7686EE6D--></AD_COLUMN>
+
 <!--F0DC1E59056A43CA9FFC55DAFCA74B94--><AD_COLUMN>
 <!--F0DC1E59056A43CA9FFC55DAFCA74B94-->  <AD_COLUMN_ID><![CDATA[F0DC1E59056A43CA9FFC55DAFCA74B94]]></AD_COLUMN_ID>
 <!--F0DC1E59056A43CA9FFC55DAFCA74B94-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -381321,6 +382945,44 @@
 <!--FDB6AC6235CE49D69A8F056D24BE6C61-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--FDB6AC6235CE49D69A8F056D24BE6C61--></AD_COLUMN>
 
+<!--FDEFF96C3F5D4780B35B2C2324C08101--><AD_COLUMN>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <AD_COLUMN_ID><![CDATA[FDEFF96C3F5D4780B35B2C2324C08101]]></AD_COLUMN_ID>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <NAME><![CDATA[Organization Tree]]></NAME>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <DESCRIPTION><![CDATA[Maintain the Level Information of the Organization in the Organization Tree Structure.]]></DESCRIPTION>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <HELP><![CDATA[Maintain the Level Information of the Organization in the Organization Tree Structure.]]></HELP>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <COLUMNNAME><![CDATA[AD_Org_Tree_ID]]></COLUMNNAME>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <AD_TABLE_ID><![CDATA[3277BAAF6B7249BA972D99D351BD08CC]]></AD_TABLE_ID>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <ISKEY><![CDATA[Y]]></ISKEY>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <AD_ELEMENT_ID><![CDATA[B48D79396B5E42EEA605AFC18B59F166]]></AD_ELEMENT_ID>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <POSITION><![CDATA[1]]></POSITION>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--FDEFF96C3F5D4780B35B2C2324C08101-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--FDEFF96C3F5D4780B35B2C2324C08101--></AD_COLUMN>
+
 <!--FE0FAD381FE04CDDAFD6531FE555C547--><AD_COLUMN>
 <!--FE0FAD381FE04CDDAFD6531FE555C547-->  <AD_COLUMN_ID><![CDATA[FE0FAD381FE04CDDAFD6531FE555C547]]></AD_COLUMN_ID>
 <!--FE0FAD381FE04CDDAFD6531FE555C547-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -381497,7 +383159,7 @@
 <!--FEDC3A57EFB74EC082F7E7EDD4858153-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--FEDC3A57EFB74EC082F7E7EDD4858153-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--FEDC3A57EFB74EC082F7E7EDD4858153-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--FEDC3A57EFB74EC082F7E7EDD4858153-->  <POSITION><![CDATA[29]]></POSITION>
+<!--FEDC3A57EFB74EC082F7E7EDD4858153-->  <POSITION><![CDATA[28]]></POSITION>
 <!--FEDC3A57EFB74EC082F7E7EDD4858153-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--FEDC3A57EFB74EC082F7E7EDD4858153-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--FEDC3A57EFB74EC082F7E7EDD4858153-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
--- a/model/src-db/database/sourcedata/AD_DATASET.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/sourcedata/AD_DATASET.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -139,7 +139,7 @@
 <!--575BE80AA7864187966A3FCFA1B1854D-->  <EXPORT><![CDATA[N]]></EXPORT>
 <!--575BE80AA7864187966A3FCFA1B1854D-->  <ACCESSLEVEL><![CDATA[4]]></ACCESSLEVEL>
 <!--575BE80AA7864187966A3FCFA1B1854D-->  <EXPORTALLOWED><![CDATA[Y]]></EXPORTALLOWED>
-<!--575BE80AA7864187966A3FCFA1B1854D-->  <CHECKSUM><![CDATA[49710530986698124763818046900153842955]]></CHECKSUM>
+<!--575BE80AA7864187966A3FCFA1B1854D-->  <CHECKSUM><![CDATA[49320918317931939560655329630180362882]]></CHECKSUM>
 <!--575BE80AA7864187966A3FCFA1B1854D-->  <ISDEFAULTVALUESDATASET><![CDATA[N]]></ISDEFAULTVALUESDATASET>
 <!--575BE80AA7864187966A3FCFA1B1854D--></AD_DATASET>
 
--- a/model/src-db/database/sourcedata/AD_DATASET_TABLE.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/sourcedata/AD_DATASET_TABLE.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -643,6 +643,20 @@
 <!--2DC6102296DC11DDB441001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2DC6102296DC11DDB441001B388C61A4--></AD_DATASET_TABLE>
 
+<!--2F65523B685044B085F75E4A454380FB--><AD_DATASET_TABLE>
+<!--2F65523B685044B085F75E4A454380FB-->  <AD_DATASET_TABLE_ID><![CDATA[2F65523B685044B085F75E4A454380FB]]></AD_DATASET_TABLE_ID>
+<!--2F65523B685044B085F75E4A454380FB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2F65523B685044B085F75E4A454380FB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2F65523B685044B085F75E4A454380FB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2F65523B685044B085F75E4A454380FB-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
+<!--2F65523B685044B085F75E4A454380FB-->  <AD_TABLE_ID><![CDATA[95FE1A1DCB1948AD8E2D5AFE4E95521C]]></AD_TABLE_ID>
+<!--2F65523B685044B085F75E4A454380FB-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
+<!--2F65523B685044B085F75E4A454380FB-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
+<!--2F65523B685044B085F75E4A454380FB-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
+<!--2F65523B685044B085F75E4A454380FB-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
+<!--2F65523B685044B085F75E4A454380FB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2F65523B685044B085F75E4A454380FB--></AD_DATASET_TABLE>
+
 <!--2FF759C157354DE998B30336180BEB16--><AD_DATASET_TABLE>
 <!--2FF759C157354DE998B30336180BEB16-->  <AD_DATASET_TABLE_ID><![CDATA[2FF759C157354DE998B30336180BEB16]]></AD_DATASET_TABLE_ID>
 <!--2FF759C157354DE998B30336180BEB16-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1215,6 +1229,20 @@
 <!--6EE4A47E96E111DDAD4D001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6EE4A47E96E111DDAD4D001B388C61A4--></AD_DATASET_TABLE>
 
+<!--70530668A11B474A86B38BB9D67D7CAE--><AD_DATASET_TABLE>
+<!--70530668A11B474A86B38BB9D67D7CAE-->  <AD_DATASET_TABLE_ID><![CDATA[70530668A11B474A86B38BB9D67D7CAE]]></AD_DATASET_TABLE_ID>
+<!--70530668A11B474A86B38BB9D67D7CAE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--70530668A11B474A86B38BB9D67D7CAE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--70530668A11B474A86B38BB9D67D7CAE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--70530668A11B474A86B38BB9D67D7CAE-->  <AD_DATASET_ID><![CDATA[D81C5C810AEF47C690E4F688ABC8AAC8]]></AD_DATASET_ID>
+<!--70530668A11B474A86B38BB9D67D7CAE-->  <AD_TABLE_ID><![CDATA[3277BAAF6B7249BA972D99D351BD08CC]]></AD_TABLE_ID>
+<!--70530668A11B474A86B38BB9D67D7CAE-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
+<!--70530668A11B474A86B38BB9D67D7CAE-->  <WHERECLAUSE><![CDATA[client.id=:ClientID]]></WHERECLAUSE>
+<!--70530668A11B474A86B38BB9D67D7CAE-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
+<!--70530668A11B474A86B38BB9D67D7CAE-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
+<!--70530668A11B474A86B38BB9D67D7CAE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--70530668A11B474A86B38BB9D67D7CAE--></AD_DATASET_TABLE>
+
 <!--71FC341E96DD11DDB961001B388C61A4--><AD_DATASET_TABLE>
 <!--71FC341E96DD11DDB961001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[71FC341E96DD11DDB961001B388C61A4]]></AD_DATASET_TABLE_ID>
 <!--71FC341E96DD11DDB961001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1229,6 +1257,20 @@
 <!--71FC341E96DD11DDB961001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--71FC341E96DD11DDB961001B388C61A4--></AD_DATASET_TABLE>
 
+<!--73AF56C3C96E4A6A98970A234C42635E--><AD_DATASET_TABLE>
+<!--73AF56C3C96E4A6A98970A234C42635E-->  <AD_DATASET_TABLE_ID><![CDATA[73AF56C3C96E4A6A98970A234C42635E]]></AD_DATASET_TABLE_ID>
+<!--73AF56C3C96E4A6A98970A234C42635E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--73AF56C3C96E4A6A98970A234C42635E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--73AF56C3C96E4A6A98970A234C42635E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--73AF56C3C96E4A6A98970A234C42635E-->  <AD_DATASET_ID><![CDATA[D81C5C810AEF47C690E4F688ABC8AAC8]]></AD_DATASET_ID>
+<!--73AF56C3C96E4A6A98970A234C42635E-->  <AD_TABLE_ID><![CDATA[339677E1B4854680A6BCCFBE5D6BE6B2]]></AD_TABLE_ID>
+<!--73AF56C3C96E4A6A98970A234C42635E-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
+<!--73AF56C3C96E4A6A98970A234C42635E-->  <WHERECLAUSE><![CDATA[client.id=:ClientID]]></WHERECLAUSE>
+<!--73AF56C3C96E4A6A98970A234C42635E-->  <EXCLUDEAUDITINFO><![CDATA[N]]></EXCLUDEAUDITINFO>
+<!--73AF56C3C96E4A6A98970A234C42635E-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
+<!--73AF56C3C96E4A6A98970A234C42635E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--73AF56C3C96E4A6A98970A234C42635E--></AD_DATASET_TABLE>
+
 <!--742BF79896E111DD9F89001B388C61A4--><AD_DATASET_TABLE>
 <!--742BF79896E111DD9F89001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[742BF79896E111DD9F89001B388C61A4]]></AD_DATASET_TABLE_ID>
 <!--742BF79896E111DD9F89001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1300,6 +1342,20 @@
 <!--7769D3EF15F249ABB74BF3368622448B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7769D3EF15F249ABB74BF3368622448B--></AD_DATASET_TABLE>
 
+<!--7935539824E840D8BF46275220CDB44C--><AD_DATASET_TABLE>
+<!--7935539824E840D8BF46275220CDB44C-->  <AD_DATASET_TABLE_ID><![CDATA[7935539824E840D8BF46275220CDB44C]]></AD_DATASET_TABLE_ID>
+<!--7935539824E840D8BF46275220CDB44C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7935539824E840D8BF46275220CDB44C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7935539824E840D8BF46275220CDB44C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7935539824E840D8BF46275220CDB44C-->  <AD_DATASET_ID><![CDATA[D81C5C810AEF47C690E4F688ABC8AAC8]]></AD_DATASET_ID>
+<!--7935539824E840D8BF46275220CDB44C-->  <AD_TABLE_ID><![CDATA[77264B07BB0E4FA483A07FB40C2E0FE0]]></AD_TABLE_ID>
+<!--7935539824E840D8BF46275220CDB44C-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
+<!--7935539824E840D8BF46275220CDB44C-->  <WHERECLAUSE><![CDATA[client.id=:ClientID]]></WHERECLAUSE>
+<!--7935539824E840D8BF46275220CDB44C-->  <EXCLUDEAUDITINFO><![CDATA[N]]></EXCLUDEAUDITINFO>
+<!--7935539824E840D8BF46275220CDB44C-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
+<!--7935539824E840D8BF46275220CDB44C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7935539824E840D8BF46275220CDB44C--></AD_DATASET_TABLE>
+
 <!--7AF5DEC896E011DDA8AC001B388C61A4--><AD_DATASET_TABLE>
 <!--7AF5DEC896E011DDA8AC001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[7AF5DEC896E011DDA8AC001B388C61A4]]></AD_DATASET_TABLE_ID>
 <!--7AF5DEC896E011DDA8AC001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -6214,6 +6270,20 @@
 <!--B4B10DB866F444B7BBEDE296299B1EEB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--B4B10DB866F444B7BBEDE296299B1EEB--></AD_DATASET_TABLE>
 
+<!--B54C2FE02209406E9C83802ABA5FCB56--><AD_DATASET_TABLE>
+<!--B54C2FE02209406E9C83802ABA5FCB56-->  <AD_DATASET_TABLE_ID><![CDATA[B54C2FE02209406E9C83802ABA5FCB56]]></AD_DATASET_TABLE_ID>
+<!--B54C2FE02209406E9C83802ABA5FCB56-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B54C2FE02209406E9C83802ABA5FCB56-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B54C2FE02209406E9C83802ABA5FCB56-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B54C2FE02209406E9C83802ABA5FCB56-->  <AD_DATASET_ID><![CDATA[1]]></AD_DATASET_ID>
+<!--B54C2FE02209406E9C83802ABA5FCB56-->  <AD_TABLE_ID><![CDATA[95FE1A1DCB1948AD8E2D5AFE4E95521C]]></AD_TABLE_ID>
+<!--B54C2FE02209406E9C83802ABA5FCB56-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
+<!--B54C2FE02209406E9C83802ABA5FCB56-->  <WHERECLAUSE><![CDATA[m_inventorystatus_id='0']]></WHERECLAUSE>
+<!--B54C2FE02209406E9C83802ABA5FCB56-->  <EXCLUDEAUDITINFO><![CDATA[N]]></EXCLUDEAUDITINFO>
+<!--B54C2FE02209406E9C83802ABA5FCB56-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
+<!--B54C2FE02209406E9C83802ABA5FCB56-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B54C2FE02209406E9C83802ABA5FCB56--></AD_DATASET_TABLE>
+
 <!--B81566BA96E111DD95E3001B388C61A4--><AD_DATASET_TABLE>
 <!--B81566BA96E111DD95E3001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[B81566BA96E111DD95E3001B388C61A4]]></AD_DATASET_TABLE_ID>
 <!--B81566BA96E111DD95E3001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -6256,6 +6326,20 @@
 <!--BB7CD3530866434FA431DEBB1C46DF8D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--BB7CD3530866434FA431DEBB1C46DF8D--></AD_DATASET_TABLE>
 
+<!--BE95083E3B234A0EBDAD4CEBC10C93B1--><AD_DATASET_TABLE>
+<!--BE95083E3B234A0EBDAD4CEBC10C93B1-->  <AD_DATASET_TABLE_ID><![CDATA[BE95083E3B234A0EBDAD4CEBC10C93B1]]></AD_DATASET_TABLE_ID>
+<!--BE95083E3B234A0EBDAD4CEBC10C93B1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BE95083E3B234A0EBDAD4CEBC10C93B1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BE95083E3B234A0EBDAD4CEBC10C93B1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BE95083E3B234A0EBDAD4CEBC10C93B1-->  <AD_DATASET_ID><![CDATA[575BE80AA7864187966A3FCFA1B1854D]]></AD_DATASET_ID>
+<!--BE95083E3B234A0EBDAD4CEBC10C93B1-->  <AD_TABLE_ID><![CDATA[175]]></AD_TABLE_ID>
+<!--BE95083E3B234A0EBDAD4CEBC10C93B1-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
+<!--BE95083E3B234A0EBDAD4CEBC10C93B1-->  <WHERECLAUSE><![CDATA[ad_client_id='0']]></WHERECLAUSE>
+<!--BE95083E3B234A0EBDAD4CEBC10C93B1-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
+<!--BE95083E3B234A0EBDAD4CEBC10C93B1-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
+<!--BE95083E3B234A0EBDAD4CEBC10C93B1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--BE95083E3B234A0EBDAD4CEBC10C93B1--></AD_DATASET_TABLE>
+
 <!--BF1902C896E111DDB89F001B388C61A4--><AD_DATASET_TABLE>
 <!--BF1902C896E111DDB89F001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[BF1902C896E111DDB89F001B388C61A4]]></AD_DATASET_TABLE_ID>
 <!--BF1902C896E111DDB89F001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -6383,6 +6467,20 @@
 <!--C8015E340F864C38A8396A263E3901E3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--C8015E340F864C38A8396A263E3901E3--></AD_DATASET_TABLE>
 
+<!--C8885BD6F5B841049384055CC8122DC4--><AD_DATASET_TABLE>
+<!--C8885BD6F5B841049384055CC8122DC4-->  <AD_DATASET_TABLE_ID><![CDATA[C8885BD6F5B841049384055CC8122DC4]]></AD_DATASET_TABLE_ID>
+<!--C8885BD6F5B841049384055CC8122DC4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C8885BD6F5B841049384055CC8122DC4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C8885BD6F5B841049384055CC8122DC4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C8885BD6F5B841049384055CC8122DC4-->  <AD_DATASET_ID><![CDATA[D81C5C810AEF47C690E4F688ABC8AAC8]]></AD_DATASET_ID>
+<!--C8885BD6F5B841049384055CC8122DC4-->  <AD_TABLE_ID><![CDATA[D6079A4A6C2542678D9A50114367B967]]></AD_TABLE_ID>
+<!--C8885BD6F5B841049384055CC8122DC4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
+<!--C8885BD6F5B841049384055CC8122DC4-->  <WHERECLAUSE><![CDATA[client.id=:ClientID]]></WHERECLAUSE>
+<!--C8885BD6F5B841049384055CC8122DC4-->  <EXCLUDEAUDITINFO><![CDATA[N]]></EXCLUDEAUDITINFO>
+<!--C8885BD6F5B841049384055CC8122DC4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
+<!--C8885BD6F5B841049384055CC8122DC4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C8885BD6F5B841049384055CC8122DC4--></AD_DATASET_TABLE>
+
 <!--C9E9E59296DB11DDB70F001B388C61A4--><AD_DATASET_TABLE>
 <!--C9E9E59296DB11DDB70F001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[C9E9E59296DB11DDB70F001B388C61A4]]></AD_DATASET_TABLE_ID>
 <!--C9E9E59296DB11DDB70F001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_ELEMENT.xml	Tue Sep 12 11:03:08 2017 +0200
+++ b/model/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Sep 21 04:04:15 2017 +0000
@@ -21374,6 +21374,18 @@
 <!--0FAB9FAA9D204B8AB9FA36C663842DAF-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--0FAB9FAA9D204B8AB9FA36C663842DAF--></AD_ELEMENT>
 
+<!--0FD37224984F45608788C44A5ED9C885--><AD_ELEMENT>
+<!--0FD37224984F45608788C44A5ED9C885-->  <AD_ELEMENT_ID><![CDATA[0FD37224984F45608788C44A5ED9C885]]></AD_ELEMENT_ID>
+<!--0FD37224984F45608788C44A5ED9C885-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0FD37224984F45608788C44A5ED9C885-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0FD37224984F45608788C44A5ED9C885-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0FD37224984F45608788C44A5ED9C885-->  <COLUMNNAME><![CDATA[Available]]></COLUMNNAME>
+<!--0FD37224984F45608788C44A5ED9C885-->  <NAME><![CDATA[Available]]></NAME>
+<!--0FD37224984F45608788C44A5ED9C885-->  <PRINTNAME><![CDATA[Available]]></PRINTNAME>
+<!--0FD37224984F45608788C44A5ED9C885-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0FD37224984F45608788C44A5ED9C885-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--0FD37224984F45608788C44A5ED9C885--></AD_ELEMENT>
+
 <!--0FF8F04EC4204CA3AC8F003F38C0502A--><AD_ELEMENT>
 <!--0FF8F04EC4204CA3AC8F003F38C0502A-->  <AD_ELEMENT_ID><![CDATA[0FF8F04EC4204CA3AC8F003F38C0502A]]></AD_ELEMENT_ID>
 <!--0FF8F04EC4204CA3AC8F003F38C0502A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21781,6 +21793,18 @@
 <!--1C5C8314A52C45819097381E72843369-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--1C5C8314A52C45819097381E72843369--></AD_ELEMENT>
 
+<!--1C8F2CAE187242BBA9D5A34A29A20B81--><AD_ELEMENT>
+<!--1C8F2CAE187242BBA9D5A34A29A20B81-->  <AD_ELEMENT_ID><![CDATA[1C8F2CAE187242BBA9D5A34A29A20B81]]></AD_ELEMENT_ID>
+<!--1C8F2CAE187242BBA9D5A34A29A20B81-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1C8F2CAE187242BBA9D5A34A29A20B81-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1C8F2CAE187242BBA9D5A34A29A20B81-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1C8F2CAE187242BBA9D5A34A29A20B81-->  <COLUMNNAME><![CDATA[Change_Status]]></COLUMNNAME>
+<!--1C8F2CAE187242BBA9D5A34A29A20B81-->  <NAME><![CDATA[Change Status]]></NAME>
+<!--1C8F2CAE187242BBA9D5A34A29A20B81-->  <PRINTNAME><![CDATA[Change Status]]></PRINTNAME>
+<!--1C8F2CAE187242BBA9D5A34A29A20B81-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1C8F2CAE187242BBA9D5A34A29A20B81-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--1C8F2CAE187242BBA9D5A34A29A20B81--></AD_ELEMENT>
+
 <!--1CF418C350EA368FE0530100007F5EDF--><AD_ELEMENT>
 <!--1CF418C350EA368FE0530100007F5EDF-->  <AD_ELEMENT_ID><![CDATA[1CF418C350EA368FE0530100007F5EDF]]></AD_ELEMENT_ID>
 <!--1CF418C350EA368FE0530100007F5EDF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21837,7 +21861,7 @@
 <!--1E5CB7185CF94CC595BDB2A1C2129C75-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--1E5CB7185CF94CC595BDB2A1C2129C75-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1E5CB7185CF94CC595BDB2A1C2129C75-->  <COLUMNNAME><![CDATA[AllocatedQty]]></COLUMNNAME>
-<!--1E5CB7185CF94CC595BDB2A1C2129C75-->  <NAME><![CDATA[AllocatedQuantity]]></NAME>
+<!--1E5CB7185CF94CC595BDB2A1C2129C75-->  <NAME><![CDATA[Allocated Quantity]]></NAME>
 <!--1E5CB7185CF94CC595BDB2A1C2129C75-->  <PRINTNAME><![CDATA[AllocatedQuantity]]></PRINTNAME>
 <!--1E5CB7185CF94CC595BDB2A1C2129C75-->  <HELP><![CDATA[From a Reservation, the quantity that it is already allocated, which means that the Reserved Stock already has an
  Storage Bin and an Attribute values assigned to it]]></HELP>
@@ -21845,6 +21869,18 @@
 <!--1E5CB7185CF94CC595BDB2A1C2129C75-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--1E5CB7185CF94CC595BDB2A1C2129C75--></AD_ELEMENT>
 
+<!--1E7063D3AEF04320A4234FBABCA8EA3C--><AD_ELEMENT>
+<!--1E7063D3AEF04320A4234FBABCA8EA3C-->  <AD_ELEMENT_ID><![CDATA[1E7063D3AEF04320A4234FBABCA8EA3C]]></AD_ELEMENT_ID>
+<!--1E7063D3AEF04320A4234FBABCA8EA3C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1E7063D3AEF04320A4234FBABCA8EA3C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1E7063D3AEF04320A4234FBABCA8EA3C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1E7063D3AEF04320A4234FBABCA8EA3C-->  <COLUMNNAME><![CDATA[Parent_Locator_ID]]></COLUMNNAME>
+<!--1E7063D3AEF04320A4234FBABCA8EA3C-->  <NAME><![CDATA[Parent Locator]]></NAME>
+<!--1E7063D3AEF04320A4234FBABCA8EA3C-->  <PRINTNAME><![CDATA[Parent Locator]]></PRINTNAME>
+<!--1E7063D3AEF04320A4234FBABCA8EA3C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1E7063D3AEF04320A4234FBABCA8EA3C-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--1E7063D3AEF04320A4234FBABCA8EA3C--></AD_ELEMENT>
+
 <!--1E9B451D4487ECDDE050007F010057FB--><AD_ELEMENT>
 <!--1E9B451D4487ECDDE050007F010057FB-->  <AD_ELEMENT_ID><![CDATA[1E9B451D4487ECDDE050007F010057FB]]></AD_ELEMENT_ID>
 <!--1E9B451D4487ECDDE050007F010057FB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -22061,6 +22097,18 @@
 <!--234900BCE25C40B6B71586F9CAF952A2-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--234900BCE25C40B6B71586F9CAF952A2--></AD_ELEMENT>
 
+<!--24C8375A1CF740449A29D93DFE72BCBD--><AD_ELEMENT>
+<!--24C8375A1CF740449A29D93DFE72BCBD-->  <AD_ELEMENT_ID><![CDATA[24C8375A1CF740449A29D93DFE72BCBD]]></AD_ELEMENT_ID>
+<!--24C8375A1CF740449A29D93DFE72BCBD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--24C8375A1CF740449A29D93DFE72BCBD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--24C8375A1CF740449A29D93DFE72BCBD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--24C8375A1CF740449A29D93DFE72BCBD-->  <COLUMNNAME><![CDATA[Isvirtual]]></COLUMNNAME>
+<!--24C8375A1CF740449A29D93DFE72BCBD-->  <NAME><![CDATA[Isvirtual]]></NAME>
+<!--24C8375A1CF740449A29D93DFE72BCBD-->  <PRINTNAME><![CDATA[Isvirtual]]></PRINTNAME>
+<!--24C8375A1CF740449A29D93DFE72BCBD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--24C8375A1CF740449A29D93DFE72BCBD-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--24C8375A1CF740449A29D93DFE72BCBD--></AD_ELEMENT>