Update to 3.0PR18Q3 3.0PR18Q3
authorRM packaging bot <staff.rm@openbravo.com>
Wed, 08 Aug 2018 05:40:37 +0000
changeset 824 fd9babe2d430
parent 823 794efefb012d
child 825 900f16cbee2a
Update to 3.0PR18Q3
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_GEN_PAYMENTSCHEDULE_ORD.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.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.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_DATA_POOL_SEL.xml
model/modules/org.openbravo.client.application/src-db/database/model/views/OBUIAPP_POOL_REPORT_V.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_MENU.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_PREFERENCE.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REFERENCE.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TAB.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TABLE.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TREENODE.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_WINDOW.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.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_MODULE.xml
model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/src-db/database/model/excludeFilter.xml
model/src-db/database/model/functions/AD_GET_ORG_LE_BU.xml
model/src-db/database/model/functions/AD_GET_ORG_LE_BU_TREENODE.xml
model/src-db/database/model/functions/AD_ORG_GETCALENDAROWNER.xml
model/src-db/database/model/functions/AD_ORG_GETCALENDAROWNERTN.xml
model/src-db/database/model/functions/AD_ORG_GETPERIODCONTROLALLOW.xml
model/src-db/database/model/functions/AD_ORG_GETPERIODCONTROLALLOWTN.xml
model/src-db/database/model/functions/AD_ORG_READY.xml
model/src-db/database/model/functions/A_ASSET_CREATE.xml
model/src-db/database/model/functions/C_BP_SOCREDITUSED_REFRESH.xml
model/src-db/database/model/functions/C_CASH_POST.xml
model/src-db/database/model/functions/C_CONVERT_DOC_CURRENCY.xml
model/src-db/database/model/functions/C_CREATE_PINVOICE_FROM_OUTS.xml
model/src-db/database/model/functions/C_CURRENCY_CONVERT.xml
model/src-db/database/model/functions/C_CURRENCY_CONVERT_PRECISION.xml
model/src-db/database/model/functions/C_CURRENCY_CONVERT_RATE.xml
model/src-db/database/model/functions/C_CURRENCY_RATE.xml
model/src-db/database/model/functions/C_GETWITHHOLDING.xml
model/src-db/database/model/functions/C_GET_CURRENCY_PRECISION.xml
model/src-db/database/model/functions/C_GET_DEFAULT_PERIOD.xml
model/src-db/database/model/functions/C_GET_NET_AMOUNT_FROM_GROSS.xml
model/src-db/database/model/functions/C_GET_NET_PRICE_FROM_GROSS.xml
model/src-db/database/model/functions/C_GET_TAX_AMT_FROM_NET.xml
model/src-db/database/model/functions/C_INVOICETAX_ADJUSTMENT.xml
model/src-db/database/model/functions/C_INVOICE_CREATE.xml
model/src-db/database/model/functions/C_INVOICE_CREATE0.xml
model/src-db/database/model/functions/C_INVOICE_CREATERECEIPT.xml
model/src-db/database/model/functions/C_INVOICE_POST.xml
model/src-db/database/model/functions/C_ORDERTAX_ADJUSTMENT.xml
model/src-db/database/model/functions/C_ORDER_POST1.xml
model/src-db/database/model/functions/C_PROJECT_WON.xml
model/src-db/database/model/functions/C_TAXPAYMENT_POST.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_PURCHASEPLAN.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_GETJSONDESCRIPTION.xml
model/src-db/database/model/functions/M_GET_STOCK_PARAM.xml
model/src-db/database/model/functions/M_INITIALIZE_STOCK_VALUATION.xml
model/src-db/database/model/functions/M_INOUT_CREATE.xml
model/src-db/database/model/functions/M_INOUT_CREATE0.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_PRICELIST_CREATE.xml
model/src-db/database/model/functions/M_RESERVATION_POST.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/functions/M_WAREHOUSE_DEFAULT_RULE_PARAM.xml
model/src-db/database/model/prescript-Oracle.sql
model/src-db/database/model/prescript-PostgreSql.sql
model/src-db/database/model/tables/AD_ORG.xml
model/src-db/database/model/tables/AD_PROCESS_REQUEST.xml
model/src-db/database/model/tables/AD_ROLE.xml
model/src-db/database/model/tables/C_INVOICELINE.xml
model/src-db/database/model/tables/M_INOUT.xml
model/src-db/database/model/tables/M_MATCHPO.xml
model/src-db/database/model/tables/M_MOVEMENTLINE.xml
model/src-db/database/model/triggers/AD_CALLOUT_TRG.xml
model/src-db/database/model/triggers/AD_MODULE_TRG.xml
model/src-db/database/model/triggers/AD_MODULE_TRG2.xml
model/src-db/database/model/triggers/AD_ROLE_CHECK_TRG.xml
model/src-db/database/model/triggers/AD_ROLE_TRG.xml
model/src-db/database/model/triggers/C_CONVERSION_RATE_DOCUMENT_TRG.xml
model/src-db/database/model/triggers/C_ORDERLINE_TRG2.xml
model/src-db/database/model/triggers/C_PERIOD_TRG.xml
model/src-db/database/model/triggers/M_RESERVATION_TRG.xml
model/src-db/database/model/triggers/M_TRANSACTION_TRG.xml
model/src-db/database/model/triggers/M_TRANSACTION_TRG2.xml
model/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
model/src-db/database/sourcedata/AD_COLUMN.xml
model/src-db/database/sourcedata/AD_DATASET_TABLE.xml
model/src-db/database/sourcedata/AD_ELEMENT.xml
model/src-db/database/sourcedata/AD_EXTENSION_POINTS.xml
model/src-db/database/sourcedata/AD_FIELD.xml
model/src-db/database/sourcedata/AD_FIELDGROUP.xml
model/src-db/database/sourcedata/AD_MENU.xml
model/src-db/database/sourcedata/AD_MESSAGE.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_VAL_RULE.xml
model/src-db/database/sourcedata/AD_WINDOW.xml
model/src-db/database/sourcedata/M_PRODUCT_STATUS.xml
model/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
model/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
model/src-db/database/sourcedata/referencedData/C_COUNTRY.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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -657,7 +657,8 @@
         v_ConvertedAmount := COALESCE(V_OutstandingAmount, 0) * v_creditmultiplier;
       end if;
       UPDATE C_BPARTNER
-      SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) + v_ConvertedAmount
+      SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) + v_ConvertedAmount,
+      UPDATED = now()
       WHERE C_BPARTNER_ID = v_BPartner_ID;
 
       -- Automatic creation of payment and financial transaction
@@ -999,7 +1000,8 @@
                   v_ConvertedAmount := (COALESCE(cur_paymentschedule.OUTSTANDINGAMT, 0) * v_creditmultiplier);
                 end if;
                 UPDATE C_BPARTNER
-                SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) - v_ConvertedAmount
+                SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) - v_ConvertedAmount,
+                UPDATED = now()
                 WHERE C_BPARTNER_ID = v_BPartner_ID;
               END IF;
               -- Automatic creation of financial transaction
@@ -1070,8 +1072,6 @@
 
   ELSIF (p_docaction = 'RE') THEN
     DECLARE
-      v_count NUMBER;
-      v_documentno VARCHAR2(40);
       v_PaymentPlanExpectedTotal NUMBER:= 0;
     BEGIN
       SELECT count(*), max(p.documentno)
@@ -1148,7 +1148,8 @@
         v_ConvertedAmount := ((v_PaymentPlanExpectedTotal - v_PaidAmount) * v_creditmultiplier);
       END IF;
       UPDATE C_BPARTNER
-         SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) - v_convertedAmount
+         SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) - v_convertedAmount,
+         UPDATED = now()
       WHERE C_BPARTNER_ID = v_BPartner_ID;
 
       -- Delete C_InvoiceTax_CashVAT records for this invoice
@@ -1168,7 +1169,6 @@
 
   ELSIF (p_docaction = 'RC') THEN
     DECLARE
-      v_count NUMBER;
       v_prepaymentamt NUMBER;
     BEGIN
       v_delete_paymentplan := TRUE;
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_ORD.xml	Wed Aug 08 05:40:37 2018 +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) 2013-2015 Openbravo SLU
+* All portions are Copyright (C) 2013-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -97,7 +97,6 @@
 
     DECLARE
       v_payment_schedule_order VARCHAR2(32);
-      v_count NUMBER;
       v_pendingamount NUMBER;
       cur_invoicepayments RECORD;
     BEGIN
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml	Wed Aug 08 05:40:37 2018 +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-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -106,6 +106,7 @@
 WHEN OTHERS THEN
   DBMS_OUTPUT.PUT_LINE('aprm_ispaymentconfirmed exception');
   RAISE;
+  RETURN NULL;
 END APRM_ISPAYMENTCONFIRMED
 ]]></body>
     </function>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNOINVPAIDSTATUS.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -22,7 +22,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2015 Openbravo SLU
+* All portions are Copyright (C) 2015-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -43,6 +43,7 @@
 WHEN OTHERS THEN
   DBMS_OUTPUT.PUT_LINE('aprm_seqnumberinvoicepaidstatus exception');
   RAISE;
+  RETURN NULL;
 END APRM_SEQNOINVPAIDSTATUS
 ]]></body>
     </function>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml	Wed Aug 08 05:40:37 2018 +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-2017 Openbravo SLU
+* All portions are Copyright (C) 2014-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -49,6 +49,7 @@
 WHEN OTHERS THEN
   DBMS_OUTPUT.PUT_LINE('aprm_seqnumberpaymentstatus exception');
   RAISE;
+  RETURN NULL;
 END APRM_SEQNUMBERPAYMENTSTATUS
 ]]></body>
     </function>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_TAX_PAYMENT.xml	Wed Aug 08 05:40:37 2018 +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) 2010-2014 Openbravo SLU
+* All portions are Copyright (C) 2010-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -175,7 +175,8 @@
     WHERE C_TAXPAYMENT_ID = p_record_id;
     -- Updating SO_CREDITUSED when PAYMENT OCCUR
     UPDATE C_BPARTNER
-    SET SO_CREDITUSED = SO_CREDITUSED - COALESCE(p_amount, 0)
+    SET SO_CREDITUSED = SO_CREDITUSED - COALESCE(p_amount, 0),
+    UPDATED = now()
     WHERE C_BPARTNER_ID = v_BPartner_ID; 
 
     -- Automatic creation of financial transaction
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -374,7 +374,7 @@
 <!--04CFE3A53162449380A253DE0B814AEF-->  <AD_COLUMN_ID><![CDATA[F8F6A13C5682DC4DE040007F01000363]]></AD_COLUMN_ID>
 <!--04CFE3A53162449380A253DE0B814AEF-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--04CFE3A53162449380A253DE0B814AEF-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--04CFE3A53162449380A253DE0B814AEF-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y' & (@showAddPayment@='Y' | @showAddPayment@ ='') & (@APRM_OrderIsPaid@='N' | @APRM_OrderIsPaid@ ='')]]></DISPLAYLOGIC>
+<!--04CFE3A53162449380A253DE0B814AEF-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y' & (@showAddPayment@='Y' | @showAddPayment@ ='') & (@APRM_OrderIsPaid@='N' | @APRM_OrderIsPaid@ ='') & @GrandTotal@!0]]></DISPLAYLOGIC>
 <!--04CFE3A53162449380A253DE0B814AEF-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
 <!--04CFE3A53162449380A253DE0B814AEF-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--04CFE3A53162449380A253DE0B814AEF-->  <SEQNO><![CDATA[335]]></SEQNO>
@@ -21974,7 +21974,7 @@
 <!--F4A594CF81DA4C0DB3A81BBFF0305C12-->  <AD_COLUMN_ID><![CDATA[F8F6A13C5682DC4DE040007F01000363]]></AD_COLUMN_ID>
 <!--F4A594CF81DA4C0DB3A81BBFF0305C12-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--F4A594CF81DA4C0DB3A81BBFF0305C12-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--F4A594CF81DA4C0DB3A81BBFF0305C12-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y' & (@showAddPayment@='Y' | @showAddPayment@ ='') & (@APRM_OrderIsPaid@='N' | @APRM_OrderIsPaid@ ='')]]></DISPLAYLOGIC>
+<!--F4A594CF81DA4C0DB3A81BBFF0305C12-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y' & (@showAddPayment@='Y' | @showAddPayment@ ='') & (@APRM_OrderIsPaid@='N' | @APRM_OrderIsPaid@ ='') & @GrandTotal@!0]]></DISPLAYLOGIC>
 <!--F4A594CF81DA4C0DB3A81BBFF0305C12-->  <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
 <!--F4A594CF81DA4C0DB3A81BBFF0305C12-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--F4A594CF81DA4C0DB3A81BBFF0305C12-->  <SEQNO><![CDATA[415]]></SEQNO>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -6,7 +6,7 @@
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A918E3331C404B889D69AA9BFAFB23AC-->  <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME>
-<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.33777]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.34267]]></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[PR18Q2]]></VERSION_LABEL>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION_LABEL><![CDATA[PR18Q3]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -7,7 +7,7 @@
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--89326AE95DAD449D85DFAB2C5B1C6683-->  <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID>
-<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.34267]]></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.33777]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.34267]]></STARTVERSION>
 <!--B97FC854C6DD41E692161585645A900F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -6,7 +6,7 @@
 <!--8A098711BB324335A19833286BDB093D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--8A098711BB324335A19833286BDB093D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8A098711BB324335A19833286BDB093D-->  <NAME><![CDATA[Apache External Connection Pool]]></NAME>
-<!--8A098711BB324335A19833286BDB093D-->  <VERSION><![CDATA[1.0.33777]]></VERSION>
+<!--8A098711BB324335A19833286BDB093D-->  <VERSION><![CDATA[1.0.34267]]></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[PR18Q2]]></VERSION_LABEL>
+<!--8A098711BB324335A19833286BDB093D-->  <VERSION_LABEL><![CDATA[PR18Q3]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.apachejdbcconnectionpool/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -7,7 +7,7 @@
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <AD_MODULE_ID><![CDATA[8A098711BB324335A19833286BDB093D]]></AD_MODULE_ID>
 <!--1467C397BC5F4999A5606F39CD6FF8A4-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--1467C397BC5F4999A5606F39CD6FF8A4-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
+<!--1467C397BC5F4999A5606F39CD6FF8A4-->  <STARTVERSION><![CDATA[2.1.34267]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -6,7 +6,7 @@
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C70732EA90A14EC0916078B85CC33D2D-->  <NAME><![CDATA[JBoss Weld]]></NAME>
-<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.33777]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.34267]]></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[PR18Q2]]></VERSION_LABEL>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION_LABEL><![CDATA[PR18Q3]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -7,7 +7,7 @@
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.34267]]></STARTVERSION>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_DATA_POOL_SEL.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -0,0 +1,55 @@
+<?xml version="1.0"?>
+  <database name="TABLE OBUIAPP_DATA_POOL_SEL">
+    <table name="OBUIAPP_DATA_POOL_SEL" primaryKey="OBUIAPP_DPS_KEY">
+      <column name="OBUIAPP_DATA_POOL_SEL_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="OBUIAPP_POOL_REPORT_V_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="DATA_POOL" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="AD_CLIENT" name="OBUIAPP_DPS_CLIENT">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="OBUIAPP_DPS_ORG">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <index name="OBUIAPP_DPS_REPORT_V_ID_UNIQUE" unique="true">
+        <index-column name="OBUIAPP_POOL_REPORT_V_ID"/>
+      </index>
+      <check name="OBUIAPP_DPS_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+    </table>
+  </database>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/modules/org.openbravo.client.application/src-db/database/model/views/OBUIAPP_POOL_REPORT_V.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+  <database name="VIEW OBUIAPP_POOL_REPORT_V">
+    <view name="OBUIAPP_POOL_REPORT_V"><![CDATA[SELECT p.ad_process_id AS obuiapp_pool_report_v_id, p.ad_org_id, p.ad_client_id, to_char(p.name) AS name, '165' AS ad_window_id, p.isactive, p.created, p.createdby, p.updated, p.updatedby FROM ad_process p WHERE (p.isreport = 'Y' OR p.isjasper = 'Y') AND NOT (p.ad_process_id IN (SELECT DISTINCT ad_tab.ad_process_id FROM ad_tab WHERE ad_tab.ad_process_id IS NOT NULL)) UNION SELECT p.obuiapp_process_id AS obuiapp_pool_report_v_id, p.ad_org_id, p.ad_client_id, to_char(p.name) AS name, 'FF80818132D7FB620132D8193C0C0043' AS ad_window_id, p.isactive, p.created, p.createdby, p.updated, p.updatedby FROM obuiapp_process p WHERE p.uipattern = 'OBUIAPP_Report']]></view>
+  </database>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -39,6 +39,84 @@
 <!--0060401C958644D4AA38E9226FBEE232-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--0060401C958644D4AA38E9226FBEE232--></AD_COLUMN>
 
+<!--01028007CFC142A3A45BD2D1809C0538--><AD_COLUMN>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <AD_COLUMN_ID><![CDATA[01028007CFC142A3A45BD2D1809C0538]]></AD_COLUMN_ID>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <NAME><![CDATA[Data Pool]]></NAME>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <DESCRIPTION><![CDATA[Lists all possible database pools which OBDal can use to retrieve data.]]></DESCRIPTION>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <HELP><![CDATA[Lists all possible database pools which OBDal can use to retrieve data.]]></HELP>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <COLUMNNAME><![CDATA[Data_Pool]]></COLUMNNAME>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <AD_TABLE_ID><![CDATA[7C71A0B4544B4E448195E72DDDF0CA5E]]></AD_TABLE_ID>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <AD_REFERENCE_VALUE_ID><![CDATA[159EBE3F67A6431B842695888C5F1E79]]></AD_REFERENCE_VALUE_ID>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <DEFAULTVALUE><![CDATA[RO]]></DEFAULTVALUE>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <AD_ELEMENT_ID><![CDATA[B86D9D39A3234489A642BA8BCC749835]]></AD_ELEMENT_ID>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <POSITION><![CDATA[10]]></POSITION>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--01028007CFC142A3A45BD2D1809C0538-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--01028007CFC142A3A45BD2D1809C0538--></AD_COLUMN>
+
+<!--010847596B1A4654A673BBA86A27D4B3--><AD_COLUMN>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <AD_COLUMN_ID><![CDATA[010847596B1A4654A673BBA86A27D4B3]]></AD_COLUMN_ID>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <NAME><![CDATA[Obuiapp_Data_Pool_Sel_ID]]></NAME>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <DESCRIPTION><![CDATA[Data pool selection for Reports]]></DESCRIPTION>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <HELP><![CDATA[Holds the relationship between a report and the database pool where its data will be fetched.]]></HELP>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <COLUMNNAME><![CDATA[Obuiapp_Data_Pool_Sel_ID]]></COLUMNNAME>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <AD_TABLE_ID><![CDATA[7C71A0B4544B4E448195E72DDDF0CA5E]]></AD_TABLE_ID>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <ISKEY><![CDATA[Y]]></ISKEY>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <AD_ELEMENT_ID><![CDATA[3303E3F5D9714BFB81B967BAFD6AE5C9]]></AD_ELEMENT_ID>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <POSITION><![CDATA[1]]></POSITION>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--010847596B1A4654A673BBA86A27D4B3-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--010847596B1A4654A673BBA86A27D4B3--></AD_COLUMN>
+
 <!--018328092C15478F8E3F523E43172748--><AD_COLUMN>
 <!--018328092C15478F8E3F523E43172748-->  <AD_COLUMN_ID><![CDATA[018328092C15478F8E3F523E43172748]]></AD_COLUMN_ID>
 <!--018328092C15478F8E3F523E43172748-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -346,6 +424,44 @@
 <!--0785044C8E2F41AA9F8999360F70837D-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--0785044C8E2F41AA9F8999360F70837D--></AD_COLUMN>
 
+<!--081CE45046ED42CC811ED604ABD64CD4--><AD_COLUMN>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <AD_COLUMN_ID><![CDATA[081CE45046ED42CC811ED604ABD64CD4]]></AD_COLUMN_ID>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <NAME><![CDATA[Updated By]]></NAME>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <DESCRIPTION><![CDATA[User who updated this records]]></DESCRIPTION>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <HELP><![CDATA[The Updated By field indicates the user who updated this record.]]></HELP>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <COLUMNNAME><![CDATA[Updatedby]]></COLUMNNAME>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <AD_TABLE_ID><![CDATA[C41826412A134A488D94C84EB8C6EE81]]></AD_TABLE_ID>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <AD_ELEMENT_ID><![CDATA[608]]></AD_ELEMENT_ID>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <POSITION><![CDATA[10]]></POSITION>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--081CE45046ED42CC811ED604ABD64CD4-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--081CE45046ED42CC811ED604ABD64CD4--></AD_COLUMN>
+
 <!--08AF323AC6B566ADE050007F0100548B--><AD_COLUMN>
 <!--08AF323AC6B566ADE050007F0100548B-->  <AD_COLUMN_ID><![CDATA[08AF323AC6B566ADE050007F0100548B]]></AD_COLUMN_ID>
 <!--08AF323AC6B566ADE050007F0100548B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -845,6 +961,44 @@
 <!--0933E14B5EC040F7AABAF84468E1BA92-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--0933E14B5EC040F7AABAF84468E1BA92--></AD_COLUMN>
 
+<!--09A37827B9BC4CDC93DB8C99A055C60C--><AD_COLUMN>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <AD_COLUMN_ID><![CDATA[09A37827B9BC4CDC93DB8C99A055C60C]]></AD_COLUMN_ID>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <NAME><![CDATA[Name]]></NAME>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <DESCRIPTION><![CDATA[A non-unique identifier for a record/document often used as a search tool.]]></DESCRIPTION>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <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>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <COLUMNNAME><![CDATA[Name]]></COLUMNNAME>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <AD_TABLE_ID><![CDATA[C41826412A134A488D94C84EB8C6EE81]]></AD_TABLE_ID>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <AD_ELEMENT_ID><![CDATA[469]]></AD_ELEMENT_ID>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <POSITION><![CDATA[4]]></POSITION>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--09A37827B9BC4CDC93DB8C99A055C60C-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--09A37827B9BC4CDC93DB8C99A055C60C--></AD_COLUMN>
+
 <!--0A7B3E49C1284DD998353CED511DAD5E--><AD_COLUMN>
 <!--0A7B3E49C1284DD998353CED511DAD5E-->  <AD_COLUMN_ID><![CDATA[0A7B3E49C1284DD998353CED511DAD5E]]></AD_COLUMN_ID>
 <!--0A7B3E49C1284DD998353CED511DAD5E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1586,6 +1740,44 @@
 <!--182023ADC5294B6C87123A6AF98F567D-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--182023ADC5294B6C87123A6AF98F567D--></AD_COLUMN>
 
+<!--19D6D95906944F72992CDD711D2250D5--><AD_COLUMN>
+<!--19D6D95906944F72992CDD711D2250D5-->  <AD_COLUMN_ID><![CDATA[19D6D95906944F72992CDD711D2250D5]]></AD_COLUMN_ID>
+<!--19D6D95906944F72992CDD711D2250D5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--19D6D95906944F72992CDD711D2250D5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--19D6D95906944F72992CDD711D2250D5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--19D6D95906944F72992CDD711D2250D5-->  <NAME><![CDATA[Creation Date]]></NAME>
+<!--19D6D95906944F72992CDD711D2250D5-->  <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION>
+<!--19D6D95906944F72992CDD711D2250D5-->  <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP>
+<!--19D6D95906944F72992CDD711D2250D5-->  <COLUMNNAME><![CDATA[Created]]></COLUMNNAME>
+<!--19D6D95906944F72992CDD711D2250D5-->  <AD_TABLE_ID><![CDATA[C41826412A134A488D94C84EB8C6EE81]]></AD_TABLE_ID>
+<!--19D6D95906944F72992CDD711D2250D5-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--19D6D95906944F72992CDD711D2250D5-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--19D6D95906944F72992CDD711D2250D5-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--19D6D95906944F72992CDD711D2250D5-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--19D6D95906944F72992CDD711D2250D5-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--19D6D95906944F72992CDD711D2250D5-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--19D6D95906944F72992CDD711D2250D5-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--19D6D95906944F72992CDD711D2250D5-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--19D6D95906944F72992CDD711D2250D5-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--19D6D95906944F72992CDD711D2250D5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--19D6D95906944F72992CDD711D2250D5-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--19D6D95906944F72992CDD711D2250D5-->  <AD_ELEMENT_ID><![CDATA[245]]></AD_ELEMENT_ID>
+<!--19D6D95906944F72992CDD711D2250D5-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--19D6D95906944F72992CDD711D2250D5-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--19D6D95906944F72992CDD711D2250D5-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--19D6D95906944F72992CDD711D2250D5-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--19D6D95906944F72992CDD711D2250D5-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--19D6D95906944F72992CDD711D2250D5-->  <POSITION><![CDATA[7]]></POSITION>
+<!--19D6D95906944F72992CDD711D2250D5-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--19D6D95906944F72992CDD711D2250D5-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--19D6D95906944F72992CDD711D2250D5-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--19D6D95906944F72992CDD711D2250D5-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--19D6D95906944F72992CDD711D2250D5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--19D6D95906944F72992CDD711D2250D5-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--19D6D95906944F72992CDD711D2250D5-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--19D6D95906944F72992CDD711D2250D5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--19D6D95906944F72992CDD711D2250D5--></AD_COLUMN>
+
 <!--1A77A5644CA147E3BF106CC162287E04--><AD_COLUMN>
 <!--1A77A5644CA147E3BF106CC162287E04-->  <AD_COLUMN_ID><![CDATA[1A77A5644CA147E3BF106CC162287E04]]></AD_COLUMN_ID>
 <!--1A77A5644CA147E3BF106CC162287E04-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2242,6 +2434,47 @@
 <!--2A67A025C1B0483384066BD7DB282E58-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--2A67A025C1B0483384066BD7DB282E58--></AD_COLUMN>
 
+<!--2C64E2D24F524EF8A867EED43E9D7A31--><AD_COLUMN>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <AD_COLUMN_ID><![CDATA[2C64E2D24F524EF8A867EED43E9D7A31]]></AD_COLUMN_ID>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <NAME><![CDATA[Active]]></NAME>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <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>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <COLUMNNAME><![CDATA[Isactive]]></COLUMNNAME>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <AD_TABLE_ID><![CDATA[7C71A0B4544B4E448195E72DDDF0CA5E]]></AD_TABLE_ID>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <AD_ELEMENT_ID><![CDATA[348]]></AD_ELEMENT_ID>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <POSITION><![CDATA[4]]></POSITION>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--2C64E2D24F524EF8A867EED43E9D7A31-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--2C64E2D24F524EF8A867EED43E9D7A31--></AD_COLUMN>
+
 <!--2DC9621401F94F55BDBE99D7EE1BFC81--><AD_COLUMN>
 <!--2DC9621401F94F55BDBE99D7EE1BFC81-->  <AD_COLUMN_ID><![CDATA[2DC9621401F94F55BDBE99D7EE1BFC81]]></AD_COLUMN_ID>
 <!--2DC9621401F94F55BDBE99D7EE1BFC81-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2398,6 +2631,45 @@
 <!--2EEEAD8FA2C64DCDBF4C3E8CFECCCB58-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--2EEEAD8FA2C64DCDBF4C3E8CFECCCB58--></AD_COLUMN>
 
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4--><AD_COLUMN>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <AD_COLUMN_ID><![CDATA[2F332E1867FD4FD19AE1F8BCE98F0DB4]]></AD_COLUMN_ID>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <NAME><![CDATA[Creation Date]]></NAME>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <COLUMNNAME><![CDATA[Created]]></COLUMNNAME>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <AD_TABLE_ID><![CDATA[7C71A0B4544B4E448195E72DDDF0CA5E]]></AD_TABLE_ID>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <AD_ELEMENT_ID><![CDATA[245]]></AD_ELEMENT_ID>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <POSITION><![CDATA[5]]></POSITION>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--2F332E1867FD4FD19AE1F8BCE98F0DB4--></AD_COLUMN>
+
 <!--307898056A6E468DA938CC3BCD676226--><AD_COLUMN>
 <!--307898056A6E468DA938CC3BCD676226-->  <AD_COLUMN_ID><![CDATA[307898056A6E468DA938CC3BCD676226]]></AD_COLUMN_ID>
 <!--307898056A6E468DA938CC3BCD676226-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2514,6 +2786,45 @@
 <!--3240A4DCE1FC442AA0F622A1F2015AD7-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--3240A4DCE1FC442AA0F622A1F2015AD7--></AD_COLUMN>
 
+<!--332A6BFBB36E4816B0651B701C19EF00--><AD_COLUMN>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <AD_COLUMN_ID><![CDATA[332A6BFBB36E4816B0651B701C19EF00]]></AD_COLUMN_ID>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <NAME><![CDATA[Updated]]></NAME>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <AD_TABLE_ID><![CDATA[7C71A0B4544B4E448195E72DDDF0CA5E]]></AD_TABLE_ID>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <DEFAULTVALUE><![CDATA[@#Date@]]></DEFAULTVALUE>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <AD_ELEMENT_ID><![CDATA[607]]></AD_ELEMENT_ID>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <POSITION><![CDATA[7]]></POSITION>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--332A6BFBB36E4816B0651B701C19EF00-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--332A6BFBB36E4816B0651B701C19EF00--></AD_COLUMN>
+
 <!--34EB1B31523B4A15A320406D012A12D6--><AD_COLUMN>
 <!--34EB1B31523B4A15A320406D012A12D6-->  <AD_COLUMN_ID><![CDATA[34EB1B31523B4A15A320406D012A12D6]]></AD_COLUMN_ID>
 <!--34EB1B31523B4A15A320406D012A12D6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2786,6 +3097,45 @@
 <!--3B7AC0128B194A0DBB028BDA2C51DCB8-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--3B7AC0128B194A0DBB028BDA2C51DCB8--></AD_COLUMN>
 
+<!--3D4B3EDD3A204CFA8928D7599F0121B6--><AD_COLUMN>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <AD_COLUMN_ID><![CDATA[3D4B3EDD3A204CFA8928D7599F0121B6]]></AD_COLUMN_ID>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <NAME><![CDATA[Organization]]></NAME>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <AD_TABLE_ID><![CDATA[7C71A0B4544B4E448195E72DDDF0CA5E]]></AD_TABLE_ID>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <POSITION><![CDATA[3]]></POSITION>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--3D4B3EDD3A204CFA8928D7599F0121B6--></AD_COLUMN>
+
 <!--3E8FC3621ACE40258A020FE6B0E7A9E0--><AD_COLUMN>
 <!--3E8FC3621ACE40258A020FE6B0E7A9E0-->  <AD_COLUMN_ID><![CDATA[3E8FC3621ACE40258A020FE6B0E7A9E0]]></AD_COLUMN_ID>
 <!--3E8FC3621ACE40258A020FE6B0E7A9E0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3029,6 +3379,44 @@
 <!--416B600071A3481FAFF4B9CE6EB2B991-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--416B600071A3481FAFF4B9CE6EB2B991--></AD_COLUMN>
 
+<!--4442CF9875AF450491ECB75E68AF5205--><AD_COLUMN>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <AD_COLUMN_ID><![CDATA[4442CF9875AF450491ECB75E68AF5205]]></AD_COLUMN_ID>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <NAME><![CDATA[Report]]></NAME>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <DESCRIPTION><![CDATA[References a report regardless the place it is defined]]></DESCRIPTION>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <HELP><![CDATA[References a report regardless the place it is defined]]></HELP>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <COLUMNNAME><![CDATA[Obuiapp_Pool_Report_V_ID]]></COLUMNNAME>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <AD_TABLE_ID><![CDATA[C41826412A134A488D94C84EB8C6EE81]]></AD_TABLE_ID>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <ISKEY><![CDATA[Y]]></ISKEY>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <AD_ELEMENT_ID><![CDATA[9CCFB3754A1B4F78BAE881FAAD33E9D6]]></AD_ELEMENT_ID>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <POSITION><![CDATA[1]]></POSITION>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--4442CF9875AF450491ECB75E68AF5205-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--4442CF9875AF450491ECB75E68AF5205--></AD_COLUMN>
+
 <!--4651E1FC435744898055E3BE4D2F9A88--><AD_COLUMN>
 <!--4651E1FC435744898055E3BE4D2F9A88-->  <AD_COLUMN_ID><![CDATA[4651E1FC435744898055E3BE4D2F9A88]]></AD_COLUMN_ID>
 <!--4651E1FC435744898055E3BE4D2F9A88-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3538,6 +3926,45 @@
 <!--4D7ECF17EAD04F4FA0199F235EE49BA8-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--4D7ECF17EAD04F4FA0199F235EE49BA8--></AD_COLUMN>
 
+<!--54A706040E714A098E4C095D75F2EF7A--><AD_COLUMN>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <AD_COLUMN_ID><![CDATA[54A706040E714A098E4C095D75F2EF7A]]></AD_COLUMN_ID>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <NAME><![CDATA[Client]]></NAME>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <AD_TABLE_ID><![CDATA[7C71A0B4544B4E448195E72DDDF0CA5E]]></AD_TABLE_ID>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <POSITION><![CDATA[2]]></POSITION>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--54A706040E714A098E4C095D75F2EF7A-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--54A706040E714A098E4C095D75F2EF7A--></AD_COLUMN>
+
 <!--55250700311A4AB7A00E1DDECF209FF3--><AD_COLUMN>
 <!--55250700311A4AB7A00E1DDECF209FF3-->  <AD_COLUMN_ID><![CDATA[55250700311A4AB7A00E1DDECF209FF3]]></AD_COLUMN_ID>
 <!--55250700311A4AB7A00E1DDECF209FF3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3774,6 +4201,45 @@
 <!--5814BABBA2CC48EBB510CD9E5323A55C-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--5814BABBA2CC48EBB510CD9E5323A55C--></AD_COLUMN>
 
+<!--5946474316334310A0CF364B89F1E1B5--><AD_COLUMN>
+<!--5946474316334310A0CF364B89F1E1B5-->  <AD_COLUMN_ID><![CDATA[5946474316334310A0CF364B89F1E1B5]]></AD_COLUMN_ID>
+<!--5946474316334310A0CF364B89F1E1B5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5946474316334310A0CF364B89F1E1B5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5946474316334310A0CF364B89F1E1B5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5946474316334310A0CF364B89F1E1B5-->  <NAME><![CDATA[Report]]></NAME>
+<!--5946474316334310A0CF364B89F1E1B5-->  <DESCRIPTION><![CDATA[References a report regardless the place it is defined]]></DESCRIPTION>
+<!--5946474316334310A0CF364B89F1E1B5-->  <HELP><![CDATA[References a report regardless the place it is defined]]></HELP>
+<!--5946474316334310A0CF364B89F1E1B5-->  <COLUMNNAME><![CDATA[Obuiapp_Pool_Report_V_ID]]></COLUMNNAME>
+<!--5946474316334310A0CF364B89F1E1B5-->  <AD_TABLE_ID><![CDATA[7C71A0B4544B4E448195E72DDDF0CA5E]]></AD_TABLE_ID>
+<!--5946474316334310A0CF364B89F1E1B5-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--5946474316334310A0CF364B89F1E1B5-->  <AD_REFERENCE_VALUE_ID><![CDATA[9613657373F54165954A69D54803F65F]]></AD_REFERENCE_VALUE_ID>
+<!--5946474316334310A0CF364B89F1E1B5-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--5946474316334310A0CF364B89F1E1B5-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--5946474316334310A0CF364B89F1E1B5-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--5946474316334310A0CF364B89F1E1B5-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--5946474316334310A0CF364B89F1E1B5-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--5946474316334310A0CF364B89F1E1B5-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--5946474316334310A0CF364B89F1E1B5-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--5946474316334310A0CF364B89F1E1B5-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--5946474316334310A0CF364B89F1E1B5-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--5946474316334310A0CF364B89F1E1B5-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--5946474316334310A0CF364B89F1E1B5-->  <AD_ELEMENT_ID><![CDATA[9CCFB3754A1B4F78BAE881FAAD33E9D6]]></AD_ELEMENT_ID>
+<!--5946474316334310A0CF364B89F1E1B5-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--5946474316334310A0CF364B89F1E1B5-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--5946474316334310A0CF364B89F1E1B5-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--5946474316334310A0CF364B89F1E1B5-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--5946474316334310A0CF364B89F1E1B5-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--5946474316334310A0CF364B89F1E1B5-->  <POSITION><![CDATA[9]]></POSITION>
+<!--5946474316334310A0CF364B89F1E1B5-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--5946474316334310A0CF364B89F1E1B5-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--5946474316334310A0CF364B89F1E1B5-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--5946474316334310A0CF364B89F1E1B5-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--5946474316334310A0CF364B89F1E1B5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--5946474316334310A0CF364B89F1E1B5-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--5946474316334310A0CF364B89F1E1B5-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--5946474316334310A0CF364B89F1E1B5-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--5946474316334310A0CF364B89F1E1B5--></AD_COLUMN>
+
 <!--59D7AB430670477ABA73B3DF07C8CA7D--><AD_COLUMN>
 <!--59D7AB430670477ABA73B3DF07C8CA7D-->  <AD_COLUMN_ID><![CDATA[59D7AB430670477ABA73B3DF07C8CA7D]]></AD_COLUMN_ID>
 <!--59D7AB430670477ABA73B3DF07C8CA7D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -4506,6 +4972,44 @@
 <!--669F7189A86E4EBEB78165527CC81658-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--669F7189A86E4EBEB78165527CC81658--></AD_COLUMN>
 
+<!--6A3BE03A7E5849FD8C934CED956BE7CE--><AD_COLUMN>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <AD_COLUMN_ID><![CDATA[6A3BE03A7E5849FD8C934CED956BE7CE]]></AD_COLUMN_ID>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <NAME><![CDATA[Created By]]></NAME>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <COLUMNNAME><![CDATA[Createdby]]></COLUMNNAME>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <AD_TABLE_ID><![CDATA[C41826412A134A488D94C84EB8C6EE81]]></AD_TABLE_ID>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <POSITION><![CDATA[8]]></POSITION>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--6A3BE03A7E5849FD8C934CED956BE7CE--></AD_COLUMN>
+
 <!--6ABD7441749B401D9C0504DDDF8FB7CA--><AD_COLUMN>
 <!--6ABD7441749B401D9C0504DDDF8FB7CA-->  <AD_COLUMN_ID><![CDATA[6ABD7441749B401D9C0504DDDF8FB7CA]]></AD_COLUMN_ID>
 <!--6ABD7441749B401D9C0504DDDF8FB7CA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -5444,6 +5948,44 @@
 <!--84B662BB4E274C16843F33CFE166019E-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--84B662BB4E274C16843F33CFE166019E--></AD_COLUMN>
 
+<!--85074A2FD9BF4DF59C7B3AD280823A8D--><AD_COLUMN>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <AD_COLUMN_ID><![CDATA[85074A2FD9BF4DF59C7B3AD280823A8D]]></AD_COLUMN_ID>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <NAME><![CDATA[Updated By]]></NAME>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <DESCRIPTION><![CDATA[User who updated this records]]></DESCRIPTION>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <HELP><![CDATA[The Updated By field indicates the user who updated this record.]]></HELP>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <COLUMNNAME><![CDATA[Updatedby]]></COLUMNNAME>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <AD_TABLE_ID><![CDATA[7C71A0B4544B4E448195E72DDDF0CA5E]]></AD_TABLE_ID>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <AD_ELEMENT_ID><![CDATA[608]]></AD_ELEMENT_ID>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <POSITION><![CDATA[8]]></POSITION>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--85074A2FD9BF4DF59C7B3AD280823A8D--></AD_COLUMN>
+
 <!--854B307A20F04064B0CDA13C7A4DEC6E--><AD_COLUMN>
 <!--854B307A20F04064B0CDA13C7A4DEC6E-->  <AD_COLUMN_ID><![CDATA[854B307A20F04064B0CDA13C7A4DEC6E]]></AD_COLUMN_ID>
 <!--854B307A20F04064B0CDA13C7A4DEC6E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -6065,6 +6607,44 @@
 <!--8D23066BDEAB481CAAC482DD1C262218-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--8D23066BDEAB481CAAC482DD1C262218--></AD_COLUMN>
 
+<!--8FDA59843E324699B65BF49C74022C66--><AD_COLUMN>
+<!--8FDA59843E324699B65BF49C74022C66-->  <AD_COLUMN_ID><![CDATA[8FDA59843E324699B65BF49C74022C66]]></AD_COLUMN_ID>
+<!--8FDA59843E324699B65BF49C74022C66-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8FDA59843E324699B65BF49C74022C66-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8FDA59843E324699B65BF49C74022C66-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8FDA59843E324699B65BF49C74022C66-->  <NAME><![CDATA[Organization]]></NAME>
+<!--8FDA59843E324699B65BF49C74022C66-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--8FDA59843E324699B65BF49C74022C66-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--8FDA59843E324699B65BF49C74022C66-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
+<!--8FDA59843E324699B65BF49C74022C66-->  <AD_TABLE_ID><![CDATA[C41826412A134A488D94C84EB8C6EE81]]></AD_TABLE_ID>
+<!--8FDA59843E324699B65BF49C74022C66-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--8FDA59843E324699B65BF49C74022C66-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--8FDA59843E324699B65BF49C74022C66-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--8FDA59843E324699B65BF49C74022C66-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--8FDA59843E324699B65BF49C74022C66-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--8FDA59843E324699B65BF49C74022C66-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--8FDA59843E324699B65BF49C74022C66-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--8FDA59843E324699B65BF49C74022C66-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--8FDA59843E324699B65BF49C74022C66-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--8FDA59843E324699B65BF49C74022C66-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--8FDA59843E324699B65BF49C74022C66-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--8FDA59843E324699B65BF49C74022C66-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--8FDA59843E324699B65BF49C74022C66-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--8FDA59843E324699B65BF49C74022C66-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--8FDA59843E324699B65BF49C74022C66-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--8FDA59843E324699B65BF49C74022C66-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--8FDA59843E324699B65BF49C74022C66-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--8FDA59843E324699B65BF49C74022C66-->  <POSITION><![CDATA[2]]></POSITION>
+<!--8FDA59843E324699B65BF49C74022C66-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--8FDA59843E324699B65BF49C74022C66-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--8FDA59843E324699B65BF49C74022C66-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--8FDA59843E324699B65BF49C74022C66-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--8FDA59843E324699B65BF49C74022C66-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--8FDA59843E324699B65BF49C74022C66-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--8FDA59843E324699B65BF49C74022C66-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--8FDA59843E324699B65BF49C74022C66-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--8FDA59843E324699B65BF49C74022C66--></AD_COLUMN>
+
 <!--8FF8F8D0E5E145558AB1EBDDE5A02EFC--><AD_COLUMN>
 <!--8FF8F8D0E5E145558AB1EBDDE5A02EFC-->  <AD_COLUMN_ID><![CDATA[8FF8F8D0E5E145558AB1EBDDE5A02EFC]]></AD_COLUMN_ID>
 <!--8FF8F8D0E5E145558AB1EBDDE5A02EFC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -8069,6 +8649,45 @@
 <!--93DDA487C86244A28FB80B6F09E74385-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--93DDA487C86244A28FB80B6F09E74385--></AD_COLUMN>
 
+<!--94F4D13915124082B89923BD72A97C96--><AD_COLUMN>
+<!--94F4D13915124082B89923BD72A97C96-->  <AD_COLUMN_ID><![CDATA[94F4D13915124082B89923BD72A97C96]]></AD_COLUMN_ID>
+<!--94F4D13915124082B89923BD72A97C96-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--94F4D13915124082B89923BD72A97C96-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--94F4D13915124082B89923BD72A97C96-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--94F4D13915124082B89923BD72A97C96-->  <NAME><![CDATA[Client]]></NAME>
+<!--94F4D13915124082B89923BD72A97C96-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--94F4D13915124082B89923BD72A97C96-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--94F4D13915124082B89923BD72A97C96-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
+<!--94F4D13915124082B89923BD72A97C96-->  <AD_TABLE_ID><![CDATA[C41826412A134A488D94C84EB8C6EE81]]></AD_TABLE_ID>
+<!--94F4D13915124082B89923BD72A97C96-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--94F4D13915124082B89923BD72A97C96-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--94F4D13915124082B89923BD72A97C96-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
+<!--94F4D13915124082B89923BD72A97C96-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--94F4D13915124082B89923BD72A97C96-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--94F4D13915124082B89923BD72A97C96-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--94F4D13915124082B89923BD72A97C96-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--94F4D13915124082B89923BD72A97C96-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--94F4D13915124082B89923BD72A97C96-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--94F4D13915124082B89923BD72A97C96-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--94F4D13915124082B89923BD72A97C96-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--94F4D13915124082B89923BD72A97C96-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--94F4D13915124082B89923BD72A97C96-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
+<!--94F4D13915124082B89923BD72A97C96-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--94F4D13915124082B89923BD72A97C96-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--94F4D13915124082B89923BD72A97C96-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--94F4D13915124082B89923BD72A97C96-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--94F4D13915124082B89923BD72A97C96-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--94F4D13915124082B89923BD72A97C96-->  <POSITION><![CDATA[3]]></POSITION>
+<!--94F4D13915124082B89923BD72A97C96-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--94F4D13915124082B89923BD72A97C96-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--94F4D13915124082B89923BD72A97C96-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--94F4D13915124082B89923BD72A97C96-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--94F4D13915124082B89923BD72A97C96-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--94F4D13915124082B89923BD72A97C96-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--94F4D13915124082B89923BD72A97C96-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--94F4D13915124082B89923BD72A97C96-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--94F4D13915124082B89923BD72A97C96--></AD_COLUMN>
+
 <!--95501D61D46346EBA58ADD61D9CA754A--><AD_COLUMN>
 <!--95501D61D46346EBA58ADD61D9CA754A-->  <AD_COLUMN_ID><![CDATA[95501D61D46346EBA58ADD61D9CA754A]]></AD_COLUMN_ID>
 <!--95501D61D46346EBA58ADD61D9CA754A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -8223,6 +8842,44 @@
 <!--961FB60572894A78810B8845F499D387-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--961FB60572894A78810B8845F499D387--></AD_COLUMN>
 
+<!--965AD8FFAE6E46769FD5CC359252ED67--><AD_COLUMN>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <AD_COLUMN_ID><![CDATA[965AD8FFAE6E46769FD5CC359252ED67]]></AD_COLUMN_ID>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <NAME><![CDATA[Created By]]></NAME>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <COLUMNNAME><![CDATA[Createdby]]></COLUMNNAME>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <AD_TABLE_ID><![CDATA[7C71A0B4544B4E448195E72DDDF0CA5E]]></AD_TABLE_ID>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <POSITION><![CDATA[6]]></POSITION>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--965AD8FFAE6E46769FD5CC359252ED67-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--965AD8FFAE6E46769FD5CC359252ED67--></AD_COLUMN>
+
 <!--970E2B0C6F6FA805E040007F0100216B--><AD_COLUMN>
 <!--970E2B0C6F6FA805E040007F0100216B-->  <AD_COLUMN_ID><![CDATA[970E2B0C6F6FA805E040007F0100216B]]></AD_COLUMN_ID>
 <!--970E2B0C6F6FA805E040007F0100216B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -8757,6 +9414,44 @@
 <!--ABEE9EA6CC8344789ADA2ABC532DA2FF-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--ABEE9EA6CC8344789ADA2ABC532DA2FF--></AD_COLUMN>
 
+<!--AC86B3B9E5E44263BE8B2814868E469A--><AD_COLUMN>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <AD_COLUMN_ID><![CDATA[AC86B3B9E5E44263BE8B2814868E469A]]></AD_COLUMN_ID>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <NAME><![CDATA[Updated]]></NAME>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <AD_TABLE_ID><![CDATA[C41826412A134A488D94C84EB8C6EE81]]></AD_TABLE_ID>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <AD_ELEMENT_ID><![CDATA[607]]></AD_ELEMENT_ID>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <POSITION><![CDATA[9]]></POSITION>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--AC86B3B9E5E44263BE8B2814868E469A-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--AC86B3B9E5E44263BE8B2814868E469A--></AD_COLUMN>
+
 <!--AC921AD0EF784D4ABDA5FC8312BDC3FE--><AD_COLUMN>
 <!--AC921AD0EF784D4ABDA5FC8312BDC3FE-->  <AD_COLUMN_ID><![CDATA[AC921AD0EF784D4ABDA5FC8312BDC3FE]]></AD_COLUMN_ID>
 <!--AC921AD0EF784D4ABDA5FC8312BDC3FE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -9384,6 +10079,44 @@
 <!--B85EDCE11C844C52904C24B4246BE515-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--B85EDCE11C844C52904C24B4246BE515--></AD_COLUMN>
 
+<!--BB1529DE0698452CB6875C837F09C684--><AD_COLUMN>
+<!--BB1529DE0698452CB6875C837F09C684-->  <AD_COLUMN_ID><![CDATA[BB1529DE0698452CB6875C837F09C684]]></AD_COLUMN_ID>
+<!--BB1529DE0698452CB6875C837F09C684-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BB1529DE0698452CB6875C837F09C684-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BB1529DE0698452CB6875C837F09C684-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BB1529DE0698452CB6875C837F09C684-->  <NAME><![CDATA[Window]]></NAME>
+<!--BB1529DE0698452CB6875C837F09C684-->  <DESCRIPTION><![CDATA[A work area which can be used to create, view, edit, and process a record.]]></DESCRIPTION>
+<!--BB1529DE0698452CB6875C837F09C684-->  <HELP><![CDATA[The Window field identifies a unique Window in the system.]]></HELP>
+<!--BB1529DE0698452CB6875C837F09C684-->  <COLUMNNAME><![CDATA[AD_Window_ID]]></COLUMNNAME>
+<!--BB1529DE0698452CB6875C837F09C684-->  <AD_TABLE_ID><![CDATA[C41826412A134A488D94C84EB8C6EE81]]></AD_TABLE_ID>
+<!--BB1529DE0698452CB6875C837F09C684-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--BB1529DE0698452CB6875C837F09C684-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--BB1529DE0698452CB6875C837F09C684-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--BB1529DE0698452CB6875C837F09C684-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--BB1529DE0698452CB6875C837F09C684-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--BB1529DE0698452CB6875C837F09C684-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--BB1529DE0698452CB6875C837F09C684-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--BB1529DE0698452CB6875C837F09C684-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--BB1529DE0698452CB6875C837F09C684-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--BB1529DE0698452CB6875C837F09C684-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--BB1529DE0698452CB6875C837F09C684-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--BB1529DE0698452CB6875C837F09C684-->  <AD_ELEMENT_ID><![CDATA[143]]></AD_ELEMENT_ID>
+<!--BB1529DE0698452CB6875C837F09C684-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--BB1529DE0698452CB6875C837F09C684-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--BB1529DE0698452CB6875C837F09C684-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--BB1529DE0698452CB6875C837F09C684-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--BB1529DE0698452CB6875C837F09C684-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--BB1529DE0698452CB6875C837F09C684-->  <POSITION><![CDATA[5]]></POSITION>
+<!--BB1529DE0698452CB6875C837F09C684-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--BB1529DE0698452CB6875C837F09C684-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--BB1529DE0698452CB6875C837F09C684-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--BB1529DE0698452CB6875C837F09C684-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--BB1529DE0698452CB6875C837F09C684-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--BB1529DE0698452CB6875C837F09C684-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--BB1529DE0698452CB6875C837F09C684-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--BB1529DE0698452CB6875C837F09C684-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--BB1529DE0698452CB6875C837F09C684--></AD_COLUMN>
+
 <!--BB39498850B942A1B29086C89163F014--><AD_COLUMN>
 <!--BB39498850B942A1B29086C89163F014-->  <AD_COLUMN_ID><![CDATA[BB39498850B942A1B29086C89163F014]]></AD_COLUMN_ID>
 <!--BB39498850B942A1B29086C89163F014-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -11183,6 +11916,46 @@
 <!--EE86735F0BAC4358847A7820442B0FCA-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--EE86735F0BAC4358847A7820442B0FCA--></AD_COLUMN>
 
+<!--EF499E5ACDC24974B91305D92DB92D97--><AD_COLUMN>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <AD_COLUMN_ID><![CDATA[EF499E5ACDC24974B91305D92DB92D97]]></AD_COLUMN_ID>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <NAME><![CDATA[Active]]></NAME>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <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>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <COLUMNNAME><![CDATA[Isactive]]></COLUMNNAME>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <AD_TABLE_ID><![CDATA[C41826412A134A488D94C84EB8C6EE81]]></AD_TABLE_ID>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <AD_ELEMENT_ID><![CDATA[348]]></AD_ELEMENT_ID>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <POSITION><![CDATA[6]]></POSITION>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--EF499E5ACDC24974B91305D92DB92D97-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--EF499E5ACDC24974B91305D92DB92D97--></AD_COLUMN>
+
 <!--EF4E110BB3C34B4B94997DA7B77A5A9D--><AD_COLUMN>
 <!--EF4E110BB3C34B4B94997DA7B77A5A9D-->  <AD_COLUMN_ID><![CDATA[EF4E110BB3C34B4B94997DA7B77A5A9D]]></AD_COLUMN_ID>
 <!--EF4E110BB3C34B4B94997DA7B77A5A9D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_ELEMENT.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -201,6 +201,20 @@
 <!--32132ACAB66A4BC89710D81C143FDA6D-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--32132ACAB66A4BC89710D81C143FDA6D--></AD_ELEMENT>
 
+<!--3303E3F5D9714BFB81B967BAFD6AE5C9--><AD_ELEMENT>
+<!--3303E3F5D9714BFB81B967BAFD6AE5C9-->  <AD_ELEMENT_ID><![CDATA[3303E3F5D9714BFB81B967BAFD6AE5C9]]></AD_ELEMENT_ID>
+<!--3303E3F5D9714BFB81B967BAFD6AE5C9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3303E3F5D9714BFB81B967BAFD6AE5C9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3303E3F5D9714BFB81B967BAFD6AE5C9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3303E3F5D9714BFB81B967BAFD6AE5C9-->  <COLUMNNAME><![CDATA[Obuiapp_Data_Pool_Sel_ID]]></COLUMNNAME>
+<!--3303E3F5D9714BFB81B967BAFD6AE5C9-->  <NAME><![CDATA[Obuiapp_Data_Pool_Sel_ID]]></NAME>
+<!--3303E3F5D9714BFB81B967BAFD6AE5C9-->  <PRINTNAME><![CDATA[Obuiapp_Data_Pool_Sel_ID]]></PRINTNAME>
+<!--3303E3F5D9714BFB81B967BAFD6AE5C9-->  <DESCRIPTION><![CDATA[Data pool selection for Reports]]></DESCRIPTION>
+<!--3303E3F5D9714BFB81B967BAFD6AE5C9-->  <HELP><![CDATA[Holds the relationship between a report and the database pool where its data will be fetched.]]></HELP>
+<!--3303E3F5D9714BFB81B967BAFD6AE5C9-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--3303E3F5D9714BFB81B967BAFD6AE5C9-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--3303E3F5D9714BFB81B967BAFD6AE5C9--></AD_ELEMENT>
+
 <!--3C899452C68646A7A3E35A0CDCA8CA7A--><AD_ELEMENT>
 <!--3C899452C68646A7A3E35A0CDCA8CA7A-->  <AD_ELEMENT_ID><![CDATA[3C899452C68646A7A3E35A0CDCA8CA7A]]></AD_ELEMENT_ID>
 <!--3C899452C68646A7A3E35A0CDCA8CA7A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -665,6 +679,20 @@
 <!--98001F5A0FFD4D21BDE553CF8B2F00F5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--98001F5A0FFD4D21BDE553CF8B2F00F5--></AD_ELEMENT>
 
+<!--9CCFB3754A1B4F78BAE881FAAD33E9D6--><AD_ELEMENT>
+<!--9CCFB3754A1B4F78BAE881FAAD33E9D6-->  <AD_ELEMENT_ID><![CDATA[9CCFB3754A1B4F78BAE881FAAD33E9D6]]></AD_ELEMENT_ID>
+<!--9CCFB3754A1B4F78BAE881FAAD33E9D6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9CCFB3754A1B4F78BAE881FAAD33E9D6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9CCFB3754A1B4F78BAE881FAAD33E9D6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9CCFB3754A1B4F78BAE881FAAD33E9D6-->  <COLUMNNAME><![CDATA[Obuiapp_Pool_Report_V_ID]]></COLUMNNAME>
+<!--9CCFB3754A1B4F78BAE881FAAD33E9D6-->  <NAME><![CDATA[Report]]></NAME>
+<!--9CCFB3754A1B4F78BAE881FAAD33E9D6-->  <PRINTNAME><![CDATA[Report]]></PRINTNAME>
+<!--9CCFB3754A1B4F78BAE881FAAD33E9D6-->  <DESCRIPTION><![CDATA[References a report regardless the place it is defined]]></DESCRIPTION>
+<!--9CCFB3754A1B4F78BAE881FAAD33E9D6-->  <HELP><![CDATA[References a report regardless the place it is defined]]></HELP>
+<!--9CCFB3754A1B4F78BAE881FAAD33E9D6-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--9CCFB3754A1B4F78BAE881FAAD33E9D6-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--9CCFB3754A1B4F78BAE881FAAD33E9D6--></AD_ELEMENT>
+
 <!--9EAE872F6F394DE3AB3BE9AE2B8C7E73--><AD_ELEMENT>
 <!--9EAE872F6F394DE3AB3BE9AE2B8C7E73-->  <AD_ELEMENT_ID><![CDATA[9EAE872F6F394DE3AB3BE9AE2B8C7E73]]></AD_ELEMENT_ID>
 <!--9EAE872F6F394DE3AB3BE9AE2B8C7E73-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -769,6 +797,20 @@
 <!--B7BB240B9AA74817AFD7B8C2602B1CAD-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--B7BB240B9AA74817AFD7B8C2602B1CAD--></AD_ELEMENT>
 
+<!--B86D9D39A3234489A642BA8BCC749835--><AD_ELEMENT>
+<!--B86D9D39A3234489A642BA8BCC749835-->  <AD_ELEMENT_ID><![CDATA[B86D9D39A3234489A642BA8BCC749835]]></AD_ELEMENT_ID>
+<!--B86D9D39A3234489A642BA8BCC749835-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B86D9D39A3234489A642BA8BCC749835-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B86D9D39A3234489A642BA8BCC749835-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B86D9D39A3234489A642BA8BCC749835-->  <COLUMNNAME><![CDATA[Data_Pool]]></COLUMNNAME>
+<!--B86D9D39A3234489A642BA8BCC749835-->  <NAME><![CDATA[Data Pool]]></NAME>
+<!--B86D9D39A3234489A642BA8BCC749835-->  <PRINTNAME><![CDATA[Data Pool]]></PRINTNAME>
+<!--B86D9D39A3234489A642BA8BCC749835-->  <DESCRIPTION><![CDATA[Lists all possible database pools which OBDal can use to retrieve data.]]></DESCRIPTION>
+<!--B86D9D39A3234489A642BA8BCC749835-->  <HELP><![CDATA[Lists all possible database pools which OBDal can use to retrieve data.]]></HELP>
+<!--B86D9D39A3234489A642BA8BCC749835-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--B86D9D39A3234489A642BA8BCC749835-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--B86D9D39A3234489A642BA8BCC749835--></AD_ELEMENT>
+
 <!--BA3A1846B28F4FFC8F00886F5251A7BA--><AD_ELEMENT>
 <!--BA3A1846B28F4FFC8F00886F5251A7BA-->  <AD_ELEMENT_ID><![CDATA[BA3A1846B28F4FFC8F00886F5251A7BA]]></AD_ELEMENT_ID>
 <!--BA3A1846B28F4FFC8F00886F5251A7BA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -378,6 +378,34 @@
 <!--05A90B8FA5104697BFBCB14D3C49C41A-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--05A90B8FA5104697BFBCB14D3C49C41A--></AD_FIELD>
 
+<!--05FBACC4BE494A6FA865D4DD05219C60--><AD_FIELD>
+<!--05FBACC4BE494A6FA865D4DD05219C60-->  <AD_FIELD_ID><![CDATA[05FBACC4BE494A6FA865D4DD05219C60]]></AD_FIELD_ID>
+<!--05FBACC4BE494A6FA865D4DD05219C60-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--05FBACC4BE494A6FA865D4DD05219C60-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--05FBACC4BE494A6FA865D4DD05219C60-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--05FBACC4BE494A6FA865D4DD05219C60-->  <NAME><![CDATA[Data Pool]]></NAME>
+<!--05FBACC4BE494A6FA865D4DD05219C60-->  <DESCRIPTION><![CDATA[Lists all possible database pools which OBDal can use to retrieve data.]]></DESCRIPTION>
+<!--05FBACC4BE494A6FA865D4DD05219C60-->  <HELP><![CDATA[Lists all possible database pools which OBDal can use to retrieve data.]]></HELP>
+<!--05FBACC4BE494A6FA865D4DD05219C60-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--05FBACC4BE494A6FA865D4DD05219C60-->  <AD_TAB_ID><![CDATA[D829B2F06F444694B7080C9BA19428E6]]></AD_TAB_ID>
+<!--05FBACC4BE494A6FA865D4DD05219C60-->  <AD_COLUMN_ID><![CDATA[01028007CFC142A3A45BD2D1809C0538]]></AD_COLUMN_ID>
+<!--05FBACC4BE494A6FA865D4DD05219C60-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--05FBACC4BE494A6FA865D4DD05219C60-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--05FBACC4BE494A6FA865D4DD05219C60-->  <DISPLAYLENGTH><![CDATA[20]]></DISPLAYLENGTH>
+<!--05FBACC4BE494A6FA865D4DD05219C60-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--05FBACC4BE494A6FA865D4DD05219C60-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--05FBACC4BE494A6FA865D4DD05219C60-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--05FBACC4BE494A6FA865D4DD05219C60-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--05FBACC4BE494A6FA865D4DD05219C60-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--05FBACC4BE494A6FA865D4DD05219C60-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--05FBACC4BE494A6FA865D4DD05219C60-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--05FBACC4BE494A6FA865D4DD05219C60-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--05FBACC4BE494A6FA865D4DD05219C60-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--05FBACC4BE494A6FA865D4DD05219C60-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--05FBACC4BE494A6FA865D4DD05219C60-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--05FBACC4BE494A6FA865D4DD05219C60-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--05FBACC4BE494A6FA865D4DD05219C60--></AD_FIELD>
+
 <!--068027F31C744B148FA0A460145A4972--><AD_FIELD>
 <!--068027F31C744B148FA0A460145A4972-->  <AD_FIELD_ID><![CDATA[068027F31C744B148FA0A460145A4972]]></AD_FIELD_ID>
 <!--068027F31C744B148FA0A460145A4972-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2684,6 +2712,34 @@
 <!--3813306379C949A6A78A775E3130B2AB-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--3813306379C949A6A78A775E3130B2AB--></AD_FIELD>
 
+<!--384B5E6DBA49485E982F95C8E2ACBA81--><AD_FIELD>
+<!--384B5E6DBA49485E982F95C8E2ACBA81-->  <AD_FIELD_ID><![CDATA[384B5E6DBA49485E982F95C8E2ACBA81]]></AD_FIELD_ID>
+<!--384B5E6DBA49485E982F95C8E2ACBA81-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--384B5E6DBA49485E982F95C8E2ACBA81-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--384B5E6DBA49485E982F95C8E2ACBA81-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--384B5E6DBA49485E982F95C8E2ACBA81-->  <NAME><![CDATA[Organization]]></NAME>
+<!--384B5E6DBA49485E982F95C8E2ACBA81-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--384B5E6DBA49485E982F95C8E2ACBA81-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--384B5E6DBA49485E982F95C8E2ACBA81-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--384B5E6DBA49485E982F95C8E2ACBA81-->  <AD_TAB_ID><![CDATA[D829B2F06F444694B7080C9BA19428E6]]></AD_TAB_ID>
+<!--384B5E6DBA49485E982F95C8E2ACBA81-->  <AD_COLUMN_ID><![CDATA[3D4B3EDD3A204CFA8928D7599F0121B6]]></AD_COLUMN_ID>
+<!--384B5E6DBA49485E982F95C8E2ACBA81-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--384B5E6DBA49485E982F95C8E2ACBA81-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--384B5E6DBA49485E982F95C8E2ACBA81-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--384B5E6DBA49485E982F95C8E2ACBA81-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--384B5E6DBA49485E982F95C8E2ACBA81-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--384B5E6DBA49485E982F95C8E2ACBA81-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--384B5E6DBA49485E982F95C8E2ACBA81-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--384B5E6DBA49485E982F95C8E2ACBA81-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--384B5E6DBA49485E982F95C8E2ACBA81-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--384B5E6DBA49485E982F95C8E2ACBA81-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--384B5E6DBA49485E982F95C8E2ACBA81-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--384B5E6DBA49485E982F95C8E2ACBA81-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--384B5E6DBA49485E982F95C8E2ACBA81-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--384B5E6DBA49485E982F95C8E2ACBA81-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--384B5E6DBA49485E982F95C8E2ACBA81-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--384B5E6DBA49485E982F95C8E2ACBA81--></AD_FIELD>
+
 <!--39417456DC474B588BF807DF92E618CC--><AD_FIELD>
 <!--39417456DC474B588BF807DF92E618CC-->  <AD_FIELD_ID><![CDATA[39417456DC474B588BF807DF92E618CC]]></AD_FIELD_ID>
 <!--39417456DC474B588BF807DF92E618CC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2965,6 +3021,33 @@
 <!--410DFFDE2D7C4908B6CE26395A50CFF7-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--410DFFDE2D7C4908B6CE26395A50CFF7--></AD_FIELD>
 
+<!--41D85A44AE28483A8E4C942EFC71F246--><AD_FIELD>
+<!--41D85A44AE28483A8E4C942EFC71F246-->  <AD_FIELD_ID><![CDATA[41D85A44AE28483A8E4C942EFC71F246]]></AD_FIELD_ID>
+<!--41D85A44AE28483A8E4C942EFC71F246-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--41D85A44AE28483A8E4C942EFC71F246-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--41D85A44AE28483A8E4C942EFC71F246-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--41D85A44AE28483A8E4C942EFC71F246-->  <NAME><![CDATA[Obuiapp_Data_Pool_Sel_ID]]></NAME>
+<!--41D85A44AE28483A8E4C942EFC71F246-->  <DESCRIPTION><![CDATA[Data pool selection for Reports]]></DESCRIPTION>
+<!--41D85A44AE28483A8E4C942EFC71F246-->  <HELP><![CDATA[Holds the relationship between a report and the database pool where its data will be fetched.]]></HELP>
+<!--41D85A44AE28483A8E4C942EFC71F246-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--41D85A44AE28483A8E4C942EFC71F246-->  <AD_TAB_ID><![CDATA[D829B2F06F444694B7080C9BA19428E6]]></AD_TAB_ID>
+<!--41D85A44AE28483A8E4C942EFC71F246-->  <AD_COLUMN_ID><![CDATA[010847596B1A4654A673BBA86A27D4B3]]></AD_COLUMN_ID>
+<!--41D85A44AE28483A8E4C942EFC71F246-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--41D85A44AE28483A8E4C942EFC71F246-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--41D85A44AE28483A8E4C942EFC71F246-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--41D85A44AE28483A8E4C942EFC71F246-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--41D85A44AE28483A8E4C942EFC71F246-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--41D85A44AE28483A8E4C942EFC71F246-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--41D85A44AE28483A8E4C942EFC71F246-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--41D85A44AE28483A8E4C942EFC71F246-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--41D85A44AE28483A8E4C942EFC71F246-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--41D85A44AE28483A8E4C942EFC71F246-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--41D85A44AE28483A8E4C942EFC71F246-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--41D85A44AE28483A8E4C942EFC71F246-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--41D85A44AE28483A8E4C942EFC71F246-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--41D85A44AE28483A8E4C942EFC71F246-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--41D85A44AE28483A8E4C942EFC71F246--></AD_FIELD>
+
 <!--421D1B31477E4B038E4D5A129EEBE399--><AD_FIELD>
 <!--421D1B31477E4B038E4D5A129EEBE399-->  <AD_FIELD_ID><![CDATA[421D1B31477E4B038E4D5A129EEBE399]]></AD_FIELD_ID>
 <!--421D1B31477E4B038E4D5A129EEBE399-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3698,6 +3781,33 @@
 <!--544E592E576843ECAC02FAD57F8E5E29-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--544E592E576843ECAC02FAD57F8E5E29--></AD_FIELD>
 
+<!--556484C5531F4B7B941425561D44E67D--><AD_FIELD>
+<!--556484C5531F4B7B941425561D44E67D-->  <AD_FIELD_ID><![CDATA[556484C5531F4B7B941425561D44E67D]]></AD_FIELD_ID>
+<!--556484C5531F4B7B941425561D44E67D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--556484C5531F4B7B941425561D44E67D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--556484C5531F4B7B941425561D44E67D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--556484C5531F4B7B941425561D44E67D-->  <NAME><![CDATA[Client]]></NAME>
+<!--556484C5531F4B7B941425561D44E67D-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--556484C5531F4B7B941425561D44E67D-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--556484C5531F4B7B941425561D44E67D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--556484C5531F4B7B941425561D44E67D-->  <AD_TAB_ID><![CDATA[D829B2F06F444694B7080C9BA19428E6]]></AD_TAB_ID>
+<!--556484C5531F4B7B941425561D44E67D-->  <AD_COLUMN_ID><![CDATA[54A706040E714A098E4C095D75F2EF7A]]></AD_COLUMN_ID>
+<!--556484C5531F4B7B941425561D44E67D-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--556484C5531F4B7B941425561D44E67D-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--556484C5531F4B7B941425561D44E67D-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--556484C5531F4B7B941425561D44E67D-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--556484C5531F4B7B941425561D44E67D-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--556484C5531F4B7B941425561D44E67D-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--556484C5531F4B7B941425561D44E67D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--556484C5531F4B7B941425561D44E67D-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--556484C5531F4B7B941425561D44E67D-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--556484C5531F4B7B941425561D44E67D-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--556484C5531F4B7B941425561D44E67D-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--556484C5531F4B7B941425561D44E67D-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--556484C5531F4B7B941425561D44E67D-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--556484C5531F4B7B941425561D44E67D-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--556484C5531F4B7B941425561D44E67D--></AD_FIELD>
+
 <!--556AC61E6A614BD3AC1074E8E0AF0898--><AD_FIELD>
 <!--556AC61E6A614BD3AC1074E8E0AF0898-->  <AD_FIELD_ID><![CDATA[556AC61E6A614BD3AC1074E8E0AF0898]]></AD_FIELD_ID>
 <!--556AC61E6A614BD3AC1074E8E0AF0898-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -5600,6 +5710,36 @@
 <!--92EDD1AEF5B545648BB0F8FE550ACF67-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--92EDD1AEF5B545648BB0F8FE550ACF67--></AD_FIELD>
 
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181--><AD_FIELD>
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181-->  <AD_FIELD_ID><![CDATA[9483F6DF3CCA4CD3BDCDC27EA3D7E181]]></AD_FIELD_ID>
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181-->  <NAME><![CDATA[Active]]></NAME>
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181-->  <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>
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181-->  <AD_TAB_ID><![CDATA[D829B2F06F444694B7080C9BA19428E6]]></AD_TAB_ID>
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181-->  <AD_COLUMN_ID><![CDATA[2C64E2D24F524EF8A867EED43E9D7A31]]></AD_COLUMN_ID>
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--9483F6DF3CCA4CD3BDCDC27EA3D7E181--></AD_FIELD>
+
 <!--9496136E2E3243B49310D44322956431--><AD_FIELD>
 <!--9496136E2E3243B49310D44322956431-->  <AD_FIELD_ID><![CDATA[9496136E2E3243B49310D44322956431]]></AD_FIELD_ID>
 <!--9496136E2E3243B49310D44322956431-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -6278,6 +6418,34 @@
 <!--A955248F20C6403CB0D9553128B6A3BB-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--A955248F20C6403CB0D9553128B6A3BB--></AD_FIELD>
 
+<!--A9F88FDBF5784146AAE2CE5350C617F4--><AD_FIELD>
+<!--A9F88FDBF5784146AAE2CE5350C617F4-->  <AD_FIELD_ID><![CDATA[A9F88FDBF5784146AAE2CE5350C617F4]]></AD_FIELD_ID>
+<!--A9F88FDBF5784146AAE2CE5350C617F4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A9F88FDBF5784146AAE2CE5350C617F4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A9F88FDBF5784146AAE2CE5350C617F4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A9F88FDBF5784146AAE2CE5350C617F4-->  <NAME><![CDATA[Report]]></NAME>
+<!--A9F88FDBF5784146AAE2CE5350C617F4-->  <DESCRIPTION><![CDATA[References a report regardless the place it is defined]]></DESCRIPTION>
+<!--A9F88FDBF5784146AAE2CE5350C617F4-->  <HELP><![CDATA[References a report regardless the place it is defined]]></HELP>
+<!--A9F88FDBF5784146AAE2CE5350C617F4-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--A9F88FDBF5784146AAE2CE5350C617F4-->  <AD_TAB_ID><![CDATA[D829B2F06F444694B7080C9BA19428E6]]></AD_TAB_ID>
+<!--A9F88FDBF5784146AAE2CE5350C617F4-->  <AD_COLUMN_ID><![CDATA[5946474316334310A0CF364B89F1E1B5]]></AD_COLUMN_ID>
+<!--A9F88FDBF5784146AAE2CE5350C617F4-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--A9F88FDBF5784146AAE2CE5350C617F4-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--A9F88FDBF5784146AAE2CE5350C617F4-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--A9F88FDBF5784146AAE2CE5350C617F4-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--A9F88FDBF5784146AAE2CE5350C617F4-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--A9F88FDBF5784146AAE2CE5350C617F4-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--A9F88FDBF5784146AAE2CE5350C617F4-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--A9F88FDBF5784146AAE2CE5350C617F4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--A9F88FDBF5784146AAE2CE5350C617F4-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--A9F88FDBF5784146AAE2CE5350C617F4-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--A9F88FDBF5784146AAE2CE5350C617F4-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--A9F88FDBF5784146AAE2CE5350C617F4-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--A9F88FDBF5784146AAE2CE5350C617F4-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--A9F88FDBF5784146AAE2CE5350C617F4-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--A9F88FDBF5784146AAE2CE5350C617F4-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--A9F88FDBF5784146AAE2CE5350C617F4--></AD_FIELD>
+
 <!--ADA1D18866624FAA9CFCDB0F2D7DBDD8--><AD_FIELD>
 <!--ADA1D18866624FAA9CFCDB0F2D7DBDD8-->  <AD_FIELD_ID><![CDATA[ADA1D18866624FAA9CFCDB0F2D7DBDD8]]></AD_FIELD_ID>
 <!--ADA1D18866624FAA9CFCDB0F2D7DBDD8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MENU.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MENU.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -4,7 +4,7 @@
 <!--1005400002-->  <AD_MENU_ID><![CDATA[1005400002]]></AD_MENU_ID>
 <!--1005400002-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--1005400002-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--1005400002-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1005400002-->  <ISACTIVE><![CDATA[N]]></ISACTIVE>
 <!--1005400002-->  <NAME><![CDATA[Register]]></NAME>
 <!--1005400002-->  <DESCRIPTION><![CDATA[Register your installation of Openbravo ERP in order to receive development and commercial updates and information]]></DESCRIPTION>
 <!--1005400002-->  <ISSUMMARY><![CDATA[N]]></ISSUMMARY>
@@ -14,6 +14,20 @@
 <!--1005400002-->  <EM_OBUIAPP_VIEW_IMPL_ID><![CDATA[FF808081329B023101329B0CE2080013]]></EM_OBUIAPP_VIEW_IMPL_ID>
 <!--1005400002--></AD_MENU>
 
+<!--53A93D1C7EB84409B05847A8691FA9AB--><AD_MENU>
+<!--53A93D1C7EB84409B05847A8691FA9AB-->  <AD_MENU_ID><![CDATA[53A93D1C7EB84409B05847A8691FA9AB]]></AD_MENU_ID>
+<!--53A93D1C7EB84409B05847A8691FA9AB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--53A93D1C7EB84409B05847A8691FA9AB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--53A93D1C7EB84409B05847A8691FA9AB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--53A93D1C7EB84409B05847A8691FA9AB-->  <NAME><![CDATA[Data Pool Selection]]></NAME>
+<!--53A93D1C7EB84409B05847A8691FA9AB-->  <DESCRIPTION><![CDATA[Defines which database pool should be used for a particular report.]]></DESCRIPTION>
+<!--53A93D1C7EB84409B05847A8691FA9AB-->  <ISSUMMARY><![CDATA[N]]></ISSUMMARY>
+<!--53A93D1C7EB84409B05847A8691FA9AB-->  <ACTION><![CDATA[W]]></ACTION>
+<!--53A93D1C7EB84409B05847A8691FA9AB-->  <AD_WINDOW_ID><![CDATA[48B7215F9BF6458E813E6B280DEDB958]]></AD_WINDOW_ID>
+<!--53A93D1C7EB84409B05847A8691FA9AB-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--53A93D1C7EB84409B05847A8691FA9AB-->  <OPENLINKINBROWSER><![CDATA[N]]></OPENLINKINBROWSER>
+<!--53A93D1C7EB84409B05847A8691FA9AB--></AD_MENU>
+
 <!--6FD97ECD72B4405FA1442FD8673AE571--><AD_MENU>
 <!--6FD97ECD72B4405FA1442FD8673AE571-->  <AD_MENU_ID><![CDATA[6FD97ECD72B4405FA1442FD8673AE571]]></AD_MENU_ID>
 <!--6FD97ECD72B4405FA1442FD8673AE571-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -306,7 +306,7 @@
 <!--165D4AB1311A477C8F95184C0A9F4B2F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--165D4AB1311A477C8F95184C0A9F4B2F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--165D4AB1311A477C8F95184C0A9F4B2F-->  <VALUE><![CDATA[UINAVBA_NewPwd]]></VALUE>
-<!--165D4AB1311A477C8F95184C0A9F4B2F-->  <MSGTEXT><![CDATA[New password]]></MSGTEXT>
+<!--165D4AB1311A477C8F95184C0A9F4B2F-->  <MSGTEXT><![CDATA[New Password]]></MSGTEXT>
 <!--165D4AB1311A477C8F95184C0A9F4B2F-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--165D4AB1311A477C8F95184C0A9F4B2F-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--165D4AB1311A477C8F95184C0A9F4B2F-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
@@ -1063,6 +1063,18 @@
 <!--733C8CD6D07F44E5BDD0D9DFB521B2B8-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--733C8CD6D07F44E5BDD0D9DFB521B2B8--></AD_MESSAGE>
 
+<!--734F1A1DF43349A189CE20BF54352FF1--><AD_MESSAGE>
+<!--734F1A1DF43349A189CE20BF54352FF1-->  <AD_MESSAGE_ID><![CDATA[734F1A1DF43349A189CE20BF54352FF1]]></AD_MESSAGE_ID>
+<!--734F1A1DF43349A189CE20BF54352FF1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--734F1A1DF43349A189CE20BF54352FF1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--734F1A1DF43349A189CE20BF54352FF1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--734F1A1DF43349A189CE20BF54352FF1-->  <VALUE><![CDATA[OBUIAPP_ROPoolNotAvailable]]></VALUE>
+<!--734F1A1DF43349A189CE20BF54352FF1-->  <MSGTEXT><![CDATA[Read-Only pool is not activated yet. Default pool will be used for all requests.]]></MSGTEXT>
+<!--734F1A1DF43349A189CE20BF54352FF1-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--734F1A1DF43349A189CE20BF54352FF1-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--734F1A1DF43349A189CE20BF54352FF1-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--734F1A1DF43349A189CE20BF54352FF1--></AD_MESSAGE>
+
 <!--7410A9E707384D369419188644A31430--><AD_MESSAGE>
 <!--7410A9E707384D369419188644A31430-->  <AD_MESSAGE_ID><![CDATA[7410A9E707384D369419188644A31430]]></AD_MESSAGE_ID>
 <!--7410A9E707384D369419188644A31430-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1370,7 +1382,7 @@
 <!--9A2BB372D26D47A8B63BC87CB08B270C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--9A2BB372D26D47A8B63BC87CB08B270C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9A2BB372D26D47A8B63BC87CB08B270C-->  <VALUE><![CDATA[UINAVBA_ConfirmPwd]]></VALUE>
-<!--9A2BB372D26D47A8B63BC87CB08B270C-->  <MSGTEXT><![CDATA[Confirm password]]></MSGTEXT>
+<!--9A2BB372D26D47A8B63BC87CB08B270C-->  <MSGTEXT><![CDATA[Confirm Password]]></MSGTEXT>
 <!--9A2BB372D26D47A8B63BC87CB08B270C-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--9A2BB372D26D47A8B63BC87CB08B270C-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--9A2BB372D26D47A8B63BC87CB08B270C-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -6,7 +6,7 @@
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9BA0836A3CD74EE4AB48753A47211BCC-->  <NAME><![CDATA[User Interface Application]]></NAME>
-<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.33777]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.34267]]></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[PR18Q2]]></VERSION_LABEL>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION_LABEL><![CDATA[PR18Q3]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -7,7 +7,7 @@
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--15D7CE8D95D043189162DBABA54A1F61-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID>
-<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.34267]]></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.33777]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.34267]]></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.33777]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.34267]]></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.33777]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.34267]]></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/AD_PREFERENCE.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_PREFERENCE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -131,4 +131,17 @@
 <!--C5C3ECF98CB14B02B88D2FE46D810739-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--C5C3ECF98CB14B02B88D2FE46D810739--></AD_PREFERENCE>
 
+<!--D6244D4AAFA9457288943D99863DB328--><AD_PREFERENCE>
+<!--D6244D4AAFA9457288943D99863DB328-->  <AD_PREFERENCE_ID><![CDATA[D6244D4AAFA9457288943D99863DB328]]></AD_PREFERENCE_ID>
+<!--D6244D4AAFA9457288943D99863DB328-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D6244D4AAFA9457288943D99863DB328-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D6244D4AAFA9457288943D99863DB328-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D6244D4AAFA9457288943D99863DB328-->  <VALUE><![CDATA[RO]]></VALUE>
+<!--D6244D4AAFA9457288943D99863DB328-->  <PROPERTY><![CDATA[OBUIAPP_DefaultDBPoolForReports]]></PROPERTY>
+<!--D6244D4AAFA9457288943D99863DB328-->  <ISPROPERTYLIST><![CDATA[Y]]></ISPROPERTYLIST>
+<!--D6244D4AAFA9457288943D99863DB328-->  <VISIBLEAT_CLIENT_ID><![CDATA[0]]></VISIBLEAT_CLIENT_ID>
+<!--D6244D4AAFA9457288943D99863DB328-->  <VISIBLEAT_ORG_ID><![CDATA[0]]></VISIBLEAT_ORG_ID>
+<!--D6244D4AAFA9457288943D99863DB328-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--D6244D4AAFA9457288943D99863DB328--></AD_PREFERENCE>
+
 </data>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REFERENCE.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REFERENCE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -18,6 +18,20 @@
 <!--0BD87850221D409596E57FBFE58B1392-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--0BD87850221D409596E57FBFE58B1392--></AD_REFERENCE>
 
+<!--159EBE3F67A6431B842695888C5F1E79--><AD_REFERENCE>
+<!--159EBE3F67A6431B842695888C5F1E79-->  <AD_REFERENCE_ID><![CDATA[159EBE3F67A6431B842695888C5F1E79]]></AD_REFERENCE_ID>
+<!--159EBE3F67A6431B842695888C5F1E79-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--159EBE3F67A6431B842695888C5F1E79-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--159EBE3F67A6431B842695888C5F1E79-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--159EBE3F67A6431B842695888C5F1E79-->  <NAME><![CDATA[Database Pool Type]]></NAME>
+<!--159EBE3F67A6431B842695888C5F1E79-->  <DESCRIPTION><![CDATA[Lists all possible database pools which OBDal can use to retrieve data.]]></DESCRIPTION>
+<!--159EBE3F67A6431B842695888C5F1E79-->  <HELP><![CDATA[Lists all possible database pools which OBDal can use to retrieve data.]]></HELP>
+<!--159EBE3F67A6431B842695888C5F1E79-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--159EBE3F67A6431B842695888C5F1E79-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--159EBE3F67A6431B842695888C5F1E79-->  <PARENTREFERENCE_ID><![CDATA[17]]></PARENTREFERENCE_ID>
+<!--159EBE3F67A6431B842695888C5F1E79-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--159EBE3F67A6431B842695888C5F1E79--></AD_REFERENCE>
+
 <!--1AC7885279E44C4F976267C28270E1F9--><AD_REFERENCE>
 <!--1AC7885279E44C4F976267C28270E1F9-->  <AD_REFERENCE_ID><![CDATA[1AC7885279E44C4F976267C28270E1F9]]></AD_REFERENCE_ID>
 <!--1AC7885279E44C4F976267C28270E1F9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -42,6 +56,20 @@
 <!--892231CFE03848758D74B0209B801C14-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--892231CFE03848758D74B0209B801C14--></AD_REFERENCE>
 
+<!--9613657373F54165954A69D54803F65F--><AD_REFERENCE>
+<!--9613657373F54165954A69D54803F65F-->  <AD_REFERENCE_ID><![CDATA[9613657373F54165954A69D54803F65F]]></AD_REFERENCE_ID>
+<!--9613657373F54165954A69D54803F65F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9613657373F54165954A69D54803F65F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9613657373F54165954A69D54803F65F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9613657373F54165954A69D54803F65F-->  <NAME><![CDATA[Pool Report Selector]]></NAME>
+<!--9613657373F54165954A69D54803F65F-->  <DESCRIPTION><![CDATA[This selector groups all reports from Process Definition and Report and Process.]]></DESCRIPTION>
+<!--9613657373F54165954A69D54803F65F-->  <HELP><![CDATA[This selector groups all reports from Process Definition and Report and Process.]]></HELP>
+<!--9613657373F54165954A69D54803F65F-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--9613657373F54165954A69D54803F65F-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--9613657373F54165954A69D54803F65F-->  <PARENTREFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></PARENTREFERENCE_ID>
+<!--9613657373F54165954A69D54803F65F-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--9613657373F54165954A69D54803F65F--></AD_REFERENCE>
+
 <!--BCDF0DC3ECD14B07AC54287DCB1276D2--><AD_REFERENCE>
 <!--BCDF0DC3ECD14B07AC54287DCB1276D2-->  <AD_REFERENCE_ID><![CDATA[BCDF0DC3ECD14B07AC54287DCB1276D2]]></AD_REFERENCE_ID>
 <!--BCDF0DC3ECD14B07AC54287DCB1276D2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -223,6 +223,18 @@
 <!--7BA6CC6144AC411BA76447FBECFD801C-->  <SEQNO><![CDATA[10]]></SEQNO>
 <!--7BA6CC6144AC411BA76447FBECFD801C--></AD_REF_LIST>
 
+<!--7ED34AAD4A1746FBAF149C03BCBF53B7--><AD_REF_LIST>
+<!--7ED34AAD4A1746FBAF149C03BCBF53B7-->  <AD_REF_LIST_ID><![CDATA[7ED34AAD4A1746FBAF149C03BCBF53B7]]></AD_REF_LIST_ID>
+<!--7ED34AAD4A1746FBAF149C03BCBF53B7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7ED34AAD4A1746FBAF149C03BCBF53B7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7ED34AAD4A1746FBAF149C03BCBF53B7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7ED34AAD4A1746FBAF149C03BCBF53B7-->  <VALUE><![CDATA[OBUIAPP_DefaultDBPoolForReports]]></VALUE>
+<!--7ED34AAD4A1746FBAF149C03BCBF53B7-->  <NAME><![CDATA[Default DB pool used by reports]]></NAME>
+<!--7ED34AAD4A1746FBAF149C03BCBF53B7-->  <DESCRIPTION><![CDATA[Defines the database pool used to generate reports. Can be either "DEFAULT" for the default pool and "RO" for the read-only pool.]]></DESCRIPTION>
+<!--7ED34AAD4A1746FBAF149C03BCBF53B7-->  <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
+<!--7ED34AAD4A1746FBAF149C03BCBF53B7-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--7ED34AAD4A1746FBAF149C03BCBF53B7--></AD_REF_LIST>
+
 <!--A25195B724B84A3A95B05AD2FA286276--><AD_REF_LIST>
 <!--A25195B724B84A3A95B05AD2FA286276-->  <AD_REF_LIST_ID><![CDATA[A25195B724B84A3A95B05AD2FA286276]]></AD_REF_LIST_ID>
 <!--A25195B724B84A3A95B05AD2FA286276-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TAB.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TAB.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -399,6 +399,37 @@
 <!--D275449FFACC4539A401336214FDBF94-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
 <!--D275449FFACC4539A401336214FDBF94--></AD_TAB>
 
+<!--D829B2F06F444694B7080C9BA19428E6--><AD_TAB>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <AD_TAB_ID><![CDATA[D829B2F06F444694B7080C9BA19428E6]]></AD_TAB_ID>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <NAME><![CDATA[Header]]></NAME>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <DESCRIPTION><![CDATA[Associates a Report to a data pool.]]></DESCRIPTION>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <HELP><![CDATA[Associates a Report to a data pool.]]></HELP>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <AD_TABLE_ID><![CDATA[7C71A0B4544B4E448195E72DDDF0CA5E]]></AD_TABLE_ID>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <AD_WINDOW_ID><![CDATA[48B7215F9BF6458E813E6B280DEDB958]]></AD_WINDOW_ID>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <TABLEVEL><![CDATA[0]]></TABLEVEL>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <ISSINGLEROW><![CDATA[N]]></ISSINGLEROW>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <ISINFOTAB><![CDATA[N]]></ISINFOTAB>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <ISTRANSLATIONTAB><![CDATA[N]]></ISTRANSLATIONTAB>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <HASTREE><![CDATA[N]]></HASTREE>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <PROCESSING><![CDATA[N]]></PROCESSING>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <SHOWPARENTBUTTONS><![CDATA[Y]]></SHOWPARENTBUTTONS>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <ISREADONLYTREE><![CDATA[N]]></ISREADONLYTREE>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <ISSHOWTREENODEICONS><![CDATA[Y]]></ISSHOWTREENODEICONS>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <EM_OBUIAPP_CAN_DELETE><![CDATA[N]]></EM_OBUIAPP_CAN_DELETE>
+<!--D829B2F06F444694B7080C9BA19428E6-->  <EM_OBUIAPP_SHOW_SELECT><![CDATA[Y]]></EM_OBUIAPP_SHOW_SELECT>
+<!--D829B2F06F444694B7080C9BA19428E6--></AD_TAB>
+
 <!--F48E7C517C334F26AC5A25D71FE707D5--><AD_TAB>
 <!--F48E7C517C334F26AC5A25D71FE707D5-->  <AD_TAB_ID><![CDATA[F48E7C517C334F26AC5A25D71FE707D5]]></AD_TAB_ID>
 <!--F48E7C517C334F26AC5A25D71FE707D5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TABLE.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TABLE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -167,6 +167,31 @@
 <!--79127717F4514B459D9014C91E793CE9-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--79127717F4514B459D9014C91E793CE9--></AD_TABLE>
 
+<!--7C71A0B4544B4E448195E72DDDF0CA5E--><AD_TABLE>
+<!--7C71A0B4544B4E448195E72DDDF0CA5E-->  <AD_TABLE_ID><![CDATA[7C71A0B4544B4E448195E72DDDF0CA5E]]></AD_TABLE_ID>
+<!--7C71A0B4544B4E448195E72DDDF0CA5E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7C71A0B4544B4E448195E72DDDF0CA5E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7C71A0B4544B4E448195E72DDDF0CA5E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7C71A0B4544B4E448195E72DDDF0CA5E-->  <NAME><![CDATA[OBUIAPP_Data_Pool_Selection]]></NAME>
+<!--7C71A0B4544B4E448195E72DDDF0CA5E-->  <DESCRIPTION><![CDATA[Associates a Report to a data pool.]]></DESCRIPTION>
+<!--7C71A0B4544B4E448195E72DDDF0CA5E-->  <HELP><![CDATA[Associates a Report to a data pool.]]></HELP>
+<!--7C71A0B4544B4E448195E72DDDF0CA5E-->  <TABLENAME><![CDATA[OBUIAPP_Data_Pool_Sel]]></TABLENAME>
+<!--7C71A0B4544B4E448195E72DDDF0CA5E-->  <CLASSNAME><![CDATA[DataPoolSelection]]></CLASSNAME>
+<!--7C71A0B4544B4E448195E72DDDF0CA5E-->  <ISVIEW><![CDATA[N]]></ISVIEW>
+<!--7C71A0B4544B4E448195E72DDDF0CA5E-->  <ACCESSLEVEL><![CDATA[4]]></ACCESSLEVEL>
+<!--7C71A0B4544B4E448195E72DDDF0CA5E-->  <AD_WINDOW_ID><![CDATA[48B7215F9BF6458E813E6B280DEDB958]]></AD_WINDOW_ID>
+<!--7C71A0B4544B4E448195E72DDDF0CA5E-->  <ISSECURITYENABLED><![CDATA[N]]></ISSECURITYENABLED>
+<!--7C71A0B4544B4E448195E72DDDF0CA5E-->  <ISDELETEABLE><![CDATA[Y]]></ISDELETEABLE>
+<!--7C71A0B4544B4E448195E72DDDF0CA5E-->  <ISHIGHVOLUME><![CDATA[N]]></ISHIGHVOLUME>
+<!--7C71A0B4544B4E448195E72DDDF0CA5E-->  <IMPORTTABLE><![CDATA[N]]></IMPORTTABLE>
+<!--7C71A0B4544B4E448195E72DDDF0CA5E-->  <ISCHANGELOG><![CDATA[N]]></ISCHANGELOG>
+<!--7C71A0B4544B4E448195E72DDDF0CA5E-->  <ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT>
+<!--7C71A0B4544B4E448195E72DDDF0CA5E-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7C71A0B4544B4E448195E72DDDF0CA5E-->  <AD_PACKAGE_ID><![CDATA[BA250A68426F4D71BACAE830EF4EC696]]></AD_PACKAGE_ID>
+<!--7C71A0B4544B4E448195E72DDDF0CA5E-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--7C71A0B4544B4E448195E72DDDF0CA5E-->  <ISTREE><![CDATA[N]]></ISTREE>
+<!--7C71A0B4544B4E448195E72DDDF0CA5E--></AD_TABLE>
+
 <!--815D739C48414E01AF9F44EE3E8CCEBB--><AD_TABLE>
 <!--815D739C48414E01AF9F44EE3E8CCEBB-->  <AD_TABLE_ID><![CDATA[815D739C48414E01AF9F44EE3E8CCEBB]]></AD_TABLE_ID>
 <!--815D739C48414E01AF9F44EE3E8CCEBB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -238,6 +263,30 @@
 <!--B733B9E74A0D4FE1A3EC2A100E0ADD47-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--B733B9E74A0D4FE1A3EC2A100E0ADD47--></AD_TABLE>
 
+<!--C41826412A134A488D94C84EB8C6EE81--><AD_TABLE>
+<!--C41826412A134A488D94C84EB8C6EE81-->  <AD_TABLE_ID><![CDATA[C41826412A134A488D94C84EB8C6EE81]]></AD_TABLE_ID>
+<!--C41826412A134A488D94C84EB8C6EE81-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C41826412A134A488D94C84EB8C6EE81-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C41826412A134A488D94C84EB8C6EE81-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C41826412A134A488D94C84EB8C6EE81-->  <NAME><![CDATA[OBUIAPP_Pool_Report]]></NAME>
+<!--C41826412A134A488D94C84EB8C6EE81-->  <DESCRIPTION><![CDATA[Contains the Reports defined in various sources]]></DESCRIPTION>
+<!--C41826412A134A488D94C84EB8C6EE81-->  <HELP><![CDATA[Groups all Reports defined either as a Process (AD_Process) or as a Process Definition (OBUIAPP_Process).]]></HELP>
+<!--C41826412A134A488D94C84EB8C6EE81-->  <TABLENAME><![CDATA[OBUIAPP_Pool_Report_V]]></TABLENAME>
+<!--C41826412A134A488D94C84EB8C6EE81-->  <CLASSNAME><![CDATA[DataPoolReport]]></CLASSNAME>
+<!--C41826412A134A488D94C84EB8C6EE81-->  <ISVIEW><![CDATA[Y]]></ISVIEW>
+<!--C41826412A134A488D94C84EB8C6EE81-->  <ACCESSLEVEL><![CDATA[4]]></ACCESSLEVEL>
+<!--C41826412A134A488D94C84EB8C6EE81-->  <ISSECURITYENABLED><![CDATA[N]]></ISSECURITYENABLED>
+<!--C41826412A134A488D94C84EB8C6EE81-->  <ISDELETEABLE><![CDATA[Y]]></ISDELETEABLE>
+<!--C41826412A134A488D94C84EB8C6EE81-->  <ISHIGHVOLUME><![CDATA[N]]></ISHIGHVOLUME>
+<!--C41826412A134A488D94C84EB8C6EE81-->  <IMPORTTABLE><![CDATA[N]]></IMPORTTABLE>
+<!--C41826412A134A488D94C84EB8C6EE81-->  <ISCHANGELOG><![CDATA[N]]></ISCHANGELOG>
+<!--C41826412A134A488D94C84EB8C6EE81-->  <ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT>
+<!--C41826412A134A488D94C84EB8C6EE81-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--C41826412A134A488D94C84EB8C6EE81-->  <AD_PACKAGE_ID><![CDATA[BA250A68426F4D71BACAE830EF4EC696]]></AD_PACKAGE_ID>
+<!--C41826412A134A488D94C84EB8C6EE81-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--C41826412A134A488D94C84EB8C6EE81-->  <ISTREE><![CDATA[N]]></ISTREE>
+<!--C41826412A134A488D94C84EB8C6EE81--></AD_TABLE>
+
 <!--C7CAB786F3EF4DF0B5E7B9AC6EC7DED8--><AD_TABLE>
 <!--C7CAB786F3EF4DF0B5E7B9AC6EC7DED8-->  <AD_TABLE_ID><![CDATA[C7CAB786F3EF4DF0B5E7B9AC6EC7DED8]]></AD_TABLE_ID>
 <!--C7CAB786F3EF4DF0B5E7B9AC6EC7DED8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TREENODE.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TREENODE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -8,7 +8,7 @@
 <!--02198A87B7CB4FD4B61697255AC68F4C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--02198A87B7CB4FD4B61697255AC68F4C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--02198A87B7CB4FD4B61697255AC68F4C-->  <PARENT_ID><![CDATA[161]]></PARENT_ID>
-<!--02198A87B7CB4FD4B61697255AC68F4C-->  <SEQNO><![CDATA[250]]></SEQNO>
+<!--02198A87B7CB4FD4B61697255AC68F4C-->  <SEQNO><![CDATA[260]]></SEQNO>
 <!--02198A87B7CB4FD4B61697255AC68F4C--></AD_TREENODE>
 
 <!--258D19F188E94196936EF06CF608664C--><AD_TREENODE>
@@ -30,7 +30,7 @@
 <!--52118BF1A3E74D84E040007F01005FEC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--52118BF1A3E74D84E040007F01005FEC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--52118BF1A3E74D84E040007F01005FEC-->  <PARENT_ID><![CDATA[161]]></PARENT_ID>
-<!--52118BF1A3E74D84E040007F01005FEC-->  <SEQNO><![CDATA[300]]></SEQNO>
+<!--52118BF1A3E74D84E040007F01005FEC-->  <SEQNO><![CDATA[310]]></SEQNO>
 <!--52118BF1A3E74D84E040007F01005FEC--></AD_TREENODE>
 
 <!--76DC645312694D7A8E686BF48C3B490C--><AD_TREENODE>
@@ -41,7 +41,7 @@
 <!--76DC645312694D7A8E686BF48C3B490C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--76DC645312694D7A8E686BF48C3B490C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--76DC645312694D7A8E686BF48C3B490C-->  <PARENT_ID><![CDATA[161]]></PARENT_ID>
-<!--76DC645312694D7A8E686BF48C3B490C-->  <SEQNO><![CDATA[280]]></SEQNO>
+<!--76DC645312694D7A8E686BF48C3B490C-->  <SEQNO><![CDATA[290]]></SEQNO>
 <!--76DC645312694D7A8E686BF48C3B490C--></AD_TREENODE>
 
 <!--8AB1608C49C946D99AFB540DD2EE3543--><AD_TREENODE>
@@ -63,9 +63,20 @@
 <!--9E88163FFD3D4B41E040007F01005CF5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--9E88163FFD3D4B41E040007F01005CF5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9E88163FFD3D4B41E040007F01005CF5-->  <PARENT_ID><![CDATA[161]]></PARENT_ID>
-<!--9E88163FFD3D4B41E040007F01005CF5-->  <SEQNO><![CDATA[240]]></SEQNO>
+<!--9E88163FFD3D4B41E040007F01005CF5-->  <SEQNO><![CDATA[250]]></SEQNO>
 <!--9E88163FFD3D4B41E040007F01005CF5--></AD_TREENODE>
 
+<!--B83877C5FBFF4DF495E4A2F4DE15E2D1--><AD_TREENODE>
+<!--B83877C5FBFF4DF495E4A2F4DE15E2D1-->  <AD_TREENODE_ID><![CDATA[B83877C5FBFF4DF495E4A2F4DE15E2D1]]></AD_TREENODE_ID>
+<!--B83877C5FBFF4DF495E4A2F4DE15E2D1-->  <AD_TREE_ID><![CDATA[10]]></AD_TREE_ID>
+<!--B83877C5FBFF4DF495E4A2F4DE15E2D1-->  <NODE_ID><![CDATA[53A93D1C7EB84409B05847A8691FA9AB]]></NODE_ID>
+<!--B83877C5FBFF4DF495E4A2F4DE15E2D1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B83877C5FBFF4DF495E4A2F4DE15E2D1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B83877C5FBFF4DF495E4A2F4DE15E2D1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B83877C5FBFF4DF495E4A2F4DE15E2D1-->  <PARENT_ID><![CDATA[161]]></PARENT_ID>
+<!--B83877C5FBFF4DF495E4A2F4DE15E2D1-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--B83877C5FBFF4DF495E4A2F4DE15E2D1--></AD_TREENODE>
+
 <!--CDB4E2EADAAA4C63946C2EC2D8031CAF--><AD_TREENODE>
 <!--CDB4E2EADAAA4C63946C2EC2D8031CAF-->  <AD_TREENODE_ID><![CDATA[CDB4E2EADAAA4C63946C2EC2D8031CAF]]></AD_TREENODE_ID>
 <!--CDB4E2EADAAA4C63946C2EC2D8031CAF-->  <AD_TREE_ID><![CDATA[10]]></AD_TREE_ID>
@@ -74,7 +85,7 @@
 <!--CDB4E2EADAAA4C63946C2EC2D8031CAF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--CDB4E2EADAAA4C63946C2EC2D8031CAF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--CDB4E2EADAAA4C63946C2EC2D8031CAF-->  <PARENT_ID><![CDATA[161]]></PARENT_ID>
-<!--CDB4E2EADAAA4C63946C2EC2D8031CAF-->  <SEQNO><![CDATA[260]]></SEQNO>
+<!--CDB4E2EADAAA4C63946C2EC2D8031CAF-->  <SEQNO><![CDATA[270]]></SEQNO>
 <!--CDB4E2EADAAA4C63946C2EC2D8031CAF--></AD_TREENODE>
 
 <!--DF2A058DCBE34B41AEC5D243E264A993--><AD_TREENODE>
@@ -85,7 +96,7 @@
 <!--DF2A058DCBE34B41AEC5D243E264A993-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--DF2A058DCBE34B41AEC5D243E264A993-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--DF2A058DCBE34B41AEC5D243E264A993-->  <PARENT_ID><![CDATA[153]]></PARENT_ID>
-<!--DF2A058DCBE34B41AEC5D243E264A993-->  <SEQNO><![CDATA[77]]></SEQNO>
+<!--DF2A058DCBE34B41AEC5D243E264A993-->  <SEQNO><![CDATA[87]]></SEQNO>
 <!--DF2A058DCBE34B41AEC5D243E264A993--></AD_TREENODE>
 
 </data>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_WINDOW.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_WINDOW.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -1,5 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <data>
+<!--48B7215F9BF6458E813E6B280DEDB958--><AD_WINDOW>
+<!--48B7215F9BF6458E813E6B280DEDB958-->  <AD_WINDOW_ID><![CDATA[48B7215F9BF6458E813E6B280DEDB958]]></AD_WINDOW_ID>
+<!--48B7215F9BF6458E813E6B280DEDB958-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--48B7215F9BF6458E813E6B280DEDB958-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--48B7215F9BF6458E813E6B280DEDB958-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--48B7215F9BF6458E813E6B280DEDB958-->  <NAME><![CDATA[Data Pool Selection]]></NAME>
+<!--48B7215F9BF6458E813E6B280DEDB958-->  <DESCRIPTION><![CDATA[Defines which database pool should be used for a particular report.]]></DESCRIPTION>
+<!--48B7215F9BF6458E813E6B280DEDB958-->  <HELP><![CDATA[Defines which database pool should be used for a particular report. Reports can be defined either in the Report and Process or in the Process Definition Window. If no pool is defined for a report in this window, it should use the one defined in Preferences.]]></HELP>
+<!--48B7215F9BF6458E813E6B280DEDB958-->  <WINDOWTYPE><![CDATA[M]]></WINDOWTYPE>
+<!--48B7215F9BF6458E813E6B280DEDB958-->  <ISSOTRX><![CDATA[Y]]></ISSOTRX>
+<!--48B7215F9BF6458E813E6B280DEDB958-->  <PROCESSING><![CDATA[N]]></PROCESSING>
+<!--48B7215F9BF6458E813E6B280DEDB958-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
+<!--48B7215F9BF6458E813E6B280DEDB958-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--48B7215F9BF6458E813E6B280DEDB958-->  <ISTHREADSAFE><![CDATA[N]]></ISTHREADSAFE>
+<!--48B7215F9BF6458E813E6B280DEDB958-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
+<!--48B7215F9BF6458E813E6B280DEDB958--></AD_WINDOW>
+
 <!--54AE252A40C34DA285FC48DA94EB3847--><AD_WINDOW>
 <!--54AE252A40C34DA285FC48DA94EB3847-->  <AD_WINDOW_ID><![CDATA[54AE252A40C34DA285FC48DA94EB3847]]></AD_WINDOW_ID>
 <!--54AE252A40C34DA285FC48DA94EB3847-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--3B41D413D7FE4AF384574ED7594FFB11--><OBUISEL_SELECTOR>
+<!--3B41D413D7FE4AF384574ED7594FFB11-->  <OBUISEL_SELECTOR_ID><![CDATA[3B41D413D7FE4AF384574ED7594FFB11]]></OBUISEL_SELECTOR_ID>
+<!--3B41D413D7FE4AF384574ED7594FFB11-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3B41D413D7FE4AF384574ED7594FFB11-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3B41D413D7FE4AF384574ED7594FFB11-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--3B41D413D7FE4AF384574ED7594FFB11-->  <NAME><![CDATA[Reports]]></NAME>
+<!--3B41D413D7FE4AF384574ED7594FFB11-->  <AD_REFERENCE_ID><![CDATA[9613657373F54165954A69D54803F65F]]></AD_REFERENCE_ID>
+<!--3B41D413D7FE4AF384574ED7594FFB11-->  <AD_TABLE_ID><![CDATA[C41826412A134A488D94C84EB8C6EE81]]></AD_TABLE_ID>
+<!--3B41D413D7FE4AF384574ED7594FFB11-->  <AD_COLUMN_ID><![CDATA[4442CF9875AF450491ECB75E68AF5205]]></AD_COLUMN_ID>
+<!--3B41D413D7FE4AF384574ED7594FFB11-->  <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
+<!--3B41D413D7FE4AF384574ED7594FFB11-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3B41D413D7FE4AF384574ED7594FFB11-->  <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE>
+<!--3B41D413D7FE4AF384574ED7594FFB11-->  <POPUPTEXTMATCHSTYLE><![CDATA[startsWith]]></POPUPTEXTMATCHSTYLE>
+<!--3B41D413D7FE4AF384574ED7594FFB11-->  <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
+<!--3B41D413D7FE4AF384574ED7594FFB11--></OBUISEL_SELECTOR>
+
+</data>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -0,0 +1,47 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<data>
+<!--AF307E77F9774BFBB9A18223DD51596B--><OBUISEL_SELECTOR_FIELD>
+<!--AF307E77F9774BFBB9A18223DD51596B-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[AF307E77F9774BFBB9A18223DD51596B]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--AF307E77F9774BFBB9A18223DD51596B-->  <OBUISEL_SELECTOR_ID><![CDATA[3B41D413D7FE4AF384574ED7594FFB11]]></OBUISEL_SELECTOR_ID>
+<!--AF307E77F9774BFBB9A18223DD51596B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AF307E77F9774BFBB9A18223DD51596B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AF307E77F9774BFBB9A18223DD51596B-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--AF307E77F9774BFBB9A18223DD51596B-->  <AD_COLUMN_ID><![CDATA[09A37827B9BC4CDC93DB8C99A055C60C]]></AD_COLUMN_ID>
+<!--AF307E77F9774BFBB9A18223DD51596B-->  <NAME><![CDATA[Name]]></NAME>
+<!--AF307E77F9774BFBB9A18223DD51596B-->  <DESCRIPTION><![CDATA[A non-unique identifier for a record/document often used as a search tool.]]></DESCRIPTION>
+<!--AF307E77F9774BFBB9A18223DD51596B-->  <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>
+<!--AF307E77F9774BFBB9A18223DD51596B-->  <PROPERTY><![CDATA[name]]></PROPERTY>
+<!--AF307E77F9774BFBB9A18223DD51596B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--AF307E77F9774BFBB9A18223DD51596B-->  <SORT><![CDATA[Y]]></SORT>
+<!--AF307E77F9774BFBB9A18223DD51596B-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--AF307E77F9774BFBB9A18223DD51596B-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--AF307E77F9774BFBB9A18223DD51596B-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--AF307E77F9774BFBB9A18223DD51596B-->  <SORTNO><![CDATA[0]]></SORTNO>
+<!--AF307E77F9774BFBB9A18223DD51596B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AF307E77F9774BFBB9A18223DD51596B-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--AF307E77F9774BFBB9A18223DD51596B-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--AF307E77F9774BFBB9A18223DD51596B--></OBUISEL_SELECTOR_FIELD>
+
+<!--B5A8A4933C4F4BF599FE539BB7B68BC5--><OBUISEL_SELECTOR_FIELD>
+<!--B5A8A4933C4F4BF599FE539BB7B68BC5-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[B5A8A4933C4F4BF599FE539BB7B68BC5]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--B5A8A4933C4F4BF599FE539BB7B68BC5-->  <OBUISEL_SELECTOR_ID><![CDATA[3B41D413D7FE4AF384574ED7594FFB11]]></OBUISEL_SELECTOR_ID>
+<!--B5A8A4933C4F4BF599FE539BB7B68BC5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B5A8A4933C4F4BF599FE539BB7B68BC5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B5A8A4933C4F4BF599FE539BB7B68BC5-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--B5A8A4933C4F4BF599FE539BB7B68BC5-->  <AD_COLUMN_ID><![CDATA[BB1529DE0698452CB6875C837F09C684]]></AD_COLUMN_ID>
+<!--B5A8A4933C4F4BF599FE539BB7B68BC5-->  <NAME><![CDATA[Window]]></NAME>
+<!--B5A8A4933C4F4BF599FE539BB7B68BC5-->  <DESCRIPTION><![CDATA[A work area which can be used to create, view, edit, and process a record.]]></DESCRIPTION>
+<!--B5A8A4933C4F4BF599FE539BB7B68BC5-->  <HELP><![CDATA[The Window field identifies a unique Window in the system.]]></HELP>
+<!--B5A8A4933C4F4BF599FE539BB7B68BC5-->  <PROPERTY><![CDATA[window]]></PROPERTY>
+<!--B5A8A4933C4F4BF599FE539BB7B68BC5-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--B5A8A4933C4F4BF599FE539BB7B68BC5-->  <SORT><![CDATA[Y]]></SORT>
+<!--B5A8A4933C4F4BF599FE539BB7B68BC5-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--B5A8A4933C4F4BF599FE539BB7B68BC5-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--B5A8A4933C4F4BF599FE539BB7B68BC5-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--B5A8A4933C4F4BF599FE539BB7B68BC5-->  <SORTNO><![CDATA[0]]></SORTNO>
+<!--B5A8A4933C4F4BF599FE539BB7B68BC5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B5A8A4933C4F4BF599FE539BB7B68BC5-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--B5A8A4933C4F4BF599FE539BB7B68BC5-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--B5A8A4933C4F4BF599FE539BB7B68BC5--></OBUISEL_SELECTOR_FIELD>
+
+</data>
--- a/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -6,7 +6,7 @@
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D393BE6F22BB44B7B728259B34FC795A-->  <NAME><![CDATA[HTML Widget]]></NAME>
-<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.33777]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.34267]]></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[PR18Q2]]></VERSION_LABEL>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION_LABEL><![CDATA[PR18Q3]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -7,7 +7,7 @@
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_MODULE_ID><![CDATA[D393BE6F22BB44B7B728259B34FC795A]]></AD_MODULE_ID>
 <!--DCE798FBC5B648F7A3C81A6941720A57-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.34267]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -6,7 +6,7 @@
 <!--4B828F4D03264080AA1D2057B13F613C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4B828F4D03264080AA1D2057B13F613C-->  <NAME><![CDATA[User Interface Client Kernel]]></NAME>
-<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.33777]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.34267]]></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[PR18Q2]]></VERSION_LABEL>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION_LABEL><![CDATA[PR18Q3]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -7,7 +7,7 @@
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
 <!--26B041893E844A53AFA58BC326C4F0D7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.34267]]></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.33777]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.34267]]></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.33777]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.34267]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -6,7 +6,7 @@
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2758CD25B2704AF6BBAD10365FC82C06-->  <NAME><![CDATA[Workspace & Widgets]]></NAME>
-<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.33777]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.34267]]></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[PR18Q2]]></VERSION_LABEL>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION_LABEL><![CDATA[PR18Q3]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -7,7 +7,7 @@
 <!--15F51F03882F444CAB6593B4566DC929-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_MODULE_ID>
 <!--15F51F03882F444CAB6593B4566DC929-->  <AD_DEPENDENT_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_DEPENDENT_MODULE_ID>
-<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.34267]]></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.33777]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.34267]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -6,7 +6,7 @@
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <NAME><![CDATA[Query/List Widget]]></NAME>
-<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.33777]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.34267]]></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[PR18Q2]]></VERSION_LABEL>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION_LABEL><![CDATA[PR18Q3]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -7,7 +7,7 @@
 <!--26558497C31140BFAB067BA4BC47D799-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_MODULE_ID><![CDATA[0A060B2AF1974E8EAA8DB61388E9AECC]]></AD_MODULE_ID>
 <!--26558497C31140BFAB067BA4BC47D799-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.34267]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -6,7 +6,7 @@
 <!--FF8080812D842086012D844F3CC0003E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080812D842086012D844F3CC0003E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D844F3CC0003E-->  <NAME><![CDATA[Widgets Collection]]></NAME>
-<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.33777]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.34267]]></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[PR18Q2]]></VERSION_LABEL>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION_LABEL><![CDATA[PR18Q3]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -7,7 +7,7 @@
 <!--FF8080812D842086012D845002070046-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080812D842086012D845002070046-->  <AD_MODULE_ID><![CDATA[FF8080812D842086012D844F3CC0003E]]></AD_MODULE_ID>
 <!--FF8080812D842086012D845002070046-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.34267]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -6,7 +6,7 @@
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2A5EE903D7974AC298C0504FBC4501A7-->  <NAME><![CDATA[Payment Report]]></NAME>
-<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.33777]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.34267]]></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[PR18Q2]]></VERSION_LABEL>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION_LABEL><![CDATA[PR18Q3]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -7,7 +7,7 @@
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
 <!--A3B449C4D5FE4D688CC58236FE33B802-->  <AD_DEPENDENT_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_DEPENDENT_MODULE_ID>
-<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.34267]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -6,7 +6,7 @@
 <!--3A3A943684D64DEF9EC39F588A656848-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3A3A943684D64DEF9EC39F588A656848-->  <NAME><![CDATA[Orders Awaiting Delivery]]></NAME>
-<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.33777]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.34267]]></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[PR18Q2]]></VERSION_LABEL>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION_LABEL><![CDATA[PR18Q3]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -7,7 +7,7 @@
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_MODULE_ID><![CDATA[3A3A943684D64DEF9EC39F588A656848]]></AD_MODULE_ID>
 <!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.34267]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -6,7 +6,7 @@
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <NAME><![CDATA[JSON Datasource]]></NAME>
-<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.33777]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.34267]]></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[PR18Q2]]></VERSION_LABEL>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION_LABEL><![CDATA[PR18Q3]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -7,7 +7,7 @@
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
 <!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <AD_DEPENDENT_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_DEPENDENT_MODULE_ID>
-<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.33777]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.34267]]></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.33777]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.34267]]></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.33777]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.34267]]></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.33777]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.34267]]></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.33777]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.34267]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -6,7 +6,7 @@
 <!--FF8080813129ADA401312CA1222A0005-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813129ADA401312CA1222A0005-->  <NAME><![CDATA[Integration with Google APIs]]></NAME>
-<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.33777]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.34267]]></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[PR18Q2]]></VERSION_LABEL>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION_LABEL><![CDATA[PR18Q3]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -7,7 +7,7 @@
 <!--FF8080813141B198013141BA0F7D0012-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141BA0F7D0012-->  <AD_MODULE_ID><![CDATA[FF8080813129ADA401312CA1222A0005]]></AD_MODULE_ID>
 <!--FF8080813141B198013141BA0F7D0012-->  <AD_DEPENDENT_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.33777]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.34267]]></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.33777]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.34267]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -6,7 +6,7 @@
 <!--FF8080813141B198013141B86DD70003-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FF8080813141B198013141B86DD70003-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141B86DD70003-->  <NAME><![CDATA[OpenID Service Integration]]></NAME>
-<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.33777]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.34267]]></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[PR18Q2]]></VERSION_LABEL>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION_LABEL><![CDATA[PR18Q3]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -7,7 +7,7 @@
 <!--FF8080813141B198013141B8B21B0006-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FF8080813141B198013141B8B21B0006-->  <AD_MODULE_ID><![CDATA[FF8080813141B198013141B86DD70003]]></AD_MODULE_ID>
 <!--FF8080813141B198013141B8B21B0006-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.34267]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -6,7 +6,7 @@
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <NAME><![CDATA[JSON REST Webservice]]></NAME>
-<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.33777]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.34267]]></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[PR18Q2]]></VERSION_LABEL>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION_LABEL><![CDATA[PR18Q3]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -7,7 +7,7 @@
 <!--9E3E7B42DB16405FB794496D309D7044-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <AD_MODULE_ID><![CDATA[F8D1B3ECB3474E8DA5C216473C840DF1]]></AD_MODULE_ID>
 <!--9E3E7B42DB16405FB794496D309D7044-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.34267]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -6,7 +6,7 @@
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5EB4F15C80684ACA904756BDC12ADBE5-->  <NAME><![CDATA[User Interface Selector]]></NAME>
-<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.33777]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.34267]]></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[PR18Q2]]></VERSION_LABEL>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION_LABEL><![CDATA[PR18Q3]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -7,7 +7,7 @@
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <AD_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_MODULE_ID>
 <!--38825CAED43941D38CA0C78DB04FCFA0-->  <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID>
-<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.33777]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.34267]]></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.33777]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.34267]]></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.33777]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.34267]]></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.33777]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.34267]]></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.33777]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.34267]]></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.33777]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.34267]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -6,7 +6,7 @@
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--96998CBC42744B3DBEE28AC8095C9335-->  <NAME><![CDATA[2.50 to 3.00 Compatibility Skin]]></NAME>
-<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.33777]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.34267]]></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[PR18Q2]]></VERSION_LABEL>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION_LABEL><![CDATA[PR18Q3]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -7,7 +7,7 @@
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <AD_MODULE_ID><![CDATA[96998CBC42744B3DBEE28AC8095C9335]]></AD_MODULE_ID>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.34267]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -6,7 +6,7 @@
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <NAME><![CDATA[Smartclient]]></NAME>
-<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.33777]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.34267]]></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[PR18Q2]]></VERSION_LABEL>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION_LABEL><![CDATA[PR18Q3]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -7,7 +7,7 @@
 <!--086331E18477496B8AC74D2CFEBD1307-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--086331E18477496B8AC74D2CFEBD1307-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.34267]]></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.33777]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.34267]]></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.33777]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.34267]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -6,7 +6,7 @@
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8A34B301DC524EA3A07513DF9F42CC90-->  <NAME><![CDATA[Log Clean Up Utility]]></NAME>
-<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION><![CDATA[1.0.33777]]></VERSION>
+<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION><![CDATA[1.0.34267]]></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[PR18Q2]]></VERSION_LABEL>
+<!--8A34B301DC524EA3A07513DF9F42CC90-->  <VERSION_LABEL><![CDATA[PR18Q3]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.utility.cleanup.log/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -7,7 +7,7 @@
 <!--86EBD30DEB8045508185B457896C9F6D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <AD_MODULE_ID><![CDATA[8A34B301DC524EA3A07513DF9F42CC90]]></AD_MODULE_ID>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <AD_DEPENDENT_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_DEPENDENT_MODULE_ID>
-<!--86EBD30DEB8045508185B457896C9F6D-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
+<!--86EBD30DEB8045508185B457896C9F6D-->  <STARTVERSION><![CDATA[2.1.34267]]></STARTVERSION>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <DEPENDANT_MODULE_NAME><![CDATA[Openbravo 3.0 Framework]]></DEPENDANT_MODULE_NAME>
 <!--86EBD30DEB8045508185B457896C9F6D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -6,7 +6,7 @@
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <NAME><![CDATA[Standard Roles]]></NAME>
-<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.33777]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.34267]]></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[PR18Q2]]></VERSION_LABEL>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION_LABEL><![CDATA[PR18Q3]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -7,7 +7,7 @@
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <AD_MODULE_ID><![CDATA[883B5872CA0548F9AF2BBBE7D2DDFA61]]></AD_MODULE_ID>
 <!--148A000EE9A04A3CA653B1296A00B8E6-->  <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID>
-<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.33777]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.34267]]></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.33777]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.34267]]></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.33777]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.34267]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -6,7 +6,7 @@
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7E48CDD73B7E493A8BED4F7253E7C989-->  <NAME><![CDATA[Openbravo 3.0 Framework]]></NAME>
-<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.33777]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.34267]]></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[PR18Q2]]></VERSION_LABEL>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION_LABEL><![CDATA[PR18Q3]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -7,7 +7,7 @@
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <AD_MODULE_ID><![CDATA[7E48CDD73B7E493A8BED4F7253E7C989]]></AD_MODULE_ID>
 <!--01E1BCCEC9114DE0960538DF34E30E6F-->  <AD_DEPENDENT_MODULE_ID><![CDATA[2758CD25B2704AF6BBAD10365FC82C06]]></AD_DEPENDENT_MODULE_ID>
-<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.33777]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.34267]]></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.33777]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.34267]]></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.33777]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.34267]]></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.33777]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.34267]]></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.33777]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.34267]]></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.33777]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.34267]]></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.33777]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.34267]]></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.33777]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.34267]]></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.33777]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.34267]]></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.33777]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.34267]]></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.33777]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.34267]]></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.33777]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.34267]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -6,7 +6,7 @@
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0138E7A89B5E4DC3932462252801FFBC-->  <NAME><![CDATA[Openbravo 3.0]]></NAME>
-<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.33777]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.34267]]></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[PR18Q2]]></VERSION_LABEL>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[PR18Q3]]></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 Jul 24 10:08:45 2018 +0200
+++ b/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -7,7 +7,7 @@
 <!--48D556894CE54CF998DC97882E904CBD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--48D556894CE54CF998DC97882E904CBD-->  <AD_MODULE_ID><![CDATA[0138E7A89B5E4DC3932462252801FFBC]]></AD_MODULE_ID>
 <!--48D556894CE54CF998DC97882E904CBD-->  <AD_DEPENDENT_MODULE_ID><![CDATA[8A098711BB324335A19833286BDB093D]]></AD_DEPENDENT_MODULE_ID>
-<!--48D556894CE54CF998DC97882E904CBD-->  <STARTVERSION><![CDATA[1.0.33777]]></STARTVERSION>
+<!--48D556894CE54CF998DC97882E904CBD-->  <STARTVERSION><![CDATA[1.0.34267]]></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.33777]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.34267]]></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.33777]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.34267]]></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.33777]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.34267]]></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.33777]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.34267]]></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.33777]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.34267]]></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.33777]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.34267]]></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.33777]]></STARTVERSION>
+<!--FEF6E40F244A4061B7C62CB755663712-->  <STARTVERSION><![CDATA[1.0.34267]]></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.33777]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.34267]]></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.33777]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.34267]]></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.33777]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.34267]]></STARTVERSION>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDANT_MODULE_NAME><![CDATA[Widgets Collection]]></DEPENDANT_MODULE_NAME>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/src-db/database/model/excludeFilter.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/excludeFilter.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -5,6 +5,7 @@
     <excludedTable name="C_TEMP_SELECTION"/>
     <excludedTable name="C_TEMP_SELECTION2"/>
     <excludedTable name="AD_CONTEXT_INFO"/>
+    <excludedTable name="AD_SESSION_STATUS"/>
     <excludedView name="DUAL"/>
     <excludedView name="USER_CONS_COLUMNS"/>
     <excludedView name="USER_TABLES"/>
@@ -96,4 +97,8 @@
 
     <excludedFunction name="OBEQUALS"/>
     <excludedFunction name="UUID\_%"/> <!-- PostgreSQL uuid functions -->
+
+    <excludedFunction name="AD_ISTRIGGERENABLED"/>
+    <excludedFunction name="AD_ENABLE_TRIGGERS"/>
+    <excludedFunction name="AD_DISABLE_TRIGGERS"/>
   </vector>
--- a/model/src-db/database/model/functions/AD_GET_ORG_LE_BU.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/AD_GET_ORG_LE_BU.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -19,72 +19,58 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2012-2014 Openbravo SLU
+* All portions are Copyright (C) 2012-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
+
+/*
+* if p_type = 'LE', returns the Legal Entity
+*    p_type = 'BU', returns the Business Unit
+*    p_type = NULL, returns either the Business Unit or Legal Entity found.
+*
+* This function works only for organizations set as ready. For the flows where 
+* the organization is not set as ready yet, please use AD_GET_ORG_LE_BU_TREENODE instead.
+*
+* Only when working with ready organizations, and in processes where performance is important, 
+* it is highly recommended to directly query AD_Org.AD_LEGALENTITY_ORG_ID or 
+* AD_Org.AD_BUSINESSUNIT_ORG_ID columns. 
+*/
+
+
   v_org_header_id ad_org.ad_org_id%TYPE;
-  v_isbusinessunit ad_orgtype.isbusinessunit%TYPE := 'N';
-  v_islegalentity ad_orgtype.islegalentity%TYPE := 'N';
 
 BEGIN
-  v_org_header_id := p_org_id;
-  --Check if given org is legal entity or business unit
-  SELECT ot.islegalentity, ot.isbusinessunit
-    INTO v_islegalentity, v_isbusinessunit
-  FROM ad_org o JOIN ad_orgtype ot ON o.ad_orgtype_id = ot.ad_orgtype_id
-  WHERE o.ad_org_id = p_org_id;
-  -- Gets recursively the organization parent until finding a Business Unit or a Legal Entity
+  -- Gets a Business Unit or a Legal Entity from organization itself
   IF (p_type IS NULL) THEN
-    WHILE (v_isbusinessunit='N' AND v_islegalentity='N') LOOP
-      SELECT hh.parent_id, ad_orgtype.isbusinessunit, ad_orgtype.islegalentity
-        INTO v_org_header_id, v_isbusinessunit, v_islegalentity
-      FROM ad_org
-          JOIN ad_orgtype ON ad_org.ad_orgtype_id=ad_orgtype.ad_orgtype_id
-          JOIN ad_treenode pp ON pp.node_id=ad_org.ad_org_id
-          JOIN ad_treenode hh ON pp.node_id = hh.parent_id
-                                 AND hh.ad_tree_id = pp.ad_tree_id
-      WHERE hh.node_id=v_org_header_id
-        AND ad_org.isready='Y'
-        AND EXISTS (SELECT 1 FROM ad_tree
-                    WHERE ad_tree.ad_table_id='155'
-                      AND hh.ad_tree_id=ad_tree.ad_tree_id
-                      AND hh.ad_client_id=ad_tree.ad_client_id);
-    END LOOP;
-  -- Gets recursively the organization parent until finding a Legal Entity
+    BEGIN
+      SELECT COALESCE(AD_BUSINESSUNIT_ORG_ID, AD_LEGALENTITY_ORG_ID)
+      INTO v_org_header_id
+      FROM AD_Org
+      WHERE AD_Org_ID = p_org_id;
+    EXCEPTION WHEN NO_DATA_FOUND THEN
+      v_org_header_id := NULL;
+    END;
+  -- Gets legal entity from the organization itself
   ELSIF (p_type='LE') THEN
-    WHILE (v_islegalentity='N') LOOP
-      SELECT hh.parent_id, ad_orgtype.islegalentity
-        INTO v_org_header_id, v_islegalentity
-      FROM ad_org
-          JOIN ad_orgtype ON ad_org.ad_orgtype_id=ad_orgtype.ad_orgtype_id
-          JOIN ad_treenode pp ON pp.node_id=ad_org.ad_org_id
-          JOIN ad_treenode hh ON pp.node_id = hh.parent_id
-                                 AND hh.ad_tree_id = pp.ad_tree_id
-      WHERE hh.node_id=v_org_header_id
-        AND ad_org.isready='Y'
-        AND EXISTS (SELECT 1 FROM ad_tree
-                    WHERE ad_tree.ad_table_id='155'
-                      AND hh.ad_tree_id=ad_tree.ad_tree_id
-                      AND hh.ad_client_id=ad_tree.ad_client_id);
-    END LOOP;
-    -- Gets recursively the organization parent until finding a Business Unit
+    BEGIN
+      SELECT AD_LEGALENTITY_ORG_ID
+      INTO v_org_header_id
+      FROM AD_Org
+      WHERE AD_Org_ID = p_org_id;
+    EXCEPTION WHEN NO_DATA_FOUND THEN
+      v_org_header_id := NULL;
+    END;
+    -- Gets a Business Unit from the organizartioh itself
   ELSIF (p_type='BU') THEN
-    WHILE (v_isbusinessunit='N' AND v_org_header_id<>'0') LOOP
-      SELECT hh.parent_id, ad_orgtype.isbusinessunit
-        INTO v_org_header_id, v_isbusinessunit
-      FROM ad_org
-          JOIN ad_orgtype ON ad_org.ad_orgtype_id=ad_orgtype.ad_orgtype_id
-          JOIN ad_treenode pp ON pp.node_id=ad_org.ad_org_id
-          JOIN ad_treenode hh ON pp.node_id = hh.parent_id
-                                 AND hh.ad_tree_id = pp.ad_tree_id
-      WHERE hh.node_id=v_org_header_id
-        AND ad_org.isready='Y'
-        AND EXISTS (SELECT 1 FROM ad_tree
-                    WHERE ad_tree.ad_table_id='155'
-                      AND hh.ad_tree_id=ad_tree.ad_tree_id
-                      AND hh.ad_client_id=ad_tree.ad_client_id);
-    END LOOP;
+    BEGIN
+      SELECT AD_BUSINESSUNIT_ORG_ID
+      INTO v_org_header_id
+      FROM AD_Org
+      WHERE AD_Org_ID = p_org_id;
+    EXCEPTION WHEN NO_DATA_FOUND THEN
+      v_org_header_id := NULL;
+    END;
   END IF;
 
   RETURN v_org_header_id;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/functions/AD_GET_ORG_LE_BU_TREENODE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+  <database name="FUNCTION AD_GET_ORG_LE_BU_TREENODE">
+    <function name="AD_GET_ORG_LE_BU_TREENODE" type="VARCHAR">
+      <parameter name="p_org_id" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_type" 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) 2018 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+/*
+* 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_legalentity_org_id or
+* ad_business_unit_id from ad_org directly as required.
+*/
+
+  v_org_header_id ad_org.ad_org_id%TYPE;
+  v_isbusinessunit ad_orgtype.isbusinessunit%TYPE := 'N';
+  v_islegalentity ad_orgtype.islegalentity%TYPE := 'N';
+
+BEGIN
+  v_org_header_id := p_org_id;
+  --Check if given org is legal entity or business unit
+  SELECT ot.islegalentity, ot.isbusinessunit
+    INTO v_islegalentity, v_isbusinessunit
+  FROM ad_org o JOIN ad_orgtype ot ON o.ad_orgtype_id = ot.ad_orgtype_id
+  WHERE o.ad_org_id = p_org_id;
+  -- Gets recursively the organization parent until finding a Business Unit or a Legal Entity
+  IF (p_type IS NULL) THEN
+    WHILE (v_isbusinessunit='N' AND v_islegalentity='N') LOOP
+      SELECT hh.parent_id, ad_orgtype.isbusinessunit, ad_orgtype.islegalentity
+        INTO v_org_header_id, v_isbusinessunit, v_islegalentity
+      FROM ad_org
+          JOIN ad_orgtype ON ad_org.ad_orgtype_id=ad_orgtype.ad_orgtype_id
+          JOIN ad_treenode pp ON pp.node_id=ad_org.ad_org_id
+          JOIN ad_treenode hh ON pp.node_id = hh.parent_id
+                                 AND hh.ad_tree_id = pp.ad_tree_id
+      WHERE hh.node_id=v_org_header_id
+        AND ad_org.isready='Y'
+        AND EXISTS (SELECT 1 FROM ad_tree
+                    WHERE ad_tree.ad_table_id='155'
+                      AND hh.ad_tree_id=ad_tree.ad_tree_id
+                      AND hh.ad_client_id=ad_tree.ad_client_id);
+    END LOOP;
+  -- Gets recursively the organization parent until finding a Legal Entity
+  ELSIF (p_type='LE') THEN
+    WHILE (v_islegalentity='N') LOOP
+      SELECT hh.parent_id, ad_orgtype.islegalentity
+        INTO v_org_header_id, v_islegalentity
+      FROM ad_org
+          JOIN ad_orgtype ON ad_org.ad_orgtype_id=ad_orgtype.ad_orgtype_id
+          JOIN ad_treenode pp ON pp.node_id=ad_org.ad_org_id
+          JOIN ad_treenode hh ON pp.node_id = hh.parent_id
+                                 AND hh.ad_tree_id = pp.ad_tree_id
+      WHERE hh.node_id=v_org_header_id
+        AND ad_org.isready='Y'
+        AND EXISTS (SELECT 1 FROM ad_tree
+                    WHERE ad_tree.ad_table_id='155'
+                      AND hh.ad_tree_id=ad_tree.ad_tree_id
+                      AND hh.ad_client_id=ad_tree.ad_client_id);
+    END LOOP;
+    -- Gets recursively the organization parent until finding a Business Unit
+  ELSIF (p_type='BU') THEN
+    WHILE (v_isbusinessunit='N') LOOP
+      SELECT hh.parent_id, ad_orgtype.isbusinessunit
+        INTO v_org_header_id, v_isbusinessunit
+      FROM ad_org
+          JOIN ad_orgtype ON ad_org.ad_orgtype_id=ad_orgtype.ad_orgtype_id
+          JOIN ad_treenode pp ON pp.node_id=ad_org.ad_org_id
+          JOIN ad_treenode hh ON pp.node_id = hh.parent_id
+                                 AND hh.ad_tree_id = pp.ad_tree_id
+      WHERE hh.node_id=v_org_header_id
+        AND ad_org.isready='Y'
+        AND EXISTS (SELECT 1 FROM ad_tree
+                    WHERE ad_tree.ad_table_id='155'
+                      AND hh.ad_tree_id=ad_tree.ad_tree_id
+                      AND hh.ad_client_id=ad_tree.ad_client_id);
+    END LOOP;
+  END IF;
+
+  RETURN v_org_header_id;
+END AD_GET_ORG_LE_BU_TREENODE
+]]></body>
+    </function>
+  </database>
--- a/model/src-db/database/model/functions/AD_ORG_GETCALENDAROWNER.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/AD_ORG_GETCALENDAROWNER.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -16,56 +16,36 @@
 * 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-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
 
 /*
-* It returns the organization that owns the calendar for the p_organization Organization.
-* If no calendar is found, it returns NULL.
+* It returns the calendar owner organization of the p_organization Organization.
+* If calendar owner organization is not set, it returns NULL.
+*
+* This function works only for organizations set as ready. For the flows where 
+* the organization is not set as ready yet, please use AD_ORG_GETCALENDAROWNERTN instead.
+*
+* Only when working with ready organizations, and in processes where performance is important, 
+* it is highly recommended to directly query AD_Org.AD_CALENDAROWNER_ORG_ID column. 
 */
 
-  v_calendar_id AD_Org.C_Calendar_ID%TYPE;  
-  v_parent_id ad_treenode.parent_id%TYPE;
-  v_node_id ad_treenode.parent_id%TYPE;
+  v_CalendarOwner_Org_ID AD_Org.AD_CalendarOwner_Org_ID%TYPE;
 
 BEGIN
-  SELECT C_Calendar_ID, AD_Org_ID
-  INTO v_calendar_id, v_parent_id
-  FROM AD_Org
-  WHERE AD_Org_ID=p_organization;
+
+  BEGIN
+    SELECT AD_CalendarOwner_Org_ID
+    INTO v_CalendarOwner_Org_ID
+    FROM AD_Org
+    WHERE AD_Org_ID=p_organization;
+  EXCEPTION WHEN NO_DATA_FOUND THEN
+    v_CalendarOwner_Org_ID := NULL;
+  END;
   
-  IF (v_calendar_id IS NOT NULL) THEN
-    RETURN v_parent_id;
-  ELSE
-    v_node_id:=p_organization;
-    WHILE ( v_parent_id <> '0' AND v_node_id <> '0' ) LOOP      
-      SELECT parent_id
-      INTO v_parent_id
-      FROM ad_treenode t
-      WHERE node_id=v_node_id
-      AND EXISTS (SELECT 1 
-                  FROM ad_tree, ad_org
-                  WHERE ad_tree.ad_client_id = ad_org.ad_client_id
-                  AND ad_tree.ad_client_id=t.ad_client_id
-                  AND ad_tree.ad_table_id='155'
-                  AND t.ad_tree_id=ad_tree.ad_tree_id
-                  );
-
-      SELECT C_Calendar_ID, AD_Org_ID
-      INTO v_calendar_id, v_parent_id
-      FROM AD_Org
-      WHERE AD_Org_ID=v_parent_id;
-      
-      IF (v_calendar_id IS NOT NULL) THEN
-        RETURN v_parent_id;
-      END IF;
-      
-      v_node_id:=v_parent_id;
-   END LOOP;
-END IF;
-RETURN NULL;
+  RETURN v_CalendarOwner_Org_ID;
 END AD_ORG_GETCALENDAROWNER
 ]]></body>
     </function>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/functions/AD_ORG_GETCALENDAROWNERTN.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+  <database name="FUNCTION AD_ORG_GETCALENDAROWNERTN">
+    <function name="AD_ORG_GETCALENDAROWNERTN" type="VARCHAR">
+      <parameter name="p_organization" 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) 2008-2018 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+
+/*
+* It returns the organization that owns the calendar for the p_organization Organization.
+* If no calendar is found, it returns NULL.
+*
+* 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_calendarowner_org_id
+* from ad_org directly.
+*/
+
+  v_calendar_id AD_Org.C_Calendar_ID%TYPE;
+  v_parent_id ad_treenode.parent_id%TYPE;
+  v_node_id ad_treenode.parent_id%TYPE;
+
+BEGIN
+  SELECT C_Calendar_ID, AD_Org_ID
+  INTO v_calendar_id, v_parent_id
+  FROM AD_Org
+  WHERE AD_Org_ID=p_organization;
+
+  IF (v_calendar_id IS NOT NULL) THEN
+    RETURN v_parent_id;
+  ELSE
+    v_node_id:=p_organization;
+    WHILE ( v_parent_id <> '0' AND v_node_id <> '0' ) LOOP
+      SELECT parent_id
+      INTO v_parent_id
+      FROM ad_treenode t
+      WHERE node_id=v_node_id
+      AND EXISTS (SELECT 1
+                  FROM ad_tree, ad_org
+                  WHERE ad_tree.ad_client_id = ad_org.ad_client_id
+                  AND ad_tree.ad_client_id=t.ad_client_id
+                  AND ad_tree.ad_table_id='155'
+                  AND t.ad_tree_id=ad_tree.ad_tree_id
+                  );
+
+      SELECT C_Calendar_ID, AD_Org_ID
+      INTO v_calendar_id, v_parent_id
+      FROM AD_Org
+      WHERE AD_Org_ID=v_parent_id;
+
+      IF (v_calendar_id IS NOT NULL) THEN
+        RETURN v_parent_id;
+      END IF;
+
+      v_node_id:=v_parent_id;
+   END LOOP;
+END IF;
+RETURN NULL;
+END AD_ORG_GETCALENDAROWNERTN
+]]></body>
+    </function>
+  </database>
--- a/model/src-db/database/model/functions/AD_ORG_GETPERIODCONTROLALLOW.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/AD_ORG_GETPERIODCONTROLALLOW.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -16,18 +16,23 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2009-2016 Openbravo SLU
+* All portions are Copyright (C) 2009-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
 
 /*
-* It returns the organization that is period control allowed for the p_organization Organization.
-* If no organization is found, it returns NULL.
+* It returns the period allowed organization of the p_organization Organization.
+* If period allowed organization is not set, it returns NULL.
+*
+* This function works only for organizations set as ready. For the flows where 
+* the organization is not set as ready yet, please use AD_ORG_GETPERIODCONTROLALLOWTN instead.
+*
+* Only when working with ready organizations, and in processes where performance is important, 
+* it is highly recommended to directly query AD_Org.AD_PERIODCONTROLALLOWED_ORG_ID column. 
 */
 
-  v_isperiodcontrolallowed AD_Org.IsPeriodControlAllowed%TYPE;  
-  v_parent_id ad_treenode.parent_id%TYPE;
+  v_periodcontrolallowed_org_id AD_Org.AD_periodcontrolallowed_org_id%TYPE;
 
 BEGIN
 
@@ -35,25 +40,16 @@
     RETURN NULL;
   END IF;
 
-  SELECT IsPeriodControlAllowed
-  INTO v_isperiodcontrolallowed
-  FROM AD_Org
-  WHERE AD_Org_ID=p_organization;
+  BEGIN
+    SELECT AD_periodcontrolallowed_org_id
+    INTO v_periodcontrolallowed_org_id
+    FROM AD_Org
+    WHERE AD_Org_ID = p_organization;
+  EXCEPTION WHEN NO_DATA_FOUND THEN
+    v_periodcontrolallowed_org_id := NULL;
+  END;
   
-  IF (v_isperiodcontrolallowed='Y') THEN
-    RETURN p_organization;
-  ELSIF (p_organization='0') THEN
-    RETURN NULL;
-  ELSE
-    SELECT tn.parent_id
-    INTO v_parent_id
-    FROM ad_tree t JOIN ad_treenode tn
-    ON t.ad_tree_id = tn.ad_tree_id
-    WHERE tn.node_id=p_organization
-    AND t.ad_table_id='155';
-    RETURN ad_org_getperiodcontrolallow(v_parent_id);
-  END IF;
-RETURN NULL;
+RETURN v_periodcontrolallowed_org_id;
 END AD_ORG_GETPERIODCONTROLALLOW
 ]]></body>
     </function>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/functions/AD_ORG_GETPERIODCONTROLALLOWTN.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+  <database name="FUNCTION AD_ORG_GETPERIODCONTROLALLOWTN">
+    <function name="AD_ORG_GETPERIODCONTROLALLOWTN" type="VARCHAR">
+      <parameter name="p_organization" 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) 2009-2018 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+
+/*
+* It returns the organization that is period control allowed for the p_organization Organization.
+* If no organization is found, it returns NULL.
+*
+* 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_periodcontrolallowed_org_id
+* from AD_ORG directly.
+*/
+
+  v_isperiodcontrolallowed AD_Org.IsPeriodControlAllowed%TYPE;
+  v_parent_id ad_treenode.parent_id%TYPE;
+
+BEGIN
+
+  IF (p_organization IS NULL) THEN
+    RETURN NULL;
+  END IF;
+
+  SELECT IsPeriodControlAllowed
+  INTO v_isperiodcontrolallowed
+  FROM AD_Org
+  WHERE AD_Org_ID=p_organization;
+
+  IF (v_isperiodcontrolallowed='Y') THEN
+    RETURN p_organization;
+  ELSIF (p_organization='0') THEN
+    RETURN NULL;
+  ELSE
+    SELECT tn.parent_id
+    INTO v_parent_id
+    FROM ad_tree t JOIN ad_treenode tn
+    ON t.ad_tree_id = tn.ad_tree_id
+    WHERE tn.node_id=p_organization
+    AND t.ad_table_id='155';
+    RETURN ad_org_getperiodcontrolallowtn(v_parent_id);
+  END IF;
+RETURN NULL;
+END AD_ORG_GETPERIODCONTROLALLOWTN
+]]></body>
+    </function>
+  </database>
--- a/model/src-db/database/model/functions/AD_ORG_READY.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/AD_ORG_READY.xml	Wed Aug 08 05:40:37 2018 +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-2017 Openbravo SLU
+* All portions are Copyright (C) 2008-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -30,6 +30,12 @@
   v_isperiodcontrol AD_Org.IsPeriodControlAllowed%TYPE;
   v_calendar_id AD_Org.C_Calendar_ID%TYPE;
 
+  v_PeriodControlAllowed_Org_ID AD_Org.AD_PeriodControlAllowed_Org_ID%TYPE;
+  v_CalendarOwner_Org_ID AD_Org.AD_CalendarOwner_Org_ID%TYPE;
+  v_InheritedCalendar_ID AD_Org.AD_InheritedCalendar_ID%TYPE;
+  v_LegalEntity_Org_ID AD_Org.AD_LegalEntity_Org_ID%TYPE;
+  v_BusinessUnit_Org_ID AD_Org.AD_BusinessUnit_Org_ID%TYPE;
+
   v_num NUMBER; 
   TYPE RECORD IS REF CURSOR;
   Cur_Parameter RECORD;
@@ -149,6 +155,49 @@
         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;
+
+        -- Get Persist Information for organization
+        BEGIN
+          v_PeriodControlAllowed_Org_ID := ad_org_getperiodcontrolallowtn(Cur_Org.AD_Org_ID);
+        EXCEPTION WHEN NO_DATA_FOUND THEN
+          v_PeriodControlAllowed_Org_ID := NULL;
+        END;
+        BEGIN
+          v_CalendarOwner_Org_ID := ad_org_getcalendarownertn(Cur_Org.AD_Org_ID);
+        EXCEPTION WHEN NO_DATA_FOUND THEN
+          v_CalendarOwner_Org_ID := NULL;
+        END;
+        IF(v_CalendarOwner_Org_ID IS NOT NULL) THEN
+          BEGIN
+            SELECT c_calendar_id
+            INTO v_InheritedCalendar_ID
+            FROM AD_ORG
+            WHERE AD_ORG_ID = v_CalendarOwner_Org_ID;
+          EXCEPTION WHEN NO_DATA_FOUND THEN
+            v_InheritedCalendar_ID := NULL;
+          END;
+        ELSE
+          v_InheritedCalendar_ID := NULL;
+        END IF;
+        BEGIN
+          v_LegalEntity_Org_ID := ad_get_org_le_bu_treenode(Cur_Org.AD_Org_ID, 'LE');
+        EXCEPTION WHEN NO_DATA_FOUND THEN
+          v_LegalEntity_Org_ID := NULL;
+        END;
+        BEGIN
+          v_BusinessUnit_Org_ID := ad_get_org_le_bu_treenode(Cur_Org.AD_Org_ID, 'BU');
+        EXCEPTION WHEN NO_DATA_FOUND THEN
+          v_BusinessUnit_Org_ID := NULL;
+        END;
+
+        -- Set Persist Org Information. Variables usage avoids mutating table in Oracle
+        UPDATE AD_ORG
+        SET AD_PeriodControlAllowed_Org_ID = v_PeriodControlAllowed_Org_ID,
+            AD_CalendarOwner_Org_ID = v_CalendarOwner_Org_ID,
+            AD_InheritedCalendar_ID = v_InheritedCalendar_ID,
+            AD_LegalEntity_Org_ID = v_LegalEntity_Org_ID,
+            AD_BusinessUnit_Org_ID = v_BusinessUnit_Org_ID
+        WHERE AD_ORG_ID=Cur_Org.AD_Org_ID;
       END LOOP;
     ELSE 
       INSERT INTO ad_org_tree
@@ -167,6 +216,49 @@
       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;
+
+      -- Get Persist Information for organization
+      BEGIN
+        v_PeriodControlAllowed_Org_ID := ad_org_getperiodcontrolallowtn(v_Record_ID);
+      EXCEPTION WHEN NO_DATA_FOUND THEN
+        v_PeriodControlAllowed_Org_ID := NULL;
+      END;
+      BEGIN
+        v_CalendarOwner_Org_ID := ad_org_getcalendarownertn(v_Record_ID);
+      EXCEPTION WHEN NO_DATA_FOUND THEN
+        v_CalendarOwner_Org_ID := NULL;
+      END;
+      IF(v_CalendarOwner_Org_ID IS NOT NULL) THEN
+        BEGIN
+          SELECT c_calendar_id
+          INTO v_InheritedCalendar_ID
+          FROM AD_ORG
+          WHERE AD_ORG_ID = v_CalendarOwner_Org_ID;
+        EXCEPTION WHEN NO_DATA_FOUND THEN
+          v_InheritedCalendar_ID := NULL;
+        END;
+      ELSE
+        v_InheritedCalendar_ID := NULL;
+      END IF;
+      BEGIN
+        v_LegalEntity_Org_ID := ad_get_org_le_bu_treenode(v_Record_ID, 'LE');
+      EXCEPTION WHEN NO_DATA_FOUND THEN
+        v_LegalEntity_Org_ID := NULL;
+      END;
+      BEGIN
+        v_BusinessUnit_Org_ID := ad_get_org_le_bu_treenode(v_Record_ID, 'BU');
+      EXCEPTION WHEN NO_DATA_FOUND THEN
+        v_BusinessUnit_Org_ID := NULL;
+      END;
+
+      -- Set Persist Org Information. Variables usage avoids mutating table in Oracle
+      UPDATE AD_ORG
+      SET AD_PeriodControlAllowed_Org_ID = v_PeriodControlAllowed_Org_ID,
+          AD_CalendarOwner_Org_ID = v_CalendarOwner_Org_ID,
+          AD_InheritedCalendar_ID = v_InheritedCalendar_ID,
+          AD_LegalEntity_Org_ID = v_LegalEntity_Org_ID,
+          AD_BusinessUnit_Org_ID = v_BusinessUnit_Org_ID
+      WHERE AD_ORG_ID = v_Record_ID;
     END IF;
     
     -- Create PeriodControl for the organization
--- a/model/src-db/database/model/functions/A_ASSET_CREATE.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/A_ASSET_CREATE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -22,7 +22,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-2018 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -35,16 +35,13 @@
   * - Reversal or Negative Delivery
   * - Guarantee Extension
   ************************************************************************/
-  -- Logistice
-  v_ResultStr VARCHAR2(2000):='';
-  v_Message VARCHAR2(2000):='';
-  v_Result NUMBER:=1; -- 0=failure
-  v_Record_ID VARCHAR2(32);
-  -- Parameter
-  TYPE RECORD IS REF CURSOR;
-    Cur_Parameter RECORD;
+    -- Logistice
+    v_ResultStr VARCHAR2(2000):='';
+    v_Message VARCHAR2(2000):='';
+    v_Result NUMBER:=1; -- 0=failure
     -- Parameter Variables
     -- Create from ShipmentLine
+    TYPE RECORD IS REF CURSOR;
     Cur_ShipLine RECORD;
     --
     v_A_Asset_ID VARCHAR2(32) ;
@@ -59,28 +56,8 @@
       DBMS_OUTPUT.PUT_LINE('A_Asset_Create - Processing ' || p_PInstance_ID) ;
       v_ResultStr:='PInstanceNotFound';
       AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'Y', NULL, NULL) ;
-      -- Get Parameters
-      v_ResultStr:='ReadingParameters';
-      FOR Cur_Parameter IN
-        (SELECT i.Record_ID, i.AD_User_ID, p.ParameterName, p.P_String, p.P_Number, p.P_Date
-        FROM AD_PInstance i
-        LEFT JOIN AD_PInstance_Para p
-          ON i.AD_PInstance_ID=p.AD_PInstance_ID
-        WHERE i.AD_PInstance_ID=p_PInstance_ID
-        ORDER BY p.SeqNo
-        )
-      LOOP
-        v_Record_ID:=Cur_Parameter.Record_ID;
-        -- IF (p.ParameterName = 'xx') THEN
-        --  p_xx := p.P_String;
-        --  DBMS_OUTPUT.PUT_LINE('  xx=' || p_xx);
-        -- ELSE
-        --  DBMS_OUTPUT.PUT_LINE('*** Unknown Parameter=' || p.ParameterName);
-        --  END IF;
-      END LOOP; -- Get Parameter
     END IF;
   BEGIN --BODY
-    -- DBMS_OUTPUT.PUT_LINE('  Record_ID=' || v_Record_ID || ', InOutLine_ID=' || p_InOutLine_ID);
     -- Create From Shipment Line
     IF(p_InOutLine_ID IS NOT NULL) THEN
       FOR Cur_ShipLine IN
--- a/model/src-db/database/model/functions/C_BP_SOCREDITUSED_REFRESH.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/C_BP_SOCREDITUSED_REFRESH.xml	Wed Aug 08 05:40:37 2018 +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-2009 Openbravo SLU
+* All portions are Copyright (C) 2001-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -35,6 +35,7 @@
     AND ad_module_id <> '0';
   IF (v_count > 1) THEN
     v_dummy := AD_GET_PREFERENCE_VALUE('CCU', 'Y', v_client_id, v_org_id, NULL, NULL, NULL);
+    DBMS_OUTPUT.PUT_LINE('CCU preference value: ' || v_dummy);
   ELSIF (v_count = 0) THEN
     UPDATE C_BPARTNER
       SET SO_CreditUsed=
@@ -42,7 +43,8 @@
       FROM C_DEBT_PAYMENT_V
       WHERE C_BPartner_ID=p_BPartner_ID
         AND C_DEBT_PAYMENT_STATUS(C_SETTLEMENT_CANCEL_ID, Cancel_Processed, Generate_Processed, IsPaid, IsValid, C_CashLine_ID, C_BankStatementLine_ID)='P'
-      )
+      ),
+      UPDATED = now()
     WHERE C_BPartner_ID=p_BPartner_ID;
   END IF;
 END C_BP_SOCREDITUSED_REFRESH
--- a/model/src-db/database/model/functions/C_CASH_POST.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/C_CASH_POST.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -20,7 +20,7 @@
   * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
   * All Rights Reserved.
   * Contributor(s): Openbravo SLU
-  * Contributions are Copyright (C) 1999-2016 Openbravo, S.L.U.
+  * Contributions are Copyright (C) 1999-2018 Openbravo, S.L.U.
   *************************************************************************
   * $Id: C_Cash_Post.sql,v 1.10 2003/03/17 20:32:25 jjanke Exp $
   ***
@@ -32,7 +32,6 @@
   ************************************************************************/
   --  Logistice
   v_ResultStr VARCHAR2(2000):='';
-  v_Result NUMBER;
   v_Message VARCHAR2(2000):='';
   v_Record_ID VARCHAR2(32) ;
   v_User VARCHAR2(32);
@@ -73,7 +72,6 @@
     v_CB_Date DATE;
     v_AD_Org_ID VARCHAR2(32);
     v_AD_Client_ID VARCHAR2(32);
-    v_C_CashBook_ID VARCHAR2(32) ;
     FINISH_PROCESS BOOLEAN:=false;
   BEGIN
     --  Update AD_PInstance
@@ -104,27 +102,14 @@
       POSTED,
       AD_Org_ID,
       AD_Client_ID,
-      C_CASHBOOK_ID, DateAcct
+      DateAcct
     INTO v_Processed,
       v_Posted,
       v_AD_Org_ID,
       v_AD_Client_ID,
-      v_C_CashBook_ID, v_dateCash
+      v_dateCash
     FROM C_CASH
     WHERE C_Cash_ID=v_Record_ID;
-    /* Not needed: payments are updated to pending status
-    SELECT COUNT(*) INTO v_Count
-    FROM C_CASHLINE
-    WHERE C_CASH_ID = v_Record_ID
-    AND C_ORDER_ID IS NOT NULL
-    AND C_DEBT_PAYMENT_ID IS NOT NULL;
-    DBMS_OUTPUT.PUT_LINE('  Record_ID=' || v_Record_ID);
-    IF (v_Processed = 'Y' AND v_Count>0) THEN
-    v_Message := '@AlreadyPosted@';
-    v_Result := 0;
-    FINISH_PROCESS := true;
-    END IF;
-    */
     IF(NOT FINISH_PROCESS) THEN
       IF(v_Posted='Y') THEN
         RAISE_APPLICATION_ERROR(-20000, '@CashDocumentPosted@') ;
@@ -342,7 +327,6 @@
         ;
       IF v_count>0 THEN
         v_Message:='@CashOrderInvoiced@. Line:'||v_line;
-        v_Result:=0;
         FINISH_PROCESS:=true;
       END IF;
     END IF;--FINISH_PROCESS
@@ -476,45 +460,6 @@
     END IF;--FINISH_PROCESS
     IF(NOT FINISH_PROCESS) THEN
       /**
-      *  Generate C_debt_payment for cashline with order type
-      */
-      /* Now this goes to c_order_post ALO
-      DECLARE
-      v_debtPaymentID varchar2(32);
-      CurCashLinesOrder RECORD;
-      BEGIN
-      FOR CurCashLinesOrder IN (SELECT o.AD_CLIENT_ID, o.AD_ORG_ID, o.ISSOTRX, o.DOCUMENTNO, bp.NAME, o.POREFERENCE, o.C_ORDER_ID, o.C_BPARTNER_ID,
-      o.C_CURRENCY_ID, cl.C_CASHLINE_ID, o.PAYMENTRULE, C_Currency_Convert((cl.Amount + cl.WriteOffAmt),
-      cl.C_Currency_ID, o.C_Currency_ID, c.DateAcct, NULL, c.AD_Client_ID, c.AD_Org_ID) AMT,
-      c.STATEMENTDATE, o.C_PROJECT_ID
-      FROM C_CASHLINE cl, C_ORDER o, C_BPARTNER bp, C_CASH c
-      WHERE cl.C_ORDER_ID = o.C_ORDER_ID
-      AND cl.C_CASH_ID = v_Record_ID
-      AND bp.C_BPARTNER_ID = o.C_BPARTNER_ID
-      AND C.C_CASH_ID = cl.C_CASH_id) LOOP
-      Ad_Sequence_Next('C_Debt_Payment', v_Record_ID, v_debtPaymentID);
-      INSERT INTO C_DEBT_PAYMENT(C_DEBT_PAYMENT_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, CREATED, CREATEDBY, UPDATED, UPDATEDBY,
-      ISRECEIPT, C_SETTLEMENT_CANCEL_ID, C_SETTLEMENT_GENERATE_ID, DESCRIPTION,
-      C_ORDER_ID, C_BPARTNER_ID,
-      C_CURRENCY_ID, C_CASHLINE_ID, C_BANKACCOUNT_ID, C_CASHBOOK_ID, PAYMENTRULE,
-      ISPAID, AMOUNT, WRITEOFFAMT, DATEPLANNED, ISMANUAL, ISVALID,
-      C_BANKSTATEMENTLINE_ID, CHANGESETTLEMENTCANCEL, CANCEL_PROCESSED, GENERATE_PROCESSED, c_project_id)
-      VALUES
-      (v_debtPaymentID, CurCashLinesOrder.AD_CLIENT_ID, CurCashLinesOrder.AD_ORG_ID, 'Y', now(), v_User, now(), v_User,
-      CurCashLinesOrder.IsSOTrx, NULL, NULL, 'Order No: ' || CurCashLinesOrder.DOCUMENTNO || ' (' || CurCashLinesOrder.Name || (CASE WHEN CurCashLinesOrder.POREFERENCE IS NULL THEN '' ELSE ' .Ref:'||TO_CHAR(CurCashLinesOrder.POREFERENCE) END) || ')',
-      CurCashLinesOrder.C_ORDER_ID, CurCashLinesOrder.C_BPartner_ID,
-      CurCashLinesOrder.C_CURRENCY_ID, NULL,NULL,v_C_CashBook_ID, CurCashLinesOrder.PAYMENTRULE,
-      'N',(CASE CurCashLinesOrder.IsSOTrx WHEN 'Y' THEN CurCashLinesOrder.AMT ELSE (-1)*CurCashLinesOrder.AMT END),0,CurCashLinesOrder.STATEMENTDATE,'N','Y',
-      NULL,'N','N','N',CurCashLinesOrder.C_PROJECT_ID);
-      UPDATE C_CASHLINE
-      SET C_DEBT_PAYMENT_ID = v_debtPaymentID,
-              Updated=now(),
-              UpdatedBy=v_User
-      WHERE C_CASHLINE_ID = CurCashLinesOrder.C_CASHLINE_ID;
-      END LOOP;
-      END;
-      */
-      /**
       *  Generate C_Settlement
       */
       SELECT COUNT(*)
@@ -577,7 +522,6 @@
       */
       DECLARE
         v_Total NUMBER:=0;
-        v_Currency_ID VARCHAR2(32):=NULL;
         -- Lines
         Cur_Lines RECORD;
       BEGIN
@@ -593,23 +537,7 @@
               Updated=now(),
               UpdatedBy=v_User
             WHERE C_Debt_Payment_ID=Cur_Lines.C_Debt_Payment_ID;
-            SELECT C_Currency_ID
-            INTO v_Currency_ID
-            FROM C_DEBT_PAYMENT
-            WHERE C_Debt_Payment_ID=Cur_Lines.C_Debt_Payment_ID;
           END IF;
-          -- Assume CashBook Currency for Charge
-          /* Lines are in cashbook currency
-     IF(v_Currency_ID IS NULL) THEN
-            v_Currency_ID:=v_CB_Currency_ID;
-          END IF;
-          v_ResultStr:='CalculatingSum';
-          IF(v_Currency_ID<>v_CB_Currency_ID) THEN
-            v_Total:=v_Total + C_Currency_Convert(Cur_Lines.Amount, v_Currency_ID, v_CB_Currency_ID, v_CB_Date, NULL, Cur_Lines.AD_Client_ID, Cur_Lines.AD_Org_ID) ;
-          ELSE
-            v_Total:=v_Total + Cur_Lines.Amount;
-          END IF;
-     */
      v_Total:=v_Total + Cur_Lines.Amount;
         END LOOP;
         --
--- a/model/src-db/database/model/functions/C_CONVERT_DOC_CURRENCY.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/C_CONVERT_DOC_CURRENCY.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -40,24 +40,17 @@
 * 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 Openbravo SLU
+* All portions are Copyright (C) 2011-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
   v_Rate NUMBER;
-  v_ConvDate DATE;
 BEGIN
 
   IF(p_Amount=0 OR p_CurFrom_ID=p_CurTo_ID) THEN
     RETURN p_Amount;
   END IF;
 
-  if (p_convdate > now()) then
-    v_ConvDate:=now();
-  else
-    v_ConvDate:=p_convdate;
-  end if;
-
   if (p_fin_finacc_transaction_id is not null) then
     select foreign_convert_rate into v_rate from fin_finacc_transaction fat where fin_finacc_transaction_id=p_fin_finacc_transaction_id;
   elsif (p_fin_payment_id is not null) then
@@ -76,6 +69,7 @@
 WHEN OTHERS THEN
   DBMS_OUTPUT.PUT_LINE(SQLERRM);
   RAISE;
+  RETURN NULL;
 END C_CONVERT_DOC_CURRENCY
 ]]></body>
     </function>
--- a/model/src-db/database/model/functions/C_CREATE_PINVOICE_FROM_OUTS.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/C_CREATE_PINVOICE_FROM_OUTS.xml	Wed Aug 08 05:40:37 2018 +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-2009 Openbravo SLU
+* All portions are Copyright (C) 2001-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -25,7 +25,6 @@
   * - Create purchase invoice from sales shipments and inventory movements
   ************************************************************************/
   -- Logistice
-  v_ResultStr VARCHAR2(2000):='';
   v_Message VARCHAR2(2000):='';
   -- Parameter
   TYPE RECORD IS REF CURSOR;
@@ -74,11 +73,9 @@
   BEGIN
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Processing ' || p_PInstance_ID) ;
-    v_ResultStr:='PInstanceNotFound';
     AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'Y', NULL, NULL) ;
   BEGIN --BODY
     -- Get Parameters
-    v_ResultStr:='ReadingParameters';
     FOR Cur_Parameter IN
       (SELECT i.Record_ID,
         p.ParameterName,
@@ -199,7 +196,6 @@
         WHERE M_PriceList_ID=Cur_Outs.M_PriceList_ID;
         --
         DBMS_OUTPUT.PUT_LINE('  Invoice_ID=' || v_Invoice_ID || ' DocumentNo=' || v_DocumentNo) ;
-        v_ResultStr:='InsertInvoice ' || v_Invoice_ID;
         INSERT
         INTO C_INVOICE
           (
@@ -370,7 +366,6 @@
   END; --BODY
 EXCEPTION
 WHEN OTHERS THEN
-  v_ResultStr:= '@ERROR=' || SQLERRM;
   DBMS_OUTPUT.PUT_LINE(v_Message) ;
   ROLLBACK;
   AD_UPDATE_PINSTANCE(p_PInstance_ID, NULL, 'N', 0, v_Message) ;
--- a/model/src-db/database/model/functions/C_CURRENCY_CONVERT.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/C_CURRENCY_CONVERT.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -37,7 +37,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-2018 Openbravo, S.L.U.
 *
 * Specifically, this derivative work is based upon the following Compiere
 * file and version.
@@ -59,6 +59,7 @@
 WHEN OTHERS THEN
   DBMS_OUTPUT.PUT_LINE(SQLERRM) ;
   RAISE;
+  RETURN NULL;
 END C_CURRENCY_CONVERT
 ]]></body>
     </function>
--- a/model/src-db/database/model/functions/C_CURRENCY_CONVERT_PRECISION.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/C_CURRENCY_CONVERT_PRECISION.xml	Wed Aug 08 05:40:37 2018 +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) 2010 Openbravo SLU
+ * All portions are Copyright (C) 2010-2018 Openbravo SLU
  * All Rights Reserved.
 ************************************************************************/
   v_Rate NUMBER;
@@ -61,6 +61,7 @@
 WHEN OTHERS THEN
   DBMS_OUTPUT.PUT_LINE(SQLERRM) ;
   RAISE;
+  RETURN NULL;
 END C_CURRENCY_CONVERT_PRECISION
 ]]></body>
     </function>
--- a/model/src-db/database/model/functions/C_CURRENCY_CONVERT_RATE.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/C_CURRENCY_CONVERT_RATE.xml	Wed Aug 08 05:40:37 2018 +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) 2012-2016 Openbravo SLU
+ * All portions are Copyright (C) 2012-2018 Openbravo SLU
  * All Rights Reserved.
 ************************************************************************/
 
@@ -60,6 +60,7 @@
 WHEN OTHERS THEN
   DBMS_OUTPUT.PUT_LINE(SQLERRM) ;
   RAISE;
+  RETURN NULL;
 END C_CURRENCY_CONVERT_RATE
 ]]></body>
     </function>
--- a/model/src-db/database/model/functions/C_CURRENCY_RATE.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/C_CURRENCY_RATE.xml	Wed Aug 08 05:40:37 2018 +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-2018 Openbravo, S.L.U.
 *
 * Specifically, this derivative work is based upon the following Compiere
 * file and version.
@@ -126,6 +126,7 @@
 WHEN OTHERS THEN
   DBMS_OUTPUT.PUT_LINE(SQLERRM) ;
   RAISE;
+  RETURN NULL;
 END C_CURRENCY_RATE
 ]]></body>
     </function>
--- a/model/src-db/database/model/functions/C_GETWITHHOLDING.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/C_GETWITHHOLDING.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -16,7 +16,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2015 Openbravo SLU
+* All portions are Copyright (C) 2001-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  _Francesco Finamore_______________________.
 ************************************************************************/
@@ -24,7 +24,6 @@
 --Cursori usati
 TYPE RECORD IS REF CURSOR;
     curInvoice     RECORD;
-    curBusPart     RECORD;
     curBP_WithHold RECORD;
     curWithHold    RECORD;
     curTaxInps     RECORD;
@@ -45,7 +44,6 @@
 TotCompensi NUMBER;
 base_amount NUMBER;
 Withholding NUMBER;
-TaxInps NUMBER;
 TaxAmount NUMBER;
 
 BEGIN
@@ -67,16 +65,6 @@
 where C_INVOICE_ID= id_invoice_in
 and COALESCE(EXCLUDEFORWITHHOLDING,'N') <> 'Y' ;
 
--- Dati del Businness Partner
-FOR curBusPart IN
-    (SELECT *
-        FROM C_BPARTNER
-        WHERE C_BPARTNER_ID = IdBusPart
-    )
-    LOOP
-        -- IdBusPart:=curBusPart.C_BPARTNER_ID;
-    EXIT;
-END LOOP;
 -- WithHolding del Businness Partner
 FOR curBP_WithHold IN
     (SELECT *
@@ -130,12 +118,10 @@
       TaxAmount := 0;
      end if;
 else
-  TaxInps :=0 ;
   TaxAmount := 0;
 end if;
 -- 3) base imponibile
 base_amount:=TotCompensi*baseamountpercent/100 ;
---TaxAmount := TaxInps*base_amount/100;
 base_amount := base_amount + TaxAmount ;
 -- 4) Calcolo finale
 Withholding:=(withpercent*base_amount)/100;
--- a/model/src-db/database/model/functions/C_GET_CURRENCY_PRECISION.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/C_GET_CURRENCY_PRECISION.xml	Wed Aug 08 05:40:37 2018 +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) 2010 Openbravo SLU
+ * All portions are Copyright (C) 2010-2018 Openbravo SLU
  * All Rights Reserved.
 *************************************************************************
 ****
@@ -46,6 +46,7 @@
    ELSIF(p_prec_type = 'A') THEN
     RETURN v_StdPrecision;
   END IF;
+  RETURN NULL;
 END C_GET_CURRENCY_PRECISION
 ]]></body>
     </function>
--- a/model/src-db/database/model/functions/C_GET_DEFAULT_PERIOD.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/C_GET_DEFAULT_PERIOD.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -19,14 +19,15 @@
 * 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 Openbravo SLU
+* All portions are Copyright (C) 2012-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
 
 /*
-* It returns the organization that owns the calendar for the p_organization Organization.
-* If no calendar is found, it returns NULL.
+* It returns the period from the inherited calendar of the invoice organization
+* based on p_defaultperiod input parameter.
+* If no period is found, it returns NULL.
 */
 
   v_calendar_id AD_Org.C_Calendar_ID%TYPE; 
@@ -36,10 +37,10 @@
   
 begin
 
-		SELECT C_CALENDAR_ID 
+		SELECT ad_inheritedcalendar_id
 		INTO v_calendar_id
 		FROM AD_ORG
-		WHERE AD_ORG_ID = AD_ORG_GETCALENDAROWNER((SELECT AD_ORG_ID FROM C_INVOICE WHERE C_INVOICE_ID = p_invoice));
+		WHERE AD_ORG_ID = (SELECT AD_ORG_ID FROM C_INVOICE WHERE C_INVOICE_ID = p_invoice);
 
 		SELECT DATEACCT 
 		INTO v_dateAcct
--- a/model/src-db/database/model/functions/C_GET_NET_AMOUNT_FROM_GROSS.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/C_GET_NET_AMOUNT_FROM_GROSS.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -25,7 +25,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2017 Openbravo SLU
+* All portions are Copyright (C) 2017-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -60,6 +60,7 @@
   v_ResultStr:= '@ERROR=' || SQLERRM;
   DBMS_OUTPUT.PUT_LINE(v_ResultStr) ;
   RAISE;
+  RETURN NULL;
 END C_GET_NET_AMOUNT_FROM_GROSS
 ]]></body>
     </function>
--- a/model/src-db/database/model/functions/C_GET_NET_PRICE_FROM_GROSS.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/C_GET_NET_PRICE_FROM_GROSS.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -28,7 +28,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-2017 Openbravo SLU
+* All portions are Copyright (C) 2012-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -60,6 +60,7 @@
   v_ResultStr:= '@ERROR=' || SQLERRM;
   DBMS_OUTPUT.PUT_LINE(v_ResultStr) ;
   RAISE;
+  RETURN NULL;
 END C_GET_NET_PRICE_FROM_GROSS
 ]]></body>
     </function>
--- a/model/src-db/database/model/functions/C_GET_TAX_AMT_FROM_NET.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/C_GET_TAX_AMT_FROM_NET.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -28,7 +28,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 Openbravo SLU
+* All portions are Copyright (C) 2012-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -89,6 +89,7 @@
   v_ResultStr:= '@ERROR=' || SQLERRM;
   DBMS_OUTPUT.PUT_LINE(v_ResultStr) ;
   RAISE;
+  RETURN NULL;
 END C_GET_TAX_AMT_FROM_NET
 ]]></body>
     </function>
--- a/model/src-db/database/model/functions/C_INVOICETAX_ADJUSTMENT.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/C_INVOICETAX_ADJUSTMENT.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -45,10 +45,7 @@
 
   -- Round and Adjust taxes
   IF (p_action = 'CO') THEN
-
-    -- Disable triggers
-    INSERT INTO AD_Session_Status (ad_session_status_id, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby, isimporting)
-    VALUES (get_uuid(), '0', '0', 'Y', now(), '0', now(), '0', 'Y');
+    AD_Disable_Triggers();
 
     -- Round
     UPDATE C_INVOICELINETAX
@@ -152,9 +149,7 @@
       END IF;
     END LOOP;
 
-    -- Enable triggers
-    DELETE FROM AD_Session_Status
-    WHERE isimporting = 'Y';
+    AD_Enable_Triggers();
 
   -- Recalculate amounts and taxes
   ELSIF (p_action = 'RE') THEN
@@ -169,19 +164,14 @@
       FROM C_INVOICELINE
       WHERE C_Invoice_ID = p_invoice_id
     ) LOOP
-
-      -- Disable triggers
-      INSERT INTO AD_Session_Status (ad_session_status_id, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby, isimporting)
-      VALUES (get_uuid(), '0', '0', 'Y', now(), '0', now(), '0', 'Y');
+      AD_Disable_Triggers();
 
       -- Remove line amounts and taxes
       DELETE FROM C_INVOICELINETAX WHERE C_InvoiceLine_ID = Cur_line.C_InvoiceLine_ID;
       SELECT Line_Gross_Amount INTO v_amount FROM C_INVOICELINE WHERE C_InvoiceLine_ID = Cur_line.C_InvoiceLine_ID;
       UPDATE C_INVOICELINE SET Line_Gross_Amount = 0 WHERE C_InvoiceLine_ID = Cur_line.C_InvoiceLine_ID;
 
-      -- Enable triggers
-      DELETE FROM AD_Session_Status
-      WHERE isimporting = 'Y';
+      AD_Enable_Triggers();
 
       -- Recalculate amounts and taxes
       UPDATE C_INVOICELINE SET Line_Gross_Amount = v_amount WHERE C_InvoiceLine_ID = Cur_line.C_InvoiceLine_ID;
--- a/model/src-db/database/model/functions/C_INVOICE_CREATE.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/C_INVOICE_CREATE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -94,6 +94,7 @@
     c_soo_doctype C_DOCTYPE.C_DOCTYPE_ID%TYPE := '01360D369B5F473686354A701A6EA559';
 
     Cur_Bpblocked RECORD;
+    v_groupByOrg VARCHAR2(1);
     
     Cur_OrderLine_ISOPEN BOOLEAN:=false;
     Cur_InOutLine_ISOPEN BOOLEAN:=false;
@@ -909,7 +910,7 @@
                 OR(v_Selection<>'Y'
                 AND(si.DateLimit IS NULL
                 OR TRUNC(o.DateOrdered)<=si.DateLimit)) ))
-              ORDER BY sh.C_BPartner_ID, pl.istaxincluded, (
+              ORDER BY sh.C_BPartner_ID, pl.istaxincluded, sh.ad_org_id, (
                 CASE TO_CHAR(SUBSTR(RPAD(substr(bp.InvoiceGrouping, instr(bp.InvoiceGrouping, '_') + 1), 15, '0'), 1, 1))
                   WHEN '0'
                   THEN '0'
@@ -1034,7 +1035,13 @@
               ELSE 
                 v_invOrg_ID := Cur_InvoiceSchedule.AD_Org_ID;
               END IF;
-              IF((v_Partner_ID<>Cur_InvoiceSchedule.C_BPartner_ID) OR (v_istaxincluded <> cur_invoiceschedule.istaxincluded) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 1, 1)='1' AND v_gOrg_ID<>Cur_InvoiceSchedule.AD_Org_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 2, 1)='1' AND v_gOrder_ID<>Cur_InvoiceSchedule.C_Order_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 3, 1)='1' AND v_gInOut_ID<>Cur_InvoiceSchedule.M_InOut_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 4, 1)='1' AND v_gBillTo_ID<>Cur_InvoiceSchedule.BillTo_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 5, 1)='1' AND v_gBPartner_Location_ID<>Cur_InvoiceSchedule.C_BPartner_Location_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 6, 1)='1' AND v_gSalesRep_ID<>Cur_InvoiceSchedule.SalesRep_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 7, 1)='1' AND v_gPaymentRule<>Cur_InvoiceSchedule.PaymentRule) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 8, 1)='1' AND v_gPaymentTerm_ID<>Cur_InvoiceSchedule.C_PaymentTerm_ID) OR(SUBSTR(
+              IF (SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 1, 1)='0' AND v_IncludeChildOrgs = 'Y' AND v_AD_Org_ID IS NOT NULL) THEN
+                -- Related to Issue 38238: Only when an Organizaton for the Invoice has been explicitly selected by the user, and the Children Organizations are included it is possible to group by Organization
+                v_groupByOrg := 'Y';
+              ELSE
+                v_groupByOrg := 'N';
+              END IF;
+              IF((v_Partner_ID<>Cur_InvoiceSchedule.C_BPartner_ID) OR (v_istaxincluded <> cur_invoiceschedule.istaxincluded) OR(v_groupByOrg = 'N' AND v_gOrg_ID<>Cur_InvoiceSchedule.AD_Org_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 2, 1)='1' AND v_gOrder_ID<>Cur_InvoiceSchedule.C_Order_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 3, 1)='1' AND v_gInOut_ID<>Cur_InvoiceSchedule.M_InOut_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 4, 1)='1' AND v_gBillTo_ID<>Cur_InvoiceSchedule.BillTo_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 5, 1)='1' AND v_gBPartner_Location_ID<>Cur_InvoiceSchedule.C_BPartner_Location_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 6, 1)='1' AND v_gSalesRep_ID<>Cur_InvoiceSchedule.SalesRep_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 7, 1)='1' AND v_gPaymentRule<>Cur_InvoiceSchedule.PaymentRule) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 8, 1)='1' AND v_gPaymentTerm_ID<>Cur_InvoiceSchedule.C_PaymentTerm_ID) OR(SUBSTR(
                 Cur_InvoiceSchedule.InvoiceGrouping, 9, 1)='1' AND v_gCurrency_ID<>Cur_InvoiceSchedule.C_Currency_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 10, 1)='1' AND v_gCampaign_ID<>Cur_InvoiceSchedule.C_Campaign_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 11, 1)='1' AND ((v_gProject_ID<>Cur_InvoiceSchedule.C_Project_ID) OR (v_gProject_ID IS NULL AND Cur_InvoiceSchedule.C_Project_ID IS NOT NULL) OR (v_gProject_ID IS NOT NULL AND Cur_InvoiceSchedule.C_Project_ID IS NULL))) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 12, 1)='1' AND v_gActivitiy_ID<>Cur_InvoiceSchedule.C_Activity_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 13, 1)='1' AND v_gOrgTrx_ID<>Cur_InvoiceSchedule.AD_OrgTrx_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 14, 1)='1' AND v_gUser1_ID<>Cur_InvoiceSchedule.User1_ID) OR(SUBSTR(Cur_InvoiceSchedule.InvoiceGrouping, 15, 1)='1' AND v_gUser2_ID<>Cur_InvoiceSchedule.User2_ID)) THEN
                 v_Partner_ID:=Cur_InvoiceSchedule.C_BPartner_ID;
                 v_istaxincluded:=cur_invoiceschedule.istaxincluded;
--- a/model/src-db/database/model/functions/C_INVOICE_CREATE0.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/C_INVOICE_CREATE0.xml	Wed Aug 08 05:40:37 2018 +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-2018 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -32,6 +32,7 @@
   v_Dummy varchar2(32);
 BEGIN
   C_Invoice_Create(p_PInstance_ID, v_Dummy, NULL) ;
+  DBMS_OUTPUT.PUT_LINE('C_Invoice_Create: ' || v_Dummy);
 END C_INVOICE_CREATE0
 ]]></body>
     </function>
--- a/model/src-db/database/model/functions/C_INVOICE_CREATERECEIPT.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/C_INVOICE_CREATERECEIPT.xml	Wed Aug 08 05:40:37 2018 +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-2018 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -84,7 +84,6 @@
     -- Check, if we have a Shipment already
     IF(NOT FINISH_PROCESS) THEN
       DECLARE
-        v_DocumentNo VARCHAR2(60) ;
         Cur_MInOut RECORD;
       BEGIN
         v_ResultStr:='Check Receipt exists';
--- a/model/src-db/database/model/functions/C_INVOICE_POST.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/C_INVOICE_POST.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -103,7 +103,6 @@
   v_GrandTotal NUMBER:=0;
   v_TotalLines NUMBER:=0;
   v_Currency_ID VARCHAR2(32);
-  v_Multiplier NUMBER:=1;
   v_paymentcheck NUMBER;
   --
   v_RInvoice_ID VARCHAR2(32);
@@ -174,7 +173,6 @@
   v_prepaymentamt NUMBER;
   v_hasTaxes NUMBER;
   v_calendarId C_CALENDAR.C_CALENDAR_ID%TYPE;
-  v_calendar_owner_id AD_Org.AD_Org_ID%TYPE;
    
 BEGIN
   IF (p_PInstance_ID IS NOT NULL) THEN
@@ -343,9 +341,8 @@
     /*
      * Avoids repeating the same documentno for the same organization tree within the same fiscal year
      */
-    SELECT AD_ORG_GETCALENDAROWNER(v_Org_ID) INTO v_calendar_owner_id FROM DUAL;
-    IF (v_calendar_owner_id IS NOT NULL) THEN
-      SELECT C_CALENDAR_ID INTO v_calendarId FROM AD_ORG WHERE AD_ORG_ID = v_calendar_owner_id;
+    SELECT ad_inheritedcalendar_id INTO v_calendarId FROM AD_ORG WHERE AD_ORG_ID = v_Org_ID;
+    IF (v_calendarId IS NOT NULL) THEN
       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
@@ -864,23 +861,6 @@
     END; -- FOR COMMIT
   END IF;--FINISH_PROCESS
   IF (NOT FINISH_PROCESS AND NOT END_PROCESSING) THEN
-    /**************************************************************************
-     * Credit Multiplier
-     *************************************************************************/
-    DECLARE
-      v_DocBaseType C_DOCTYPE.DocBaseType%TYPE;
-      v_DocTypeIsSOtrx C_DOCTYPE.IsSOtrx%TYPE;
-    BEGIN
-      -- Is it a Credit Memo?
-      SELECT DocBaseType, IsReversal, issotrx INTO v_DocBaseType, v_isReversal, v_DocTypeIsSOtrx
-      FROM C_DOCTYPE
-      WHERE C_DocType_ID=v_DocType_ID;
-      IF (v_DocBaseType IN('ARC', 'API') or (v_isReversal='Y' and v_DocTypeIsSOtrx='Y') or (v_isReversal='N' and v_DocTypeIsSOtrx='N')) THEN
-        v_Multiplier:=-1;
-      END IF;
-    END;
-  END IF;--FINISH_PROCESS
-  IF (NOT FINISH_PROCESS AND NOT END_PROCESSING) THEN
     /************************************************************************
      * Actions allowed: Reactivate
      * Modified by Jon Alegria
@@ -963,11 +943,6 @@
         EXIT;
       END LOOP;
       IF (v_IsSOTrx='Y') THEN
-        -- Undo revenue and credit limit
-        --The next lines (3) have been commented due to the issue 19198
-        --UPDATE C_BPARTNER
-        --SET ActualLifeTimeValue=ActualLifeTimeValue -(v_Multiplier *  C_Base_Convert(v_GrandTotal, v_Currency_ID, v_Client_ID, v_DateAcct, v_Org_ID))
-        --WHERE C_BPartner_ID=v_BPartner_ID;
         FOR Cur_ReactivateInvoiceLine IN
           (SELECT C_InvoiceLine_ID, C_Orderline_ID, M_InoutLine_ID, QtyInvoiced
            FROM C_INVOICELINE
@@ -1203,7 +1178,6 @@
      *************************************************************************/
     v_CumDiscount:=0;
     v_OldCumDiscount:=0;
-    v_Line:=10;
     SELECT MAX(LINE) INTO v_InvoiceLineSeqNo
     FROM C_INVOICELINE
     WHERE C_INVOICE_ID=v_Record_ID;
@@ -1312,7 +1286,6 @@
         SET C_INVOICE_DISCOUNT_ID=Cur_CInvoiceDiscount.C_INVOICE_DISCOUNT_ID
         WHERE C_INVOICELINE_ID=v_InvoiceLine;
       END LOOP;
-      v_Line:=v_Line + 10;
     END LOOP;
   END IF;--FINISH_PROCESS
   IF (NOT FINISH_PROCESS AND NOT END_PROCESSING) THEN
@@ -1344,14 +1317,6 @@
     SET LastContact=now(),
         LastResult=v_DocumentNo
     WHERE AD_User_ID=v_BPartner_User_ID;
-    -- Update total revenue and credit limit
-    -- It is reversed in C_Allocation_Trg
-    --The next lines (5) have been commented due to the issue 19198
-    --IF (v_IsSOTrx='Y') THEN
-      --UPDATE C_BPARTNER
-      --SET ActualLifeTimeValue=ActualLifeTimeValue +(v_Multiplier *  C_Base_Convert(v_GrandTotal, v_Currency_ID, v_Client_ID, v_DateAcct, v_Org_ID))
-      --WHERE C_BPartner_ID=v_BPartner_ID;
-    --END IF;
   END IF;--FINISH_PROCESS
   IF (NOT FINISH_PROCESS AND NOT END_PROCESSING) THEN
     /**************************************************************************
@@ -1532,7 +1497,6 @@
       v_cash VARCHAR2(32) ;
       v_IsoCode C_CURRENCY.ISO_CODE%TYPE;
       v_CashLine VARCHAR2(32) ;
-      v_line NUMBER ;
       v_BPartnerName C_BPARTNER.NAME%TYPE;
       v_GenDP_Org VARCHAR2(32);
       v_dummy VARCHAR2(2000);
@@ -1543,6 +1507,7 @@
         AND ad_module_id <> '0';
       IF (v_count > 1) THEN
         v_dummy := AD_GET_PREFERENCE_VALUE('FinancialManagement', 'Y', v_client_id, v_org_id, NULL, NULL, NULL);
+        DBMS_OUTPUT.PUT_LINE('FinancialManagement preference value: ' || v_dummy);
       ELSIF (v_count = 0) THEN
         v_ResultStr:='Generating C_Debt_Payment';
         UPDATE C_DEBT_PAYMENT
--- a/model/src-db/database/model/functions/C_ORDERTAX_ADJUSTMENT.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/C_ORDERTAX_ADJUSTMENT.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -44,10 +44,7 @@
 
   -- Round and Adjust taxes
   IF (p_action = 'CO') THEN
-
-    -- Disable triggers
-    INSERT INTO AD_Session_Status (ad_session_status_id, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby, isimporting)
-    VALUES (get_uuid(), '0', '0', 'Y', now(), '0', now(), '0', 'Y');
+    AD_Disable_Triggers();
 
     -- Round
     UPDATE C_ORDERLINETAX
@@ -147,9 +144,7 @@
       END IF;
     END LOOP;
 
-    -- Enable triggers
-    DELETE FROM AD_Session_Status
-    WHERE isimporting = 'Y';
+    AD_Enable_Triggers();
 
   -- Recalculate amounts and taxes
   ELSIF (p_action = 'RE') THEN
@@ -163,19 +158,14 @@
       FROM C_ORDERLINE
       WHERE C_Order_ID = p_order_id
     ) LOOP
-
-      -- Disable triggers
-      INSERT INTO AD_Session_Status (ad_session_status_id, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby, isimporting)
-      VALUES (get_uuid(), '0', '0', 'Y', now(), '0', now(), '0', 'Y');
+      AD_Disable_Triggers();
 
       -- Remove line amounts and taxes
       DELETE FROM C_ORDERLINETAX WHERE C_OrderLine_ID = Cur_line.C_OrderLine_ID;
       SELECT Line_Gross_Amount INTO v_amount FROM C_ORDERLINE WHERE C_OrderLine_ID = Cur_line.C_OrderLine_ID;
       UPDATE C_ORDERLINE SET Line_Gross_Amount = 0 WHERE C_OrderLine_ID = Cur_line.C_OrderLine_ID;
 
-      -- Enable triggers
-      DELETE FROM AD_Session_Status
-      WHERE isimporting = 'Y';
+      AD_Enable_Triggers();
 
       -- Recalculate amounts and taxes
       UPDATE C_ORDERLINE SET Line_Gross_Amount = v_amount WHERE C_OrderLine_ID = Cur_line.C_OrderLine_ID;
--- a/model/src-db/database/model/functions/C_ORDER_POST1.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/C_ORDER_POST1.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -22,7 +22,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2017 Openbravo SLU
+* All portions are Copyright (C) 2001-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -98,6 +98,7 @@
   END_PROCESSING BOOLEAN:=FALSE;
   v_CBPartner_ID VARCHAR2(32);
   rowcount NUMBER;
+  v_stockqty NUMBER;
 
   v_CumDiscount NUMBER;
   v_OldCumDiscount NUMBER;
@@ -355,6 +356,37 @@
       RAISE_APPLICATION_ERROR(-20000, '@CannotUseGenericProduct@ ' || v_productName);
     END IF;
 
+    /*PLM Status*/
+    IF (v_DocAction = 'CO' AND v_IsSOTrx = 'Y' AND v_isreturndoctype = 'N') THEN
+      FOR Cur_line IN
+        (SELECT SUM(ol.qtyordered) AS qtyordered, ol.m_product_id, ol.c_uom_id, p.name, ps.restrictsalefrombackend, ps.restrictsaleoutofstock
+         FROM c_orderline ol
+         JOIN m_product p ON ol.m_product_id = p.m_product_id
+         JOIN m_product_status ps ON p.m_product_status_id = ps.m_product_status_id
+         WHERE ol.c_order_id = v_Record_ID
+         AND (ps.restrictsalefrombackend = 'Y' OR ps.restrictsaleoutofstock = 'Y')
+         GROUP BY ol.m_product_id, ol.c_uom_id, p.name, ps.restrictsalefrombackend, ps.restrictsaleoutofstock)
+      LOOP
+        IF (Cur_line.restrictsalefrombackend = 'Y') THEN
+          RAISE_APPLICATION_ERROR(-20000, '@CannotUseLockedProduct@ ' || Cur_line.name || '. @VerifyPLMStatus@.');
+        ELSIF (Cur_line.restrictsaleoutofstock = 'Y') THEN
+          SELECT COALESCE(SUM(sd.qtyonhand - sd.reservedqty), 0) INTO v_stockqty
+          FROM m_storage_detail sd
+          JOIN m_locator loc on loc.m_locator_id = sd.m_locator_id
+          WHERE sd.m_product_id = Cur_line.m_product_id
+          AND sd.c_uom_id = Cur_line.c_uom_id
+          AND EXISTS (SELECT 1
+                      FROM AD_Org_Warehouse w
+                      WHERE w.ad_org_id = v_Org_ID
+                      AND w.m_warehouse_id = loc.m_warehouse_id);
+
+          IF (Cur_line.qtyordered > v_stockqty) THEN
+            RAISE_APPLICATION_ERROR(-20000, '@CannotUseDiscontinuedProduct@ ' || Cur_line.name || '. @ProductDiscontinuedNoStock@ (' || v_stockqty || '). @VerifyPLMStatus@.');
+          END IF;
+        END IF;
+      END LOOP;
+    END IF;
+
     /** 
     * Quotations
     */
@@ -644,7 +676,8 @@
         FROM ad_preference
         WHERE property = 'StockReservations';
         IF (v_count > 1) THEN
-          v_dummy := AD_GET_PREFERENCE_VALUE('StockReservations', 'Y', v_client_id, v_org_id, NULL, NULL, NULL);
+          v_dummy := AD_GET_PREFERENCE_VALUE('StockReservations', 'Y', v_client_id, v_org_id, v_User, NULL, NULL);
+          DBMS_OUTPUT.PUT_LINE('StockReservations preference value: ' || v_dummy);
         ELSIF (v_count = 1) THEN
           UPDATE c_orderline
           SET so_res_status = NULL
@@ -1275,7 +1308,8 @@
       WHERE property = 'StockReservations';
       IF (v_count > 0) THEN
         IF (v_count > 1) THEN
-          v_dummy := AD_GET_PREFERENCE_VALUE('StockReservations', 'Y', v_client_id, v_org_id, NULL, NULL, NULL);
+          v_dummy := AD_GET_PREFERENCE_VALUE('StockReservations', 'Y', v_client_id, v_org_id, v_User, NULL, NULL);
+          DBMS_OUTPUT.PUT_LINE('StockReservations preference value: ' || v_dummy);
         END IF;
         DECLARE
           v_reservation_id      VARCHAR2(32);
@@ -1340,6 +1374,9 @@
                   IF (cur_orderline.qtyordered < v_reservedqty) OR (v_releasedqty = 0 AND cur_orderline.qtyordered > 0) THEN
                     --Reservation quantity to decrease with more reserved quantity than new quantity, unreserve stock
                     v_pendingtounreserve := v_reservedqty - cur_orderline.qtyordered;
+                    IF(v_pendingtounreserve < 0) THEN
+                      v_pendingtounreserve := 0;
+                    END IF;
                     FOR cur_res_stock IN (
                         SELECT m_reservation_stock_id, quantity - COALESCE(releasedqty, 0) AS reservedqty
                         FROM m_reservation_stock
@@ -1382,7 +1419,7 @@
                       updated = now(),
                       updatedby = v_user
                   WHERE m_reservation_id = v_reservation_id;
-                  IF (v_quantity < cur_orderline.qtyordered AND v_res_status = 'CO' AND v_DocAction <> 'CO') THEN
+                  IF (v_quantity < cur_orderline.qtyordered AND v_res_status = '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/C_PROJECT_WON.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/C_PROJECT_WON.xml	Wed Aug 08 05:40:37 2018 +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-2012 Openbravo SLU
+* All portions are Copyright (C) 2001-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -33,7 +33,6 @@
     v_cProjectId varchar2(32);
     v_cBPartnerId varchar2(32);
     v_cBPartnerLocationId varchar2(32);
-    v_adUserId varchar2(32);
     v_billToId varchar2(32);
     v_paymentRule VARCHAR(60) ;
     v_FINpayment C_PROJECTPROPOSAL.FIN_Paymentmethod_ID%TYPE;
@@ -80,14 +79,12 @@
     IF(v_projectStatus='OP') THEN
       SELECT C_PROJECTPROPOSAL.C_BPartner_ID,
         C_PROJECTPROPOSAL.C_BPartner_Location_ID,
-        C_PROJECTPROPOSAL.AD_User_ID,
         MAX(C_BPARTNER_LOCATION.C_BPartner_Location_ID),
         C_PROJECTPROPOSAL.PaymentRule,
         C_PROJECTPROPOSAL.FIN_Paymentmethod_ID,
         C_PROJECTPROPOSAL.C_Paymentterm_ID
       INTO v_cBPartnerId,
         v_cBPartnerLocationId,
-        v_adUserId,
         v_billToId,
         v_paymentRule,
         v_FINpayment,
@@ -101,7 +98,6 @@
         AND C_PROJECTPROPOSAL.C_ProjectProposal_ID=v_Record_ID
       GROUP BY C_PROJECTPROPOSAL.C_BPartner_ID,
         C_PROJECTPROPOSAL.C_BPartner_Location_ID,
-        C_PROJECTPROPOSAL.AD_User_ID,
         C_PROJECTPROPOSAL.PaymentRule,
         C_PROJECTPROPOSAL.FIN_Paymentmethod_ID,
         C_PROJECTPROPOSAL.C_Paymentterm_ID;
@@ -125,7 +121,7 @@
           SET Updated=now(),
           UpdatedBy='0',
           C_BPartner_ID=v_cBPartnerId,
-          C_BPartner_Location_ID=v_cBPartnerLocationId, --Salesrep_ID = v_adUserId,
+          C_BPartner_Location_ID=v_cBPartnerLocationId,
           BillTo_ID=v_billToId,
           PaymentRule=v_paymentRule,
           FIN_paymentmethod_id=v_FINpayment,
--- a/model/src-db/database/model/functions/C_TAXPAYMENT_POST.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/C_TAXPAYMENT_POST.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -145,9 +145,9 @@
         v_paymentrule := 'T';
         v_currencyratetype := 'S';
 
-      select c_calendar_id into v_calendar_ID
+      select ad_inheritedcalendar_id into v_calendar_ID
       from ad_org
-      where ad_org_id = ad_org_getcalendarowner(v_org_id);
+      where ad_org_id = v_org_id;
 
       select c_period_id into v_period_id
       from c_period
@@ -190,7 +190,8 @@
         WHERE property = 'FinancialManagement'
 	  AND ad_module_id <> '0';
         IF (v_count > 0) THEN
-	  v_dummy := AD_GET_PREFERENCE_VALUE('FinancialManagement', 'Y', v_client_id, v_org_id, NULL, NULL, NULL);
+          v_dummy := AD_GET_PREFERENCE_VALUE('FinancialManagement', 'Y', v_client_id, v_org_id, NULL, NULL, NULL);
+          DBMS_OUTPUT.PUT_LINE('FinancialManagement preference value: ' || v_dummy);
         ELSIF (v_count = 0) THEN
 	  C_SETTLEMENT_POST(null, v_settlementid);
 	  update c_taxpayment set c_settlement_id=null where c_taxpayment.C_TAXPAYMENT_ID = v_record_id;
@@ -366,6 +367,7 @@
 		AND ad_module_id <> '0';
 	IF (v_count > 0) THEN
 		v_dummy := AD_GET_PREFERENCE_VALUE('FinancialManagement', 'Y', v_client_id, v_org_id, NULL, NULL, NULL);
+		DBMS_OUTPUT.PUT_LINE('FinancialManagement preference value: ' || v_dummy);
 	ELSIF (v_count = 0) THEN
 		v_ResultStr:='Generating C_Debt_Payment';
 
--- a/model/src-db/database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml	Wed Aug 08 05:40:37 2018 +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-2017 Openbravo SLU
+* All portions are Copyright (C) 2001-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -563,6 +563,7 @@
                 now(), v_User_ID, now(), v_User_ID, v_Client_ID, v_PlanOrg_ID, 'Y',
                 v_Record_ID, Cur_CostCenter_Employee.C_Salary_Category_ID, 1
             );
+            DBMS_OUTPUT.PUT_LINE('Insert into MA_PL_Employee: ' || i);
           END LOOP;
         ELSE
           INSERT INTO MA_PL_EMPLOYEE(
--- a/model/src-db/database/model/functions/MA_PRODUCTION_COST.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/MA_PRODUCTION_COST.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -595,6 +595,34 @@
       END IF;
     END LOOP;
 
+    --ma_production_cost - Finish Process Extension Point
+    SELECT count(*) INTO v_count
+    FROM DUAL
+    where exists (select 1 from ad_ep_procedures where ad_extension_points_id = '9A3AFB83226246C490EEB51352F2314F');
+    IF (v_count=1) THEN
+      DECLARE
+        v_ep_instance VARCHAR2(32);
+        v_extension_point_id VARCHAR2(32) := '9A3AFB83226246C490EEB51352F2314F';
+      BEGIN
+        v_ep_instance := get_uuid();
+        AD_EP_INSTANCE_PARA_INSERT(v_ep_instance, v_extension_point_id, 'p_production_id',
+          p_production_id, NULL, NULL, NULL, NULL, NULL, NULL);
+        AD_EP_INSTANCE_PARA_INSERT(v_ep_instance, v_extension_point_id, 'User',
+          p_User_ID, NULL, NULL, NULL, NULL, NULL, NULL);
+        AD_EP_INSTANCE_PARA_INSERT(v_ep_instance, v_extension_point_id, 'Message',
+          NULL, NULL, NULL, NULL, NULL, NULL, v_Message);
+        AD_EXTENSION_POINT_HANDLER(v_ep_instance, v_extension_point_id);
+
+        SELECT p_text INTO v_Message
+        FROM ad_ep_instance_para
+        WHERE ad_ep_instance_id = v_ep_instance
+          AND parametername LIKE 'Message';
+	  
+        DELETE FROM ad_ep_instance_para
+        WHERE ad_ep_instance_id = v_ep_instance;
+      END;
+    END IF;
+
     RETURN;
 
 END; --BODY
--- a/model/src-db/database/model/functions/MRP_PURCHASEPLAN.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/MRP_PURCHASEPLAN.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -40,7 +40,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-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -51,7 +51,6 @@
 
   v_Stock NUMBER:=0;
   v_neededQty_New NUMBER;
-  v_neededQty_Old NUMBER;
   v_Qty_New NUMBER;
   v_Qty_Old NUMBER;
   v_Qty_Added VARCHAR(1);
@@ -100,7 +99,6 @@
             porg.stockmin, porg.maximumqty
     ) LOOP
       v_stock := 0;
-      v_neededqty_old := NULL;
       v_planneddate_old := NULL;
       v_Qty_Added := 'N';
       FOR Cur_Lines IN (
@@ -188,7 +186,6 @@
             WHERE MRP_RUN_PURCHASELINE_ID = v_Aux_new;
             v_stock := v_stock + v_qty_new - v_qty_old;
           END IF;
-          v_neededqty_old := v_neededqty_new;
           v_qty_old := v_qty_new;
         END IF;
 
--- a/model/src-db/database/model/functions/MRP_RUN_EXPLODE.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/MRP_RUN_EXPLODE.xml	Wed Aug 08 05:40:37 2018 +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-2017 Openbravo SLU
+* All portions are Copyright (C) 2001-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -110,9 +110,11 @@
 	  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);
+          DBMS_OUTPUT.PUT_LINE('Mrp_Run_Insertlines: ' || i || ' - ' || 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);
+        DBMS_OUTPUT.PUT_LINE('Mrp_Run_Insertlines: ' || v_Aux_ID);
 	  END IF;
         ELSE
           v_ResultStr := 'Explode dependant products';
@@ -140,6 +142,7 @@
             v_New := 'Y';
             v_qty := ROUND((Cur_Run_Lines.Qty*Cur_Dependants.qty)+0.0005,3);
             Mrp_Run_Insertlines(p_Client_ID, p_Org_ID, p_User_ID, p_Run_ID, Cur_Dependants.DependantProduct, v_qty, v_qty, Cur_Run_Lines.MRP_RUN_Line_ID, 'WP', 'N', NULL, NULL, NULL, NULL, NULL, (CASE WHEN Cur_Dependants.qty > 0 THEN Cur_Run_Lines.planneddate ELSE Cur_Run_Lines.plannedorderdate END), Cur_Run_Lines.plannedorderdate, 'Y', (CASE WHEN Cur_Dependants.qty < 0 THEN 'N' ELSE 'Y' END), NULL, v_Aux_ID);
+            DBMS_OUTPUT.PUT_LINE('Mrp_Run_Insertlines: ' || v_Aux_ID);
           END LOOP;
         END IF;
 
--- a/model/src-db/database/model/functions/MRP_RUN_INITIALIZE.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/MRP_RUN_INITIALIZE.xml	Wed Aug 08 05:40:37 2018 +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-2017 Openbravo SLU
+* All portions are Copyright (C) 2001-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -194,7 +194,9 @@
 
     v_ResultStr := 'Inserting stock lines product: ' || Cur_Product.M_Product_ID;
     MRP_RUN_INSERTLINES(p_client_id, p_org_id, p_user_id, p_run, cur_product.m_product_id, (-1 * cur_product.stockmin), 0, NULL, 'MS', 'Y', NULL, NULL, NULL, NULL, NULL, p_planningdate, NULL, p_production, (CASE WHEN cur_product.stockmin > 0 THEN 'N' ELSE 'Y' END), NULL, v_aux_id);
+    DBMS_OUTPUT.PUT_LINE('Mrp_Run_Insertlines: ' || v_Aux_ID);
     MRP_RUN_INSERTLINES(p_client_id, p_org_id, p_user_id, p_run, cur_product.m_product_id, v_qtyonhand, 0, NULL, 'ST', 'Y', NULL, NULL, NULL, NULL, NULL, p_planningdate, NULL, p_production, 'Y', NULL, v_aux_id);
+    DBMS_OUTPUT.PUT_LINE('Mrp_Run_Insertlines: ' || v_Aux_ID);
 
     v_ResultStr := 'Inserting Order lines product: ' || Cur_Product.M_Product_ID;
     FOR Cur_OrderLine IN (
@@ -230,6 +232,7 @@
              OR (o.issotrx = 'Y' AND dt.docsubtypeso <> 'OB' AND ol.qtyordered - COALESCE(ol.qtydelivered, 0) > COALESCE(res.reservedqty, 0) - COALESCE(res.releasedqty, 0)))
     ) LOOP
       MRP_RUN_INSERTLINES(p_Client_ID, p_Org_ID, p_User_ID, p_Run, Cur_Product.M_Product_ID, (CASE Cur_OrderLine.IsSOTrx WHEN 'Y' THEN (-1*Cur_OrderLine.Qty*Cur_OrderLine.Weighting) ELSE (Cur_OrderLine.Qty*Cur_OrderLine.Weighting) END), (CASE Cur_OrderLine.IsSOTrx WHEN 'Y' THEN (-1*Cur_OrderLine.Qty*Cur_OrderLine.Weighting) ELSE (Cur_OrderLine.Qty*Cur_OrderLine.Weighting) END), NULL, (CASE Cur_OrderLine.IsSOTrx WHEN 'Y' THEN 'SO' ELSE 'PO' END), 'Y', Cur_OrderLine.C_OrderLine_ID, NULL, NULL, NULL, NULL, Cur_OrderLine.planningDate, Cur_OrderLine.dateordered, p_Production, (CASE WHEN (Cur_OrderLine.IsSOTrx = 'Y' AND p_Production = 'Y') OR (p_Production = 'N' AND Cur_OrderLine.Qty < 0 ) THEN 'N' ELSE 'Y' END), NULL, v_Aux_ID);
+      DBMS_OUTPUT.PUT_LINE('Mrp_Run_Insertlines: ' || v_Aux_ID);
     END LOOP;
 
     IF (p_Production = 'Y') THEN
@@ -282,6 +285,7 @@
             AND a.total <> 0
         ) LOOP
           MRP_RUN_INSERTLINES(p_Client_ID, p_Org_ID, p_User_ID, p_Run, Cur_Phase_Dependants.M_Product_ID, Cur_Phase_Dependants.total*Cur_Phase.WEIGHTING, Cur_Phase_Dependants.Total*Cur_Phase.WEIGHTING, v_ParentLine, 'WR', 'Y', NULL, Cur_Phase.MA_WorkRequirement_ID, NULL, NULL, NULL, (CASE WHEN Cur_Phase_Dependants.Total>0 THEN Cur_Phase.EndDate ELSE Cur_Phase.StartDate END), Cur_Phase.StartDate, p_Production, (CASE WHEN Cur_Phase_Dependants.Total>0 THEN 'Y' ELSE 'N' END), NULL, v_Aux_ID);
+          DBMS_OUTPUT.PUT_LINE('Mrp_Run_Insertlines: ' || v_Aux_ID);
           MRP_RUN_INITIALIZE(p_User_ID, p_Org_ID, p_Client_ID, p_Run, p_Planner_ID,
                    Cur_Phase_Dependants.M_Product_ID, NULL, NULL, NULL, NULL, p_TimeHorizon,
                    p_PlanningDate, p_Production);
@@ -304,6 +308,7 @@
            AND AD_ISORGINCLUDED(sf.ad_org_id, p_org_id, p_client_id) > -1
     ) LOOP
       MRP_RUN_INSERTLINES(p_Client_ID, p_Org_ID, p_User_ID, p_Run, Cur_Product.M_Product_ID, (Cur_SalesForeCast.Qty*Cur_SalesForeCast.Weighting), (Cur_SalesForeCast.Qty*Cur_SalesForeCast.Weighting), NULL, 'SF', 'Y', NULL, NULL, Cur_SalesForeCast.MRP_SALESFORECASTLINE_ID, NULL, NULL, Cur_SalesForeCast.DatePlanned, Cur_SalesForeCast.DatePlanned, p_Production, CASE WHEN (Cur_SalesForeCast.Qty < 0 AND p_Production='Y') OR (Cur_SalesForeCast.Qty > 0 AND p_Production='N') THEN 'N' ELSE 'Y' END, NULL, v_Aux_ID);
+      DBMS_OUTPUT.PUT_LINE('Mrp_Run_Insertlines: ' || v_Aux_ID);
     END LOOP;
 
     IF (p_Production = 'N') THEN
@@ -324,6 +329,7 @@
             AND r.m_product_id = cur_product.m_product_id
       ) LOOP
         MRP_RUN_INSERTLINES(p_Client_ID, p_Org_ID, p_User_ID, p_Run, Cur_Product.M_Product_ID, Cur_RequisitionLine.qty*Cur_RequisitionLine.Weighting, Cur_RequisitionLine.qty*Cur_RequisitionLine.Weighting, NULL, 'MF', 'Y', NULL, NULL, NULL, Cur_RequisitionLine.M_RequisitionLine_ID, NULL, Cur_RequisitionLine.DatePlanned, Cur_RequisitionLine.DatePlanned, p_Production, CASE WHEN (Cur_RequisitionLine.Qty > 0) THEN 'N' ELSE 'Y' END, NULL, v_Aux_ID);
+        DBMS_OUTPUT.PUT_LINE('Mrp_Run_Insertlines: ' || v_Aux_ID);
         UPDATE m_requisitionline
         SET lockedby = p_user_id,
             lockdate = now(),
--- a/model/src-db/database/model/functions/M_GETJSONDESCRIPTION.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/M_GETJSONDESCRIPTION.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -26,7 +26,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) 2017 Openbravo SLU
+ * All portions are Copyright (C) 2017-2018 Openbravo SLU
  * All Rights Reserved.
  * Contributor(s):  ______________________________________.
  *************************************************************************
@@ -41,6 +41,10 @@
   v_serno VARCHAR2(2000):='';
   v_lot VARCHAR2(2000):='';
   v_guaranteedate VARCHAR2(2000):='';
+  v_escaped_serno VARCHAR2(2000):='';
+  v_escaped_lot VARCHAR2(2000):='';
+  v_escaped_guaranteedate VARCHAR2(2000):='';
+  v_escaped_attvalue VARCHAR2(2000):='';
   v_serno_sk VARCHAR(60):='SerialNoLabel';
   v_guaranteedate_sk VARCHAR(60):='ExpirationDateLabel';
   v_lot_sk VARCHAR(60):='LotLabel';
@@ -48,6 +52,11 @@
   v_guaranteedate_label AD_Message.MsgText%TYPE;
   v_lot_label AD_Message.MsgText%TYPE;
   v_language_code VARCHAR(6);
+  v_att_set_instance_id_to_use VARCHAR(32);
+  v_ref_inv_id VARCHAR(32);
+  v_backslash VARCHAR(1):= CHR(92);
+  v_two_backslash VARCHAR(2);
+  v_backslash_and_quote VARCHAR(2);
   TYPE RECORD IS REF CURSOR;
   Cur_Attribute RECORD;
   
@@ -56,19 +65,6 @@
   select ad_message_get2(v_serno_sk, v_language_code) INTO v_serno_label from dual;
   select ad_message_get2(v_guaranteedate_sk, v_language_code) INTO v_guaranteedate_label from dual;
   select ad_message_get2(v_lot_sk, v_language_code) INTO v_lot_label from dual;
-  
-  FOR Cur_Attribute IN
-    (SELECT mai.m_attribute_id as attributeId, coalesce(to_char(mai.value), '') as attributeValue, ma.name as attributeName, mau.seqno as seqNo, ma.ismandatory as isMandatory
-     FROM m_attributeinstance mai
-     INNER JOIN m_attribute ma on (ma.m_attribute_id=mai.m_attribute_id)
-     INNER JOIN m_attributesetinstance masi on (masi.m_attributesetinstance_id=mai.m_attributesetinstance_id)
-     INNER JOIN m_attributeuse mau on (ma.m_attribute_id = mau.m_attribute_id and masi.m_attributeset_id = mau.m_attributeset_id)
-     WHERE mai.m_attributesetinstance_id = p_attributesetinstance_id
-     ORDER BY seqno asc, ma.name)
-  LOOP
-    v_json:=v_json || '"' || Cur_Attribute.attributeId || '":{"value":"' || Cur_Attribute.attributeValue || '","name":"' || Cur_Attribute.attributeName || '","ismandatory":' || (CASE WHEN (Cur_Attribute.isMandatory = 'Y') THEN 'true' ELSE 'false' END)  || ',"seqno":' || Cur_Attribute.seqNo || '},';
-  END LOOP;
-  
   SELECT coalesce(to_char(case when mas.M_SERNOCTL_ID is null AND p_exclude_characters = 'N' then concat('#', masi.serno) else masi.serno end), ''),
          coalesce(to_char(case when mas.M_LOTCTL_ID is null AND p_exclude_characters = 'N' then concat('L', masi.lot) else masi.lot end),  ''), 
          coalesce(to_char(TO_DATE(masi.guaranteedate), p_dateformatsql), '')
@@ -79,9 +75,50 @@
   INNER JOIN m_attributeset mas on (mas.m_attributeset_id = masi.m_attributeset_id)
   where masi.m_attributesetinstance_id = p_attributesetinstance_id;
 
-  v_json:=v_json || '"lot":{"value":"' || v_lot || '","name":"lot","label":"' || v_lot_label || '"},';
-  v_json:=v_json || '"serialno":{"value":"' || v_serno || '","name":"serialno","label":"' || v_serno_label || '"},';
-  v_json:=v_json || '"guaranteedate":{"value":"' || v_guaranteedate || '","name":"guaranteedate","label":"' || v_guaranteedate_label || '"}';
+  v_two_backslash := v_backslash || v_backslash;
+  v_backslash_and_quote := v_backslash || '"';
+  
+  v_escaped_lot := replace(v_lot, CHR(10), '');
+  v_escaped_lot := replace(v_escaped_lot, CHR(13), '');
+  v_escaped_lot := replace(v_escaped_lot, v_backslash, v_two_backslash);
+  v_escaped_lot := replace(v_escaped_lot, '"', v_backslash_and_quote);
+  
+  v_escaped_serno := replace(v_serno, CHR(10), '');
+  v_escaped_serno := replace(v_escaped_serno, CHR(13), '');
+  v_escaped_serno := replace(v_escaped_serno, v_backslash, v_two_backslash);
+  v_escaped_serno := replace(v_escaped_serno, '"', v_backslash_and_quote);
+  
+  v_escaped_guaranteedate := replace(v_guaranteedate, CHR(10), '');
+  v_escaped_guaranteedate := replace(v_escaped_guaranteedate, CHR(13), '');
+  v_escaped_guaranteedate := replace(v_escaped_guaranteedate, v_backslash, v_two_backslash);
+  v_escaped_guaranteedate := replace(v_escaped_guaranteedate, '"', v_backslash_and_quote);
+  
+  v_json:=v_json || '"lot":{"value":"' || v_escaped_lot || '","name":"lot","label":"' || v_lot_label || '"},';
+  v_json:=v_json || '"serialno":{"value":"' || v_escaped_serno || '","name":"serialno","label":"' || v_serno_label || '"},';
+  v_json:=v_json || '"guaranteedate":{"value":"' || v_escaped_guaranteedate || '","name":"guaranteedate","label":"' || v_guaranteedate_label || '"}';
+
+  SELECT m_refinventory_id, parent_attributesetinstance_id
+  INTO v_ref_inv_id, v_att_set_instance_id_to_use
+  FROM m_attributesetinstance
+  WHERE m_attributesetinstance_id = p_attributesetinstance_id;
+  
+  IF (v_ref_inv_id IS NULL) THEN
+    v_att_set_instance_id_to_use:=p_attributesetinstance_id;
+  END IF;
+  
+  FOR Cur_Attribute IN
+    (SELECT mai.m_attribute_id as attributeId, coalesce(to_char(mai.value), '') as attributeValue, ma.name as attributeName
+     FROM m_attributeinstance mai
+     INNER JOIN m_attribute ma on (ma.m_attribute_id=mai.m_attribute_id)
+     WHERE mai.m_attributesetinstance_id = v_att_set_instance_id_to_use
+     ORDER BY ma.name)
+  LOOP
+    v_escaped_attvalue := replace(Cur_Attribute.attributeValue, CHR(10), '');
+    v_escaped_attvalue := replace(v_escaped_attvalue, CHR(13), '');
+    v_escaped_attvalue := replace(v_escaped_attvalue, v_backslash, v_two_backslash);
+    v_escaped_attvalue := replace(v_escaped_attvalue, '"', v_backslash_and_quote);
+    v_json:=v_json || ',"' || Cur_Attribute.attributeId || '":{"value":"' || v_escaped_attvalue || '","name":"' || Cur_Attribute.attributeName || '"}';
+  END LOOP;
 
   v_json:=v_json || '}';
   
--- a/model/src-db/database/model/functions/M_GET_STOCK_PARAM.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/M_GET_STOCK_PARAM.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -88,7 +88,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) 2015-2017 Openbravo SLU
+* All portions are Copyright (C) 2015-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -483,6 +483,7 @@
         SELECT result, errormsg INTO v_auxresult, v_auxmessage
         FROM ad_pinstance
         WHERE ad_pinstance_id = p_uuid;
+        DBMS_OUTPUT.PUT_LINE('v_auxresult: ' || v_auxresult || ' v_auxmessage: ' || v_auxmessage);
         v_message := v_message || ' ' || cur_warehouse.name || ': ' || COALESCE(v_auxmessage, '@Success@');
     	IF(v_count=0) THEN 
         DELETE FROM ad_pinstance
--- a/model/src-db/database/model/functions/M_INITIALIZE_STOCK_VALUATION.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/M_INITIALIZE_STOCK_VALUATION.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -68,7 +68,8 @@
           SELECT SUM(a.qty) as stock, ROUND(SUM(sumcost), v_costprecission) as valuation, aux_warehouse_id as m_warehouse_id
           FROM (
             SELECT trx.m_product_id, w.m_warehouse_id AS aux_warehouse_id,
-                trx.movementqty AS qty, c_currency_convert_precision(SUM (CASE WHEN trx.movementqty < 0 THEN -tc.cost ELSE tc.cost END), tc.c_currency_id, v_currency_id, tc.dateacct, NULL, p_client, Cur_legal_entities.ad_org_id, 'C') AS sumcost
+                CASE WHEN (LAG(trx.m_transaction_id, 1) OVER (ORDER BY trx.m_transaction_id) = trx.m_transaction_id) THEN 0 ELSE trx.movementqty END AS qty,
+                c_currency_convert_precision(SUM (CASE WHEN trx.movementqty < 0 THEN -tc.cost ELSE tc.cost END), tc.c_currency_id, v_currency_id, tc.dateacct, NULL, p_client, Cur_legal_entities.ad_org_id, 'C') AS sumcost
             FROM m_transaction trx
               JOIN m_locator l ON (trx.m_locator_id=l.m_locator_id)
               LEFT JOIN m_warehouse w ON w.m_warehouse_id = CASE Cur_legal_entities.warehouse_dimension WHEN 'Y' THEN l.m_warehouse_id ELSE '-1' END
--- a/model/src-db/database/model/functions/M_INOUT_CREATE.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/M_INOUT_CREATE.xml	Wed Aug 08 05:40:37 2018 +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-2017 Openbravo, S.L.U.
+  * Contributions are Copyright (C) 2001-2018 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -376,8 +376,8 @@
           Ad_Sequence_Doc('DocumentNo_M_InOut', Cur_Order.AD_Client_ID, 'Y', v_DocumentNo) ;
         END IF;
 
-        IF (Cur_Order.DocSubTypeSO = 'WR') THEN
-          v_NEWORDERDATE := Cur_Order.DATEORDERED; -- IS A POS ORDER
+        IF (Cur_Order.DocSubTypeSO IN ('WR','WP')) THEN
+          v_NEWORDERDATE := Cur_Order.DATEORDERED; -- IS A POS ORDER OR A WAREHOUSE ORDER
         ELSE
           v_NEWORDERDATE := TRUNC(now());
         END IF;
--- a/model/src-db/database/model/functions/M_INOUT_CREATE0.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/M_INOUT_CREATE0.xml	Wed Aug 08 05:40:37 2018 +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-2018 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -32,6 +32,7 @@
 BEGIN
   -- No forced Delivery
   M_InOut_Create(PInstance_ID, Dummy, NULL, NULL, 'N') ;
+  DBMS_OUTPUT.PUT_LINE('M_InOut_Create: ' || Dummy);
 END M_INOUT_CREATE0
 ]]></body>
     </function>
--- a/model/src-db/database/model/functions/M_INOUT_POST.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/M_INOUT_POST.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -886,7 +886,6 @@
             DECLARE
               Cur_SLines RECORD;
               Cur_ILines RECORD;
-              v_Qty NUMBER;
               v_MatchPO_ID VARCHAR2(32) ;
               v_MatchInv_ID VARCHAR2(32) ;
             BEGIN
--- a/model/src-db/database/model/functions/M_MOVEMENT_POST.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/M_MOVEMENT_POST.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -252,6 +252,7 @@
                 SET quantity = quantity - v_qtytorelease
               WHERE m_reservation_stock_id = cur_res_stock.m_reservation_stock_id;
               M_RESERVE_STOCK_MANUAL(cur_moveline.m_reservation_id, 'SD', v_storage_detail_id, v_qtytorelease, v_p_user, cur_res_stock.isallocated, v_res_stock_id);
+              DBMS_OUTPUT.PUT_LINE('M_Reserve_Stock_Manual: ' || v_res_stock_id);
 
               v_reservedqty := v_reservedqty - v_qtytorelease;
               IF (v_reservedqty <= 0) THEN
--- a/model/src-db/database/model/functions/M_PRICELIST_CREATE.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/M_PRICELIST_CREATE.xml	Wed Aug 08 05:40:37 2018 +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-2017 Openbravo, S.L.U.
+  * Contributions are Copyright (C) 2001-2018 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -53,6 +53,8 @@
     v_validfromdate M_PriceList_Version.ValidFrom%TYPE;
     v_isCostMigrated NUMBER;
     v_clientCurrencyId AD_Client.C_Currency_ID%TYPE;
+    v_count NUMBER;
+    v_priceListPrefValue CHAR(1):='Y';
     --
     -- Get PL Parameter
     Cur_DiscountLine RECORD;
@@ -68,7 +70,6 @@
     v_Sql_insert VARCHAR2(2000);
     v_rdbms VARCHAR2(2000):=AD_GET_RDBMS();
 
-    v_priceRemoved CHAR(1) := 'N';
   BEGIN
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Processing') ;
@@ -134,8 +135,16 @@
     IF (v_Costbased = 'N' AND (v_PriceList_Version_Base_ID IS NULL OR v_PriceList_Version_Base_ID='')) THEN
       RAISE_APPLICATION_ERROR(-20000, '@BasePriceListRequired@');
     END IF;
+    -- Calculate Hierarchical Product Price Preference
+    SELECT COUNT(1) INTO v_count
+    FROM ad_preference
+    WHERE property = 'HierarchicalPriceList';
+    IF (v_count > 0) THEN
+      v_priceListPrefValue := AD_GET_PREFERENCE_VALUE('HierarchicalPriceList', 'Y', v_client_id, v_org_id, v_User, NULL, NULL);    
+    END IF;
     --Create temporary tables 
     v_temp:=C_CREATE_TEMPORARY_TABLES();
+    DELETE FROM C_TEMP_Selection2;
     DBMS_OUTPUT.PUT_LINE('  PriceList_Version_ID=' || v_PriceList_Version_ID) ;
     -- Checking Prerequisites
     -- -- PO Prices must exists
@@ -158,7 +167,6 @@
         rowcount:=SQL%ROWCOUNT;
         v_Message:='@Deleted@=' || rowcount || ' - ';
         DBMS_OUTPUT.PUT_LINE(v_Message) ;
-        v_priceRemoved := 'Y';
       END IF;
       /**
       * For All Discount Lines in Sequence
@@ -264,7 +272,7 @@
         END IF;
 
         -- Product Price will be created with initial values only the first time and will be used as basis for next iterations
-        IF (v_priceRemoved = 'N' AND (v_PriceList_Version_Base_ID IS NULL OR v_PriceList_Version_Base_ID <> v_PriceList_Version_ID)) THEN
+        IF (v_PriceList_Version_Base_ID IS NULL OR v_PriceList_Version_Base_ID <> v_PriceList_Version_ID) THEN
           v_ResultStr:=v_ResultStr || ', Delete';
           DELETE
           FROM M_ProductPrice
@@ -274,8 +282,24 @@
             FROM C_TEMP_Selection s
             WHERE M_ProductPrice.M_Product_ID=s.C_TEMP_Selection_ID
             )
-            ;
-          v_priceRemoved := 'Y';
+            AND NOT EXISTS
+            (SELECT 1
+            FROM C_TEMP_Selection2 sel2
+            WHERE M_ProductPrice.M_Product_ID=sel2.C_TEMP_Selection_ID
+            );
+          IF(v_priceListPrefValue = 'Y') THEN
+            INSERT INTO C_TEMP_Selection2 
+            (
+             C_TEMP_Selection_ID, QUERY_ID
+            )
+            SELECT sel.C_TEMP_Selection_ID, ' '
+            FROM C_TEMP_Selection sel
+            WHERE NOT EXISTS
+              (SELECT 1
+               FROM C_TEMP_Selection2 sel2
+               WHERE sel.C_TEMP_Selection_ID=sel2.C_TEMP_Selection_ID
+              );  
+          END IF;
         END IF;
         -- --------------------
         -- Copy (Insert) Prices
--- a/model/src-db/database/model/functions/M_RESERVATION_POST.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/M_RESERVATION_POST.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -25,7 +25,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2012-2017 Openbravo SLU
+* All portions are Copyright (C) 2012-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -204,7 +204,7 @@
           AND rs.m_reservation_id = v_reservation_id
           AND rs.m_locator_id IS NOT NULL
       ) LOOP
-        RAISE_APPLICATION_ERROR(-20000, '@NotEnoughAvailableStock@ : ' || cur_not_available.locatorName || ' - ' || cur_not_available.attributeName);
+        RAISE_APPLICATION_ERROR(-20000, '@NotEnoughAvailableStock@ : ' || cur_not_available.locatorName || ' - ' || COALESCE(TO_CHAR(cur_not_available.attributeName), ''));
       END LOOP;
       
       -- Check that prereserved quantity is equal all lower than ordered quantity
--- a/model/src-db/database/model/functions/M_RESERVATION_REALLOCATE.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/M_RESERVATION_REALLOCATE.xml	Wed Aug 08 05:40:37 2018 +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-2017 Openbravo SLU
+* All portions are Copyright (C) 2013-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -305,6 +305,7 @@
     
     IF (v_availablestock >= v_qtytorelease) THEN
       M_RESERVE_STOCK_AUTO(cur_not_allocated_stock.m_reservation_id, p_user_id, v_newreservedqty);
+      DBMS_OUTPUT.PUT_LINE('M_Reserve_Stock_Auto: ' || v_newreservedqty);
       v_pendingtoreallocate := v_pendingtoreallocate - v_qtytorelease;
       IF (v_pendingtoreallocate <= 0) THEN
         -- Reallocation completed
--- a/model/src-db/database/model/functions/M_RESERVE_STOCK_AUTO.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/M_RESERVE_STOCK_AUTO.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -22,7 +22,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2012-2017 Openbravo SLU
+* All portions are Copyright (C) 2012-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -98,6 +98,7 @@
   ) LOOP
     v_qty := LEAST(cur_stock.quantity, v_pendingqty);
     M_RESERVE_STOCK_MANUAL(p_reservation_id, 'SD', cur_stock.m_storage_detail_id, v_qty, p_user_id, cur_stock.isallocated, v_dummy);
+    DBMS_OUTPUT.PUT_LINE('M_Rerserve_Stock_Manual: ' || v_dummy);
     v_pendingqty := v_pendingqty - v_qty;
     IF (v_pendingqty <= 0) THEN
       p_reservedqty := v_reserveqty;
--- a/model/src-db/database/model/functions/M_WAREHOUSE_DEFAULT_RULE_PARAM.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/functions/M_WAREHOUSE_DEFAULT_RULE_PARAM.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -76,7 +76,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) 2017 Openbravo SLU
+* All portions are Copyright (C) 2017-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -88,6 +88,7 @@
   
   */
   p_result:=1;
+  p_message:='';
   RETURN;
 END M_WAREHOUSE_DEFAULT_RULE_PARAM
 ]]></body>
--- a/model/src-db/database/model/prescript-Oracle.sql	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/prescript-Oracle.sql	Wed Aug 08 05:40:37 2018 +0000
@@ -16,6 +16,11 @@
 End;
 /-- END
 
+Begin  
+  execute immediate 'Drop table AD_SESSION_STATUS';
+  Exception when others then null;
+End;
+/-- END
 
 DECLARE
   AUX NUMBER;
@@ -269,3 +274,103 @@
     END IF;
 end OBEQUALS;
 /-- END
+
+CREATE TABLE AD_SESSION_STATUS
+   (AD_SESSION_STATUS_ID VARCHAR2(32 BYTE), 
+    AD_CLIENT_ID VARCHAR2(32 BYTE) NOT NULL ENABLE, 
+    AD_ORG_ID VARCHAR2(32 BYTE) NOT NULL ENABLE, 
+    ISACTIVE CHAR(1 BYTE) DEFAULT 'Y' NOT NULL ENABLE, 
+    CREATED DATE DEFAULT SYSDATE NOT NULL ENABLE, 
+    CREATEDBY VARCHAR2(32 BYTE) NOT NULL ENABLE, 
+    UPDATED DATE DEFAULT SYSDATE NOT NULL ENABLE, 
+    UPDATEDBY VARCHAR2(32 BYTE) NOT NULL ENABLE, 
+    ISIMPORTING CHAR(1 BYTE) NOT NULL ENABLE, 
+    CONSTRAINT AD_SESSION_STATUS_ISACTIVE_CHK CHECK (ISACTIVE IN ('Y', 'N')) ENABLE, 
+    CONSTRAINT AD_SESSION_STATUS_ISIMPORT_CHK CHECK (ISIMPORTING IN ('Y', 'N')) ENABLE, 
+    CONSTRAINT AD_SESSION_STATUS_KEY PRIMARY KEY (AD_SESSION_STATUS_ID)
+   )
+/-- END
+
+create or replace FUNCTION AD_IsTriggerEnabled RETURN CHAR
+AS
+/*************************************************************************
+* 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) 2008-2018 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+ v_aux NUMBER;
+BEGIN
+ SELECT COUNT(*)
+   INTO v_aux
+   FROM AD_Session_Status
+  WHERE IsImporting='Y';
+
+  IF v_Aux>0 THEN
+    RETURN 'N';
+  ELSE
+    RETURN 'Y';
+  END IF;
+EXCEPTION
+WHEN OTHERS THEN
+  RETURN 'Y';
+END AD_ISTRIGGERENABLED;
+/-- END
+
+create or replace PROCEDURE AD_Disable_Triggers
+AS
+/*************************************************************************
+* 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) 2018 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+BEGIN
+  INSERT INTO AD_Session_Status (ad_session_status_id, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby, isimporting)
+      VALUES (get_uuid(), '0', '0', 'Y', TO_DATE(NOW()), '0', TO_DATE(NOW()), '0', 'Y');
+END AD_Disable_Triggers;
+/-- END
+
+create or replace PROCEDURE AD_Enable_Triggers
+AS
+/*************************************************************************
+* 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) 2018 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+BEGIN
+  DELETE FROM AD_Session_Status
+      WHERE isimporting = 'Y';
+END AD_Enable_Triggers;
+/-- END
--- a/model/src-db/database/model/prescript-PostgreSql.sql	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/prescript-PostgreSql.sql	Wed Aug 08 05:40:37 2018 +0000
@@ -1602,3 +1602,85 @@
 END; $BODY$
   LANGUAGE plpgsql IMMUTABLE
 /-- END
+ 
+CREATE OR REPLACE FUNCTION AD_IsTriggerEnabled()
+  RETURNS character AS
+$BODY$ DECLARE 
+/*************************************************************************
+* 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) 2008-2018 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+BEGIN
+  if current_setting('my.triggers_disabled') = 'Y' then
+    return 'N';
+  end if;
+  return 'Y';
+EXCEPTION
+WHEN OTHERS THEN
+  RETURN 'Y';
+END ; $BODY$
+  LANGUAGE plpgsql VOLATILE
+/-- END
+ 
+CREATE OR REPLACE FUNCTION AD_Disable_Triggers()
+  RETURNS void AS
+$BODY$ DECLARE 
+/*************************************************************************
+* 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) 2018 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+BEGIN
+  perform set_config('my.triggers_disabled', 'Y', true);
+END ; $BODY$
+  LANGUAGE plpgsql VOLATILE
+/-- END
+
+CREATE OR REPLACE FUNCTION AD_Enable_Triggers()
+  RETURNS void AS
+$BODY$ DECLARE 
+/*************************************************************************
+* 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) 2018 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+BEGIN
+  perform set_config('my.triggers_disabled', 'N', true);
+END ; $BODY$
+  LANGUAGE plpgsql VOLATILE
+/-- END
+ 
\ No newline at end of file
--- a/model/src-db/database/model/tables/AD_ORG.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/tables/AD_ORG.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -73,12 +73,35 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="AD_PERIODCONTROLALLOWED_ORG_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_CALENDAROWNER_ORG_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_LEGALENTITY_ORG_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_INHERITEDCALENDAR_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_BUSINESSUNIT_ORG_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="AD_ORG_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
       <foreign-key foreignTable="AD_ORGTYPE" name="AD_ORG_AD_ORGTYPE">
         <reference local="AD_ORGTYPE_ID" foreign="AD_ORGTYPE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="AD_ORG_BUSINESSUNIT_ORG">
+        <reference local="AD_BUSINESSUNIT_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="AD_ORG_C_ACCTSCHEMA_">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
@@ -88,6 +111,18 @@
       <foreign-key foreignTable="C_CURRENCY" name="AD_ORG_C_CURRENCY">
         <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="AD_ORG_CALENDAROWNER_ORG">
+        <reference local="AD_CALENDAROWNER_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_CALENDAR" name="AD_ORG_INHERITEDCALENDAR">
+        <reference local="AD_INHERITEDCALENDAR_ID" foreign="C_CALENDAR_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="AD_ORG_LEGALENTITY_ORG">
+        <reference local="AD_LEGALENTITY_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="AD_ORG_PERIODCNTRLALLOWED_ORG">
+        <reference local="AD_PERIODCONTROLALLOWED_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <unique name="AD_ORG_VALUE">
         <unique-column name="AD_CLIENT_ID"/>
         <unique-column name="VALUE"/>
--- a/model/src-db/database/model/tables/AD_PROCESS_REQUEST.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/tables/AD_PROCESS_REQUEST.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -227,6 +227,10 @@
       <foreign-key foreignTable="AD_PROCESS_REQUEST" name="AD_PROCESS_REQUEST_GROUP">
         <reference local="AD_PROCESS_REQUEST_GROUP_ID" foreign="AD_PROCESS_REQUEST_ID"/>
       </foreign-key>
+      <index name="AD_PROCESS_REQGROUP_IDX" unique="false">
+        <index-column name="AD_PROCESS_REQUEST_GROUP_ID"/>
+        <whereClause><![CDATA[AD_PROCESS_REQUEST_GROUP_ID IS NOT NULL]]></whereClause>
+      </index>
       <check name="AD_PROCESS_REQUEST_GROUP_CHK"><![CDATA[ISGROUP = 'Y' AND AD_PROCESS_GROUP_ID IS NOT NULL OR ISGROUP = 'N' AND AD_PROCESS_GROUP_ID IS NULL]]></check>
       <check name="AD_PROCESS_REQUEST_ISGROUP_CHK"><![CDATA[ISGROUP IN ('Y', 'N')]]></check>
       <check name="AD_PROCESS_REQUEST_PROCESS_CHK"><![CDATA[AD_PROCESS_ID IS NOT NULL AND AD_PROCESS_GROUP_ID IS NULL OR AD_PROCESS_GROUP_ID IS NOT NULL AND AD_PROCESS_ID IS NULL]]></check>
--- a/model/src-db/database/model/tables/AD_ROLE.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/tables/AD_ROLE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -58,7 +58,7 @@
         <onCreateDefault/>
       </column>
       <column name="ISMANUAL" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
-        <default><![CDATA[N]]></default>
+        <default><![CDATA[Y]]></default>
         <onCreateDefault/>
       </column>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
@@ -70,7 +70,7 @@
         <onCreateDefault/>
       </column>
       <column name="ISADVANCED" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
-        <default><![CDATA[Y]]></default>
+        <default><![CDATA[N]]></default>
         <onCreateDefault><![CDATA['Y']]></onCreateDefault>
       </column>
       <column name="ISRESTRICTBACKEND" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
--- a/model/src-db/database/model/tables/C_INVOICELINE.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/tables/C_INVOICELINE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -306,6 +306,7 @@
       </foreign-key>
       <index name="C_INVOICELINE_ACCOUNT" unique="false">
         <index-column name="ACCOUNT_ID"/>
+        <whereClause><![CDATA[ACCOUNT_ID IS NOT NULL]]></whereClause>
       </index>
       <index name="C_INVOICELINE_BOMPARENT_IDX" unique="false">
         <index-column name="BOM_PARENT_ID"/>
--- a/model/src-db/database/model/tables/M_INOUT.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/tables/M_INOUT.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -263,7 +263,7 @@
       </column>
       <column name="ISCOMPLETELYINVOICED" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
         <default><![CDATA[N]]></default>
-        <onCreateDefault/>
+        <onCreateDefault><![CDATA['Y']]></onCreateDefault>
       </column>
       <foreign-key foreignTable="M_FREIGHTCATEGORY" name="M_FREIGHTCATEGORY_M_INOUT">
         <reference local="M_FREIGHTCATEGORY_ID" foreign="M_FREIGHTCATEGORY_ID"/>
--- a/model/src-db/database/model/tables/M_MATCHPO.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/tables/M_MATCHPO.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -95,6 +95,11 @@
         <index-column name="C_INVOICELINE_ID"/>
         <whereClause><![CDATA[C_INVOICELINE_ID IS NOT NULL]]></whereClause>
       </index>
+      <index name="M_MATCHPO_ORDLINE_INVLINE" unique="false">
+        <index-column name="C_ORDERLINE_ID"/>
+        <index-column name="C_INVOICELINE_ID"/>
+        <whereClause><![CDATA[C_INVOICELINE_ID IS NOT NULL]]></whereClause>
+      </index>
       <index name="M_MATCHPO_POSTED" unique="false">
         <index-column name="POSTED"/>
       </index>
--- a/model/src-db/database/model/tables/M_MOVEMENTLINE.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/tables/M_MOVEMENTLINE.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -131,6 +131,7 @@
       </foreign-key>
       <index name="M_MOVEMENTLINE_C_AUM" unique="false">
         <index-column name="C_AUM"/>
+        <whereClause><![CDATA[C_AUM IS NOT NULL]]></whereClause>
       </index>
       <index name="M_MOVEMENTLINE_MOVEMENT" unique="false">
         <index-column name="M_MOVEMENT_ID"/>
--- a/model/src-db/database/model/triggers/AD_CALLOUT_TRG.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/triggers/AD_CALLOUT_TRG.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -18,13 +18,12 @@
 * 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-2009 Openbravo SLU
+* All portions are Copyright (C) 2001-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
 
   v_ClassName  VARCHAR2(60) ;
-  v_dir VARCHAR2(200);
   v_package VARCHAR2(200);
   v_ID VARCHAR2(32);
     
@@ -67,10 +66,8 @@
           INTO v_package
           FROM AD_MODULE
         WHERE AD_MODULE_ID = :NEW.AD_MODULE_ID;
-          v_dir := v_package||'.ad_callouts';
       ELSE
         v_package := 'org.openbravo.erpCommon.ad_callouts';
-        v_dir := 'ad_callouts';
       END IF;
     
       v_ClassName:=AD_MAPPING_FORMAT(TO_CHAR(:new.NAME)) ;
@@ -94,22 +91,6 @@
         )
         ;
 
-      INSERT
-      INTO AD_MODEL_OBJECT_MAPPING
-        (
-          AD_MODEL_OBJECT_MAPPING_ID, AD_CLIENT_ID, AD_ORG_ID,
-          ISACTIVE, CREATED, CREATEDBY,
-          UPDATED, UPDATEDBY, AD_MODEL_OBJECT_ID,
-          MAPPINGNAME, ISDEFAULT
-        )
-        VALUES
-        (
-          get_uuid(), :new.AD_CLIENT_ID, :new.AD_ORG_ID,
-           'Y', now(), :new.CREATEDBY,
-          now(), :new.UPDATEDBY, v_ID,
-          ('/' || v_dir || '/' || v_ClassName || '.html'), 'Y'
-        )
-        ;
     END IF;
   END IF;
 END AD_CALLOUT_TRG
--- a/model/src-db/database/model/triggers/AD_MODULE_TRG.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/triggers/AD_MODULE_TRG.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -14,63 +14,70 @@
   * 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-2018 Openbravo SLU
   * All Rights Reserved.
   * Contributor(s):  ______________________________________.
   ************************************************************************/
+  v_InstancePurpose CHAR(1);
+
 BEGIN
-    
-    IF AD_isTriggerEnabled()='N' THEN RETURN;
-    END IF;
 
-   IF :new.ENABLED = 'N' AND :new.AD_Module_ID = '0' THEN
-     RAISE_APPLICATION_ERROR(-20000, '@CannotDisableCore@');
-   END IF;
+  IF AD_isTriggerEnabled()='N' THEN RETURN;
+  END IF;
 
-   --Tranlsation management
-   IF INSERTING THEN
+  IF :new.ENABLED = 'N' AND :new.AD_Module_ID = '0' THEN
+    RAISE_APPLICATION_ERROR(-20000, '@CannotDisableCore@');
+  END IF;
+
+  --Prevents modules in "In Development" status in Production instances
+  SELECT instance_purpose INTO v_InstancePurpose FROM ad_system_info;
+  IF :new.isindevelopment = 'Y' AND v_InstancePurpose = 'P' THEN
+    RAISE_APPLICATION_ERROR(-20000, '@AD_MODULE_INDEV_IN_PROD@');
+  END IF;
+
+  --Tranlsation management
+  IF INSERTING THEN
     --  Create Translation Row
-      INSERT INTO AD_Module_Trl
-        (
-          AD_Module_Trl_ID, AD_Module_ID, AD_Language, AD_Client_ID,
-          AD_Org_ID, IsActive, Created,
-          CreatedBy, Updated, UpdatedBy,
-          Description, Help, License,
-          IsTranslated
-        )
-      SELECT get_uuid(), :new.AD_Module_ID, AD_Language, :new.AD_Client_ID, 
-        :new.AD_Org_ID, :new.IsActive, :new.Created, 
-        :new.CreatedBy, :new.Updated, :new.UpdatedBy, 
+    INSERT INTO AD_Module_Trl
+    (
+      AD_Module_Trl_ID, AD_Module_ID, AD_Language, AD_Client_ID,
+      AD_Org_ID, IsActive, Created,
+      CreatedBy, Updated, UpdatedBy,
+      Description, Help, License,
+      IsTranslated
+    )
+      SELECT get_uuid(), :new.AD_Module_ID, AD_Language, :new.AD_Client_ID,
+        :new.AD_Org_ID, :new.IsActive, :new.Created,
+        :new.CreatedBy, :new.Updated, :new.UpdatedBy,
         :new.Description, :new.Help, :new.License,
         'N'
       FROM AD_Language
       WHERE IsActive='Y'
-        AND IsSystemLanguage='Y'
-        and (AD_Language.AD_Language != :new.ad_language or :new.ad_language is null);
-   END IF;
- 
-   IF UPDATING THEN
-    IF :new.IsRegistered ='Y' 
-      AND (COALESCE(:NEW.NAME, '.') <> COALESCE(:NEW.NAME, '.')
-        OR COALESCE(:NEW.TYPE, '.') <> COALESCE(:NEW.TYPE, '.')
-        OR COALESCE(:NEW.JAVAPACKAGE, '.') <> COALESCE(:NEW.JAVAPACKAGE, '.')) THEN
+            AND IsSystemLanguage='Y'
+            and (AD_Language.AD_Language != :new.ad_language or :new.ad_language is null);
+  END IF;
+
+  IF UPDATING THEN
+    IF :new.IsRegistered ='Y'
+       AND (COALESCE(:NEW.NAME, '.') <> COALESCE(:NEW.NAME, '.')
+            OR COALESCE(:NEW.TYPE, '.') <> COALESCE(:NEW.TYPE, '.')
+            OR COALESCE(:NEW.JAVAPACKAGE, '.') <> COALESCE(:NEW.JAVAPACKAGE, '.')) THEN
       RAISE_APPLICATION_ERROR(-20000, '@20534@');
     END IF;
-    
-    
+
+
     IF(COALESCE(:old.License, '.') <> COALESCE(:NEW.License, '.')
-    OR COALESCE(:old.Description, '.') <> COALESCE(:NEW.Description, '.')
-    OR COALESCE(:old.Help, '.') <> COALESCE(:NEW.Help, '.'))
+       OR COALESCE(:old.Description, '.') <> COALESCE(:NEW.Description, '.')
+       OR COALESCE(:old.Help, '.') <> COALESCE(:NEW.Help, '.'))
     THEN
       UPDATE AD_Module_Trl
-        SET IsTranslated='N',
+      SET IsTranslated='N',
         Updated=now()
       WHERE AD_Module_ID=:new.AD_Module_ID;
     END IF;
-   END IF;
-   
+  END IF;
 
-END AD_MODULE_TRG
+  END AD_MODULE_TRG
 ]]></body>
     </trigger>
   </database>
--- a/model/src-db/database/model/triggers/AD_MODULE_TRG2.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/triggers/AD_MODULE_TRG2.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -14,7 +14,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 Openbravo SLU
+  * All portions are Copyright (C) 2011-2018 Openbravo SLU
   * All Rights Reserved.
   * Contributor(s):  ______________________________________.
   ************************************************************************/
@@ -50,7 +50,6 @@
       COALESCE(:OLD.UPDATE_VER_ID        ,'.') = COALESCE(:NEW.UPDATE_VER_ID        ,'.') AND
       COALESCE(:OLD.REFERENCEDATAINFO    ,'.') = COALESCE(:NEW.REFERENCEDATAINFO    ,'.') AND
       COALESCE(:OLD.VERSION_LABEL        ,'.') = COALESCE(:NEW.VERSION_LABEL        ,'.') AND
-      COALESCE(:OLD.VERSION_ID           ,'.') = COALESCE(:NEW.VERSION_ID           ,'.') AND
       COALESCE(:OLD.ISCOMMERCIAL         ,'.') = COALESCE(:NEW.ISCOMMERCIAL         ,'.') AND
       COALESCE(:OLD.MATURITY_UPDATE      ,'.') = COALESCE(:NEW.MATURITY_UPDATE      ,'.') AND
       COALESCE(:OLD.ENABLED              ,'.') = COALESCE(:NEW.ENABLED              ,'.') AND
--- a/model/src-db/database/model/triggers/AD_ROLE_CHECK_TRG.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/triggers/AD_ROLE_CHECK_TRG.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -46,6 +46,12 @@
 	    RAISE_APPLICATION_ERROR(-20000, '@CannotChangeAccessLevel@');
 	END IF;
       END IF;
+      IF (:OLD.ISMANUAL = 'Y' AND :NEW.ISMANUAL='N') THEN
+        SELECT COUNT(*) INTO v_count FROM dual WHERE EXISTS (SELECT 1 FROM AD_ROLE_INHERITANCE WHERE AD_ROLE_ID = :NEW.AD_ROLE_ID);
+        IF (v_count <> 0) THEN
+	    RAISE_APPLICATION_ERROR(-20000, '@CannotSetAsNotManual@');
+	END IF;
+      END IF;
     END IF;
 
 END AD_ROLE_CHECK_TRG
--- a/model/src-db/database/model/triggers/AD_ROLE_TRG.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/triggers/AD_ROLE_TRG.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -17,7 +17,7 @@
 * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
 * All Rights Reserved.
 * Contributor(s): Openbravo SLU
-* Contributions are Copyright (C) 2001-2012 Openbravo, S.L.U.
+* Contributions are Copyright (C) 2001-2018 Openbravo, S.L.U.
 *
 * Specifically, this derivative work is based upon the following Compiere
 * file and version.
@@ -37,7 +37,8 @@
 
 
 IF (UPDATING) THEN
- IF NOT(COALESCE(:OLD.UserLevel,'.')<>COALESCE(:NEW.UserLevel,'.')) THEN
+ IF NOT((COALESCE(:OLD.UserLevel,'.') <> COALESCE(:NEW.UserLevel,'.'))
+        OR (:OLD.IsManual = 'Y' AND :NEW.IsManual='N')) THEN
   RETURN;
  END IF;
  END IF;
--- a/model/src-db/database/model/triggers/C_CONVERSION_RATE_DOCUMENT_TRG.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/triggers/C_CONVERSION_RATE_DOCUMENT_TRG.xml	Wed Aug 08 05:40:37 2018 +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) 2001-2015 Openbravo SLU
+    * All portions are Copyright (C) 2001-2018 Openbravo SLU
     * All Rights Reserved.
     * Contributor(s):  ______________________________________.
     ************************************************************************/
@@ -35,6 +35,11 @@
     IF AD_isTriggerEnabled()='N' THEN RETURN;
     END IF;
 
+    IF (UPDATING OR INSERTING) THEN
+      IF :NEW.c_currency_id = :NEW.c_currency_id_to then
+        RAISE_APPLICATION_ERROR(-20000, '@SameCurrency@');
+      END IF;
+    END IF;
 
     -- If invoice is posted, CRUD is not allowed
     IF INSERTING
--- a/model/src-db/database/model/triggers/C_ORDERLINE_TRG2.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/triggers/C_ORDERLINE_TRG2.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -58,7 +58,8 @@
   v_CalcLine NUMBER;
           
   TYPE RECORD IS REF CURSOR;
-  Cur_BOM RECORD;        
+  Cur_BOM RECORD; 
+  Cur_TAXLINES RECORD;      
 BEGIN
     
     IF AD_isTriggerEnabled()='N' THEN RETURN;
@@ -121,8 +122,16 @@
       v_oldLineAlternate := COALESCE(:old.TaxBaseAmt,0) + COALESCE(:old.FreightAmt,0) + COALESCE(:old.ChargeAmt,0);
       IF (:new.AD_Org_ID <> :old.AD_Org_ID OR :new.C_Tax_ID <> :old.C_Tax_ID OR
           v_newLineNetAmt <> v_oldLine OR v_newLineAlternate <> v_oldLineAlternate OR
-          :new.line_gross_amount <> :old.line_gross_amount) THEN
-        DELETE FROM C_ORDERLINETAX WHERE C_ORDERLINE_ID = :new.C_OrderLine_ID;
+          :new.line_gross_amount <> :old.line_gross_amount) THEN        
+         -- Delete the TaxLines using a Cursor to be able to delete them in the proper order.
+         -- If not, the calculations done in the triggers can be incorrect
+         FOR Cur_TAXLINES IN (SELECT C_ORDERLINETAX_ID
+                              FROM C_ORDERLINETAX
+                              WHERE C_ORDERLINE_ID = :new.C_OrderLine_ID
+                              ORDER BY line ASC)
+         LOOP
+           DELETE FROM C_ORDERLINETAX WHERE C_ORDERLINETAX_ID = Cur_TAXLINES.C_OrderLineTax_ID;
+         END LOOP;
         v_create := 'Y';
       ELSE        
         v_create := 'N';        
--- a/model/src-db/database/model/triggers/C_PERIOD_TRG.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/triggers/C_PERIOD_TRG.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -17,7 +17,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-2018 Openbravo, S.L.U.
     *
     * Specifically, this derivative work is based upon the following Compiere
     * file and version.
@@ -41,11 +41,10 @@
                            WHERE o.ISREADY='Y'
                            AND o.ISPERIODCONTROLALLOWED='Y'
                            and exists (SELECT 1
-                                                  FROM C_Year, c_calendar, ad_org
+                                                  FROM C_Year, c_calendar
                                                   WHERE C_Year.c_calendar_id = c_calendar.c_calendar_id
-                                                  and c_calendar.c_calendar_id = ad_org.c_calendar_id
-                                                  and C_Year.C_Year_ID=:new.C_Year_ID
-                                                  and ad_org.ad_org_id = ad_org_getcalendarowner(o.AD_ORG_ID))
+                                                  and c_calendar.c_calendar_id = o.ad_inheritedcalendar_id
+                                                  and C_Year.C_Year_ID=:new.C_Year_ID)
                           ) a
        WHERE AD_Reference_ID='183'
        AND VALUE = (CASE WHEN :new.PeriodType = 'S' THEN VALUE ELSE 'GLJ' END)
--- a/model/src-db/database/model/triggers/M_RESERVATION_TRG.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/triggers/M_RESERVATION_TRG.xml	Wed Aug 08 05:40:37 2018 +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) 2012-2017 Openbravo SLU
+* All portions are Copyright (C) 2012-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -42,6 +42,7 @@
     WHERE property = 'StockReservations';
     IF (v_count > 1) THEN
       v_dummy := AD_GET_PREFERENCE_VALUE('StockReservations', 'Y', :NEW.ad_client_id, :NEW.ad_org_id, NULL, NULL, NULL);
+      DBMS_OUTPUT.PUT_LINE('StockReservations preference value: ' || v_dummy);
     ELSIF (v_count = 0) THEN
       RAISE_APPLICATION_ERROR(-20000, 'ReservationsNotEnabled');
     END IF;
--- a/model/src-db/database/model/triggers/M_TRANSACTION_TRG.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/triggers/M_TRANSACTION_TRG.xml	Wed Aug 08 05:40:37 2018 +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-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -38,8 +38,9 @@
   v_doDecrease BOOLEAN:= FALSE;
   v_stockdiff NUMBER:= 0;
   v_checkuom NUMBER:= 0;
+  v_stockCount NUMBER;
+  v_inventoryLineQtyCount M_INVENTORYLINE.QTYCOUNT%TYPE;
 BEGIN
-    
     IF AD_isTriggerEnabled()='N' THEN RETURN;
     END IF;
 
@@ -69,55 +70,97 @@
     	OR(COALESCE(:old.c_uom_id, '0') <> COALESCE(:new.c_uom_id, '0'))
     	OR(COALESCE(:old.m_internal_consumptionline_id ,'0') <> COALESCE(:new.m_internal_consumptionline_id ,'0')) THEN
 
-      	IF(COALESCE(v_UOM_ID, '0') <> COALESCE(:NEW.C_UOM_ID, '0')) THEN
-        	RAISE_APPLICATION_ERROR(-20000, '@20111@') ;
-      	END IF;
-      	IF(v_attributeset_id IS NOT NULL AND (v_AttrSetValueType IS NULL OR v_AttrSetValueType <> 'F') AND v_IsOneAtSetValReq = 'Y' AND COALESCE(:NEW.M_ATTRIBUTESETINSTANCE_ID, '0') = '0') THEN
-        	RAISE_APPLICATION_ERROR(-20000, '@20112@' || ' - ' || v_Name) ;
-      	END IF;
-      	--Does not allow to change the attribute set value
-      	-- for products which attribute set value type is Fixed
-      	IF (:NEW.M_PRODUCT_ID IS NOT NULL AND COALESCE(:new.M_AttributeSetInstance_ID,'0')!='0') THEN
-        	SELECT ATTRSETVALUETYPE 
-          	INTO v_AttrSetValueType
-        	FROM M_PRODUCT 
-        	WHERE M_PRODUCT_ID=:NEW.M_PRODUCT_ID;
-        	IF (v_AttrSetValueType='F') THEN
-          	RAISE_APPLICATION_ERROR(-20000, '@AttrSetValueFixed@');
-        	END IF;
-      	END IF;
+        IF(COALESCE(v_UOM_ID, '0') <> COALESCE(:NEW.C_UOM_ID, '0')) THEN
+       	  RAISE_APPLICATION_ERROR(-20000, '@20111@') ;
+        END IF;
+        IF(v_attributeset_id IS NOT NULL AND (v_AttrSetValueType IS NULL OR v_AttrSetValueType <> 'F') AND v_IsOneAtSetValReq = 'Y' AND COALESCE(:NEW.M_ATTRIBUTESETINSTANCE_ID, '0') = '0' ) THEN
+          IF(:NEW.M_INVENTORYLINE_ID IS NOT NULL) THEN
+            SELECT IL.QTYCOUNT INTO v_inventoryLineQtyCount
+            FROM M_INVENTORYLINE IL
+            WHERE IL.M_INVENTORYLINE_ID = :NEW.M_INVENTORYLINE_ID;
+         
+            SELECT COUNT(1) INTO v_stockCount
+            FROM DUAL
+            WHERE EXISTS (SELECT 1
+                          FROM M_STORAGE_DETAIL SD
+                          WHERE SD.M_PRODUCT_ID = :NEW.M_PRODUCT_ID
+                          AND SD.M_LOCATOR_ID = :NEW.M_LOCATOR_ID
+                          AND SD.M_ATTRIBUTESETINSTANCE_ID = '0'
+                          AND SD.C_UOM_ID = :NEW.C_UOM_ID
+                          AND SD.QTYONHAND <> 0
+                          AND SD.PREQTYONHAND <> 0); 
+            
+            IF(v_inventoryLineQtyCount <> 0 OR (v_inventoryLineQtyCount = 0 AND v_stockCount = 0)) THEN   
+              RAISE_APPLICATION_ERROR(-20000, '@20112@' || ' - ' || v_Name) ;
+            END IF;
+          ELSE
+            RAISE_APPLICATION_ERROR(-20000, '@20112@' || ' - ' || v_Name) ;
+          END IF; 
+        END IF;
+        --Does not allow to change the attribute set value
+        -- for products which attribute set value type is Fixed
+        IF (:NEW.M_PRODUCT_ID IS NOT NULL AND COALESCE(:new.M_AttributeSetInstance_ID,'0')!='0') THEN
+         	SELECT ATTRSETVALUETYPE 
+           	INTO v_AttrSetValueType
+       	  FROM M_PRODUCT 
+         	WHERE M_PRODUCT_ID=:NEW.M_PRODUCT_ID;
+         	IF (v_AttrSetValueType='F') THEN
+           	RAISE_APPLICATION_ERROR(-20000, '@AttrSetValueFixed@');
+         	END IF;
+        END IF;
       END IF;
     END IF;
     
 		IF INSERTING THEN
 			IF(COALESCE(v_UOM_ID, '0') <> COALESCE(:NEW.C_UOM_ID, '0')) THEN
         IF (:new.M_InventoryLine_ID IS NOT NULL) THEN
-	  SELECT il.line, CASE WHEN i.inventory_type = 'O' OR i.inventory_type = 'C' THEN 1 ELSE 0 END
-	  INTO v_DocumentLineNo, v_checkuom
-	  FROM M_Inventory i JOIN M_InventoryLine il
-	  ON i.m_inventory_id = il.m_inventory_id
-	  WHERE il.m_inventoryline_id = :new.M_InventoryLine_ID;
-	END IF;
-	IF (:new.M_MovementLine_ID IS NOT NULL) THEN
-	  SELECT line INTO v_DocumentLineNo FROM M_MovementLine WHERE M_MovementLine_ID = :new.M_MovementLine_ID;
-	END IF;
-	IF (:new.M_InOutLine_ID IS NOT NULL) THEN
-	  SELECT line INTO v_DocumentLineNo FROM M_InOutLine WHERE M_InOutLine_ID = :new.M_InOutLine_ID;
-	END IF;
-	IF (:new.M_ProductionLine_ID IS NOT NULL) THEN
-	  SELECT line INTO v_DocumentLineNo FROM M_ProductionLine WHERE M_ProductionLine_ID = :new.M_ProductionLine_ID;
-	END IF;
-	IF (:new.M_Internal_ConsumptionLine_ID IS NOT NULL) THEN
-	  SELECT line INTO v_DocumentLineNo FROM M_Internal_ConsumptionLine WHERE M_Internal_ConsumptionLine_ID = :new.M_Internal_ConsumptionLine_ID;
-	END IF;
+	        SELECT il.line, CASE WHEN i.inventory_type = 'O' OR i.inventory_type = 'C' THEN 1 ELSE 0 END
+	        INTO v_DocumentLineNo, v_checkuom
+	        FROM M_Inventory i JOIN M_InventoryLine il ON i.m_inventory_id = il.m_inventory_id
+	        WHERE il.m_inventoryline_id = :new.M_InventoryLine_ID;
+	      END IF;
+	      IF (:new.M_MovementLine_ID IS NOT NULL) THEN
+	        SELECT line INTO v_DocumentLineNo FROM M_MovementLine WHERE M_MovementLine_ID = :new.M_MovementLine_ID;
+	      END IF;
+	      IF (:new.M_InOutLine_ID IS NOT NULL) THEN
+	        SELECT line INTO v_DocumentLineNo FROM M_InOutLine WHERE M_InOutLine_ID = :new.M_InOutLine_ID;
+	      END IF;
+	      IF (:new.M_ProductionLine_ID IS NOT NULL) THEN
+	        SELECT line INTO v_DocumentLineNo FROM M_ProductionLine WHERE M_ProductionLine_ID = :new.M_ProductionLine_ID;
+	      END IF;
+	      IF (:new.M_Internal_ConsumptionLine_ID IS NOT NULL) THEN
+	        SELECT line INTO v_DocumentLineNo FROM M_Internal_ConsumptionLine WHERE M_Internal_ConsumptionLine_ID = :new.M_Internal_ConsumptionLine_ID;
+	      END IF;
 
-	IF (v_checkuom = 0) THEN
-	  RAISE_APPLICATION_ERROR(-20000, '@DocUOMMismatch@' || ' ' || COALESCE(v_DocumentLineNo, 0));
-	END IF;
+	      IF (v_checkuom = 0) THEN
+	        RAISE_APPLICATION_ERROR(-20000, '@DocUOMMismatch@' || ' ' || COALESCE(v_DocumentLineNo, 0));
+	      END IF;
      	END IF;
       IF(v_attributeset_id IS NOT NULL AND (v_AttrSetValueType IS NULL OR v_AttrSetValueType <> 'F') AND v_IsOneAtSetValReq = 'Y' AND COALESCE(:NEW.M_ATTRIBUTESETINSTANCE_ID, '0') = '0') THEN
-       	RAISE_APPLICATION_ERROR(-20000, '@20112@' || ' - ' || v_Name) ;
-     	END IF;
+        IF(:NEW.M_INVENTORYLINE_ID IS NOT NULL) THEN
+          SELECT IL.QTYCOUNT INTO v_inventoryLineQtyCount
+          FROM M_INVENTORYLINE IL
+          WHERE IL.M_INVENTORYLINE_ID = :NEW.M_INVENTORYLINE_ID;
+         
+          SELECT COUNT(1) INTO v_stockCount
+            FROM DUAL
+            WHERE EXISTS (SELECT 1
+                          FROM M_STORAGE_DETAIL SD
+                          WHERE SD.M_PRODUCT_ID = :NEW.M_PRODUCT_ID
+                          AND SD.M_LOCATOR_ID = :NEW.M_LOCATOR_ID
+                          AND SD.M_ATTRIBUTESETINSTANCE_ID = '0'
+                          AND SD.C_UOM_ID = :NEW.C_UOM_ID
+                          AND SD.QTYONHAND <> 0
+                          AND SD.PREQTYONHAND <> 0);          
+
+          IF(v_inventoryLineQtyCount <> 0 OR (v_inventoryLineQtyCount = 0 AND v_stockCount = 0)) THEN   
+            RAISE_APPLICATION_ERROR(-20000, '@20112@' || ' - ' || v_Name) ;
+          END IF;
+        ELSE
+          RAISE_APPLICATION_ERROR(-20000, '@20112@' || ' - ' || v_Name) ;
+        END IF; 
+      END IF;
+
       --Does not allow to change the attribute set value
       -- for products which attribute set value type is Fixed
       IF (:NEW.M_PRODUCT_ID IS NOT NULL AND COALESCE(:new.M_AttributeSetInstance_ID,'0')!='0') THEN
--- a/model/src-db/database/model/triggers/M_TRANSACTION_TRG2.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/model/triggers/M_TRANSACTION_TRG2.xml	Wed Aug 08 05:40:37 2018 +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) 2012-2017 Openbravo SLU
+* All portions are Copyright (C) 2012-2018 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -48,21 +48,25 @@
                       AND COALESCE(rs.m_attributesetinstance_id, '0') = :NEW.m_attributesetinstance_id
                       AND rs.m_locator_id = :NEW.m_locator_id);
       IF (v_count > 0) THEN
-        SELECT COALESCE(sum(rs.quantity - COALESCE(rs.releasedqty,0)), 0), sd.qtyonhand
-          INTO v_reserved, v_onhand
+        SELECT COALESCE(sum(rs.quantity - COALESCE(rs.releasedqty,0)), 0)
+          INTO v_reserved
         FROM m_reservation_stock rs
             JOIN m_reservation r ON rs.m_reservation_id = r.m_reservation_id
-            JOIN m_storage_detail sd ON r.m_product_id = sd.m_product_id
-                                        AND r.c_uom_id = sd.c_uom_id
-                                        AND COALESCE(rs.m_attributesetinstance_id, '0') = COALESCE(sd.m_attributesetinstance_id, '0')
-                                        AND rs.m_locator_id = sd.m_locator_id
-                                        AND sd.m_product_uom_id IS NULL
         WHERE r.res_status NOT IN ('CL', 'DR')
           AND r.m_product_id = :NEW.m_product_id
           AND r.c_uom_id = :NEW.c_uom_id
           AND COALESCE(rs.m_attributesetinstance_id, '0') = :NEW.m_attributesetinstance_id
-          AND rs.m_locator_id = :NEW.m_locator_id
-        GROUP BY sd.qtyonhand, sd.m_storage_detail_id;
+          AND rs.m_locator_id = :NEW.m_locator_id;
+
+        SELECT sd.qtyonhand
+          INTO v_onhand
+        FROM m_storage_detail sd
+        WHERE sd.m_product_id = :NEW.m_product_id
+          AND sd.c_uom_id = :NEW.c_uom_id
+          AND COALESCE(sd.m_attributesetinstance_id, '0') = :NEW.m_attributesetinstance_id
+          AND sd.m_locator_id = :NEW.m_locator_id
+          AND sd.m_product_uom_id IS NULL;
+
         IF (v_onhand - v_reserved < ABS(:NEW.movementqty) AND v_reserved > 0) THEN
 	  SELECT value
             INTO v_product_value
--- a/model/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -1538,6 +1538,25 @@
 <!--34E27119A7B74205B025002E9CD5074F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--34E27119A7B74205B025002E9CD5074F--></AD_AUXILIARINPUT>
 
+<!--34E955EADE8843BD9A0342895CB8AAF0--><AD_AUXILIARINPUT>
+<!--34E955EADE8843BD9A0342895CB8AAF0-->  <AD_AUXILIARINPUT_ID><![CDATA[34E955EADE8843BD9A0342895CB8AAF0]]></AD_AUXILIARINPUT_ID>
+<!--34E955EADE8843BD9A0342895CB8AAF0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--34E955EADE8843BD9A0342895CB8AAF0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--34E955EADE8843BD9A0342895CB8AAF0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--34E955EADE8843BD9A0342895CB8AAF0-->  <AD_TAB_ID><![CDATA[186]]></AD_TAB_ID>
+<!--34E955EADE8843BD9A0342895CB8AAF0-->  <NAME><![CDATA[showAddPayment]]></NAME>
+<!--34E955EADE8843BD9A0342895CB8AAF0-->  <CODE><![CDATA[@SQL=select case when sum(fpsd.amount)=co.GrandTotal then 'N' else 'Y' end
+          from fin_payment_scheduledetail fpsd
+              join fin_payment_detail fpd on fpsd.fin_payment_detail_id=fpd.fin_payment_detail_id
+              join fin_payment fp on fpd.fin_payment_id=fp.fin_payment_id
+              join fin_payment_schedule ps ON ps.fin_payment_schedule_id = fpsd.fin_payment_schedule_order
+              join c_order co on co.c_order_id=ps.c_order_id
+                WHERE ps.c_order_id =@c_order_id@
+                and to_number(aprm_seqnumberpaymentstatus(fp.status)) >= 40
+                group by co.GrandTotal]]></CODE>
+<!--34E955EADE8843BD9A0342895CB8AAF0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--34E955EADE8843BD9A0342895CB8AAF0--></AD_AUXILIARINPUT>
+
 <!--35586436B2FB4809B66D519BC02230F4--><AD_AUXILIARINPUT>
 <!--35586436B2FB4809B66D519BC02230F4-->  <AD_AUXILIARINPUT_ID><![CDATA[35586436B2FB4809B66D519BC02230F4]]></AD_AUXILIARINPUT_ID>
 <!--35586436B2FB4809B66D519BC02230F4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3371,6 +3390,25 @@
 <!--A5153957017944A08E6A504455417843-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--A5153957017944A08E6A504455417843--></AD_AUXILIARINPUT>
 
+<!--A53F5DC798974EBD9707C988B0C72D63--><AD_AUXILIARINPUT>
+<!--A53F5DC798974EBD9707C988B0C72D63-->  <AD_AUXILIARINPUT_ID><![CDATA[A53F5DC798974EBD9707C988B0C72D63]]></AD_AUXILIARINPUT_ID>
+<!--A53F5DC798974EBD9707C988B0C72D63-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A53F5DC798974EBD9707C988B0C72D63-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A53F5DC798974EBD9707C988B0C72D63-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A53F5DC798974EBD9707C988B0C72D63-->  <AD_TAB_ID><![CDATA[294]]></AD_TAB_ID>
+<!--A53F5DC798974EBD9707C988B0C72D63-->  <NAME><![CDATA[showAddPayment]]></NAME>
+<!--A53F5DC798974EBD9707C988B0C72D63-->  <CODE><![CDATA[@SQL=select case when sum(fpsd.amount)=co.GrandTotal then 'N' else 'Y' end
+          from fin_payment_scheduledetail fpsd
+              join fin_payment_detail fpd on fpsd.fin_payment_detail_id=fpd.fin_payment_detail_id
+              join fin_payment fp on fpd.fin_payment_id=fp.fin_payment_id
+              join fin_payment_schedule ps ON ps.fin_payment_schedule_id = fpsd.fin_payment_schedule_order
+              join c_order co on co.c_order_id=ps.c_order_id
+                WHERE ps.c_order_id =@c_order_id@
+                and to_number(aprm_seqnumberpaymentstatus(fp.status)) >= 40
+                group by co.GrandTotal]]></CODE>
+<!--A53F5DC798974EBD9707C988B0C72D63-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A53F5DC798974EBD9707C988B0C72D63--></AD_AUXILIARINPUT>
+
 <!--A6000327591C4D82A8F20A0311167B94--><AD_AUXILIARINPUT>
 <!--A6000327591C4D82A8F20A0311167B94-->  <AD_AUXILIARINPUT_ID><![CDATA[A6000327591C4D82A8F20A0311167B94]]></AD_AUXILIARINPUT_ID>
 <!--A6000327591C4D82A8F20A0311167B94-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/src-db/database/sourcedata/AD_COLUMN.xml	Tue Jul 24 10:08:45 2018 +0200
+++ b/model/src-db/database/sourcedata/AD_COLUMN.xml	Wed Aug 08 05:40:37 2018 +0000
@@ -32989,7 +32989,7 @@
 <!--2201-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--2201-->  <ISSELECTIONCOLUMN><![CDATA[Y]]></ISSELECTIONCOLUMN>
 <!--2201-->  <AD_ELEMENT_ID><![CDATA[316]]></AD_ELEMENT_ID>
-<!--2201-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--2201-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--2201-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--2201-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--2201-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
@@ -126997,6 +126997,7 @@
 <!--9593-->  <AD_TABLE_ID><![CDATA[156]]></AD_TABLE_ID>
 <!--9593-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
 <!--9593-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--9593-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
 <!--9593-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--9593-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--9593-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
@@ -170425,7 +170426,7 @@
 <!--802026-->  <HELP><![CDATA[How many times it is necessary to complete a phase before closing it.]]></HELP>
 <!--802026-->  <COLUMNNAME><![CDATA[Neededquantity]]></COLUMNNAME>
 <!--802026-->  <AD_TABLE_ID><![CDATA[385]]></AD_TABLE_ID>
-<!--802026-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--802026-->  <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
 <!--802026-->  <FIELDLENGTH><![CDATA[8]]></FIELDLENGTH>
 <!--802026-->  <DEFAULTVALUE><![CDATA[@SQL=SELECT (QUANTITY - DONEQUANTITY) AS DefaultValue FROM MA_WRPhase WHERE MA_WRPhase_ID = @MA_WRPhase_ID@]]></DEFAULTVALUE>
 <!--802026-->  <ISKEY><![CDATA[N]]></ISKEY>
@@ -243657,6 +243658,45 @@
 <!--03FDE59B3CA243879963E1937C64A5DC-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--03FDE59B3CA243879963E1937C64A5DC--></AD_COLUMN>
 
+<!--041335A9A3E34DD1982DAC026027A42C--><AD_COLUMN>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <AD_COLUMN_ID><![CDATA[041335A9A3E34DD1982DAC026027A42C]]></AD_COLUMN_ID>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <NAME><![CDATA[Restrictsalefrompos]]></NAME>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <DESCRIPTION><![CDATA[Indicates if a product is available to be sold in Web POS]]></DESCRIPTION>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <HELP><![CDATA[Indicates if a product is available to be sold in Web POS]]></HELP>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <COLUMNNAME><![CDATA[Restrictsalefrompos]]></COLUMNNAME>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <AD_TABLE_ID><![CDATA[46D42547938047CAADFB240E5BB11BC1]]></AD_TABLE_ID>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <SEQNO><![CDATA[180]]></SEQNO>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <AD_ELEMENT_ID><![CDATA[D3580ABED2D449938AB819EF8A25EA4B]]></AD_ELEMENT_ID>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <POSITION><![CDATA[21]]></POSITION>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--041335A9A3E34DD1982DAC026027A42C-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--041335A9A3E34DD1982DAC026027A42C--></AD_COLUMN>
+
 <!--04283D32C32E4589830E57DCB7A335A7--><AD_COLUMN>
 <!--04283D32C32E4589830E57DCB7A335A7-->  <AD_COLUMN_ID><![CDATA[04283D32C32E4589830E57DCB7A335A7]]></AD_COLUMN_ID>
 <!--04283D32C32E4589830E57DCB7A335A7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -247980,6 +248020,45 @@
 <!--123ECC9DA80E47D6BBE8D3C8E9ACC59C-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--123ECC9DA80E47D6BBE8D3C8E9ACC59C--></AD_COLUMN>
 
+<!--12681AD19DAC4FFEA2D71772094FF8C8--><AD_COLUMN>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <AD_COLUMN_ID><![CDATA[12681AD19DAC4FFEA2D71772094FF8C8]]></AD_COLUMN_ID>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <NAME><![CDATA[Client]]></NAME>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <AD_TABLE_ID><![CDATA[A8ED9F40C48249ED99430F9E587B001D]]></AD_TABLE_ID>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <POSITION><![CDATA[2]]></POSITION>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--12681AD19DAC4FFEA2D71772094FF8C8-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--12681AD19DAC4FFEA2D71772094FF8C8--></AD_COLUMN>
+
 <!--126D0666E46B4B41B3D596102127A6D6--><AD_COLUMN>
 <!--126D0666E46B4B41B3D596102127A6D6-->  <AD_COLUMN_ID><![CDATA[126D0666E46B4B41B3D596102127A6D6]]></AD_COLUMN_ID>
 <!--126D0666E46B4B41B3D596102127A6D6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -248248,6 +248327,45 @@
 <!--12F5170C647C493E9ABE51BB256EDBC2-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--12F5170C647C493E9ABE51BB256EDBC2--></AD_COLUMN>
 
+<!--131A911F53AB4E6FB39F2B23530A67EE--><AD_COLUMN>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <AD_COLUMN_ID><![CDATA[131A911F53AB4E6FB39F2B23530A67EE]]></AD_COLUMN_ID>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <NAME><![CDATA[Seqno]]></NAME>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <DESCRIPTION><![CDATA[The order of records in a specified document.]]></DESCRIPTION>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <HELP><![CDATA[The Sequence indicates the order of records]]></HELP>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <COLUMNNAME><![CDATA[Seqno]]></COLUMNNAME>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <AD_TABLE_ID><![CDATA[46D42547938047CAADFB240E5BB11BC1]]></AD_TABLE_ID>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <DEFAULTVALUE><![CDATA[@SQL=SELECT COALESCE(MAX(SEQNO),0)+10 AS DefaultValue FROM M_PRODUCT_STATUS]]></DEFAULTVALUE>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <SEQNO><![CDATA[200]]></SEQNO>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <AD_ELEMENT_ID><![CDATA[566]]></AD_ELEMENT_ID>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <POSITION><![CDATA[25]]></POSITION>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--131A911F53AB4E6FB39F2B23530A67EE-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--131A911F53AB4E6FB39F2B23530A67EE--></AD_COLUMN>
+
 <!--1322478AD1C444D7B9116099CA2B7787--><AD_COLUMN>
 <!--1322478AD1C444D7B9116099CA2B7787-->  <AD_COLUMN_ID><![CDATA[1322478AD1C444D7B9116099CA2B7787]]></AD_COLUMN_ID>
 <!--1322478AD1C444D7B9116099CA2B7787-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -250648,7 +250766,7 @@
 <!--19E0D897C9652093E0530100007F77BB-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--19E0D897C9652093E0530100007F77BB-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--19E0D897C9652093E0530100007F77BB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--19E0D897C9652093E0530100007F77BB-->  <POSITION><![CDATA[112]]></POSITION>
+<!--19E0D897C9652093E0530100007F77BB-->  <POSITION><![CDATA[99]]></POSITION>
 <!--19E0D897C9652093E0530100007F77BB-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--19E0D897C9652093E0530100007F77BB-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--19E0D897C9652093E0530100007F77BB-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -251200,6 +251318,45 @@
 <!--1BD54BBB36824703BB681F8A88377D62-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--1BD54BBB36824703BB681F8A88377D62--></AD_COLUMN>
 
+<!--1BDA5C3444A340899D27036CB441ABEC--><AD_COLUMN>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <AD_COLUMN_ID><![CDATA[1BDA5C3444A340899D27036CB441ABEC]]></AD_COLUMN_ID>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <NAME><![CDATA[AD_Module_ID]]></NAME>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <DESCRIPTION><![CDATA[Module]]></DESCRIPTION>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <HELP><![CDATA[Indicates the module the element forms part of.]]></HELP>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <COLUMNNAME><![CDATA[AD_Module_ID]]></COLUMNNAME>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <AD_TABLE_ID><![CDATA[46D42547938047CAADFB240E5BB11BC1]]></AD_TABLE_ID>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <DEFAULTVALUE><![CDATA[0]]></DEFAULTVALUE>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <SEQNO><![CDATA[190]]></SEQNO>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <AD_ELEMENT_ID><![CDATA[565E666A619A2693E040007F01002851]]></AD_ELEMENT_ID>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <POSITION><![CDATA[23]]></POSITION>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--1BDA5C3444A340899D27036CB441ABEC-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--1BDA5C3444A340899D27036CB441ABEC--></AD_COLUMN>
+
 <!--1BDE1D43080946E88595AB6C5BBC696F--><AD_COLUMN>
 <!--1BDE1D43080946E88595AB6C5BBC696F-->  <AD_COLUMN_ID><![CDATA[1BDE1D43080946E88595AB6C5BBC696F]]></AD_COLUMN_ID>
 <!--1BDE1D43080946E88595AB6C5BBC696F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -254986,6 +255143,45 @@
 <!--26684F9855B64C9189052F01BA13592D-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--26684F9855B64C9189052F01BA13592D--></AD_COLUMN>
 
+<!--267DB49B2442496C8BE5D206964891A6--><AD_COLUMN>
+<!--267DB49B2442496C8BE5D206964891A6-->  <AD_COLUMN_ID><![CDATA[267DB49B2442496C8BE5D206964891A6]]></AD_COLUMN_ID>
+<!--267DB49B2442496C8BE5D206964891A6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--267DB49B2442496C8BE5D206964891A6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--267DB49B2442496C8BE5D206964891A6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--267DB49B2442496C8BE5D206964891A6-->  <NAME><![CDATA[Restrictsaleoutofstock]]></NAME>
+<!--267DB49B2442496C8BE5D206964891A6-->  <DESCRIPTION><![CDATA[Indicates if a product is able to be sold when there's no available stock for this product]]></DESCRIPTION>
+<!--267DB49B2442496C8BE5D206964891A6-->  <HELP><![CDATA[Indicates if a product is able to be sold when there's no available stock for this product]]></HELP>
+<!--267DB49B2442496C8BE5D206964891A6-->  <COLUMNNAME><![CDATA[Restrictsaleoutofstock]]></COLUMNNAME>
+<!--267DB49B2442496C8BE5D206964891A6-->  <AD_TABLE_ID><![CDATA[46D42547938047CAADFB240E5BB11BC1]]></AD_TABLE_ID>
+<!--267DB49B2442496C8BE5D206964891A6-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--267DB49B2442496C8BE5D206964891A6-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--267DB49B2442496C8BE5D206964891A6-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--267DB49B2442496C8BE5D206964891A6-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--267DB49B2442496C8BE5D206964891A6-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--267DB49B2442496C8BE5D206964891A6-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--267DB49B2442496C8BE5D206964891A6-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--267DB49B2442496C8BE5D206964891A6-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--267DB49B2442496C8BE5D206964891A6-->  <SEQNO><![CDATA[130]]></SEQNO>
+<!--267DB49B2442496C8BE5D206964891A6-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--267DB49B2442496C8BE5D206964891A6-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--267DB49B2442496C8BE5D206964891A6-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--267DB49B2442496C8BE5D206964891A6-->  <AD_ELEMENT_ID><![CDATA[ED38B6AFEDDC4E07963A71A55128489A]]></AD_ELEMENT_ID>
+<!--267DB49B2442496C8BE5D206964891A6-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--267DB49B2442496C8BE5D206964891A6-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--267DB49B2442496C8BE5D206964891A6-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--267DB49B2442496C8BE5D206964891A6-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--267DB49B2442496C8BE5D206964891A6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--267DB49B2442496C8BE5D206964891A6-->  <POSITION><![CDATA[13]]></POSITION>
+<!--267DB49B2442496C8BE5D206964891A6-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--267DB49B2442496C8BE5D206964891A6-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--267DB49B2442496C8BE5D206964891A6-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--267DB49B2442496C8BE5D206964891A6-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--267DB49B2442496C8BE5D206964891A6-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--267DB49B2442496C8BE5D206964891A6-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--267DB49B2442496C8BE5D206964891A6-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--267DB49B2442496C8BE5D206964891A6-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--267DB49B2442496C8BE5D206964891A6--></AD_COLUMN>
+
 <!--268D8AD41BE941C6988EB4CA9C16F67D--><AD_COLUMN>
 <!--268D8AD41BE941C6988EB4CA9C16F67D-->  <AD_COLUMN_ID><![CDATA[268D8AD41BE941C6988EB4CA9C16F67D]]></AD_COLUMN_ID>
 <!--268D8AD41BE941C6988EB4CA9C16F67D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -255360,7 +255556,7 @@
 <!--2776DAF2F3EA4D3989DDEAAE2EEA6326-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--2776DAF2F3EA4D3989DDEAAE2EEA6326-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--2776DAF2F3EA4D3989DDEAAE2EEA6326-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--2776DAF2F3EA4D3989DDEAAE2EEA6326-->  <POSITION><![CDATA[118]]></POSITION>
+<!--2776DAF2F3EA4D3989DDEAAE2EEA6326-->  <POSITION><![CDATA[100]]></POSITION>
 <!--2776DAF2F3EA4D3989DDEAAE2EEA6326-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--2776DAF2F3EA4D3989DDEAAE2EEA6326-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--2776DAF2F3EA4D3989DDEAAE2EEA6326-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -257293,7 +257489,7 @@
 <!--2D40ED5332FE4880B29C88BD9D9BB817-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--2D40ED5332FE4880B29C88BD9D9BB817-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--2D40ED5332FE4880B29C88BD9D9BB817-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--2D40ED5332FE4880B29C88BD9D9BB817-->  <POSITION><![CDATA[111]]></POSITION>
+<!--2D40ED5332FE4880B29C88BD9D9BB817-->  <POSITION><![CDATA[97]]></POSITION>
 <!--2D40ED5332FE4880B29C88BD9D9BB817-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--2D40ED5332FE4880B29C88BD9D9BB817-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--2D40ED5332FE4880B29C88BD9D9BB817-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -258499,6 +258695,45 @@
 <!--3243D34AA7E9477A95A5AFF70824363B-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--3243D34AA7E9477A95A5AFF70824363B--></AD_COLUMN>
 
+<!--3244C11EC50745D092859E2545903F63--><AD_COLUMN>
+<!--3244C11EC50745D092859E2545903F63-->  <AD_COLUMN_ID><![CDATA[3244C11EC50745D092859E2545903F63]]></AD_COLUMN_ID>
+<!--3244C11EC50745D092859E2545903F63-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3244C11EC50745D092859E2545903F63-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3244C11EC50745D092859E2545903F63-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3244C11EC50745D092859E2545903F63-->  <NAME><![CDATA[Calendar Owner Organization]]></NAME>
+<!--3244C11EC50745D092859E2545903F63-->  <DESCRIPTION><![CDATA[Organization that owns Calendar.]]></DESCRIPTION>
+<!--3244C11EC50745D092859E2545903F63-->  <HELP><![CDATA[Organization that owns Calendar.]]></HELP>
+<!--3244C11EC50745D092859E2545903F63-->  <COLUMNNAME><![CDATA[AD_Calendarowner_Org_ID]]></COLUMNNAME>
+<!--3244C11EC50745D092859E2545903F63-->  <AD_TABLE_ID><![CDATA[155]]></AD_TABLE_ID>
+<!--3244C11EC50745D092859E2545903F63-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--3244C11EC50745D092859E2545903F63-->  <AD_REFERENCE_VALUE_ID><![CDATA[100A788331734AE8BCC87BA0AC9E3406]]></AD_REFERENCE_VALUE_ID>
+<!--3244C11EC50745D092859E2545903F63-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--3244C11EC50745D092859E2545903F63-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--3244C11EC50745D092859E2545903F63-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--3244C11EC50745D092859E2545903F63-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--3244C11EC50745D092859E2545903F63-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--3244C11EC50745D092859E2545903F63-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--3244C11EC50745D092859E2545903F63-->  <SEQNO><![CDATA[101]]></SEQNO>
+<!--3244C11EC50745D092859E2545903F63-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--3244C11EC50745D092859E2545903F63-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--3244C11EC50745D092859E2545903F63-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--3244C11EC50745D092859E2545903F63-->  <AD_ELEMENT_ID><![CDATA[863D7D80A3F04CC484A19C35985C1D8B]]></AD_ELEMENT_ID>
+<!--3244C11EC50745D092859E2545903F63-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--3244C11EC50745D092859E2545903F63-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--3244C11EC50745D092859E2545903F63-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--3244C11EC50745D092859E2545903F63-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--3244C11EC50745D092859E2545903F63-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3244C11EC50745D092859E2545903F63-->  <POSITION><![CDATA[21]]></POSITION>
+<!--3244C11EC50745D092859E2545903F63-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--3244C11EC50745D092859E2545903F63-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--3244C11EC50745D092859E2545903F63-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--3244C11EC50745D092859E2545903F63-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--3244C11EC50745D092859E2545903F63-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--3244C11EC50745D092859E2545903F63-->  <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--3244C11EC50745D092859E2545903F63-->  <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--3244C11EC50745D092859E2545903F63-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
+<!--3244C11EC50745D092859E2545903F63--></AD_COLUMN>
+
 <!--3244FF12369C49EE94E566544632B322--><AD_COLUMN>
 <!--3244FF12369C49EE94E566544632B322-->  <AD_COLUMN_ID><![CDATA[3244FF12369C49EE94E566544632B322]]></AD_COLUMN_ID>
 <!--3244FF12369C49EE94E566544632B322-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -260118,6 +260353,45 @@
 <!--3751D2030B554E19B2D10ADB4A0CB4E3-->  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK>
 <!--3751D2030B554E19B2D10ADB4A0CB4E3--></AD_COLUMN>
 
+<!--37569B3F7BE447F3ACB229779A6E95EB--><AD_COLUMN>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <AD_COLUMN_ID><![CDATA[37569B3F7BE447F3ACB229779A6E95EB]]></AD_COLUMN_ID>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <NAME><![CDATA[Business Unit Organization]]></NAME>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <DESCRIPTION><![CDATA[Business Unit Organization.]]></DESCRIPTION>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <HELP><![CDATA[Business Unit Organization.]]></HELP>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <COLUMNNAME><![CDATA[AD_Businessunit_Org_ID]]></COLUMNNAME>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <AD_TABLE_ID><![CDATA[155]]></AD_TABLE_ID>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <AD_REFERENCE_VALUE_ID><![CDATA[100A788331734AE8BCC87BA0AC9E3406]]></AD_REFERENCE_VALUE_ID>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <SEQNO><![CDATA[131]]></SEQNO>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <AD_ELEMENT_ID><![CDATA[2F541B681F3C4E088CADA65E873B6223]]></AD_ELEMENT_ID>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--37569B3F7BE447F3ACB229779A6E95EB-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--37569B3F7BE447F3ACB229779A6E95EB