Update to 3.0PR14Q2
authorRM packaging bot <staff.rm@openbravo.com>
Tue, 06 May 2014 13:08:31 +0000
changeset 551 c80c3e708e41
parent 550 7335ef336f63
child 552 123e054728ba
Update to 3.0PR14Q2
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_ISPAYMENTCONFIRMED.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_BANKSTATEMENT.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_RECONCILIATION.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_BNKSTM_LINE_CHECK_TRG.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_FINACC_TRAN_CHECK_TRG.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_RECON_CHECK_TRG.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_FINACC_TRANSACTION_ACCT_V.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.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_PROCESS.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_FIELD.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_REF_LIST.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TABLE.xml
model/modules/org.openbravo.client.application/src-db/database/sourcedata/OBCLKER_TEMPLATE.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.kernel/src-db/database/sourcedata/AD_TABLE.xml
model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/OBCLKER_UIDEFINITION.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.myob/src-db/database/sourcedata/AD_TABLE.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.querylist/src-db/database/sourcedata/AD_TABLE.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.financial.paymentreport/src-db/database/sourcedata/AD_PROCESS.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.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_PROCESS.xml
model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MESSAGE.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.datasource/src-db/database/sourcedata/AD_TABLE.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.google/src-db/database/sourcedata/AD_TABLE.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.integration.openid/src-db/database/sourcedata/AD_TABLE.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.selector/src-db/database/sourcedata/AD_TABLE.xml
model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MESSAGE.xml
model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml
model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
model/src-db/database/model/functions/AD_GET_ORG_LE_BU.xml
model/src-db/database/model/functions/AD_ORGTYPE_ISLE_ISBU.xml
model/src-db/database/model/functions/AD_ORGTYPE_ISTRANS_ALLOWED.xml
model/src-db/database/model/functions/AD_ORG_CHK_CALENDAR.xml
model/src-db/database/model/functions/AD_ORG_CHK_READY.xml
model/src-db/database/model/functions/AD_ORG_CHK_SCHEMAS.xml
model/src-db/database/model/functions/AD_ORG_GETCALENDAROWNER.xml
model/src-db/database/model/functions/AD_ORG_GETPERIODCONTROLALLOW.xml
model/src-db/database/model/functions/C_ACCTSCHEMA_DEFAULT_COPY.xml
model/src-db/database/model/functions/C_GETTAX.xml
model/src-db/database/model/functions/C_INVOICE_CREATE.xml
model/src-db/database/model/functions/C_INVOICE_POST.xml
model/src-db/database/model/functions/C_ORDER_POST1.xml
model/src-db/database/model/functions/MA_PRODUCTION_COST.xml
model/src-db/database/model/functions/MRP_RUN_INITIALIZE.xml
model/src-db/database/model/functions/M_EXPLODEBOMNOTSTOCK.xml
model/src-db/database/model/functions/M_INOUT_POST.xml
model/src-db/database/model/functions/M_INVEXPLODEBOMNOTSTOCK.xml
model/src-db/database/model/functions/M_PRICELIST_CREATE.xml
model/src-db/database/model/functions/M_PROMOTION_ADJUSTMENT.xml
model/src-db/database/model/functions/S_TIMEEXPENSE_POST.xml
model/src-db/database/model/tables/AD_PROCESS.xml
model/src-db/database/model/tables/AD_REF_TREE.xml
model/src-db/database/model/tables/AD_REF_TREE_FIELD.xml
model/src-db/database/model/tables/AD_ROLE.xml
model/src-db/database/model/tables/AD_TAB.xml
model/src-db/database/model/tables/AD_TABLE.xml
model/src-db/database/model/tables/AD_TABLE_TREE.xml
model/src-db/database/model/tables/AD_TREE.xml
model/src-db/database/model/tables/C_INVOICE.xml
model/src-db/database/model/tables/C_ORDER.xml
model/src-db/database/model/tables/FIN_FINACC_PAYMENTMETHOD.xml
model/src-db/database/model/tables/FIN_PAYMENT_SCHEDULEDETAIL.xml
model/src-db/database/model/tables/M_OFFER.xml
model/src-db/database/model/tables/M_RESERVATION.xml
model/src-db/database/model/tables/M_TRANSACTION.xml
model/src-db/database/model/triggers/AD_SYSTEM_INFO_TRG2.xml
model/src-db/database/model/triggers/C_ACCTSCHEMA_ELEMENT_TRG.xml
model/src-db/database/model/triggers/C_BPARTNER_TRG.xml
model/src-db/database/model/triggers/C_INVOICELINE_TRG.xml
model/src-db/database/model/triggers/C_ORDER_TRG.xml
model/src-db/database/model/triggers/FIN_FINANCIAL_ACCOUNT_TRG.xml
model/src-db/database/model/triggers/M_CHARACTERISTIC_TRG.xml
model/src-db/database/model/triggers/M_PRODUCT_TRG.xml
model/src-db/database/model/triggers/M_TRANSACTION_TRG2.xml
model/src-db/database/model/views/M_INOUT_CANDIDATE_V.xml
model/src-db/database/model/views/M_RESERVEDGOODMNT_PICK_EDIT.xml
model/src-db/database/sourcedata/AD_AUXILIARINPUT.xml
model/src-db/database/sourcedata/AD_COLUMN.xml
model/src-db/database/sourcedata/AD_DATASET_TABLE.xml
model/src-db/database/sourcedata/AD_ELEMENT.xml
model/src-db/database/sourcedata/AD_FIELD.xml
model/src-db/database/sourcedata/AD_FIELDGROUP.xml
model/src-db/database/sourcedata/AD_MESSAGE.xml
model/src-db/database/sourcedata/AD_MODULE.xml
model/src-db/database/sourcedata/AD_PREFERENCE.xml
model/src-db/database/sourcedata/AD_PROCESS.xml
model/src-db/database/sourcedata/AD_REFERENCE.xml
model/src-db/database/sourcedata/AD_REF_LIST.xml
model/src-db/database/sourcedata/AD_REF_TABLE.xml
model/src-db/database/sourcedata/AD_TAB.xml
model/src-db/database/sourcedata/AD_TABLE.xml
model/src-db/database/sourcedata/AD_TABLE_TREE.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/OBCLKER_TEMPLATE.xml
model/src-db/database/sourcedata/OBSERDS_DATASOURCE.xml
model/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
model/src-db/database/sourcedata/OBUIAPP_PROCESS.xml
model/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml
model/src-db/database/sourcedata/OBUISEL_SELECTOR.xml
model/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
model/src-db/database/sourcedata/referencedData/C_REGION.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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_GEN_PAYMENTSCHEDULE_INV.xml	Tue May 06 13:08:31 2014 +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-2013 Openbravo SLU
+* All portions are Copyright (C) 2010-2014 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -81,6 +81,7 @@
 v_finacct_currency VARCHAR2(32);
 v_rate NUMBER;
 v_PricePr NUMBER;
+v_isinvoicepaid CHAR(1):= 'N';
 v_IsCashVAT C_Invoice.IsCashVAT%TYPE;
 
 TYPE RECORD IS REF CURSOR;
@@ -89,6 +90,8 @@
 cur_finaccpaymentmethod RECORD;
 cur_PaymentScheduleOrder RECORD;
 cur_linktopayment_scheddetails RECORD;
+cur_update_scheddetails RECORD;
+cur_invoicepaid RECORD;
 
 BEGIN
 
@@ -169,7 +172,8 @@
       END;
     END IF;
     -- END Extension Point
-
+    
+    
     DECLARE
       cur_payments RECORD;
       cur_order_schdet_ISOPEN BOOLEAN:=false;
@@ -203,7 +207,7 @@
              fin_payment_scheduledetail_id,
              fin_payment_scheduledetail.fin_payment_schedule_order,
              fin_payment_scheduledetail.fin_payment_detail_id,
-             CASE WHEN fin_payment.status IN ('PPM', 'RPR', 'PWNC', 'RDNC', 'RPPC') THEN 'Y' ELSE 'N' END AS paid,
+             fin_payment_scheduledetail.isinvoicepaid AS paid,
              CASE WHEN fin_payment_scheduledetail.fin_payment_detail_id is not null THEN 0 ELSE 1 END AS priority
       FROM c_invoiceline, c_orderline, fin_payment_schedule,
         fin_payment_scheduledetail LEFT JOIN fin_payment_detail ON fin_payment_scheduledetail.fin_payment_detail_id = fin_payment_detail.fin_payment_detail_id
@@ -242,7 +246,7 @@
             
       --Insert Payment Schedules for Invoices
       v_pendingAmount := v_GrandTotal - coalesce(v_ConsumedGranTotal, 0);
-      
+
       IF (v_pendingAmount <> 0) THEN
 
         --get number of payment schedules expected for the invoice
@@ -353,7 +357,7 @@
               v_scheduledetailamount := v_differenceamount;
               v_scheduledetailid := v_new_scheduledetailid;
             END IF;
-
+            
             IF (order_schdet.order_id <> v_oldorder) THEN
               -- get invoiced amount for the order
               SELECT COALESCE(SUM(c_invoiceline.linenetamt+c_getinvoiceline_taxamount(c_invoiceline.c_invoiceline_id)),0) INTO v_invoicedamount
@@ -477,8 +481,25 @@
                   updatedby = p_user
               WHERE fin_payment_scheduledetail_id = v_scheduledetailid;
 
+               UPDATE FIN_PAYMENT_SCHEDULEDETAIL
+              SET isinvoicepaid=(select CASE WHEN fpsd.fin_payment_detail_id is null then 'N'
+                  WHEN ((aprm_seqnumberpaymentstatus(fp.status))>= (aprm_seqnumberpaymentstatus((CASE WHEN fp.isreceipt='Y' 
+                  THEN Payin_Invoicepaidstatus ELSE Payout_Invoicepaidstatus END)))) THEN 'Y' ELSE 'N' END
+                  from fin_payment_scheduledetail fpsd
+                  left join fin_payment_detail fpd on fpsd.fin_payment_detail_id=fpd.fin_payment_detail_id
+                  left join fin_payment fp on fpd.fin_payment_id=fp.fin_payment_id
+                  left join fin_financial_account fa on fa.fin_financial_account_id=fp.fin_financial_account_id 
+                  left join FIN_FinAcc_PaymentMethod fpm on fpm.fin_financial_account_id=fp.fin_financial_account_id 
+                 and fpm.fin_paymentmethod_id=fp.fin_paymentmethod_id WHERE fin_payment_scheduledetail_id = v_scheduledetailid) 
+                 WHERE FIN_PAYMENT_SCHEDULEDETAIL_ID = v_scheduledetailid;
+              
               -- if paid, update paid and outstanding amount
-              IF (order_schdet.paid = 'Y') THEN
+              select isinvoicepaid 
+              into v_isinvoicepaid 
+              from fin_payment_scheduledetail
+              where fin_payment_scheduledetail_id = v_scheduledetailid;
+              
+              IF (v_isinvoicepaid = 'Y') THEN
                 UPDATE fin_payment_schedule
                 SET outstandingamt = outstandingamt - COALESCE(v_scheduledetailamount,0),
                     paidamt = paidamt + COALESCE(v_scheduledetailamount, 0)
@@ -492,8 +513,9 @@
                 v_PercentageCashVAT := abs(c_currency_round(v_scheduledetailamount * 100 / v_GrandTotal, v_Currency_ID, null));
 		FOR cur_cinvoicetax IN (
 		  SELECT it.C_InvoiceTax_ID, it.taxamt, it.taxbaseamt
-                  FROM C_InvoiceTax it
+                  FROM C_InvoiceTax it INNER JOIN C_Tax t on (it.c_tax_id = t.c_tax_id)
 		  WHERE it.c_invoice_id = p_record_id
+                  AND t.isCashVAT = 'Y'
                 )
                 LOOP
 	          INSERT INTO c_invoicetax_cashvat(
@@ -542,7 +564,7 @@
         CLOSE cur_order_schdet;
       
       END IF;
-
+             
       -- Reading Data from FIN_PAYMENT_SCHEDULE
       SELECT COALESCE(sum(PAIDAMT),0) as PaidAmount, COALESCE(SUM(OUTSTANDINGAMT),0) as OutstandingAmount
         INTO v_PaidAmount,V_OutstandingAmount
@@ -724,8 +746,9 @@
                 'N', 'N', 'N', v_finpayment_desc,
                 v_Financial_Account_ID, v_PaymentDocType_ID, v_project_id, v_campaign_id, v_costcenter,
                 v_activity_id, v_user1, v_user2, 'N', 'N', 'N');
+
+              v_description_first := TRUE;
               
-              v_description_first := TRUE;
               -- link to the new payment all the pending payment schedule details
               FOR cur_linktopayment_scheddetails IN (
                    SELECT FIN_PAYMENT_SCHEDULEDETAIL_ID, AMOUNT
@@ -753,8 +776,9 @@
                 v_PercentageCashVAT := abs(c_currency_round(cur_linktopayment_scheddetails.AMOUNT * 100 / v_GrandTotal, v_Currency_ID, null));
                 FOR cur_cinvoicetax IN (
                   SELECT it.C_InvoiceTax_ID, it.taxamt, it.taxbaseamt
-                              FROM C_InvoiceTax it
+                  FROM C_InvoiceTax it INNER JOIN C_Tax t on (it.c_tax_id = t.c_tax_id)
                   WHERE it.c_invoice_id = p_record_id
+                  AND t.isCashVAT='Y'
                 )
                 LOOP
                   INSERT INTO c_invoicetax_cashvat(
@@ -790,6 +814,27 @@
                   EM_APRM_PROCESS_PAYMENT = 'R'
               WHERE FIN_PAYMENT_ID = v_FIN_PAYMENT_ID;
 
+                           FOR cur_update_scheddetails IN (
+                SELECT fin_payment_scheduledetail_id
+                FROM fin_payment_schedule ps
+                INNER JOIN fin_payment_scheduledetail psd 
+                ON ps.fin_payment_schedule_id = psd.fin_payment_schedule_invoice                                                    
+                WHERE ps.c_invoice_id =p_record_id
+              )
+              LOOP
+              UPDATE FIN_PAYMENT_SCHEDULEDETAIL
+              SET isinvoicepaid=(select CASE WHEN fpsd.fin_payment_detail_id is null then 'N'
+                  WHEN ((aprm_seqnumberpaymentstatus(fp.status))>= (aprm_seqnumberpaymentstatus((CASE WHEN fp.isreceipt='Y' 
+                  THEN Payin_Invoicepaidstatus ELSE Payout_Invoicepaidstatus END)))) THEN 'Y' ELSE 'N' END
+                  from fin_payment_scheduledetail fpsd
+                  left join fin_payment_detail fpd on fpsd.fin_payment_detail_id=fpd.fin_payment_detail_id
+                  left join fin_payment fp on fpd.fin_payment_id=fp.fin_payment_id
+                  left join fin_financial_account fa on fa.fin_financial_account_id=fp.fin_financial_account_id 
+                  left join FIN_FinAcc_PaymentMethod fpm on fpm.fin_financial_account_id=fp.fin_financial_account_id 
+                 and fpm.fin_paymentmethod_id=fp.fin_paymentmethod_id WHERE fin_payment_scheduledetail_id = cur_update_scheddetails.fin_payment_scheduledetail_id) 
+                 WHERE FIN_PAYMENT_SCHEDULEDETAIL_ID = cur_update_scheddetails.fin_payment_scheduledetail_id;
+              END LOOP;
+
               -- Update payment schedule amounts and payment monitor in case that the payment is not left in awaiting
               -- execution status.
               FOR cur_PaymentScheduleOrder IN (
@@ -812,7 +857,8 @@
                     v_finpayment_desc:=v_finpayment_desc || ', ' || v_orderno;
                   END IF;
                 END IF;
-                IF (cur_finaccpaymentmethod.ExecutionType<>'A') THEN
+                
+                  IF (cur_finaccpaymentmethod.ExecutionType<>'A') THEN
                   UPDATE FIN_PAYMENT_SCHEDULE
                   SET PAIDAMT = (SELECT COALESCE(sum(amount + COALESCE(writeoffamt, 0)), 0)
                                  FROM fin_payment_scheduledetail
@@ -821,7 +867,8 @@
                                        exists (SELECT 1
                                                FROM fin_payment, fin_payment_detail
                                                WHERE fin_payment.fin_payment_id = fin_payment_detail.fin_payment_id
-                                                      and fin_payment.processed='Y' and fin_payment.status<>'RPAE'
+                                                      and fin_payment.processed='Y' 
+                                                      and fin_payment_scheduledetail.isinvoicepaid='Y'
                                                       and fin_payment_detail.fin_payment_detail_id = fin_payment_scheduledetail.fin_payment_detail_id)),
                       OUTSTANDINGAMT = (SELECT COALESCE(sum(amount), 0)
                                         FROM fin_payment_scheduledetail
@@ -830,8 +877,10 @@
                                        exists (SELECT 1
                                                FROM fin_payment, fin_payment_detail
                                                WHERE fin_payment.fin_payment_id = fin_payment_detail.fin_payment_id
-                                                      and fin_payment.processed='Y' and fin_payment.status = 'RPAE'
+                                                      and fin_payment.processed='Y' 
+                                                      and fin_payment_scheduledetail.isinvoicepaid='Y'
                                                       and fin_payment_detail.fin_payment_detail_id = fin_payment_scheduledetail.fin_payment_detail_id)))
+
                   WHERE FIN_PAYMENT_SCHEDULE_ID = cur_PaymentScheduleOrder.FIN_PAYMENT_SCHEDULE_ORDER;
                 END IF;
               END LOOP;
@@ -840,7 +889,17 @@
               END IF;
               UPDATE FIN_PAYMENT SET DESCRIPTION = v_finpayment_desc
                 WHERE FIN_PAYMENT_ID = v_FIN_PAYMENT_ID;
-              IF (cur_finaccpaymentmethod.ExecutionType<>'A') THEN  
+
+              FOR cur_invoicepaid IN (
+                select isinvoicepaid from fin_payment_scheduledetail fpsd
+               left join fin_payment_detail fpd on fpsd.fin_payment_detail_id=fpd.fin_payment_detail_id
+               left join fin_payment fp on fpd.fin_payment_id=fp.fin_payment_id
+               left join fin_payment_schedule ps ON ps.fin_payment_schedule_id = fpsd.fin_payment_schedule_invoice
+                 WHERE ps.c_invoice_id =p_record_id
+              )
+             LOOP
+
+              IF ((cur_finaccpaymentmethod.ExecutionType<>'A') AND (cur_invoicepaid.isinvoicepaid='Y')) THEN 
                 UPDATE FIN_PAYMENT_SCHEDULE
                 SET PAIDAMT = PAIDAMT + COALESCE(cur_paymentschedule.OUTSTANDINGAMT,0),
                     OUTSTANDINGAMT = OUTSTANDINGAMT - COALESCE(cur_paymentschedule.OUTSTANDINGAMT, 0)
@@ -868,7 +927,7 @@
                 SET SO_CREDITUSED = COALESCE(SO_CREDITUSED,0) - (COALESCE(cur_paymentschedule.OUTSTANDINGAMT, 0) * v_creditmultiplier)
                 WHERE C_BPARTNER_ID = v_BPartner_ID;
               END IF;
-
+            END LOOP;
               -- Automatic creation of financial transaction
               IF(cur_finaccpaymentmethod.CreateFinTransaction = 'Y' AND cur_finaccpaymentmethod.ExecutionType = 'M') THEN
                 v_ResultStr:='Generating FIN_FINACC_TRANSACTION';
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_ISPAYMENTCONFIRMED.xml	Tue May 06 13:08:31 2014 +0000
@@ -4,7 +4,7 @@
       <parameter name="status" type="VARCHAR" mode="in">
         <default/>
       </parameter>
-      <parameter name="fin_payment_scheduledetail_id" type="VARCHAR" mode="in">
+      <parameter name="p_fin_psd_id" type="VARCHAR" mode="in">
         <default/>
       </parameter>
       <body><![CDATA[/*************************************************************************
@@ -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-2012 Openbravo SLU
+* All portions are Copyright (C) 2011-2014 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -28,30 +28,46 @@
   v_module   VARCHAR2(32);
   v_dbprefix   VARCHAR2(7);
   v_isPaymentConfirmed CHAR(1) := 'N';
+  v_isinvoicepaid CHAR(1):= 'N';
+  v_referencelist VARCHAR2(32):='575BCB88A4694C27BC013DE9C73E6FE7';
   TYPE RECORD IS REF CURSOR;
   Cur_Dbprefix RECORD;
-
+  v_invoicepaidstatus  VARCHAR2(32);
 BEGIN
   -- Check if the status exists
   SELECT count(*) INTO v_count FROM DUAL
   WHERE EXISTS (SELECT 1 FROM ad_ref_list
-                WHERE ad_reference_id = '575BCB88A4694C27BC013DE9C73E6FE7'
+                WHERE ad_reference_id = v_referencelist
                       AND value = status);
 
   IF (v_count = 0) THEN
     RETURN 'N';
   END IF;
-  IF (status IN ('PPM', 'RPR', 'PWNC', 'RDNC', 'RPPC')) THEN
-    -- core final statuses
-    v_isPaymentConfirmed := 'Y';
-  ELSIF (status IN ('RPAP', 'RPAE', 'RPVOID')) THEN
-    -- core intermediate statuses
-    v_isPaymentConfirmed := 'N';
-  ELSE
+  select isinvoicepaid 
+  into v_isinvoicepaid
+  from fin_payment_scheduledetail
+  where fin_payment_scheduledetail_id=p_fin_psd_id;
+  
+  IF ((p_fin_psd_id <> '') AND (p_fin_psd_id is not null))THEN
+    IF(v_isinvoicepaid='Y')THEN
+     -- core intermediate statuses
+      v_isPaymentConfirmed := 'Y';
+    ELSE
+     -- core intermediate statuses
+      v_isPaymentConfirmed := 'N';
+    END IF;
+  ELSE 
+    IF(status IN ('PPM', 'RPR', 'PWNC', 'RDNC', 'RPPC'))THEN
+     -- core intermediate statuses
+      v_isPaymentConfirmed := 'Y';
+    ELSIF (status IN ('RPAP', 'RPAE', 'RPVOID')) THEN
+     -- core intermediate statuses
+      v_isPaymentConfirmed := 'N'; 
+    ELSE
     -- statuses implemented by other module
     SELECT ad_module_id INTO v_module
     FROM ad_ref_list
-    WHERE ad_reference_id = '575BCB88A4694C27BC013DE9C73E6FE7'
+    WHERE ad_reference_id = v_referencelist
       AND value = status;
 
     -- if the module defines a merge can have several dbprefix
@@ -62,7 +78,7 @@
       ORDER BY name)
     LOOP
       BEGIN
-        v_Sql := 'SELECT ' || Cur_Dbprefix.dbprefix || '_ispaymentconfirmed' || '(''' || coalesce(status, '') || ''', ''' || coalesce(fin_payment_scheduledetail_id, '') || ''') FROM DUAL';
+        v_Sql := 'SELECT ' || Cur_Dbprefix.dbprefix || '_ispaymentconfirmed' || '(''' || coalesce(status, '') || ''', ''' || coalesce(p_fin_psd_id, '') || ''') FROM DUAL';
 
         EXECUTE IMMEDIATE v_Sql INTO v_isPaymentConfirmed;
         IF (v_ispaymentconfirmed = 'Y') THEN
@@ -74,7 +90,7 @@
       END;
     END LOOP;
   END IF;
-
+  END IF;
   RETURN v_isPaymentConfirmed;
 
 EXCEPTION
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/functions/APRM_SEQNUMBERPAYMENTSTATUS.xml	Tue May 06 13:08:31 2014 +0000
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+  <database name="FUNCTION APRM_SEQNUMBERPAYMENTSTATUS">
+    <function name="APRM_SEQNUMBERPAYMENTSTATUS" type="VARCHAR">
+      <parameter name="status" 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) 2014 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+  v_seqno VARCHAR2(32);
+  v_count NUMBER;
+  v_referencelist VARCHAR2(32):='575BCB88A4694C27BC013DE9C73E6FE7';
+
+BEGIN
+  -- Check if the status exists
+  SELECT count(*) INTO v_count FROM DUAL
+  WHERE EXISTS (SELECT 1 FROM ad_ref_list
+                WHERE ad_reference_id = v_referencelist
+                      AND value = status);
+
+  IF (v_count = 0) THEN
+    RETURN 'N';
+  END IF;
+  
+  SELECT seqno 
+  INTO v_seqno
+  FROM ad_ref_list
+  WHERE ad_reference_id = v_referencelist
+  and value = status;
+
+  RETURN v_seqno;
+
+EXCEPTION
+WHEN OTHERS THEN
+  DBMS_OUTPUT.PUT_LINE('aprm_seqnumberpaymentstatus exception');
+  RAISE;
+END APRM_SEQNUMBERPAYMENTSTATUS
+]]></body>
+    </function>
+  </database>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_BANKSTATEMENT.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_BANKSTATEMENT.xml	Tue May 06 13:08:31 2014 +0000
@@ -5,5 +5,9 @@
         <default><![CDATA[P]]></default>
         <onCreateDefault/>
       </column>
+      <column name="EM_APRM_PROCESS_BS_FORCE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false">
+        <default><![CDATA[P]]></default>
+        <onCreateDefault/>
+      </column>
     </table>
   </database>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_FINANCIAL_ACCOUNT.xml	Tue May 06 13:08:31 2014 +0000
@@ -17,5 +17,9 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="EM_APRM_MATCHTRANS_FORCE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
     </table>
   </database>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_RECONCILIATION.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/modifiedTables/FIN_RECONCILIATION.xml	Tue May 06 13:08:31 2014 +0000
@@ -17,6 +17,10 @@
         <default><![CDATA[P]]></default>
         <onCreateDefault/>
       </column>
+      <column name="EM_APRM_PROCESS_REC_FORCE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false">
+        <default><![CDATA[P]]></default>
+        <onCreateDefault/>
+      </column>
       <check name="EM_APRM_REC_PRINTDET_CHK"><![CDATA[EM_APRM_PRINTDETAILED IN ('Y', 'N')]]></check>
       <check name="EM_APRM_REC_PRINTSUM_CHK"><![CDATA[EM_APRM_PRINTSUMMARY IN ('Y', 'N')]]></check>
     </table>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_BNKSTM_LINE_CHECK_TRG.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_BNKSTM_LINE_CHECK_TRG.xml	Tue May 06 13:08:31 2014 +0000
@@ -62,6 +62,28 @@
   IF((DELETING OR INSERTING) AND v_Processed='Y') THEN
 	RAISE_APPLICATION_ERROR(-20000, '@20501@');
   END IF;
+  IF(DELETING) THEN
+    IF( :OLD.FIN_FINACC_TRANSACTION_ID IS NOT NULL) THEN
+	    RAISE_APPLICATION_ERROR(-20000, '@APRM_BSTLine_Matched@');
+    END IF;
+  END IF;
+  IF (UPDATING) THEN
+  	IF (:OLD.FIN_FINACC_TRANSACTION_ID IS NOT NULL) THEN
+    	    IF(((COALESCE(:OLD.AD_ORG_ID, '0') <> COALESCE(:NEW.AD_ORG_ID, '0'))
+      OR(COALESCE(:OLD.ISACTIVE, '0') <> COALESCE(:NEW.ISACTIVE, '0'))
+      OR(COALESCE(:OLD.FIN_BANKSTATEMENT_ID, '0') <> COALESCE(:NEW.FIN_BANKSTATEMENT_ID, '0'))
+      OR(COALESCE(:OLD.LINE, 0) <> COALESCE(:NEW.LINE, 0))
+      OR(COALESCE(:OLD.BPARTNERNAME, '0') <> COALESCE(:NEW.BPARTNERNAME, '0'))
+      OR(COALESCE(:OLD.DATETRX, v_DateNull) <> COALESCE(:NEW.DATETRX, v_DateNull))
+      OR(COALESCE(:OLD.CRAMOUNT, 0) <> COALESCE(:NEW.CRAMOUNT, 0))
+      OR(COALESCE(:OLD.DRAMOUNT, 0) <> COALESCE(:NEW.DRAMOUNT, 0))
+      OR(COALESCE(:OLD.REFERENCENO, '0') <> COALESCE(:NEW.REFERENCENO, '0'))
+      )) THEN
+      RAISE_APPLICATION_ERROR(-20000, '@APRM_BSTLine_Matched@');
+    END IF;
+
+  	END IF;
+  END IF;
 END APRM_FIN_BNKSTM_LINE_CHECK_TRG
 ]]></body>
     </trigger>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_FINACC_TRAN_CHECK_TRG.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_FINACC_TRAN_CHECK_TRG.xml	Tue May 06 13:08:31 2014 +0000
@@ -30,8 +30,7 @@
   END IF;
 
   IF (UPDATING) THEN
-    IF(:OLD.PROCESSED='Y' AND ((COALESCE(:OLD.AD_ORG_ID, '0') <> COALESCE(:NEW.AD_ORG_ID, '0'))
-      OR(COALESCE(:OLD.C_CURRENCY_ID, '0') <> COALESCE(:NEW.C_CURRENCY_ID, '0'))
+    IF(:OLD.PROCESSED='Y' AND ((COALESCE(:OLD.C_CURRENCY_ID, '0') <> COALESCE(:NEW.C_CURRENCY_ID, '0'))
       OR(COALESCE(:OLD.FIN_FINANCIAL_ACCOUNT_ID, '0') <> COALESCE(:NEW.FIN_FINANCIAL_ACCOUNT_ID, '0'))
       OR(COALESCE(:OLD.LINE, 0) <> COALESCE(:NEW.LINE, 0))
       OR(COALESCE(:OLD.FIN_PAYMENT_ID, '0') <> COALESCE(:NEW.FIN_PAYMENT_ID, '0'))
@@ -42,6 +41,7 @@
       RAISE_APPLICATION_ERROR(-20000, '@20501@');
     END IF;
     IF((COALESCE(:OLD.DATEACCT, v_DateNull) <> COALESCE(:NEW.DATEACCT, v_DateNull))
+      OR(COALESCE(:OLD.AD_ORG_ID, '0') <> COALESCE(:NEW.AD_ORG_ID, '0'))
       OR(COALESCE(:OLD.C_PROJECT_ID, '0') <> COALESCE(:NEW.C_PROJECT_ID, '0'))
       OR(COALESCE(:OLD.C_GLITEM_ID, '0') <> COALESCE(:NEW.C_GLITEM_ID, '0'))        
       OR(COALESCE(:OLD.C_CAMPAIGN_ID, '0') <> COALESCE(:NEW.C_CAMPAIGN_ID, '0'))
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_RECON_CHECK_TRG.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/triggers/APRM_FIN_RECON_CHECK_TRG.xml	Tue May 06 13:08:31 2014 +0000
@@ -34,8 +34,6 @@
       OR(COALESCE(:OLD.C_DOCTYPE_ID, '0') <> COALESCE(:NEW.C_DOCTYPE_ID, '0'))
       OR(COALESCE(:OLD.DATETO, v_DateNull) <> COALESCE(:NEW.DATETO, v_DateNull))
       OR(COALESCE(:OLD.STATEMENTDATE, v_DateNull) <> COALESCE(:NEW.STATEMENTDATE, v_DateNull))
-      OR(COALESCE(:OLD.ENDINGBALANCE, 0) <> COALESCE(:NEW.ENDINGBALANCE, 0))
-      OR(COALESCE(:OLD.STARTINGBALANCE, 0) <> COALESCE(:NEW.STARTINGBALANCE, 0))
       OR(COALESCE(:OLD.DOCSTATUS, '0') <> COALESCE(:NEW.DOCSTATUS, '0')))) THEN
       RAISE_APPLICATION_ERROR(-20000, '@20501@');
     END IF;
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_FINACC_TRANSACTION_ACCT_V.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/model/views/APRM_FINACC_TRANSACTION_ACCT_V.xml	Tue May 06 13:08:31 2014 +0000
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
   <database name="VIEW APRM_FINACC_TRANSACTION_ACCT_V">
-    <view name="APRM_FINACC_TRANSACTION_ACCT_V"><![CDATA[SELECT fact_acct.fact_acct_id AS fin_finacc_transaction_acct_id, fact_acct.ad_client_id, fact_acct.ad_org_id, fact_acct.isactive, fact_acct.created, fact_acct.createdby, fact_acct.updated, fact_acct.updatedby, fact_acct.c_acctschema_id, fact_acct.account_id AS c_elementvalue_id, fact_acct.datetrx, fact_acct.dateacct, fact_acct.c_period_id, fact_acct.ad_table_id, fact_acct.record_id AS fin_finacc_transaction_id, fin_finacc_transaction.fin_financial_account_id, fact_acct.gl_category_id, fact_acct.c_tax_id, fact_acct.m_locator_id, fact_acct.postingtype, fact_acct.c_currency_id, fact_acct.amtsourcedr, fact_acct.amtsourcecr, fact_acct.amtacctdr, fact_acct.amtacctcr, fact_acct.c_uom_id, fact_acct.qty, fact_acct.m_product_id, fact_acct.c_bpartner_id, fact_acct.ad_orgtrx_id, fact_acct.c_locfrom_id, fact_acct.c_locto_id, fact_acct.c_salesregion_id, fact_acct.c_project_id, fact_acct.c_campaign_id, fact_acct.c_activity_id, fact_acct.user1_id, fact_acct.user2_id, fact_acct.description, fact_acct.a_asset_id, fact_acct.fact_acct_group_id, fact_acct.seqno, fact_acct.factaccttype, fact_acct.docbasetype, fact_acct.acctvalue, fact_acct.acctdescription, fact_acct.c_withholding_id, fin_finacc_transaction.fin_finacc_transaction_id AS aprm_finacc_transaction_v_id FROM fact_acct, fin_finacc_transaction WHERE fact_acct.record_id = fin_finacc_transaction.fin_finacc_transaction_id AND fact_acct.ad_table_id = '4D8C3B3C31D1410DA046140C9F024D17']]></view>
+    <view name="APRM_FINACC_TRANSACTION_ACCT_V"><![CDATA[SELECT fact_acct.fact_acct_id AS fin_finacc_transaction_acct_id, fact_acct.ad_client_id, fact_acct.ad_org_id, fact_acct.isactive, fact_acct.created, fact_acct.createdby, fact_acct.updated, fact_acct.updatedby, fact_acct.c_acctschema_id, fact_acct.account_id AS c_elementvalue_id, fact_acct.datetrx, fact_acct.dateacct, fact_acct.c_period_id, fact_acct.ad_table_id, fact_acct.record_id AS fin_finacc_transaction_id, fin_finacc_transaction.fin_financial_account_id, fact_acct.gl_category_id, fact_acct.c_tax_id, fact_acct.m_locator_id, fact_acct.postingtype, fact_acct.c_currency_id, fact_acct.amtsourcedr, fact_acct.amtsourcecr, fact_acct.amtacctdr, fact_acct.amtacctcr, fact_acct.c_uom_id, fact_acct.qty, fact_acct.m_product_id, fact_acct.c_bpartner_id, fact_acct.ad_orgtrx_id, fact_acct.c_locfrom_id, fact_acct.c_locto_id, fact_acct.c_salesregion_id, fact_acct.c_project_id, fact_acct.c_campaign_id, fact_acct.c_activity_id, fact_acct.user1_id, fact_acct.user2_id, fact_acct.description, fact_acct.a_asset_id, fact_acct.fact_acct_group_id, fact_acct.seqno, fact_acct.factaccttype, fact_acct.docbasetype, fact_acct.acctvalue, fact_acct.acctdescription, fact_acct.c_withholding_id, fin_finacc_transaction.fin_finacc_transaction_id AS aprm_finacc_transaction_v_id, fact_acct.c_costcenter_id FROM fact_acct, fin_finacc_transaction WHERE fact_acct.record_id = fin_finacc_transaction.fin_finacc_transaction_id AND fact_acct.ad_table_id = '4D8C3B3C31D1410DA046140C9F024D17']]></view>
   </database>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Tue May 06 13:08:31 2014 +0000
@@ -22,6 +22,20 @@
 <!--21943DF0B89F4AE3AF14A9C06F1181C2-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--21943DF0B89F4AE3AF14A9C06F1181C2--></AD_AUXILIARINPUT>
 
+<!--29B80A89DBA84293A75434979C655101--><AD_AUXILIARINPUT>
+<!--29B80A89DBA84293A75434979C655101-->  <AD_AUXILIARINPUT_ID><![CDATA[29B80A89DBA84293A75434979C655101]]></AD_AUXILIARINPUT_ID>
+<!--29B80A89DBA84293A75434979C655101-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--29B80A89DBA84293A75434979C655101-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--29B80A89DBA84293A75434979C655101-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--29B80A89DBA84293A75434979C655101-->  <AD_TAB_ID><![CDATA[FF8080813320657F0133209DE21B0042]]></AD_TAB_ID>
+<!--29B80A89DBA84293A75434979C655101-->  <NAME><![CDATA[APRM_LASTREC]]></NAME>
+<!--29B80A89DBA84293A75434979C655101-->  <CODE><![CDATA[@SQL=select fin_reconciliation_id from fin_reconciliation where created = (
+select max(created)
+from fin_reconciliation 
+where fin_financial_account_id = @FIN_Financial_Account_ID@)]]></CODE>
+<!--29B80A89DBA84293A75434979C655101-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--29B80A89DBA84293A75434979C655101--></AD_AUXILIARINPUT>
+
 <!--4FA457B12B4E411FA662D4D97A53B2E1--><AD_AUXILIARINPUT>
 <!--4FA457B12B4E411FA662D4D97A53B2E1-->  <AD_AUXILIARINPUT_ID><![CDATA[4FA457B12B4E411FA662D4D97A53B2E1]]></AD_AUXILIARINPUT_ID>
 <!--4FA457B12B4E411FA662D4D97A53B2E1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -44,6 +58,17 @@
 <!--9D630C9E4C734361BFB09B153EEE3BCB-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--9D630C9E4C734361BFB09B153EEE3BCB--></AD_AUXILIARINPUT>
 
+<!--B1C25B989C164EDFB7F9B26CB799DDAA--><AD_AUXILIARINPUT>
+<!--B1C25B989C164EDFB7F9B26CB799DDAA-->  <AD_AUXILIARINPUT_ID><![CDATA[B1C25B989C164EDFB7F9B26CB799DDAA]]></AD_AUXILIARINPUT_ID>
+<!--B1C25B989C164EDFB7F9B26CB799DDAA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B1C25B989C164EDFB7F9B26CB799DDAA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B1C25B989C164EDFB7F9B26CB799DDAA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B1C25B989C164EDFB7F9B26CB799DDAA-->  <AD_TAB_ID><![CDATA[C56E698100314ABBBBD3A89626CA551C]]></AD_TAB_ID>
+<!--B1C25B989C164EDFB7F9B26CB799DDAA-->  <NAME><![CDATA[APRM_ISRECONCILED]]></NAME>
+<!--B1C25B989C164EDFB7F9B26CB799DDAA-->  <CODE><![CDATA[@SQL=SELECT 1 FROM DUAL WHERE EXISTS (SELECT 1 FROM FIN_BANKSTATEMENTLINE WHERE FIN_FINACC_TRANSACTION_ID IS NOT NULL AND FIN_BANKSTATEMENT_ID = @FIN_BankStatement_ID@) OR EXISTS (SELECT 1 FROM FIN_BANKSTATEMENTLINE, FIN_BANKSTATEMENT  WHERE DATETRX > (SELECT MAX(DATETRX) FROM FIN_BANKSTATEMENTLINE WHERE FIN_BANKSTATEMENT_ID = @FIN_BankStatement_ID@) AND  FIN_BANKSTATEMENT.FIN_BANKSTATEMENT_ID = FIN_BANKSTATEMENTLINE.FIN_BANKSTATEMENT_ID AND FIN_BANKSTATEMENT.FIN_FINANCIAL_ACCOUNT_ID = @FIN_Financial_Account_ID@) ]]></CODE>
+<!--B1C25B989C164EDFB7F9B26CB799DDAA-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--B1C25B989C164EDFB7F9B26CB799DDAA--></AD_AUXILIARINPUT>
+
 <!--D08EBACB459849488F49089EA28F96D9--><AD_AUXILIARINPUT>
 <!--D08EBACB459849488F49089EA28F96D9-->  <AD_AUXILIARINPUT_ID><![CDATA[D08EBACB459849488F49089EA28F96D9]]></AD_AUXILIARINPUT_ID>
 <!--D08EBACB459849488F49089EA28F96D9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_COLUMN.xml	Tue May 06 13:08:31 2014 +0000
@@ -1545,6 +1545,43 @@
 <!--41DAD5FF72274650A3C41D103F20C111-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--41DAD5FF72274650A3C41D103F20C111--></AD_COLUMN>
 
+<!--422F3732DA324AE2AA34AE2E44D42037--><AD_COLUMN>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <AD_COLUMN_ID><![CDATA[422F3732DA324AE2AA34AE2E44D42037]]></AD_COLUMN_ID>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <NAME><![CDATA[EM_APRM_Process_Reconciliation_Force]]></NAME>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <COLUMNNAME><![CDATA[EM_APRM_Process_Rec_Force]]></COLUMNNAME>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <AD_TABLE_ID><![CDATA[B1B7075C46934F0A9FD4C4D0F1457B42]]></AD_TABLE_ID>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <AD_REFERENCE_ID><![CDATA[28]]></AD_REFERENCE_ID>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <AD_REFERENCE_VALUE_ID><![CDATA[FF8080812E443491012E443C053A001A]]></AD_REFERENCE_VALUE_ID>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <AD_VAL_RULE_ID><![CDATA[FF8080812E448A62012E44943A160017]]></AD_VAL_RULE_ID>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <DEFAULTVALUE><![CDATA[P]]></DEFAULTVALUE>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <SEQNO><![CDATA[280]]></SEQNO>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <AD_ELEMENT_ID><![CDATA[1C8028555014460F81C6ACC811CA74E2]]></AD_ELEMENT_ID>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <AD_PROCESS_ID><![CDATA[6BF16EFC772843AC9A17552AE0B26AB7]]></AD_PROCESS_ID>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <POSITION><![CDATA[27]]></POSITION>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--422F3732DA324AE2AA34AE2E44D42037-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--422F3732DA324AE2AA34AE2E44D42037--></AD_COLUMN>
+
 <!--42C6FD4ECBF6451F9D570317F4472FD7--><AD_COLUMN>
 <!--42C6FD4ECBF6451F9D570317F4472FD7-->  <AD_COLUMN_ID><![CDATA[42C6FD4ECBF6451F9D570317F4472FD7]]></AD_COLUMN_ID>
 <!--42C6FD4ECBF6451F9D570317F4472FD7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2396,6 +2433,41 @@
 <!--63454E73F07B4C908EB1268C41F5DE8A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--63454E73F07B4C908EB1268C41F5DE8A--></AD_COLUMN>
 
+<!--670423B76C554A6C957A58F1DA4A6D98--><AD_COLUMN>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <AD_COLUMN_ID><![CDATA[670423B76C554A6C957A58F1DA4A6D98]]></AD_COLUMN_ID>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <NAME><![CDATA[Cost Center]]></NAME>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <DESCRIPTION><![CDATA[Division that adds to the cost of an organization]]></DESCRIPTION>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <HELP><![CDATA[Division that adds to the cost of an organization. Internal structure for cost allocation.]]></HELP>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <COLUMNNAME><![CDATA[C_Costcenter_ID]]></COLUMNNAME>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <AD_TABLE_ID><![CDATA[1BAA61D216CB4A62838AA785658EE092]]></AD_TABLE_ID>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <SEQNO><![CDATA[490]]></SEQNO>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <AD_ELEMENT_ID><![CDATA[BB1B0593596A4F63B2553183B11B0D28]]></AD_ELEMENT_ID>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <POSITION><![CDATA[49]]></POSITION>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--670423B76C554A6C957A58F1DA4A6D98-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--670423B76C554A6C957A58F1DA4A6D98--></AD_COLUMN>
+
 <!--68C853FD393C4620A3947EC34C416B9A--><AD_COLUMN>
 <!--68C853FD393C4620A3947EC34C416B9A-->  <AD_COLUMN_ID><![CDATA[68C853FD393C4620A3947EC34C416B9A]]></AD_COLUMN_ID>
 <!--68C853FD393C4620A3947EC34C416B9A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2431,6 +2503,42 @@
 <!--68C853FD393C4620A3947EC34C416B9A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--68C853FD393C4620A3947EC34C416B9A--></AD_COLUMN>
 
+<!--6B5C965B623748689A689838835C0AC2--><AD_COLUMN>
+<!--6B5C965B623748689A689838835C0AC2-->  <AD_COLUMN_ID><![CDATA[6B5C965B623748689A689838835C0AC2]]></AD_COLUMN_ID>
+<!--6B5C965B623748689A689838835C0AC2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6B5C965B623748689A689838835C0AC2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6B5C965B623748689A689838835C0AC2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6B5C965B623748689A689838835C0AC2-->  <NAME><![CDATA[EM_APRM_Process Bank Statement Force]]></NAME>
+<!--6B5C965B623748689A689838835C0AC2-->  <COLUMNNAME><![CDATA[EM_APRM_Process_BS_Force]]></COLUMNNAME>
+<!--6B5C965B623748689A689838835C0AC2-->  <AD_TABLE_ID><![CDATA[D4C23A17190649E7B78F55A05AF3438C]]></AD_TABLE_ID>
+<!--6B5C965B623748689A689838835C0AC2-->  <AD_REFERENCE_ID><![CDATA[28]]></AD_REFERENCE_ID>
+<!--6B5C965B623748689A689838835C0AC2-->  <AD_REFERENCE_VALUE_ID><![CDATA[EC75B6F5A9504DB6B3F3356EA85F15EE]]></AD_REFERENCE_VALUE_ID>
+<!--6B5C965B623748689A689838835C0AC2-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--6B5C965B623748689A689838835C0AC2-->  <DEFAULTVALUE><![CDATA[P]]></DEFAULTVALUE>
+<!--6B5C965B623748689A689838835C0AC2-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--6B5C965B623748689A689838835C0AC2-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--6B5C965B623748689A689838835C0AC2-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--6B5C965B623748689A689838835C0AC2-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--6B5C965B623748689A689838835C0AC2-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--6B5C965B623748689A689838835C0AC2-->  <SEQNO><![CDATA[220]]></SEQNO>
+<!--6B5C965B623748689A689838835C0AC2-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--6B5C965B623748689A689838835C0AC2-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6B5C965B623748689A689838835C0AC2-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--6B5C965B623748689A689838835C0AC2-->  <AD_ELEMENT_ID><![CDATA[D42C1F18622F4773989190BB8C2C8436]]></AD_ELEMENT_ID>
+<!--6B5C965B623748689A689838835C0AC2-->  <AD_PROCESS_ID><![CDATA[2DDE7D3618034C38A4462B7F3456C28D]]></AD_PROCESS_ID>
+<!--6B5C965B623748689A689838835C0AC2-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--6B5C965B623748689A689838835C0AC2-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--6B5C965B623748689A689838835C0AC2-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--6B5C965B623748689A689838835C0AC2-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--6B5C965B623748689A689838835C0AC2-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--6B5C965B623748689A689838835C0AC2-->  <POSITION><![CDATA[22]]></POSITION>
+<!--6B5C965B623748689A689838835C0AC2-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--6B5C965B623748689A689838835C0AC2-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--6B5C965B623748689A689838835C0AC2-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--6B5C965B623748689A689838835C0AC2-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--6B5C965B623748689A689838835C0AC2-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--6B5C965B623748689A689838835C0AC2--></AD_COLUMN>
+
 <!--6BBCB749C7C640A08F573BF86D270171--><AD_COLUMN>
 <!--6BBCB749C7C640A08F573BF86D270171-->  <AD_COLUMN_ID><![CDATA[6BBCB749C7C640A08F573BF86D270171]]></AD_COLUMN_ID>
 <!--6BBCB749C7C640A08F573BF86D270171-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -5342,6 +5450,40 @@
 <!--9D382AE31EFB4496B0A531A0FD72E73B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--9D382AE31EFB4496B0A531A0FD72E73B--></AD_COLUMN>
 
+<!--9DC8500B414640E09BF61A3D14FE13D1--><AD_COLUMN>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <AD_COLUMN_ID><![CDATA[9DC8500B414640E09BF61A3D14FE13D1]]></AD_COLUMN_ID>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <NAME><![CDATA[EM_APRM_MatchTransactions_Force]]></NAME>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <COLUMNNAME><![CDATA[EM_APRM_MatchTrans_Force]]></COLUMNNAME>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <AD_TABLE_ID><![CDATA[B129E53BC0E747879F7BA17F0AECEC32]]></AD_TABLE_ID>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <AD_REFERENCE_ID><![CDATA[28]]></AD_REFERENCE_ID>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <SEQNO><![CDATA[450]]></SEQNO>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <AD_ELEMENT_ID><![CDATA[F79620AE1CC041308045C23E661BD907]]></AD_ELEMENT_ID>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <AD_PROCESS_ID><![CDATA[19EEA22FCA464979B3ADAD3A967ADA52]]></AD_PROCESS_ID>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <POSITION><![CDATA[39]]></POSITION>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--9DC8500B414640E09BF61A3D14FE13D1-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--9DC8500B414640E09BF61A3D14FE13D1--></AD_COLUMN>
+
 <!--9DE9E45A80994A969AC623FA97A3C0E8--><AD_COLUMN>
 <!--9DE9E45A80994A969AC623FA97A3C0E8-->  <AD_COLUMN_ID><![CDATA[9DE9E45A80994A969AC623FA97A3C0E8]]></AD_COLUMN_ID>
 <!--9DE9E45A80994A969AC623FA97A3C0E8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -5476,7 +5618,7 @@
 <!--A028C07508878CB9E040007F01007210-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--A028C07508878CB9E040007F01007210-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--A028C07508878CB9E040007F01007210-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--A028C07508878CB9E040007F01007210-->  <POSITION><![CDATA[30]]></POSITION>
+<!--A028C07508878CB9E040007F01007210-->  <POSITION><![CDATA[35]]></POSITION>
 <!--A028C07508878CB9E040007F01007210-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--A028C07508878CB9E040007F01007210-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--A028C07508878CB9E040007F01007210-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -5510,7 +5652,7 @@
 <!--A04179EAC69DF848E040007F01004523-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--A04179EAC69DF848E040007F01004523-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--A04179EAC69DF848E040007F01004523-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--A04179EAC69DF848E040007F01004523-->  <POSITION><![CDATA[31]]></POSITION>
+<!--A04179EAC69DF848E040007F01004523-->  <POSITION><![CDATA[36]]></POSITION>
 <!--A04179EAC69DF848E040007F01004523-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--A04179EAC69DF848E040007F01004523-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--A04179EAC69DF848E040007F01004523-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -5544,7 +5686,7 @@
 <!--A04179EAC69EF848E040007F01004523-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--A04179EAC69EF848E040007F01004523-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--A04179EAC69EF848E040007F01004523-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--A04179EAC69EF848E040007F01004523-->  <POSITION><![CDATA[32]]></POSITION>
+<!--A04179EAC69EF848E040007F01004523-->  <POSITION><![CDATA[37]]></POSITION>
 <!--A04179EAC69EF848E040007F01004523-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--A04179EAC69EF848E040007F01004523-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--A04179EAC69EF848E040007F01004523-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -5579,7 +5721,7 @@
 <!--A04179EAC69FF848E040007F01004523-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--A04179EAC69FF848E040007F01004523-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--A04179EAC69FF848E040007F01004523-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--A04179EAC69FF848E040007F01004523-->  <POSITION><![CDATA[33]]></POSITION>
+<!--A04179EAC69FF848E040007F01004523-->  <POSITION><![CDATA[38]]></POSITION>
 <!--A04179EAC69FF848E040007F01004523-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--A04179EAC69FF848E040007F01004523-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--A04179EAC69FF848E040007F01004523-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_ELEMENT.xml	Tue May 06 13:08:31 2014 +0000
@@ -36,6 +36,18 @@
 <!--0CF797887AC9494F9C250A6B6EB5D60D-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--0CF797887AC9494F9C250A6B6EB5D60D--></AD_ELEMENT>
 
+<!--1C8028555014460F81C6ACC811CA74E2--><AD_ELEMENT>
+<!--1C8028555014460F81C6ACC811CA74E2-->  <AD_ELEMENT_ID><![CDATA[1C8028555014460F81C6ACC811CA74E2]]></AD_ELEMENT_ID>
+<!--1C8028555014460F81C6ACC811CA74E2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1C8028555014460F81C6ACC811CA74E2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1C8028555014460F81C6ACC811CA74E2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1C8028555014460F81C6ACC811CA74E2-->  <COLUMNNAME><![CDATA[EM_APRM_Process_Rec_Force]]></COLUMNNAME>
+<!--1C8028555014460F81C6ACC811CA74E2-->  <NAME><![CDATA[EM_APRM_Process_Reconciliation_Force]]></NAME>
+<!--1C8028555014460F81C6ACC811CA74E2-->  <PRINTNAME><![CDATA[EM_APRM_Process_Reconciliation_Force]]></PRINTNAME>
+<!--1C8028555014460F81C6ACC811CA74E2-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--1C8028555014460F81C6ACC811CA74E2-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--1C8028555014460F81C6ACC811CA74E2--></AD_ELEMENT>
+
 <!--256AB5C3D6144B2C9884CF0FA4D81911--><AD_ELEMENT>
 <!--256AB5C3D6144B2C9884CF0FA4D81911-->  <AD_ELEMENT_ID><![CDATA[256AB5C3D6144B2C9884CF0FA4D81911]]></AD_ELEMENT_ID>
 <!--256AB5C3D6144B2C9884CF0FA4D81911-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -677,6 +689,18 @@
 <!--D2AC3F75FCDC4BC187A1F492C46D68D1-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--D2AC3F75FCDC4BC187A1F492C46D68D1--></AD_ELEMENT>
 
+<!--D42C1F18622F4773989190BB8C2C8436--><AD_ELEMENT>
+<!--D42C1F18622F4773989190BB8C2C8436-->  <AD_ELEMENT_ID><![CDATA[D42C1F18622F4773989190BB8C2C8436]]></AD_ELEMENT_ID>
+<!--D42C1F18622F4773989190BB8C2C8436-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D42C1F18622F4773989190BB8C2C8436-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D42C1F18622F4773989190BB8C2C8436-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D42C1F18622F4773989190BB8C2C8436-->  <COLUMNNAME><![CDATA[EM_APRM_Process_BS_Force]]></COLUMNNAME>
+<!--D42C1F18622F4773989190BB8C2C8436-->  <NAME><![CDATA[EM_APRM_Process Bank Statement Force]]></NAME>
+<!--D42C1F18622F4773989190BB8C2C8436-->  <PRINTNAME><![CDATA[EM_APRM_Process Bank Statement Force]]></PRINTNAME>
+<!--D42C1F18622F4773989190BB8C2C8436-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--D42C1F18622F4773989190BB8C2C8436-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--D42C1F18622F4773989190BB8C2C8436--></AD_ELEMENT>
+
 <!--DB85AA94D6DF4D7CB29CE7999B15F9C7--><AD_ELEMENT>
 <!--DB85AA94D6DF4D7CB29CE7999B15F9C7-->  <AD_ELEMENT_ID><![CDATA[DB85AA94D6DF4D7CB29CE7999B15F9C7]]></AD_ELEMENT_ID>
 <!--DB85AA94D6DF4D7CB29CE7999B15F9C7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -719,6 +743,18 @@
 <!--EDB9CF491555465382F828F48291A0C0-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--EDB9CF491555465382F828F48291A0C0--></AD_ELEMENT>
 
+<!--F79620AE1CC041308045C23E661BD907--><AD_ELEMENT>
+<!--F79620AE1CC041308045C23E661BD907-->  <AD_ELEMENT_ID><![CDATA[F79620AE1CC041308045C23E661BD907]]></AD_ELEMENT_ID>
+<!--F79620AE1CC041308045C23E661BD907-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F79620AE1CC041308045C23E661BD907-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F79620AE1CC041308045C23E661BD907-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F79620AE1CC041308045C23E661BD907-->  <COLUMNNAME><![CDATA[EM_APRM_MatchTrans_Force]]></COLUMNNAME>
+<!--F79620AE1CC041308045C23E661BD907-->  <NAME><![CDATA[EM_APRM_MatchTransactions_Force]]></NAME>
+<!--F79620AE1CC041308045C23E661BD907-->  <PRINTNAME><![CDATA[EM_APRM_MatchTransactions_Force]]></PRINTNAME>
+<!--F79620AE1CC041308045C23E661BD907-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--F79620AE1CC041308045C23E661BD907-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--F79620AE1CC041308045C23E661BD907--></AD_ELEMENT>
+
 <!--FC780C136EFA4D98B2435A9448FA44AD--><AD_ELEMENT>
 <!--FC780C136EFA4D98B2435A9448FA44AD-->  <AD_ELEMENT_ID><![CDATA[FC780C136EFA4D98B2435A9448FA44AD]]></AD_ELEMENT_ID>
 <!--FC780C136EFA4D98B2435A9448FA44AD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_FIELD.xml	Tue May 06 13:08:31 2014 +0000
@@ -2398,7 +2398,9 @@
 <!--2864F0DB02224A748B57719396E4338E-->  <AD_TAB_ID><![CDATA[2A9BA5FDA0F8470D881F8EA9DEDCC598]]></AD_TAB_ID>
 <!--2864F0DB02224A748B57719396E4338E-->  <AD_COLUMN_ID><![CDATA[A6B405E9791D4BC685220C11CCA916C0]]></AD_COLUMN_ID>
 <!--2864F0DB02224A748B57719396E4338E-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--2864F0DB02224A748B57719396E4338E-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--2864F0DB02224A748B57719396E4338E-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--2864F0DB02224A748B57719396E4338E-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--2864F0DB02224A748B57719396E4338E-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
 <!--2864F0DB02224A748B57719396E4338E-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--2864F0DB02224A748B57719396E4338E-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--2864F0DB02224A748B57719396E4338E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
@@ -4591,6 +4593,36 @@
 <!--4BBE86A40070422CB644510F93C92F81-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--4BBE86A40070422CB644510F93C92F81--></AD_FIELD>
 
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F--><AD_FIELD>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <AD_FIELD_ID><![CDATA[4BF4CA0C5A5D4D2D945FD2373DD52B4F]]></AD_FIELD_ID>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <NAME><![CDATA[Cost Center]]></NAME>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <DESCRIPTION><![CDATA[Division that adds to the cost of an organization]]></DESCRIPTION>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <HELP><![CDATA[Division that adds to the cost of an organization. Internal structure for cost allocation.]]></HELP>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <AD_TAB_ID><![CDATA[2A9BA5FDA0F8470D881F8EA9DEDCC598]]></AD_TAB_ID>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <AD_COLUMN_ID><![CDATA[670423B76C554A6C957A58F1DA4A6D98]]></AD_COLUMN_ID>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <SEQNO><![CDATA[210]]></SEQNO>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--4BF4CA0C5A5D4D2D945FD2373DD52B4F--></AD_FIELD>
+
 <!--4C3D2B4E7CD14390BF20A8FB5474EE32--><AD_FIELD>
 <!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <AD_FIELD_ID><![CDATA[4C3D2B4E7CD14390BF20A8FB5474EE32]]></AD_FIELD_ID>
 <!--4C3D2B4E7CD14390BF20A8FB5474EE32-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -4688,7 +4720,9 @@
 <!--4CFDE354811341B1923BCD1AA449E1B0-->  <AD_TAB_ID><![CDATA[2A9BA5FDA0F8470D881F8EA9DEDCC598]]></AD_TAB_ID>
 <!--4CFDE354811341B1923BCD1AA449E1B0-->  <AD_COLUMN_ID><![CDATA[50D9D2D098E54FB7B5109C4BAA8977A5]]></AD_COLUMN_ID>
 <!--4CFDE354811341B1923BCD1AA449E1B0-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--4CFDE354811341B1923BCD1AA449E1B0-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--4CFDE354811341B1923BCD1AA449E1B0-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
+<!--4CFDE354811341B1923BCD1AA449E1B0-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--4CFDE354811341B1923BCD1AA449E1B0-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
 <!--4CFDE354811341B1923BCD1AA449E1B0-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--4CFDE354811341B1923BCD1AA449E1B0-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--4CFDE354811341B1923BCD1AA449E1B0-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
@@ -5217,7 +5251,6 @@
 <!--5422F2DED3234598A429221281F8B61D-->  <AD_COLUMN_ID><![CDATA[F362B84F4718449EAD840F1C25667B37]]></AD_COLUMN_ID>
 <!--5422F2DED3234598A429221281F8B61D-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--5422F2DED3234598A429221281F8B61D-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
-<!--5422F2DED3234598A429221281F8B61D-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y']]></DISPLAYLOGIC>
 <!--5422F2DED3234598A429221281F8B61D-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
 <!--5422F2DED3234598A429221281F8B61D-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--5422F2DED3234598A429221281F8B61D-->  <SEQNO><![CDATA[170]]></SEQNO>
@@ -5482,6 +5515,33 @@
 <!--56C9A3AC73DC456293EB5E18A7E88048-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--56C9A3AC73DC456293EB5E18A7E88048--></AD_FIELD>
 
+<!--573AAAA411BD4BB5B6A155A820199184--><AD_FIELD>
+<!--573AAAA411BD4BB5B6A155A820199184-->  <AD_FIELD_ID><![CDATA[573AAAA411BD4BB5B6A155A820199184]]></AD_FIELD_ID>
+<!--573AAAA411BD4BB5B6A155A820199184-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--573AAAA411BD4BB5B6A155A820199184-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--573AAAA411BD4BB5B6A155A820199184-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--573AAAA411BD4BB5B6A155A820199184-->  <NAME><![CDATA[Bank Statement Process Force]]></NAME>
+<!--573AAAA411BD4BB5B6A155A820199184-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--573AAAA411BD4BB5B6A155A820199184-->  <AD_TAB_ID><![CDATA[C56E698100314ABBBBD3A89626CA551C]]></AD_TAB_ID>
+<!--573AAAA411BD4BB5B6A155A820199184-->  <AD_COLUMN_ID><![CDATA[6B5C965B623748689A689838835C0AC2]]></AD_COLUMN_ID>
+<!--573AAAA411BD4BB5B6A155A820199184-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--573AAAA411BD4BB5B6A155A820199184-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--573AAAA411BD4BB5B6A155A820199184-->  <DISPLAYLOGIC><![CDATA[@APRM_ISRECONCILED@!'']]></DISPLAYLOGIC>
+<!--573AAAA411BD4BB5B6A155A820199184-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--573AAAA411BD4BB5B6A155A820199184-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--573AAAA411BD4BB5B6A155A820199184-->  <SEQNO><![CDATA[130]]></SEQNO>
+<!--573AAAA411BD4BB5B6A155A820199184-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--573AAAA411BD4BB5B6A155A820199184-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--573AAAA411BD4BB5B6A155A820199184-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--573AAAA411BD4BB5B6A155A820199184-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--573AAAA411BD4BB5B6A155A820199184-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--573AAAA411BD4BB5B6A155A820199184-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--573AAAA411BD4BB5B6A155A820199184-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--573AAAA411BD4BB5B6A155A820199184-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--573AAAA411BD4BB5B6A155A820199184-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--573AAAA411BD4BB5B6A155A820199184-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--573AAAA411BD4BB5B6A155A820199184--></AD_FIELD>
+
 <!--573C4BEE22054AAEA437A3EEA5A03E70--><AD_FIELD>
 <!--573C4BEE22054AAEA437A3EEA5A03E70-->  <AD_FIELD_ID><![CDATA[573C4BEE22054AAEA437A3EEA5A03E70]]></AD_FIELD_ID>
 <!--573C4BEE22054AAEA437A3EEA5A03E70-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -5521,6 +5581,7 @@
 <!--576653206CA64C59BF19A53B94AEDBA8-->  <AD_TAB_ID><![CDATA[2A9BA5FDA0F8470D881F8EA9DEDCC598]]></AD_TAB_ID>
 <!--576653206CA64C59BF19A53B94AEDBA8-->  <AD_COLUMN_ID><![CDATA[1D64AD4366EF4A209F2A462A8DE42735]]></AD_COLUMN_ID>
 <!--576653206CA64C59BF19A53B94AEDBA8-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--576653206CA64C59BF19A53B94AEDBA8-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
 <!--576653206CA64C59BF19A53B94AEDBA8-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--576653206CA64C59BF19A53B94AEDBA8-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
 <!--576653206CA64C59BF19A53B94AEDBA8-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
@@ -5888,6 +5949,7 @@
 <!--5E7451300D254B11B582F0FBA8F11D2A-->  <AD_TAB_ID><![CDATA[2A9BA5FDA0F8470D881F8EA9DEDCC598]]></AD_TAB_ID>
 <!--5E7451300D254B11B582F0FBA8F11D2A-->  <AD_COLUMN_ID><![CDATA[4B98FCB4357B49DA9DB7D79FD28838AF]]></AD_COLUMN_ID>
 <!--5E7451300D254B11B582F0FBA8F11D2A-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--5E7451300D254B11B582F0FBA8F11D2A-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
 <!--5E7451300D254B11B582F0FBA8F11D2A-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--5E7451300D254B11B582F0FBA8F11D2A-->  <DISPLAYLOGIC><![CDATA[@$Element_SR@='Y']]></DISPLAYLOGIC>
 <!--5E7451300D254B11B582F0FBA8F11D2A-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
@@ -8801,7 +8863,7 @@
 <!--80D2CCB125DAECE6E040007F01000DDE-->  <AD_COLUMN_ID><![CDATA[78A3367822B35459E040007F01012510]]></AD_COLUMN_ID>
 <!--80D2CCB125DAECE6E040007F01000DDE-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--80D2CCB125DAECE6E040007F01000DDE-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--80D2CCB125DAECE6E040007F01000DDE-->  <DISPLAYLOGIC><![CDATA[@DocStatus@='CO'&@IsPaid@='N']]></DISPLAYLOGIC>
+<!--80D2CCB125DAECE6E040007F01000DDE-->  <DISPLAYLOGIC><![CDATA[@DocStatus@='CO'& @IsPaid@='N' & (@showAddPayment@='Y' | @showAddPayment@ ='')]]></DISPLAYLOGIC>
 <!--80D2CCB125DAECE6E040007F01000DDE-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--80D2CCB125DAECE6E040007F01000DDE-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--80D2CCB125DAECE6E040007F01000DDE-->  <SEQNO><![CDATA[510]]></SEQNO>
@@ -11818,6 +11880,7 @@
 <!--970254B3E03D4A009FE4BF179AC61703-->  <AD_TAB_ID><![CDATA[2A9BA5FDA0F8470D881F8EA9DEDCC598]]></AD_TAB_ID>
 <!--970254B3E03D4A009FE4BF179AC61703-->  <AD_COLUMN_ID><![CDATA[E6DB13E1516947B7A8DC5741D58A7AB2]]></AD_COLUMN_ID>
 <!--970254B3E03D4A009FE4BF179AC61703-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--970254B3E03D4A009FE4BF179AC61703-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
 <!--970254B3E03D4A009FE4BF179AC61703-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--970254B3E03D4A009FE4BF179AC61703-->  <DISPLAYLOGIC><![CDATA[@$Element_MC@='Y']]></DISPLAYLOGIC>
 <!--970254B3E03D4A009FE4BF179AC61703-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
@@ -12379,7 +12442,7 @@
 <!--A0417A0E9255CA28E040007F01003C18-->  <AD_COLUMN_ID><![CDATA[A04179EAC69DF848E040007F01004523]]></AD_COLUMN_ID>
 <!--A0417A0E9255CA28E040007F01003C18-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--A0417A0E9255CA28E040007F01003C18-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--A0417A0E9255CA28E040007F01003C18-->  <DISPLAYLOGIC><![CDATA[@Type@='B'&@FIN_Matching_Algorithm_ID@!'']]></DISPLAYLOGIC>
+<!--A0417A0E9255CA28E040007F01003C18-->  <DISPLAYLOGIC><![CDATA[@Type@='B'&@FIN_Matching_Algorithm_ID@!''&(@LASTRECON@=@DRAFTRECONCILIATION@|@DRAFTRECONCILIATION@='')]]></DISPLAYLOGIC>
 <!--A0417A0E9255CA28E040007F01003C18-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--A0417A0E9255CA28E040007F01003C18-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--A0417A0E9255CA28E040007F01003C18-->  <SEQNO><![CDATA[240]]></SEQNO>
@@ -12601,6 +12664,7 @@
 <!--A28B0A82995D87F5E040007F010067A0-->  <AD_COLUMN_ID><![CDATA[A28B0A82995C87F5E040007F010067A0]]></AD_COLUMN_ID>
 <!--A28B0A82995D87F5E040007F010067A0-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--A28B0A82995D87F5E040007F010067A0-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--A28B0A82995D87F5E040007F010067A0-->  <DISPLAYLOGIC><![CDATA[@APRM_ISRECONCILED@='']]></DISPLAYLOGIC>
 <!--A28B0A82995D87F5E040007F010067A0-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--A28B0A82995D87F5E040007F010067A0-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--A28B0A82995D87F5E040007F010067A0-->  <SEQNO><![CDATA[130]]></SEQNO>
@@ -14391,7 +14455,7 @@
 <!--AD7C15BA367642AFB471EFAFD768FB2D-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--AD7C15BA367642AFB471EFAFD768FB2D-->  <AD_FIELDGROUP_ID><![CDATA[101]]></AD_FIELDGROUP_ID>
 <!--AD7C15BA367642AFB471EFAFD768FB2D-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--AD7C15BA367642AFB471EFAFD768FB2D-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y'&@IsPaid@='N']]></DISPLAYLOGIC>
+<!--AD7C15BA367642AFB471EFAFD768FB2D-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y'&@IsPaid@='N'& (@showAddPayment@='Y' | @showAddPayment@ ='')]]></DISPLAYLOGIC>
 <!--AD7C15BA367642AFB471EFAFD768FB2D-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--AD7C15BA367642AFB471EFAFD768FB2D-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--AD7C15BA367642AFB471EFAFD768FB2D-->  <SEQNO><![CDATA[352]]></SEQNO>
@@ -15411,6 +15475,7 @@
 <!--B2F1D76CA33240B69A4012D5CA370476-->  <AD_TAB_ID><![CDATA[2A9BA5FDA0F8470D881F8EA9DEDCC598]]></AD_TAB_ID>
 <!--B2F1D76CA33240B69A4012D5CA370476-->  <AD_COLUMN_ID><![CDATA[806198F4784445109D9067A0C868701C]]></AD_COLUMN_ID>
 <!--B2F1D76CA33240B69A4012D5CA370476-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--B2F1D76CA33240B69A4012D5CA370476-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
 <!--B2F1D76CA33240B69A4012D5CA370476-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--B2F1D76CA33240B69A4012D5CA370476-->  <DISPLAYLOGIC><![CDATA[@$Element_AS@='Y']]></DISPLAYLOGIC>
 <!--B2F1D76CA33240B69A4012D5CA370476-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
@@ -15921,6 +15986,33 @@
 <!--B739AFFFB5CC4E1C847EB25ABE62A233-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--B739AFFFB5CC4E1C847EB25ABE62A233--></AD_FIELD>
 
+<!--B7C06E2CD9EC460FBA493804E274ACC7--><AD_FIELD>
+<!--B7C06E2CD9EC460FBA493804E274ACC7-->  <AD_FIELD_ID><![CDATA[B7C06E2CD9EC460FBA493804E274ACC7]]></AD_FIELD_ID>
+<!--B7C06E2CD9EC460FBA493804E274ACC7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B7C06E2CD9EC460FBA493804E274ACC7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B7C06E2CD9EC460FBA493804E274ACC7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B7C06E2CD9EC460FBA493804E274ACC7-->  <NAME><![CDATA[Match Statement Force]]></NAME>
+<!--B7C06E2CD9EC460FBA493804E274ACC7-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--B7C06E2CD9EC460FBA493804E274ACC7-->  <AD_TAB_ID><![CDATA[2845D761A8394468BD3BA4710AA888D4]]></AD_TAB_ID>
+<!--B7C06E2CD9EC460FBA493804E274ACC7-->  <AD_COLUMN_ID><![CDATA[9DC8500B414640E09BF61A3D14FE13D1]]></AD_COLUMN_ID>
+<!--B7C06E2CD9EC460FBA493804E274ACC7-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--B7C06E2CD9EC460FBA493804E274ACC7-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--B7C06E2CD9EC460FBA493804E274ACC7-->  <DISPLAYLOGIC><![CDATA[@Type@='B'&@FIN_Matching_Algorithm_ID@!''&(@LASTRECON@!@DRAFTRECONCILIATION@&@DRAFTRECONCILIATION@!'')]]></DISPLAYLOGIC>
+<!--B7C06E2CD9EC460FBA493804E274ACC7-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--B7C06E2CD9EC460FBA493804E274ACC7-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--B7C06E2CD9EC460FBA493804E274ACC7-->  <SEQNO><![CDATA[240]]></SEQNO>
+<!--B7C06E2CD9EC460FBA493804E274ACC7-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--B7C06E2CD9EC460FBA493804E274ACC7-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--B7C06E2CD9EC460FBA493804E274ACC7-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B7C06E2CD9EC460FBA493804E274ACC7-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--B7C06E2CD9EC460FBA493804E274ACC7-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--B7C06E2CD9EC460FBA493804E274ACC7-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--B7C06E2CD9EC460FBA493804E274ACC7-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--B7C06E2CD9EC460FBA493804E274ACC7-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--B7C06E2CD9EC460FBA493804E274ACC7-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--B7C06E2CD9EC460FBA493804E274ACC7-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--B7C06E2CD9EC460FBA493804E274ACC7--></AD_FIELD>
+
 <!--B8756B0E70554048BCC9F1727B8A5AA4--><AD_FIELD>
 <!--B8756B0E70554048BCC9F1727B8A5AA4-->  <AD_FIELD_ID><![CDATA[B8756B0E70554048BCC9F1727B8A5AA4]]></AD_FIELD_ID>
 <!--B8756B0E70554048BCC9F1727B8A5AA4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -16945,7 +17037,7 @@
 <!--C2639FEBB29C4CB4A363DE376E294FD6-->  <AD_COLUMN_ID><![CDATA[B50241F11C4F404583CACB2A88CE875F]]></AD_COLUMN_ID>
 <!--C2639FEBB29C4CB4A363DE376E294FD6-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
 <!--C2639FEBB29C4CB4A363DE376E294FD6-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--C2639FEBB29C4CB4A363DE376E294FD6-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y']]></DISPLAYLOGIC>
+<!--C2639FEBB29C4CB4A363DE376E294FD6-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y'&@APRM_LASTREC@=@FIN_Reconciliation_ID@]]></DISPLAYLOGIC>
 <!--C2639FEBB29C4CB4A363DE376E294FD6-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
 <!--C2639FEBB29C4CB4A363DE376E294FD6-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--C2639FEBB29C4CB4A363DE376E294FD6-->  <SEQNO><![CDATA[180]]></SEQNO>
@@ -18469,6 +18561,64 @@
 <!--E1A05CE9F3FF433888C60B2F059480EC-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--E1A05CE9F3FF433888C60B2F059480EC--></AD_FIELD>
 
+<!--E1C580C830810696E040007F0100225E--><AD_FIELD>
+<!--E1C580C830810696E040007F0100225E-->  <AD_FIELD_ID><![CDATA[E1C580C830810696E040007F0100225E]]></AD_FIELD_ID>
+<!--E1C580C830810696E040007F0100225E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E1C580C830810696E040007F0100225E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E1C580C830810696E040007F0100225E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E1C580C830810696E040007F0100225E-->  <NAME><![CDATA[Invoice Paid]]></NAME>
+<!--E1C580C830810696E040007F0100225E-->  <DESCRIPTION><![CDATA[A flag indicating whether this document type is consider paid or not.]]></DESCRIPTION>
+<!--E1C580C830810696E040007F0100225E-->  <HELP><![CDATA[A flag indicating whether this document type is consider paid or not.]]></HELP>
+<!--E1C580C830810696E040007F0100225E-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--E1C580C830810696E040007F0100225E-->  <AD_TAB_ID><![CDATA[F6C2283A21314407BBBB23FF14B85ED4]]></AD_TAB_ID>
+<!--E1C580C830810696E040007F0100225E-->  <AD_COLUMN_ID><![CDATA[C5CABD48EA774B8289401E670504371C]]></AD_COLUMN_ID>
+<!--E1C580C830810696E040007F0100225E-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--E1C580C830810696E040007F0100225E-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--E1C580C830810696E040007F0100225E-->  <DISPLAYLOGIC><![CDATA[@InvoicePaidStatus@='Y']]></DISPLAYLOGIC>
+<!--E1C580C830810696E040007F0100225E-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--E1C580C830810696E040007F0100225E-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--E1C580C830810696E040007F0100225E-->  <SEQNO><![CDATA[280]]></SEQNO>
+<!--E1C580C830810696E040007F0100225E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--E1C580C830810696E040007F0100225E-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--E1C580C830810696E040007F0100225E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E1C580C830810696E040007F0100225E-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--E1C580C830810696E040007F0100225E-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--E1C580C830810696E040007F0100225E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--E1C580C830810696E040007F0100225E-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--E1C580C830810696E040007F0100225E-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--E1C580C830810696E040007F0100225E-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--E1C580C830810696E040007F0100225E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--E1C580C830810696E040007F0100225E--></AD_FIELD>
+
+<!--E215E9D7AE7B4C12E040007F01001D97--><AD_FIELD>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <AD_FIELD_ID><![CDATA[E215E9D7AE7B4C12E040007F01001D97]]></AD_FIELD_ID>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <NAME><![CDATA[Invoice Paid]]></NAME>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <DESCRIPTION><![CDATA[A flag indicating whether this document type is consider paid or not.]]></DESCRIPTION>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <HELP><![CDATA[A flag indicating whether this document type is consider paid or not.]]></HELP>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <AD_TAB_ID><![CDATA[9817E22E2536417F8C9AEC8D5FA33E18]]></AD_TAB_ID>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <AD_COLUMN_ID><![CDATA[C5CABD48EA774B8289401E670504371C]]></AD_COLUMN_ID>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <DISPLAYLOGIC><![CDATA[@InvoicePaidStatus@='Y']]></DISPLAYLOGIC>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <SEQNO><![CDATA[240]]></SEQNO>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--E215E9D7AE7B4C12E040007F01001D97-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--E215E9D7AE7B4C12E040007F01001D97--></AD_FIELD>
+
 <!--E452E6D8D7D14E56BFD0D9EFD22C2B4A--><AD_FIELD>
 <!--E452E6D8D7D14E56BFD0D9EFD22C2B4A-->  <AD_FIELD_ID><![CDATA[E452E6D8D7D14E56BFD0D9EFD22C2B4A]]></AD_FIELD_ID>
 <!--E452E6D8D7D14E56BFD0D9EFD22C2B4A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -18871,6 +19021,7 @@
 <!--E81BDEBDB5C0448DAECD48AA5857A091-->  <AD_TAB_ID><![CDATA[2A9BA5FDA0F8470D881F8EA9DEDCC598]]></AD_TAB_ID>
 <!--E81BDEBDB5C0448DAECD48AA5857A091-->  <AD_COLUMN_ID><![CDATA[528EE4D486444C08A1CE90CAA066BA48]]></AD_COLUMN_ID>
 <!--E81BDEBDB5C0448DAECD48AA5857A091-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--E81BDEBDB5C0448DAECD48AA5857A091-->  <AD_FIELDGROUP_ID><![CDATA[800000]]></AD_FIELDGROUP_ID>
 <!--E81BDEBDB5C0448DAECD48AA5857A091-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--E81BDEBDB5C0448DAECD48AA5857A091-->  <DISPLAYLOGIC><![CDATA[@ACCT_DIMENSION_DISPLAY@]]></DISPLAYLOGIC>
 <!--E81BDEBDB5C0448DAECD48AA5857A091-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
@@ -19313,6 +19464,33 @@
 <!--F183507AF521490292E8E31141D1610E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--F183507AF521490292E8E31141D1610E--></AD_FIELD>
 
+<!--F195EACFC9FD47C6BA15B51B6A10F25E--><AD_FIELD>
+<!--F195EACFC9FD47C6BA15B51B6A10F25E-->  <AD_FIELD_ID><![CDATA[F195EACFC9FD47C6BA15B51B6A10F25E]]></AD_FIELD_ID>
+<!--F195EACFC9FD47C6BA15B51B6A10F25E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F195EACFC9FD47C6BA15B51B6A10F25E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F195EACFC9FD47C6BA15B51B6A10F25E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F195EACFC9FD47C6BA15B51B6A10F25E-->  <NAME><![CDATA[Reconciliation Process Force]]></NAME>
+<!--F195EACFC9FD47C6BA15B51B6A10F25E-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--F195EACFC9FD47C6BA15B51B6A10F25E-->  <AD_TAB_ID><![CDATA[FF8080813320657F0133209DE21B0042]]></AD_TAB_ID>
+<!--F195EACFC9FD47C6BA15B51B6A10F25E-->  <AD_COLUMN_ID><![CDATA[422F3732DA324AE2AA34AE2E44D42037]]></AD_COLUMN_ID>
+<!--F195EACFC9FD47C6BA15B51B6A10F25E-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--F195EACFC9FD47C6BA15B51B6A10F25E-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--F195EACFC9FD47C6BA15B51B6A10F25E-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y'&@APRM_LASTREC@!@FIN_Reconciliation_ID@]]></DISPLAYLOGIC>
+<!--F195EACFC9FD47C6BA15B51B6A10F25E-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
+<!--F195EACFC9FD47C6BA15B51B6A10F25E-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--F195EACFC9FD47C6BA15B51B6A10F25E-->  <SEQNO><![CDATA[190]]></SEQNO>
+<!--F195EACFC9FD47C6BA15B51B6A10F25E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--F195EACFC9FD47C6BA15B51B6A10F25E-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--F195EACFC9FD47C6BA15B51B6A10F25E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--F195EACFC9FD47C6BA15B51B6A10F25E-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--F195EACFC9FD47C6BA15B51B6A10F25E-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--F195EACFC9FD47C6BA15B51B6A10F25E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--F195EACFC9FD47C6BA15B51B6A10F25E-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--F195EACFC9FD47C6BA15B51B6A10F25E-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--F195EACFC9FD47C6BA15B51B6A10F25E-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--F195EACFC9FD47C6BA15B51B6A10F25E-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--F195EACFC9FD47C6BA15B51B6A10F25E--></AD_FIELD>
+
 <!--F26956BDA9F147249DDC8195C303BAA2--><AD_FIELD>
 <!--F26956BDA9F147249DDC8195C303BAA2-->  <AD_FIELD_ID><![CDATA[F26956BDA9F147249DDC8195C303BAA2]]></AD_FIELD_ID>
 <!--F26956BDA9F147249DDC8195C303BAA2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MESSAGE.xml	Tue May 06 13:08:31 2014 +0000
@@ -673,6 +673,18 @@
 <!--8FC3C9524EE54E518B679D58F709119D-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--8FC3C9524EE54E518B679D58F709119D--></AD_MESSAGE>
 
+<!--91CCBCC8F7D940AA8F5EE2DD301C9291--><AD_MESSAGE>
+<!--91CCBCC8F7D940AA8F5EE2DD301C9291-->  <AD_MESSAGE_ID><![CDATA[91CCBCC8F7D940AA8F5EE2DD301C9291]]></AD_MESSAGE_ID>
+<!--91CCBCC8F7D940AA8F5EE2DD301C9291-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--91CCBCC8F7D940AA8F5EE2DD301C9291-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--91CCBCC8F7D940AA8F5EE2DD301C9291-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--91CCBCC8F7D940AA8F5EE2DD301C9291-->  <VALUE><![CDATA[APRM_DraftReconciliationExists]]></VALUE>
+<!--91CCBCC8F7D940AA8F5EE2DD301C9291-->  <MSGTEXT><![CDATA[Draft Reconciliation already exists. Just one reconciliation can be edited at a time for a financial account. Please process ongoing reconciliation prior to reactivate this one. ]]></MSGTEXT>
+<!--91CCBCC8F7D940AA8F5EE2DD301C9291-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--91CCBCC8F7D940AA8F5EE2DD301C9291-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--91CCBCC8F7D940AA8F5EE2DD301C9291-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--91CCBCC8F7D940AA8F5EE2DD301C9291--></AD_MESSAGE>
+
 <!--92EC1935A8B947BA83EF82DBD169CA8B--><AD_MESSAGE>
 <!--92EC1935A8B947BA83EF82DBD169CA8B-->  <AD_MESSAGE_ID><![CDATA[92EC1935A8B947BA83EF82DBD169CA8B]]></AD_MESSAGE_ID>
 <!--92EC1935A8B947BA83EF82DBD169CA8B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -997,6 +1009,18 @@
 <!--CCA38D3048F04C1FA6F05AD56CF81B5D-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--CCA38D3048F04C1FA6F05AD56CF81B5D--></AD_MESSAGE>
 
+<!--D0F129E2F69F4D199DAE68813D2327A2--><AD_MESSAGE>
+<!--D0F129E2F69F4D199DAE68813D2327A2-->  <AD_MESSAGE_ID><![CDATA[D0F129E2F69F4D199DAE68813D2327A2]]></AD_MESSAGE_ID>
+<!--D0F129E2F69F4D199DAE68813D2327A2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D0F129E2F69F4D199DAE68813D2327A2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D0F129E2F69F4D199DAE68813D2327A2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D0F129E2F69F4D199DAE68813D2327A2-->  <VALUE><![CDATA[APRM_BSTLine_Matched]]></VALUE>
+<!--D0F129E2F69F4D199DAE68813D2327A2-->  <MSGTEXT><![CDATA[Bank Statement Line is already matched. It can not be modified nor deleted.]]></MSGTEXT>
+<!--D0F129E2F69F4D199DAE68813D2327A2-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--D0F129E2F69F4D199DAE68813D2327A2-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--D0F129E2F69F4D199DAE68813D2327A2-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--D0F129E2F69F4D199DAE68813D2327A2--></AD_MESSAGE>
+
 <!--D2585EEAC94945C7B3CF79C209FD7650--><AD_MESSAGE>
 <!--D2585EEAC94945C7B3CF79C209FD7650-->  <AD_MESSAGE_ID><![CDATA[D2585EEAC94945C7B3CF79C209FD7650]]></AD_MESSAGE_ID>
 <!--D2585EEAC94945C7B3CF79C209FD7650-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Tue May 06 13:08:31 2014 +0000
@@ -48,6 +48,42 @@
 <!--46A3E47C3F414E948988B487A85FC244-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
 <!--46A3E47C3F414E948988B487A85FC244--></AD_MODEL_OBJECT>
 
+<!--560040FB16CB46A0ABDED8047D25D4CD--><AD_MODEL_OBJECT>
+<!--560040FB16CB46A0ABDED8047D25D4CD-->  <AD_MODEL_OBJECT_ID><![CDATA[560040FB16CB46A0ABDED8047D25D4CD]]></AD_MODEL_OBJECT_ID>
+<!--560040FB16CB46A0ABDED8047D25D4CD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--560040FB16CB46A0ABDED8047D25D4CD-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--560040FB16CB46A0ABDED8047D25D4CD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--560040FB16CB46A0ABDED8047D25D4CD-->  <ACTION><![CDATA[P]]></ACTION>
+<!--560040FB16CB46A0ABDED8047D25D4CD-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_BankStatementProcess]]></CLASSNAME>
+<!--560040FB16CB46A0ABDED8047D25D4CD-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
+<!--560040FB16CB46A0ABDED8047D25D4CD-->  <AD_PROCESS_ID><![CDATA[2DDE7D3618034C38A4462B7F3456C28D]]></AD_PROCESS_ID>
+<!--560040FB16CB46A0ABDED8047D25D4CD-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--560040FB16CB46A0ABDED8047D25D4CD--></AD_MODEL_OBJECT>
+
+<!--62CA7E15A1D94659808D715D1A6D65F9--><AD_MODEL_OBJECT>
+<!--62CA7E15A1D94659808D715D1A6D65F9-->  <AD_MODEL_OBJECT_ID><![CDATA[62CA7E15A1D94659808D715D1A6D65F9]]></AD_MODEL_OBJECT_ID>
+<!--62CA7E15A1D94659808D715D1A6D65F9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--62CA7E15A1D94659808D715D1A6D65F9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--62CA7E15A1D94659808D715D1A6D65F9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--62CA7E15A1D94659808D715D1A6D65F9-->  <ACTION><![CDATA[P]]></ACTION>
+<!--62CA7E15A1D94659808D715D1A6D65F9-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.ad_actionbutton.MatchTransaction]]></CLASSNAME>
+<!--62CA7E15A1D94659808D715D1A6D65F9-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
+<!--62CA7E15A1D94659808D715D1A6D65F9-->  <AD_PROCESS_ID><![CDATA[19EEA22FCA464979B3ADAD3A967ADA52]]></AD_PROCESS_ID>
+<!--62CA7E15A1D94659808D715D1A6D65F9-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--62CA7E15A1D94659808D715D1A6D65F9--></AD_MODEL_OBJECT>
+
+<!--640FC5F514AA4798B36A15D1E70335EC--><AD_MODEL_OBJECT>
+<!--640FC5F514AA4798B36A15D1E70335EC-->  <AD_MODEL_OBJECT_ID><![CDATA[640FC5F514AA4798B36A15D1E70335EC]]></AD_MODEL_OBJECT_ID>
+<!--640FC5F514AA4798B36A15D1E70335EC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--640FC5F514AA4798B36A15D1E70335EC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--640FC5F514AA4798B36A15D1E70335EC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--640FC5F514AA4798B36A15D1E70335EC-->  <ACTION><![CDATA[P]]></ACTION>
+<!--640FC5F514AA4798B36A15D1E70335EC-->  <CLASSNAME><![CDATA[org.openbravo.advpaymentmngt.process.FIN_ReconciliationProcess]]></CLASSNAME>
+<!--640FC5F514AA4798B36A15D1E70335EC-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
+<!--640FC5F514AA4798B36A15D1E70335EC-->  <AD_PROCESS_ID><![CDATA[6BF16EFC772843AC9A17552AE0B26AB7]]></AD_PROCESS_ID>
+<!--640FC5F514AA4798B36A15D1E70335EC-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--640FC5F514AA4798B36A15D1E70335EC--></AD_MODEL_OBJECT>
+
 <!--668D8470721B430687DFE2F97A75751F--><AD_MODEL_OBJECT>
 <!--668D8470721B430687DFE2F97A75751F-->  <AD_MODEL_OBJECT_ID><![CDATA[668D8470721B430687DFE2F97A75751F]]></AD_MODEL_OBJECT_ID>
 <!--668D8470721B430687DFE2F97A75751F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	Tue May 06 13:08:31 2014 +0000
@@ -60,6 +60,16 @@
 <!--3C67B056A44F4D948570621D2DADA439-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--3C67B056A44F4D948570621D2DADA439--></AD_MODEL_OBJECT_MAPPING>
 
+<!--3FA22942DCD0451CAA0E924B30296B8B--><AD_MODEL_OBJECT_MAPPING>
+<!--3FA22942DCD0451CAA0E924B30296B8B-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[3FA22942DCD0451CAA0E924B30296B8B]]></AD_MODEL_OBJECT_MAPPING_ID>
+<!--3FA22942DCD0451CAA0E924B30296B8B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3FA22942DCD0451CAA0E924B30296B8B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3FA22942DCD0451CAA0E924B30296B8B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3FA22942DCD0451CAA0E924B30296B8B-->  <AD_MODEL_OBJECT_ID><![CDATA[62CA7E15A1D94659808D715D1A6D65F9]]></AD_MODEL_OBJECT_ID>
+<!--3FA22942DCD0451CAA0E924B30296B8B-->  <MAPPINGNAME><![CDATA[/org.openbravo.advpaymentmngt.ad_actionbutton/MatchTransaction.html]]></MAPPINGNAME>
+<!--3FA22942DCD0451CAA0E924B30296B8B-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
+<!--3FA22942DCD0451CAA0E924B30296B8B--></AD_MODEL_OBJECT_MAPPING>
+
 <!--58BB77DE57BB409FB8C66C528C826DBF--><AD_MODEL_OBJECT_MAPPING>
 <!--58BB77DE57BB409FB8C66C528C826DBF-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[58BB77DE57BB409FB8C66C528C826DBF]]></AD_MODEL_OBJECT_MAPPING_ID>
 <!--58BB77DE57BB409FB8C66C528C826DBF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 13:08:31 2014 +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.21766]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION><![CDATA[3.0.22845]]></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[MP31]]></VERSION_LABEL>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->  <VERSION_LABEL><![CDATA[PR14Q2]]></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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 06 13:08:31 2014 +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.21766]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->  <STARTVERSION><![CDATA[2.1.22845]]></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.21766]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->  <STARTVERSION><![CDATA[3.0.22845]]></STARTVERSION>
 <!--B97FC854C6DD41E692161585645A900F-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--B97FC854C6DD41E692161585645A900F-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS.xml	Tue May 06 13:08:31 2014 +0000
@@ -18,6 +18,7 @@
 <!--017312F51139438A9665775E3B5392A1-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--017312F51139438A9665775E3B5392A1-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--017312F51139438A9665775E3B5392A1-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--017312F51139438A9665775E3B5392A1-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--017312F51139438A9665775E3B5392A1--></AD_PROCESS>
 
 <!--0BDC2164ED3E48539FCEF4D306F29EFD--><AD_PROCESS>
@@ -38,6 +39,7 @@
 <!--0BDC2164ED3E48539FCEF4D306F29EFD-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--0BDC2164ED3E48539FCEF4D306F29EFD-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--0BDC2164ED3E48539FCEF4D306F29EFD-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--0BDC2164ED3E48539FCEF4D306F29EFD-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--0BDC2164ED3E48539FCEF4D306F29EFD--></AD_PROCESS>
 
 <!--12016E2EDE0245B5A36B84CBA144DBDF--><AD_PROCESS>
@@ -59,6 +61,7 @@
 <!--12016E2EDE0245B5A36B84CBA144DBDF-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--12016E2EDE0245B5A36B84CBA144DBDF-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--12016E2EDE0245B5A36B84CBA144DBDF-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--12016E2EDE0245B5A36B84CBA144DBDF-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--12016E2EDE0245B5A36B84CBA144DBDF--></AD_PROCESS>
 
 <!--15C8708DFC464C2D91286E59624FDD18--><AD_PROCESS>
@@ -81,8 +84,30 @@
 <!--15C8708DFC464C2D91286E59624FDD18-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--15C8708DFC464C2D91286E59624FDD18-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--15C8708DFC464C2D91286E59624FDD18-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--15C8708DFC464C2D91286E59624FDD18-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--15C8708DFC464C2D91286E59624FDD18--></AD_PROCESS>
 
+<!--19EEA22FCA464979B3ADAD3A967ADA52--><AD_PROCESS>
+<!--19EEA22FCA464979B3ADAD3A967ADA52-->  <AD_PROCESS_ID><![CDATA[19EEA22FCA464979B3ADAD3A967ADA52]]></AD_PROCESS_ID>
+<!--19EEA22FCA464979B3ADAD3A967ADA52-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--19EEA22FCA464979B3ADAD3A967ADA52-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--19EEA22FCA464979B3ADAD3A967ADA52-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--19EEA22FCA464979B3ADAD3A967ADA52-->  <VALUE><![CDATA[APRM_MatchTransaction Force]]></VALUE>
+<!--19EEA22FCA464979B3ADAD3A967ADA52-->  <NAME><![CDATA[Match Statement Force]]></NAME>
+<!--19EEA22FCA464979B3ADAD3A967ADA52-->  <ACCESSLEVEL><![CDATA[7]]></ACCESSLEVEL>
+<!--19EEA22FCA464979B3ADAD3A967ADA52-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
+<!--19EEA22FCA464979B3ADAD3A967ADA52-->  <ISREPORT><![CDATA[N]]></ISREPORT>
+<!--19EEA22FCA464979B3ADAD3A967ADA52-->  <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
+<!--19EEA22FCA464979B3ADAD3A967ADA52-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
+<!--19EEA22FCA464979B3ADAD3A967ADA52-->  <ISJASPER><![CDATA[N]]></ISJASPER>
+<!--19EEA22FCA464979B3ADAD3A967ADA52-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
+<!--19EEA22FCA464979B3ADAD3A967ADA52-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--19EEA22FCA464979B3ADAD3A967ADA52-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
+<!--19EEA22FCA464979B3ADAD3A967ADA52-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
+<!--19EEA22FCA464979B3ADAD3A967ADA52-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--19EEA22FCA464979B3ADAD3A967ADA52-->  <IS_EXPLICIT_ACCESS><![CDATA[Y]]></IS_EXPLICIT_ACCESS>
+<!--19EEA22FCA464979B3ADAD3A967ADA52--></AD_PROCESS>
+
 <!--29D17F515727436DBCE32BC6CA28382B--><AD_PROCESS>
 <!--29D17F515727436DBCE32BC6CA28382B-->  <AD_PROCESS_ID><![CDATA[29D17F515727436DBCE32BC6CA28382B]]></AD_PROCESS_ID>
 <!--29D17F515727436DBCE32BC6CA28382B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -101,8 +126,30 @@
 <!--29D17F515727436DBCE32BC6CA28382B-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--29D17F515727436DBCE32BC6CA28382B-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--29D17F515727436DBCE32BC6CA28382B-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--29D17F515727436DBCE32BC6CA28382B-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--29D17F515727436DBCE32BC6CA28382B--></AD_PROCESS>
 
+<!--2DDE7D3618034C38A4462B7F3456C28D--><AD_PROCESS>
+<!--2DDE7D3618034C38A4462B7F3456C28D-->  <AD_PROCESS_ID><![CDATA[2DDE7D3618034C38A4462B7F3456C28D]]></AD_PROCESS_ID>
+<!--2DDE7D3618034C38A4462B7F3456C28D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2DDE7D3618034C38A4462B7F3456C28D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2DDE7D3618034C38A4462B7F3456C28D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2DDE7D3618034C38A4462B7F3456C28D-->  <VALUE><![CDATA[BankStatementProcessForce]]></VALUE>
+<!--2DDE7D3618034C38A4462B7F3456C28D-->  <NAME><![CDATA[Bank Statement Process Force]]></NAME>
+<!--2DDE7D3618034C38A4462B7F3456C28D-->  <ACCESSLEVEL><![CDATA[1]]></ACCESSLEVEL>
+<!--2DDE7D3618034C38A4462B7F3456C28D-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
+<!--2DDE7D3618034C38A4462B7F3456C28D-->  <ISREPORT><![CDATA[N]]></ISREPORT>
+<!--2DDE7D3618034C38A4462B7F3456C28D-->  <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
+<!--2DDE7D3618034C38A4462B7F3456C28D-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
+<!--2DDE7D3618034C38A4462B7F3456C28D-->  <ISJASPER><![CDATA[N]]></ISJASPER>
+<!--2DDE7D3618034C38A4462B7F3456C28D-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
+<!--2DDE7D3618034C38A4462B7F3456C28D-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--2DDE7D3618034C38A4462B7F3456C28D-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
+<!--2DDE7D3618034C38A4462B7F3456C28D-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
+<!--2DDE7D3618034C38A4462B7F3456C28D-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--2DDE7D3618034C38A4462B7F3456C28D-->  <IS_EXPLICIT_ACCESS><![CDATA[Y]]></IS_EXPLICIT_ACCESS>
+<!--2DDE7D3618034C38A4462B7F3456C28D--></AD_PROCESS>
+
 <!--2EED9BC16DB34D2B80BA40A21564BECF--><AD_PROCESS>
 <!--2EED9BC16DB34D2B80BA40A21564BECF-->  <AD_PROCESS_ID><![CDATA[2EED9BC16DB34D2B80BA40A21564BECF]]></AD_PROCESS_ID>
 <!--2EED9BC16DB34D2B80BA40A21564BECF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -123,6 +170,7 @@
 <!--2EED9BC16DB34D2B80BA40A21564BECF-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--2EED9BC16DB34D2B80BA40A21564BECF-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--2EED9BC16DB34D2B80BA40A21564BECF-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--2EED9BC16DB34D2B80BA40A21564BECF-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--2EED9BC16DB34D2B80BA40A21564BECF--></AD_PROCESS>
 
 <!--3C4A5FB206B74C3CA9FE20116FCA0464--><AD_PROCESS>
@@ -143,6 +191,7 @@
 <!--3C4A5FB206B74C3CA9FE20116FCA0464-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--3C4A5FB206B74C3CA9FE20116FCA0464-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--3C4A5FB206B74C3CA9FE20116FCA0464-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--3C4A5FB206B74C3CA9FE20116FCA0464-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--3C4A5FB206B74C3CA9FE20116FCA0464--></AD_PROCESS>
 
 <!--4A059E4F79294640AD37B1B718C56E5D--><AD_PROCESS>
@@ -165,6 +214,7 @@
 <!--4A059E4F79294640AD37B1B718C56E5D-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--4A059E4F79294640AD37B1B718C56E5D-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--4A059E4F79294640AD37B1B718C56E5D-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--4A059E4F79294640AD37B1B718C56E5D-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--4A059E4F79294640AD37B1B718C56E5D--></AD_PROCESS>
 
 <!--58A9261BACEF45DDA526F29D8557272D--><AD_PROCESS>
@@ -185,6 +235,7 @@
 <!--58A9261BACEF45DDA526F29D8557272D-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--58A9261BACEF45DDA526F29D8557272D-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--58A9261BACEF45DDA526F29D8557272D-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--58A9261BACEF45DDA526F29D8557272D-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--58A9261BACEF45DDA526F29D8557272D--></AD_PROCESS>
 
 <!--5BE14AA10165490A9ADEFB7532F7FA94--><AD_PROCESS>
@@ -205,6 +256,7 @@
 <!--5BE14AA10165490A9ADEFB7532F7FA94-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--5BE14AA10165490A9ADEFB7532F7FA94-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--5BE14AA10165490A9ADEFB7532F7FA94-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--5BE14AA10165490A9ADEFB7532F7FA94-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--5BE14AA10165490A9ADEFB7532F7FA94--></AD_PROCESS>
 
 <!--6255BE488882480599C81284B70CD9B3--><AD_PROCESS>
@@ -225,6 +277,7 @@
 <!--6255BE488882480599C81284B70CD9B3-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--6255BE488882480599C81284B70CD9B3-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--6255BE488882480599C81284B70CD9B3-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--6255BE488882480599C81284B70CD9B3-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--6255BE488882480599C81284B70CD9B3--></AD_PROCESS>
 
 <!--62E6270312534380B9A8BDF603CA8FBB--><AD_PROCESS>
@@ -246,8 +299,30 @@
 <!--62E6270312534380B9A8BDF603CA8FBB-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--62E6270312534380B9A8BDF603CA8FBB-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--62E6270312534380B9A8BDF603CA8FBB-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--62E6270312534380B9A8BDF603CA8FBB-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--62E6270312534380B9A8BDF603CA8FBB--></AD_PROCESS>
 
+<!--6BF16EFC772843AC9A17552AE0B26AB7--><AD_PROCESS>
+<!--6BF16EFC772843AC9A17552AE0B26AB7-->  <AD_PROCESS_ID><![CDATA[6BF16EFC772843AC9A17552AE0B26AB7]]></AD_PROCESS_ID>
+<!--6BF16EFC772843AC9A17552AE0B26AB7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6BF16EFC772843AC9A17552AE0B26AB7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6BF16EFC772843AC9A17552AE0B26AB7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6BF16EFC772843AC9A17552AE0B26AB7-->  <VALUE><![CDATA[ReconciliationProcessForce]]></VALUE>
+<!--6BF16EFC772843AC9A17552AE0B26AB7-->  <NAME><![CDATA[Reconciliation Process Force]]></NAME>
+<!--6BF16EFC772843AC9A17552AE0B26AB7-->  <ACCESSLEVEL><![CDATA[1]]></ACCESSLEVEL>
+<!--6BF16EFC772843AC9A17552AE0B26AB7-->  <ISUSERSTARTABLE><![CDATA[N]]></ISUSERSTARTABLE>
+<!--6BF16EFC772843AC9A17552AE0B26AB7-->  <ISREPORT><![CDATA[N]]></ISREPORT>
+<!--6BF16EFC772843AC9A17552AE0B26AB7-->  <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
+<!--6BF16EFC772843AC9A17552AE0B26AB7-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
+<!--6BF16EFC772843AC9A17552AE0B26AB7-->  <ISJASPER><![CDATA[N]]></ISJASPER>
+<!--6BF16EFC772843AC9A17552AE0B26AB7-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
+<!--6BF16EFC772843AC9A17552AE0B26AB7-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--6BF16EFC772843AC9A17552AE0B26AB7-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
+<!--6BF16EFC772843AC9A17552AE0B26AB7-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
+<!--6BF16EFC772843AC9A17552AE0B26AB7-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--6BF16EFC772843AC9A17552AE0B26AB7-->  <IS_EXPLICIT_ACCESS><![CDATA[Y]]></IS_EXPLICIT_ACCESS>
+<!--6BF16EFC772843AC9A17552AE0B26AB7--></AD_PROCESS>
+
 <!--7AC7BE9024E448A0BB863C159DA762F9--><AD_PROCESS>
 <!--7AC7BE9024E448A0BB863C159DA762F9-->  <AD_PROCESS_ID><![CDATA[7AC7BE9024E448A0BB863C159DA762F9]]></AD_PROCESS_ID>
 <!--7AC7BE9024E448A0BB863C159DA762F9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -267,6 +342,7 @@
 <!--7AC7BE9024E448A0BB863C159DA762F9-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--7AC7BE9024E448A0BB863C159DA762F9-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--7AC7BE9024E448A0BB863C159DA762F9-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--7AC7BE9024E448A0BB863C159DA762F9-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--7AC7BE9024E448A0BB863C159DA762F9--></AD_PROCESS>
 
 <!--B54318B49E984B9CB855AEFB1F474CD6--><AD_PROCESS>
@@ -288,6 +364,7 @@
 <!--B54318B49E984B9CB855AEFB1F474CD6-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--B54318B49E984B9CB855AEFB1F474CD6-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--B54318B49E984B9CB855AEFB1F474CD6-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--B54318B49E984B9CB855AEFB1F474CD6-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--B54318B49E984B9CB855AEFB1F474CD6--></AD_PROCESS>
 
 <!--BBA11D1A061346459AF6148920FE6629--><AD_PROCESS>
@@ -308,6 +385,7 @@
 <!--BBA11D1A061346459AF6148920FE6629-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--BBA11D1A061346459AF6148920FE6629-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--BBA11D1A061346459AF6148920FE6629-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--BBA11D1A061346459AF6148920FE6629-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--BBA11D1A061346459AF6148920FE6629--></AD_PROCESS>
 
 <!--C125EA7C85234D8B89FEA511FCCD2E9E--><AD_PROCESS>
@@ -328,6 +406,7 @@
 <!--C125EA7C85234D8B89FEA511FCCD2E9E-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--C125EA7C85234D8B89FEA511FCCD2E9E-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--C125EA7C85234D8B89FEA511FCCD2E9E-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--C125EA7C85234D8B89FEA511FCCD2E9E-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--C125EA7C85234D8B89FEA511FCCD2E9E--></AD_PROCESS>
 
 <!--D16966FBF9604A3D91A50DC83C6EA8E3--><AD_PROCESS>
@@ -349,6 +428,7 @@
 <!--D16966FBF9604A3D91A50DC83C6EA8E3-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--D16966FBF9604A3D91A50DC83C6EA8E3-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--D16966FBF9604A3D91A50DC83C6EA8E3-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--D16966FBF9604A3D91A50DC83C6EA8E3-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--D16966FBF9604A3D91A50DC83C6EA8E3--></AD_PROCESS>
 
 <!--D5B90B539C254B959045EDCA1DC99BDF--><AD_PROCESS>
@@ -371,6 +451,7 @@
 <!--D5B90B539C254B959045EDCA1DC99BDF-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--D5B90B539C254B959045EDCA1DC99BDF-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--D5B90B539C254B959045EDCA1DC99BDF-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--D5B90B539C254B959045EDCA1DC99BDF-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--D5B90B539C254B959045EDCA1DC99BDF--></AD_PROCESS>
 
 <!--DC23BB9234174E52879E4B21C8CD1F4B--><AD_PROCESS>
@@ -392,6 +473,7 @@
 <!--DC23BB9234174E52879E4B21C8CD1F4B-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--DC23BB9234174E52879E4B21C8CD1F4B-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--DC23BB9234174E52879E4B21C8CD1F4B-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--DC23BB9234174E52879E4B21C8CD1F4B-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--DC23BB9234174E52879E4B21C8CD1F4B--></AD_PROCESS>
 
 <!--DE1B382FDD2540199D223586F6E216D0--><AD_PROCESS>
@@ -414,6 +496,7 @@
 <!--DE1B382FDD2540199D223586F6E216D0-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--DE1B382FDD2540199D223586F6E216D0-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--DE1B382FDD2540199D223586F6E216D0-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--DE1B382FDD2540199D223586F6E216D0-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--DE1B382FDD2540199D223586F6E216D0--></AD_PROCESS>
 
 <!--E011F492B0814A74B63CD1F3B9FF0526--><AD_PROCESS>
@@ -434,6 +517,7 @@
 <!--E011F492B0814A74B63CD1F3B9FF0526-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--E011F492B0814A74B63CD1F3B9FF0526-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--E011F492B0814A74B63CD1F3B9FF0526-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--E011F492B0814A74B63CD1F3B9FF0526-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--E011F492B0814A74B63CD1F3B9FF0526--></AD_PROCESS>
 
 <!--E3E92E9F08214507958E6875E66F2F99--><AD_PROCESS>
@@ -455,6 +539,7 @@
 <!--E3E92E9F08214507958E6875E66F2F99-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--E3E92E9F08214507958E6875E66F2F99-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--E3E92E9F08214507958E6875E66F2F99-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--E3E92E9F08214507958E6875E66F2F99-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--E3E92E9F08214507958E6875E66F2F99--></AD_PROCESS>
 
 <!--E54287EE357C493EB127DC3BA1758751--><AD_PROCESS>
@@ -476,6 +561,7 @@
 <!--E54287EE357C493EB127DC3BA1758751-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--E54287EE357C493EB127DC3BA1758751-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--E54287EE357C493EB127DC3BA1758751-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--E54287EE357C493EB127DC3BA1758751-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--E54287EE357C493EB127DC3BA1758751--></AD_PROCESS>
 
 <!--EB3D56BDD37E4229B67DBAB9F9A9B167--><AD_PROCESS>
@@ -497,6 +583,7 @@
 <!--EB3D56BDD37E4229B67DBAB9F9A9B167-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--EB3D56BDD37E4229B67DBAB9F9A9B167-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--EB3D56BDD37E4229B67DBAB9F9A9B167-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--EB3D56BDD37E4229B67DBAB9F9A9B167-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--EB3D56BDD37E4229B67DBAB9F9A9B167--></AD_PROCESS>
 
 <!--F68F2890E96D4D85A1DEF0274D105BCE--><AD_PROCESS>
@@ -517,6 +604,7 @@
 <!--F68F2890E96D4D85A1DEF0274D105BCE-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--F68F2890E96D4D85A1DEF0274D105BCE-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--F68F2890E96D4D85A1DEF0274D105BCE-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--F68F2890E96D4D85A1DEF0274D105BCE-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--F68F2890E96D4D85A1DEF0274D105BCE--></AD_PROCESS>
 
 <!--FF8080812E2F8EAE012E2F94CF470014--><AD_PROCESS>
@@ -538,6 +626,7 @@
 <!--FF8080812E2F8EAE012E2F94CF470014-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--FF8080812E2F8EAE012E2F94CF470014-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--FF8080812E2F8EAE012E2F94CF470014-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--FF8080812E2F8EAE012E2F94CF470014-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--FF8080812E2F8EAE012E2F94CF470014--></AD_PROCESS>
 
 <!--FF8080812F348A97012F349DC24F0007--><AD_PROCESS>
@@ -558,6 +647,7 @@
 <!--FF8080812F348A97012F349DC24F0007-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--FF8080812F348A97012F349DC24F0007-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--FF8080812F348A97012F349DC24F0007-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--FF8080812F348A97012F349DC24F0007-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--FF8080812F348A97012F349DC24F0007--></AD_PROCESS>
 
 </data>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_PROCESS_PARA.xml	Tue May 06 13:08:31 2014 +0000
@@ -21,6 +21,28 @@
 <!--0F62C351CBE74F9F856E8383AF932DD6-->  <AD_ELEMENT_ID><![CDATA[5491745132934260A5F00EF178EBC04B]]></AD_ELEMENT_ID>
 <!--0F62C351CBE74F9F856E8383AF932DD6--></AD_PROCESS_PARA>
 
+<!--10D10303E5374D7E99D9D04EE16DCC5D--><AD_PROCESS_PARA>
+<!--10D10303E5374D7E99D9D04EE16DCC5D-->  <AD_PROCESS_PARA_ID><![CDATA[10D10303E5374D7E99D9D04EE16DCC5D]]></AD_PROCESS_PARA_ID>
+<!--10D10303E5374D7E99D9D04EE16DCC5D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--10D10303E5374D7E99D9D04EE16DCC5D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--10D10303E5374D7E99D9D04EE16DCC5D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--10D10303E5374D7E99D9D04EE16DCC5D-->  <NAME><![CDATA[Action]]></NAME>
+<!--10D10303E5374D7E99D9D04EE16DCC5D-->  <DESCRIPTION><![CDATA[A drop down list box indicating the next step to take.]]></DESCRIPTION>
+<!--10D10303E5374D7E99D9D04EE16DCC5D-->  <HELP><![CDATA[The Action field indicates the Action to be performed for this element.]]></HELP>
+<!--10D10303E5374D7E99D9D04EE16DCC5D-->  <AD_PROCESS_ID><![CDATA[6BF16EFC772843AC9A17552AE0B26AB7]]></AD_PROCESS_ID>
+<!--10D10303E5374D7E99D9D04EE16DCC5D-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--10D10303E5374D7E99D9D04EE16DCC5D-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--10D10303E5374D7E99D9D04EE16DCC5D-->  <AD_REFERENCE_VALUE_ID><![CDATA[FF8080812E443491012E443C053A001A]]></AD_REFERENCE_VALUE_ID>
+<!--10D10303E5374D7E99D9D04EE16DCC5D-->  <AD_VAL_RULE_ID><![CDATA[FF808081332719060133271E5BB1001B]]></AD_VAL_RULE_ID>
+<!--10D10303E5374D7E99D9D04EE16DCC5D-->  <COLUMNNAME><![CDATA[action]]></COLUMNNAME>
+<!--10D10303E5374D7E99D9D04EE16DCC5D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--10D10303E5374D7E99D9D04EE16DCC5D-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--10D10303E5374D7E99D9D04EE16DCC5D-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--10D10303E5374D7E99D9D04EE16DCC5D-->  <ISRANGE><![CDATA[N]]></ISRANGE>
+<!--10D10303E5374D7E99D9D04EE16DCC5D-->  <DEFAULTVALUE><![CDATA[@Process_Reconciliation@]]></DEFAULTVALUE>
+<!--10D10303E5374D7E99D9D04EE16DCC5D-->  <AD_ELEMENT_ID><![CDATA[152]]></AD_ELEMENT_ID>
+<!--10D10303E5374D7E99D9D04EE16DCC5D--></AD_PROCESS_PARA>
+
 <!--1913962D2952412B84B8CDD3BC17026F--><AD_PROCESS_PARA>
 <!--1913962D2952412B84B8CDD3BC17026F-->  <AD_PROCESS_PARA_ID><![CDATA[1913962D2952412B84B8CDD3BC17026F]]></AD_PROCESS_PARA_ID>
 <!--1913962D2952412B84B8CDD3BC17026F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -222,7 +244,7 @@
 <!--8ED43FD56EE041F2BBC1C0AE0A56D632-->  <AD_REFERENCE_ID><![CDATA[15]]></AD_REFERENCE_ID>
 <!--8ED43FD56EE041F2BBC1C0AE0A56D632-->  <COLUMNNAME><![CDATA[paymentDate]]></COLUMNNAME>
 <!--8ED43FD56EE041F2BBC1C0AE0A56D632-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--8ED43FD56EE041F2BBC1C0AE0A56D632-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--8ED43FD56EE041F2BBC1C0AE0A56D632-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
 <!--8ED43FD56EE041F2BBC1C0AE0A56D632-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--8ED43FD56EE041F2BBC1C0AE0A56D632-->  <ISRANGE><![CDATA[N]]></ISRANGE>
 <!--8ED43FD56EE041F2BBC1C0AE0A56D632-->  <AD_ELEMENT_ID><![CDATA[256AB5C3D6144B2C9884CF0FA4D81911]]></AD_ELEMENT_ID>
@@ -270,6 +292,27 @@
 <!--A7B47A5637A74910ADC70CD66E6C6A29-->  <AD_ELEMENT_ID><![CDATA[210]]></AD_ELEMENT_ID>
 <!--A7B47A5637A74910ADC70CD66E6C6A29--></AD_PROCESS_PARA>
 
+<!--ADC43AD315004E2D8E2802E00C4F178B--><AD_PROCESS_PARA>
+<!--ADC43AD315004E2D8E2802E00C4F178B-->  <AD_PROCESS_PARA_ID><![CDATA[ADC43AD315004E2D8E2802E00C4F178B]]></AD_PROCESS_PARA_ID>
+<!--ADC43AD315004E2D8E2802E00C4F178B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ADC43AD315004E2D8E2802E00C4F178B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ADC43AD315004E2D8E2802E00C4F178B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ADC43AD315004E2D8E2802E00C4F178B-->  <NAME><![CDATA[Action]]></NAME>
+<!--ADC43AD315004E2D8E2802E00C4F178B-->  <DESCRIPTION><![CDATA[A drop down list box indicating the next step to take.]]></DESCRIPTION>
+<!--ADC43AD315004E2D8E2802E00C4F178B-->  <HELP><![CDATA[The Action field indicates the Action to be performed for this element.]]></HELP>
+<!--ADC43AD315004E2D8E2802E00C4F178B-->  <AD_PROCESS_ID><![CDATA[2DDE7D3618034C38A4462B7F3456C28D]]></AD_PROCESS_ID>
+<!--ADC43AD315004E2D8E2802E00C4F178B-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--ADC43AD315004E2D8E2802E00C4F178B-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--ADC43AD315004E2D8E2802E00C4F178B-->  <AD_REFERENCE_VALUE_ID><![CDATA[EC75B6F5A9504DB6B3F3356EA85F15EE]]></AD_REFERENCE_VALUE_ID>
+<!--ADC43AD315004E2D8E2802E00C4F178B-->  <COLUMNNAME><![CDATA[action]]></COLUMNNAME>
+<!--ADC43AD315004E2D8E2802E00C4F178B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--ADC43AD315004E2D8E2802E00C4F178B-->  <FIELDLENGTH><![CDATA[0]]></FIELDLENGTH>
+<!--ADC43AD315004E2D8E2802E00C4F178B-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--ADC43AD315004E2D8E2802E00C4F178B-->  <ISRANGE><![CDATA[N]]></ISRANGE>
+<!--ADC43AD315004E2D8E2802E00C4F178B-->  <DEFAULTVALUE><![CDATA[@EM_APRM_Process_BS@]]></DEFAULTVALUE>
+<!--ADC43AD315004E2D8E2802E00C4F178B-->  <AD_ELEMENT_ID><![CDATA[152]]></AD_ELEMENT_ID>
+<!--ADC43AD315004E2D8E2802E00C4F178B--></AD_PROCESS_PARA>
+
 <!--D04309BB0DA14B5789FB76C141ED464C--><AD_PROCESS_PARA>
 <!--D04309BB0DA14B5789FB76C141ED464C-->  <AD_PROCESS_PARA_ID><![CDATA[D04309BB0DA14B5789FB76C141ED464C]]></AD_PROCESS_PARA_ID>
 <!--D04309BB0DA14B5789FB76C141ED464C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_REFERENCE.xml	Tue May 06 13:08:31 2014 +0000
@@ -12,6 +12,18 @@
 <!--0CC268ED2E8D4B0397A0DCBBFA2237DE-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
 <!--0CC268ED2E8D4B0397A0DCBBFA2237DE--></AD_REFERENCE>
 
+<!--1221BEA5C19F4FA89D3565CA8877A82E--><AD_REFERENCE>
+<!--1221BEA5C19F4FA89D3565CA8877A82E-->  <AD_REFERENCE_ID><![CDATA[1221BEA5C19F4FA89D3565CA8877A82E]]></AD_REFERENCE_ID>
+<!--1221BEA5C19F4FA89D3565CA8877A82E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1221BEA5C19F4FA89D3565CA8877A82E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1221BEA5C19F4FA89D3565CA8877A82E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1221BEA5C19F4FA89D3565CA8877A82E-->  <NAME><![CDATA[Organization Selector]]></NAME>
+<!--1221BEA5C19F4FA89D3565CA8877A82E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--1221BEA5C19F4FA89D3565CA8877A82E-->  <ISBASEREFERENCE><![CDATA[N]]></ISBASEREFERENCE>
+<!--1221BEA5C19F4FA89D3565CA8877A82E-->  <PARENTREFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></PARENTREFERENCE_ID>
+<!--1221BEA5C19F4FA89D3565CA8877A82E-->  <ISVALUEDISPLAYED><![CDATA[N]]></ISVALUEDISPLAYED>
+<!--1221BEA5C19F4FA89D3565CA8877A82E--></AD_REFERENCE>
+
 <!--15CCD38B5F534E03BB3C344BCD1FBB1E--><AD_REFERENCE>
 <!--15CCD38B5F534E03BB3C344BCD1FBB1E-->  <AD_REFERENCE_ID><![CDATA[15CCD38B5F534E03BB3C344BCD1FBB1E]]></AD_REFERENCE_ID>
 <!--15CCD38B5F534E03BB3C344BCD1FBB1E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TAB.xml	Tue May 06 13:08:31 2014 +0000
@@ -905,7 +905,7 @@
 <!--FF8080813320657F0133209DE21B0042-->  <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS>
 <!--FF8080813320657F0133209DE21B0042-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
 <!--FF8080813320657F0133209DE21B0042-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
-<!--FF8080813320657F0133209DE21B0042-->  <UIPATTERN><![CDATA[STD]]></UIPATTERN>
+<!--FF8080813320657F0133209DE21B0042-->  <UIPATTERN><![CDATA[ED]]></UIPATTERN>
 <!--FF8080813320657F0133209DE21B0042-->  <SHOWPARENTBUTTONS><![CDATA[N]]></SHOWPARENTBUTTONS>
 <!--FF8080813320657F0133209DE21B0042-->  <DISABLE_PARENT_KEY_PROPERTY><![CDATA[N]]></DISABLE_PARENT_KEY_PROPERTY>
 <!--FF8080813320657F0133209DE21B0042-->  <EM_OBUIAPP_CAN_ADD><![CDATA[N]]></EM_OBUIAPP_CAN_ADD>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_TABLE.xml	Tue May 06 13:08:31 2014 +0000
@@ -20,6 +20,7 @@
 <!--0DFF5BACFB964FDABAA5042C8809C813-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--0DFF5BACFB964FDABAA5042C8809C813-->  <AD_PACKAGE_ID><![CDATA[AC33B2262748414A816510545755435A]]></AD_PACKAGE_ID>
 <!--0DFF5BACFB964FDABAA5042C8809C813-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--0DFF5BACFB964FDABAA5042C8809C813-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--0DFF5BACFB964FDABAA5042C8809C813--></AD_TABLE>
 
 <!--1BAA61D216CB4A62838AA785658EE092--><AD_TABLE>
@@ -44,6 +45,7 @@
 <!--1BAA61D216CB4A62838AA785658EE092-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1BAA61D216CB4A62838AA785658EE092-->  <AD_PACKAGE_ID><![CDATA[AC33B2262748414A816510545755435A]]></AD_PACKAGE_ID>
 <!--1BAA61D216CB4A62838AA785658EE092-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--1BAA61D216CB4A62838AA785658EE092-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--1BAA61D216CB4A62838AA785658EE092--></AD_TABLE>
 
 <!--5AAFAB80FB6740D2A6190CB3939D90EC--><AD_TABLE>
@@ -66,6 +68,7 @@
 <!--5AAFAB80FB6740D2A6190CB3939D90EC-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--5AAFAB80FB6740D2A6190CB3939D90EC-->  <AD_PACKAGE_ID><![CDATA[AC33B2262748414A816510545755435A]]></AD_PACKAGE_ID>
 <!--5AAFAB80FB6740D2A6190CB3939D90EC-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--5AAFAB80FB6740D2A6190CB3939D90EC-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--5AAFAB80FB6740D2A6190CB3939D90EC--></AD_TABLE>
 
 <!--DC814AB3BC84486CA5411131724BC95A--><AD_TABLE>
@@ -88,6 +91,7 @@
 <!--DC814AB3BC84486CA5411131724BC95A-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--DC814AB3BC84486CA5411131724BC95A-->  <AD_PACKAGE_ID><![CDATA[AC33B2262748414A816510545755435A]]></AD_PACKAGE_ID>
 <!--DC814AB3BC84486CA5411131724BC95A-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--DC814AB3BC84486CA5411131724BC95A-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--DC814AB3BC84486CA5411131724BC95A--></AD_TABLE>
 
 <!--FF8080812FFEC82D012FFECCE3400030--><AD_TABLE>
@@ -110,6 +114,7 @@
 <!--FF8080812FFEC82D012FFECCE3400030-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--FF8080812FFEC82D012FFECCE3400030-->  <AD_PACKAGE_ID><![CDATA[AC33B2262748414A816510545755435A]]></AD_PACKAGE_ID>
 <!--FF8080812FFEC82D012FFECCE3400030-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--FF8080812FFEC82D012FFECCE3400030-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--FF8080812FFEC82D012FFECCE3400030--></AD_TABLE>
 
 <!--FF80808130BB89090130BB8E3D7E0012--><AD_TABLE>
@@ -134,6 +139,7 @@
 <!--FF80808130BB89090130BB8E3D7E0012-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--FF80808130BB89090130BB8E3D7E0012-->  <AD_PACKAGE_ID><![CDATA[AC33B2262748414A816510545755435A]]></AD_PACKAGE_ID>
 <!--FF80808130BB89090130BB8E3D7E0012-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--FF80808130BB89090130BB8E3D7E0012-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--FF80808130BB89090130BB8E3D7E0012--></AD_TABLE>
 
 <!--FF808081331848750133184B38D20009--><AD_TABLE>
@@ -155,6 +161,7 @@
 <!--FF808081331848750133184B38D20009-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--FF808081331848750133184B38D20009-->  <AD_PACKAGE_ID><![CDATA[AC33B2262748414A816510545755435A]]></AD_PACKAGE_ID>
 <!--FF808081331848750133184B38D20009-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--FF808081331848750133184B38D20009-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--FF808081331848750133184B38D20009--></AD_TABLE>
 
 </data>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_VAL_RULE.xml	Tue May 06 13:08:31 2014 +0000
@@ -11,6 +11,28 @@
 <!--119E4BFBC4264A148450053A47E7D3FE-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--119E4BFBC4264A148450053A47E7D3FE--></AD_VAL_RULE>
 
+<!--1D824F88E32F4282B26C48B5A910B006--><AD_VAL_RULE>
+<!--1D824F88E32F4282B26C48B5A910B006-->  <AD_VAL_RULE_ID><![CDATA[1D824F88E32F4282B26C48B5A910B006]]></AD_VAL_RULE_ID>
+<!--1D824F88E32F4282B26C48B5A910B006-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1D824F88E32F4282B26C48B5A910B006-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1D824F88E32F4282B26C48B5A910B006-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1D824F88E32F4282B26C48B5A910B006-->  <NAME><![CDATA[FIN_Payment Out status validation]]></NAME>
+<!--1D824F88E32F4282B26C48B5A910B006-->  <TYPE><![CDATA[S]]></TYPE>
+<!--1D824F88E32F4282B26C48B5A910B006-->  <CODE><![CDATA[Value not IN ('RPR','RDNC') and seqno >=(select seqno FROM ad_ref_list WHERE ad_reference_id = '575BCB88A4694C27BC013DE9C73E6FE7' and value='PPM')]]></CODE>
+<!--1D824F88E32F4282B26C48B5A910B006-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--1D824F88E32F4282B26C48B5A910B006--></AD_VAL_RULE>
+
+<!--27D8D0FDAE4742229DC64888DF9CB8A8--><AD_VAL_RULE>
+<!--27D8D0FDAE4742229DC64888DF9CB8A8-->  <AD_VAL_RULE_ID><![CDATA[27D8D0FDAE4742229DC64888DF9CB8A8]]></AD_VAL_RULE_ID>
+<!--27D8D0FDAE4742229DC64888DF9CB8A8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--27D8D0FDAE4742229DC64888DF9CB8A8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--27D8D0FDAE4742229DC64888DF9CB8A8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--27D8D0FDAE4742229DC64888DF9CB8A8-->  <NAME><![CDATA[FIN_Payment In status validation]]></NAME>
+<!--27D8D0FDAE4742229DC64888DF9CB8A8-->  <TYPE><![CDATA[S]]></TYPE>
+<!--27D8D0FDAE4742229DC64888DF9CB8A8-->  <CODE><![CDATA[Value not IN  ('PPM','PWNC') and seqno >=(select seqno FROM ad_ref_list WHERE ad_reference_id = '575BCB88A4694C27BC013DE9C73E6FE7' and value='RPR')]]></CODE>
+<!--27D8D0FDAE4742229DC64888DF9CB8A8-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--27D8D0FDAE4742229DC64888DF9CB8A8--></AD_VAL_RULE>
+
 <!--29010995FD39439D97A5C0CE8CE27D70--><AD_VAL_RULE>
 <!--29010995FD39439D97A5C0CE8CE27D70-->  <AD_VAL_RULE_ID><![CDATA[29010995FD39439D97A5C0CE8CE27D70]]></AD_VAL_RULE_ID>
 <!--29010995FD39439D97A5C0CE8CE27D70-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Tue May 06 13:08:31 2014 +0000
@@ -13,6 +13,7 @@
 <!--4EEB3497082C4F2182E16A4371CD5D96-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--4EEB3497082C4F2182E16A4371CD5D96-->  <UIPATTERN><![CDATA[OBUIAPP_PickAndExecute]]></UIPATTERN>
 <!--4EEB3497082C4F2182E16A4371CD5D96-->  <ISMULTIRECORD><![CDATA[N]]></ISMULTIRECORD>
+<!--4EEB3497082C4F2182E16A4371CD5D96-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--4EEB3497082C4F2182E16A4371CD5D96--></OBUIAPP_PROCESS>
 
 <!--6F87442DF7BC43AB8A666BDED2F7D64E--><OBUIAPP_PROCESS>
@@ -28,6 +29,7 @@
 <!--6F87442DF7BC43AB8A666BDED2F7D64E-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--6F87442DF7BC43AB8A666BDED2F7D64E-->  <UIPATTERN><![CDATA[OBUIAPP_PickAndExecute]]></UIPATTERN>
 <!--6F87442DF7BC43AB8A666BDED2F7D64E-->  <ISMULTIRECORD><![CDATA[N]]></ISMULTIRECORD>
+<!--6F87442DF7BC43AB8A666BDED2F7D64E-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--6F87442DF7BC43AB8A666BDED2F7D64E--></OBUIAPP_PROCESS>
 
 <!--8D0D32CC819E449D9A08E0459B482963--><OBUIAPP_PROCESS>
@@ -43,6 +45,7 @@
 <!--8D0D32CC819E449D9A08E0459B482963-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
 <!--8D0D32CC819E449D9A08E0459B482963-->  <UIPATTERN><![CDATA[OBUIAPP_PickAndExecute]]></UIPATTERN>
 <!--8D0D32CC819E449D9A08E0459B482963-->  <ISMULTIRECORD><![CDATA[N]]></ISMULTIRECORD>
+<!--8D0D32CC819E449D9A08E0459B482963-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--8D0D32CC819E449D9A08E0459B482963--></OBUIAPP_PROCESS>
 
 </data>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Tue May 06 13:08:31 2014 +0000
@@ -69,6 +69,22 @@
 <!--A98899B1C75A4F4EBD3414F1B654EFAB-->  <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
 <!--A98899B1C75A4F4EBD3414F1B654EFAB--></OBUISEL_SELECTOR>
 
+<!--B15DC1DA631A402C9B05AC11A2EA724C--><OBUISEL_SELECTOR>
+<!--B15DC1DA631A402C9B05AC11A2EA724C-->  <OBUISEL_SELECTOR_ID><![CDATA[B15DC1DA631A402C9B05AC11A2EA724C]]></OBUISEL_SELECTOR_ID>
+<!--B15DC1DA631A402C9B05AC11A2EA724C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B15DC1DA631A402C9B05AC11A2EA724C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B15DC1DA631A402C9B05AC11A2EA724C-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--B15DC1DA631A402C9B05AC11A2EA724C-->  <NAME><![CDATA[Organization]]></NAME>
+<!--B15DC1DA631A402C9B05AC11A2EA724C-->  <AD_REFERENCE_ID><![CDATA[1221BEA5C19F4FA89D3565CA8877A82E]]></AD_REFERENCE_ID>
+<!--B15DC1DA631A402C9B05AC11A2EA724C-->  <AD_TABLE_ID><![CDATA[155]]></AD_TABLE_ID>
+<!--B15DC1DA631A402C9B05AC11A2EA724C-->  <WHERECLAUSE><![CDATA[AD_ISORGINCLUDED(e.id, @inpadOrgId@,e.client.id)<>-1]]></WHERECLAUSE>
+<!--B15DC1DA631A402C9B05AC11A2EA724C-->  <OBCLKER_TEMPLATE_ID><![CDATA[9314DE8599AD44E7BFC4CC50699042AB]]></OBCLKER_TEMPLATE_ID>
+<!--B15DC1DA631A402C9B05AC11A2EA724C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B15DC1DA631A402C9B05AC11A2EA724C-->  <SUGGESTIONTEXTMATCHSTYLE><![CDATA[startsWith]]></SUGGESTIONTEXTMATCHSTYLE>
+<!--B15DC1DA631A402C9B05AC11A2EA724C-->  <POPUPTEXTMATCHSTYLE><![CDATA[startsWith]]></POPUPTEXTMATCHSTYLE>
+<!--B15DC1DA631A402C9B05AC11A2EA724C-->  <CUSTOM_QUERY><![CDATA[N]]></CUSTOM_QUERY>
+<!--B15DC1DA631A402C9B05AC11A2EA724C--></OBUISEL_SELECTOR>
+
 <!--FF808181312D569C01312D8C1EC40036--><OBUISEL_SELECTOR>
 <!--FF808181312D569C01312D8C1EC40036-->  <OBUISEL_SELECTOR_ID><![CDATA[FF808181312D569C01312D8C1EC40036]]></OBUISEL_SELECTOR_ID>
 <!--FF808181312D569C01312D8C1EC40036-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Tue May 06 13:08:31 2014 +0000
@@ -46,6 +46,28 @@
 <!--17843AC2A9E247E1A6DAD8041DFDB07A-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--17843AC2A9E247E1A6DAD8041DFDB07A--></OBUISEL_SELECTOR_FIELD>
 
+<!--198C982111AA4CF5ABF5E651ECD611FA--><OBUISEL_SELECTOR_FIELD>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[198C982111AA4CF5ABF5E651ECD611FA]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <OBUISEL_SELECTOR_ID><![CDATA[B15DC1DA631A402C9B05AC11A2EA724C]]></OBUISEL_SELECTOR_ID>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <AD_COLUMN_ID><![CDATA[522]]></AD_COLUMN_ID>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <NAME><![CDATA[Name]]></NAME>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <DESCRIPTION><![CDATA[A non-unique identifier for a record/document often used as a search tool.]]></DESCRIPTION>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <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>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <PROPERTY><![CDATA[name]]></PROPERTY>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <SORT><![CDATA[Y]]></SORT>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <SEARCHINSUGGESTIONBOX><![CDATA[Y]]></SEARCHINSUGGESTIONBOX>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <SORTNO><![CDATA[1]]></SORTNO>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--198C982111AA4CF5ABF5E651ECD611FA-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--198C982111AA4CF5ABF5E651ECD611FA--></OBUISEL_SELECTOR_FIELD>
+
 <!--334D0D40EF224D5CA5B9AA56124FEE25--><OBUISEL_SELECTOR_FIELD>
 <!--334D0D40EF224D5CA5B9AA56124FEE25-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[334D0D40EF224D5CA5B9AA56124FEE25]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--334D0D40EF224D5CA5B9AA56124FEE25-->  <OBUISEL_SELECTOR_ID><![CDATA[A98899B1C75A4F4EBD3414F1B654EFAB]]></OBUISEL_SELECTOR_ID>
@@ -287,6 +309,30 @@
 <!--C5CFD3978631444EB97539BCEE3D5239-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--C5CFD3978631444EB97539BCEE3D5239--></OBUISEL_SELECTOR_FIELD>
 
+<!--F229E4FBC3DB4BA6AA295C19E0798785--><OBUISEL_SELECTOR_FIELD>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[F229E4FBC3DB4BA6AA295C19E0798785]]></OBUISEL_SELECTOR_FIELD_ID>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <OBUISEL_SELECTOR_ID><![CDATA[B15DC1DA631A402C9B05AC11A2EA724C]]></OBUISEL_SELECTOR_ID>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <AD_COLUMN_ID><![CDATA[2045]]></AD_COLUMN_ID>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <NAME><![CDATA[Search Key]]></NAME>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <DESCRIPTION><![CDATA[A fast method for finding a particular record.]]></DESCRIPTION>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <HELP><![CDATA[A search key allows for a fast method of finding a particular record. If you leave the search key empty, the system automatically creates a numeric number originating from a document sequence defined in the  "Document Sequence" window. The sequence naming convention follows a rule "DocumentNo_TableName", where TableName is the actual name of the database table (e.g. C_Order).
+
+Usually, company's internal identifiers for various records (products, customers, etc) are stored here.]]></HELP>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <PROPERTY><![CDATA[searchKey]]></PROPERTY>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <SORT><![CDATA[Y]]></SORT>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <FILTER><![CDATA[Y]]></FILTER>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <SORTNO><![CDATA[2]]></SORTNO>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <ISOUTFIELD><![CDATA[N]]></ISOUTFIELD>
+<!--F229E4FBC3DB4BA6AA295C19E0798785-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
+<!--F229E4FBC3DB4BA6AA295C19E0798785--></OBUISEL_SELECTOR_FIELD>
+
 <!--FF808181312DEEAE01312DFAFE910022--><OBUISEL_SELECTOR_FIELD>
 <!--FF808181312DEEAE01312DFAFE910022-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[FF808181312DEEAE01312DFAFE910022]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--FF808181312DEEAE01312DFAFE910022-->  <OBUISEL_SELECTOR_ID><![CDATA[FF808181312DA8D801312DDE869B000C]]></OBUISEL_SELECTOR_ID>
--- a/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 13:08:31 2014 +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.21766]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION><![CDATA[1.1.22845]]></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[MP31]]></VERSION_LABEL>
+<!--C70732EA90A14EC0916078B85CC33D2D-->  <VERSION_LABEL><![CDATA[PR14Q2]]></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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 06 13:08:31 2014 +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.21766]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <STARTVERSION><![CDATA[3.0.22845]]></STARTVERSION>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_PROCESS.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/model/tables/OBUIAPP_PROCESS.xml	Tue May 06 13:08:31 2014 +0000
@@ -73,6 +73,10 @@
         <default><![CDATA[N]]></default>
         <onCreateDefault><![CDATA['N']]></onCreateDefault>
       </column>
+      <column name="IS_EXPLICIT_ACCESS" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="OBUIAPP_PROC_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -85,5 +89,6 @@
       <check name="OBUIAPP_PROC_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="OBUIAPP_PROC_ISBACKGROUND_CHK"><![CDATA[ISBACKGROUND IN ('Y', 'N')]]></check>
       <check name="OBUIAPP_PROC_MULTI_CHK"><![CDATA[ISMULTIRECORD IN ('Y', 'N')]]></check>
+      <check name="OBUIAPP_PROCESS_EXPLICITACC_CK"><![CDATA[IS_EXPLICIT_ACCESS IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_COLUMN.xml	Tue May 06 13:08:31 2014 +0000
@@ -497,6 +497,46 @@
 <!--10565D81EA4146F7AAE0293D387B6DC2-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--10565D81EA4146F7AAE0293D387B6DC2--></AD_COLUMN>
 
+<!--127F0488A8394E86A1D0822103FE1AB0--><AD_COLUMN>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <AD_COLUMN_ID><![CDATA[127F0488A8394E86A1D0822103FE1AB0]]></AD_COLUMN_ID>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <NAME><![CDATA[Requires Explicit Access Permission]]></NAME>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <DESCRIPTION><![CDATA[Requires Explicit Access Permission]]></DESCRIPTION>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <HELP><![CDATA[When processes are executed from a button in a window, by default, they inherit permissions granted to the window. So if the window is accessible it can be executed without the need of explicitly granting access for that role to the process.
+
+This behavior can be overwritten by the "Secured Process" preference.
+
+Processes with "Requires Explicit Access Permission" flag set to true, do not inherit permissions from the window but they always require the role to be explicitly granted to this process.]]></HELP>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <COLUMNNAME><![CDATA[Is_Explicit_Access]]></COLUMNNAME>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <AD_TABLE_ID><![CDATA[FF80818132D7FB620132D8129D1A0028]]></AD_TABLE_ID>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <SEQNO><![CDATA[190]]></SEQNO>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <AD_ELEMENT_ID><![CDATA[D2089AFD9A304F45BD5FCDFC617F138F]]></AD_ELEMENT_ID>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <POSITION><![CDATA[19]]></POSITION>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--127F0488A8394E86A1D0822103FE1AB0-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--127F0488A8394E86A1D0822103FE1AB0--></AD_COLUMN>
+
 <!--1330F77151CC4A9BBC1B0151F27952B9--><AD_COLUMN>
 <!--1330F77151CC4A9BBC1B0151F27952B9-->  <AD_COLUMN_ID><![CDATA[1330F77151CC4A9BBC1B0151F27952B9]]></AD_COLUMN_ID>
 <!--1330F77151CC4A9BBC1B0151F27952B9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1738,7 +1778,7 @@
 <!--37DCA71E621340B8A6FDE1264630AC48-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--37DCA71E621340B8A6FDE1264630AC48-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--37DCA71E621340B8A6FDE1264630AC48-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
-<!--37DCA71E621340B8A6FDE1264630AC48-->  <POSITION><![CDATA[45]]></POSITION>
+<!--37DCA71E621340B8A6FDE1264630AC48-->  <POSITION><![CDATA[47]]></POSITION>
 <!--37DCA71E621340B8A6FDE1264630AC48-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--37DCA71E621340B8A6FDE1264630AC48-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--37DCA71E621340B8A6FDE1264630AC48-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -2419,7 +2459,7 @@
 <!--59D7AB430670477ABA73B3DF07C8CA7D-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--59D7AB430670477ABA73B3DF07C8CA7D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--59D7AB430670477ABA73B3DF07C8CA7D-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
-<!--59D7AB430670477ABA73B3DF07C8CA7D-->  <POSITION><![CDATA[47]]></POSITION>
+<!--59D7AB430670477ABA73B3DF07C8CA7D-->  <POSITION><![CDATA[49]]></POSITION>
 <!--59D7AB430670477ABA73B3DF07C8CA7D-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--59D7AB430670477ABA73B3DF07C8CA7D-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--59D7AB430670477ABA73B3DF07C8CA7D-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -2720,7 +2760,7 @@
 <!--5F26651D1F05498F9109026505AF297C-->  <COLUMNNAME><![CDATA[AD_Field_ID]]></COLUMNNAME>
 <!--5F26651D1F05498F9109026505AF297C-->  <AD_TABLE_ID><![CDATA[F167EB822B8A4284AC37D5B40B785D51]]></AD_TABLE_ID>
 <!--5F26651D1F05498F9109026505AF297C-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
-<!--5F26651D1F05498F9109026505AF297C-->  <AD_VAL_RULE_ID><![CDATA[9C6989B15CEA4987A502C0F5FF02B171]]></AD_VAL_RULE_ID>
+<!--5F26651D1F05498F9109026505AF297C-->  <AD_VAL_RULE_ID><![CDATA[E2D591AAE44F42A3964A07DC49C6AB84]]></AD_VAL_RULE_ID>
 <!--5F26651D1F05498F9109026505AF297C-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--5F26651D1F05498F9109026505AF297C-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--5F26651D1F05498F9109026505AF297C-->  <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -3163,7 +3203,7 @@
 <!--718F42F7BD4E4F56908615C8301C8810-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--718F42F7BD4E4F56908615C8301C8810-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--718F42F7BD4E4F56908615C8301C8810-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
-<!--718F42F7BD4E4F56908615C8301C8810-->  <POSITION><![CDATA[46]]></POSITION>
+<!--718F42F7BD4E4F56908615C8301C8810-->  <POSITION><![CDATA[48]]></POSITION>
 <!--718F42F7BD4E4F56908615C8301C8810-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--718F42F7BD4E4F56908615C8301C8810-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--718F42F7BD4E4F56908615C8301C8810-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -6050,7 +6090,7 @@
 <!--961FB60572894A78810B8845F499D387-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--961FB60572894A78810B8845F499D387-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--961FB60572894A78810B8845F499D387-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
-<!--961FB60572894A78810B8845F499D387-->  <POSITION><![CDATA[44]]></POSITION>
+<!--961FB60572894A78810B8845F499D387-->  <POSITION><![CDATA[46]]></POSITION>
 <!--961FB60572894A78810B8845F499D387-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--961FB60572894A78810B8845F499D387-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--961FB60572894A78810B8845F499D387-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -7438,7 +7478,7 @@
 <!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
-<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <POSITION><![CDATA[43]]></POSITION>
+<!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <POSITION><![CDATA[45]]></POSITION>
 <!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--D3F8F1142D914AD0ACAD03B45BEB3E9F-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -7836,7 +7876,7 @@
 <!--E4F41D289C6A42A5BAF8BD766A15645F-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--E4F41D289C6A42A5BAF8BD766A15645F-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--E4F41D289C6A42A5BAF8BD766A15645F-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
-<!--E4F41D289C6A42A5BAF8BD766A15645F-->  <POSITION><![CDATA[42]]></POSITION>
+<!--E4F41D289C6A42A5BAF8BD766A15645F-->  <POSITION><![CDATA[44]]></POSITION>
 <!--E4F41D289C6A42A5BAF8BD766A15645F-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--E4F41D289C6A42A5BAF8BD766A15645F-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--E4F41D289C6A42A5BAF8BD766A15645F-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_FIELD.xml	Tue May 06 13:08:31 2014 +0000
@@ -986,6 +986,38 @@
 <!--273F9EB0619742E6B75E57F1958F1033-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--273F9EB0619742E6B75E57F1958F1033--></AD_FIELD>
 
+<!--27E751EB37C841EC930FD493AB2CF64B--><AD_FIELD>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <AD_FIELD_ID><![CDATA[27E751EB37C841EC930FD493AB2CF64B]]></AD_FIELD_ID>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <NAME><![CDATA[Requires Explicit Access Permission]]></NAME>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <DESCRIPTION><![CDATA[Requires Explicit Access Permission]]></DESCRIPTION>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <HELP><![CDATA[When processes are executed from a button in a window, by default, they inherit permissions granted to the window. So if the window is accessible it can be executed without the need of explicitly granting access for that role to the process.
+
+This behavior can be overwritten by the "Secured Process" preference.
+
+Processes with "Requires Explicit Access Permission" flag set to true, do not inherit permissions from the window but they always require the role to be explicitly granted to this process.]]></HELP>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <AD_TAB_ID><![CDATA[FF80818132D7FB620132D819C1720046]]></AD_TAB_ID>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <AD_COLUMN_ID><![CDATA[127F0488A8394E86A1D0822103FE1AB0]]></AD_COLUMN_ID>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--27E751EB37C841EC930FD493AB2CF64B-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--27E751EB37C841EC930FD493AB2CF64B--></AD_FIELD>
+
 <!--2C3B28510C0544BC8BDA4461AE88C486--><AD_FIELD>
 <!--2C3B28510C0544BC8BDA4461AE88C486-->  <AD_FIELD_ID><![CDATA[2C3B28510C0544BC8BDA4461AE88C486]]></AD_FIELD_ID>
 <!--2C3B28510C0544BC8BDA4461AE88C486-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3663,7 +3695,7 @@
 <!--C5E25325FEAA4F2DBAFB4A7B443E4851-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--C5E25325FEAA4F2DBAFB4A7B443E4851-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--C5E25325FEAA4F2DBAFB4A7B443E4851-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--C5E25325FEAA4F2DBAFB4A7B443E4851-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--C5E25325FEAA4F2DBAFB4A7B443E4851-->  <SEQNO><![CDATA[500]]></SEQNO>
 <!--C5E25325FEAA4F2DBAFB4A7B443E4851-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--C5E25325FEAA4F2DBAFB4A7B443E4851-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--C5E25325FEAA4F2DBAFB4A7B443E4851-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -4647,7 +4679,7 @@
 <!--FCD55C499D894E95B322C17919EAB3E4-->  <DISPLAYLOGIC><![CDATA[@Uipattern@='M']]></DISPLAYLOGIC>
 <!--FCD55C499D894E95B322C17919EAB3E4-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--FCD55C499D894E95B322C17919EAB3E4-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--FCD55C499D894E95B322C17919EAB3E4-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--FCD55C499D894E95B322C17919EAB3E4-->  <SEQNO><![CDATA[110]]></SEQNO>
 <!--FCD55C499D894E95B322C17919EAB3E4-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--FCD55C499D894E95B322C17919EAB3E4-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--FCD55C499D894E95B322C17919EAB3E4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml	Tue May 06 13:08:31 2014 +0000
@@ -410,6 +410,18 @@
 <!--3270B64D4D6B4464B2E9BA10C69996E4-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--3270B64D4D6B4464B2E9BA10C69996E4--></AD_MESSAGE>
 
+<!--332314CB3BE54304A309CF077A640A3C--><AD_MESSAGE>
+<!--332314CB3BE54304A309CF077A640A3C-->  <AD_MESSAGE_ID><![CDATA[332314CB3BE54304A309CF077A640A3C]]></AD_MESSAGE_ID>
+<!--332314CB3BE54304A309CF077A640A3C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--332314CB3BE54304A309CF077A640A3C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--332314CB3BE54304A309CF077A640A3C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--332314CB3BE54304A309CF077A640A3C-->  <VALUE><![CDATA[OBUIAPP_DefineStorageBin]]></VALUE>
+<!--332314CB3BE54304A309CF077A640A3C-->  <MSGTEXT><![CDATA[Define a storage bin]]></MSGTEXT>
+<!--332314CB3BE54304A309CF077A640A3C-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--332314CB3BE54304A309CF077A640A3C-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--332314CB3BE54304A309CF077A640A3C-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--332314CB3BE54304A309CF077A640A3C--></AD_MESSAGE>
+
 <!--335DB34B941E435BB829ADFA3B3D27AA--><AD_MESSAGE>
 <!--335DB34B941E435BB829ADFA3B3D27AA-->  <AD_MESSAGE_ID><![CDATA[335DB34B941E435BB829ADFA3B3D27AA]]></AD_MESSAGE_ID>
 <!--335DB34B941E435BB829ADFA3B3D27AA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -615,6 +627,18 @@
 <!--597897349BE0452C89E43E27D94A175D-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--597897349BE0452C89E43E27D94A175D--></AD_MESSAGE>
 
+<!--5A40D3779E0C4F2BAE25C2153D4BB858--><AD_MESSAGE>
+<!--5A40D3779E0C4F2BAE25C2153D4BB858-->  <AD_MESSAGE_ID><![CDATA[5A40D3779E0C4F2BAE25C2153D4BB858]]></AD_MESSAGE_ID>
+<!--5A40D3779E0C4F2BAE25C2153D4BB858-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5A40D3779E0C4F2BAE25C2153D4BB858-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5A40D3779E0C4F2BAE25C2153D4BB858-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5A40D3779E0C4F2BAE25C2153D4BB858-->  <VALUE><![CDATA[OBUIAPP_DefineQtyToMove]]></VALUE>
+<!--5A40D3779E0C4F2BAE25C2153D4BB858-->  <MSGTEXT><![CDATA[Define movement quantity]]></MSGTEXT>
+<!--5A40D3779E0C4F2BAE25C2153D4BB858-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--5A40D3779E0C4F2BAE25C2153D4BB858-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--5A40D3779E0C4F2BAE25C2153D4BB858-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--5A40D3779E0C4F2BAE25C2153D4BB858--></AD_MESSAGE>
+
 <!--5B1FB06A4EBA4654A9A93695434C72AE--><AD_MESSAGE>
 <!--5B1FB06A4EBA4654A9A93695434C72AE-->  <AD_MESSAGE_ID><![CDATA[5B1FB06A4EBA4654A9A93695434C72AE]]></AD_MESSAGE_ID>
 <!--5B1FB06A4EBA4654A9A93695434C72AE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1110,6 +1134,18 @@
 <!--9A66DC27282742BF825F53B741231823-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--9A66DC27282742BF825F53B741231823--></AD_MESSAGE>
 
+<!--9C214BA9E4974711A3368FF034CE2B0E--><AD_MESSAGE>
+<!--9C214BA9E4974711A3368FF034CE2B0E-->  <AD_MESSAGE_ID><![CDATA[9C214BA9E4974711A3368FF034CE2B0E]]></AD_MESSAGE_ID>
+<!--9C214BA9E4974711A3368FF034CE2B0E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9C214BA9E4974711A3368FF034CE2B0E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9C214BA9E4974711A3368FF034CE2B0E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9C214BA9E4974711A3368FF034CE2B0E-->  <VALUE><![CDATA[OBUIAPP_MoveQtyLowerthanReserved]]></VALUE>
+<!--9C214BA9E4974711A3368FF034CE2B0E-->  <MSGTEXT><![CDATA[Movement quantity has to be lower than 'reserved quantity - released quantity']]></MSGTEXT>
+<!--9C214BA9E4974711A3368FF034CE2B0E-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--9C214BA9E4974711A3368FF034CE2B0E-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--9C214BA9E4974711A3368FF034CE2B0E-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--9C214BA9E4974711A3368FF034CE2B0E--></AD_MESSAGE>
+
 <!--9DFDAA99FA614533B4042E6C02266BC7--><AD_MESSAGE>
 <!--9DFDAA99FA614533B4042E6C02266BC7-->  <AD_MESSAGE_ID><![CDATA[9DFDAA99FA614533B4042E6C02266BC7]]></AD_MESSAGE_ID>
 <!--9DFDAA99FA614533B4042E6C02266BC7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1134,6 +1170,18 @@
 <!--9EFEA3F8412B4F5C836DFB40034156EA-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--9EFEA3F8412B4F5C836DFB40034156EA--></AD_MESSAGE>
 
+<!--A01FFA9D8F51467FA62934F633C8DBA2--><AD_MESSAGE>
+<!--A01FFA9D8F51467FA62934F633C8DBA2-->  <AD_MESSAGE_ID><![CDATA[A01FFA9D8F51467FA62934F633C8DBA2]]></AD_MESSAGE_ID>
+<!--A01FFA9D8F51467FA62934F633C8DBA2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A01FFA9D8F51467FA62934F633C8DBA2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A01FFA9D8F51467FA62934F633C8DBA2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A01FFA9D8F51467FA62934F633C8DBA2-->  <VALUE><![CDATA[OBUIAPP_DifferentSB]]></VALUE>
+<!--A01FFA9D8F51467FA62934F633C8DBA2-->  <MSGTEXT><![CDATA[The new storage and current storage bin need to be different]]></MSGTEXT>
+<!--A01FFA9D8F51467FA62934F633C8DBA2-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--A01FFA9D8F51467FA62934F633C8DBA2-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--A01FFA9D8F51467FA62934F633C8DBA2-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--A01FFA9D8F51467FA62934F633C8DBA2--></AD_MESSAGE>
+
 <!--A0B273389C804A118EF44AD4E8D97515--><AD_MESSAGE>
 <!--A0B273389C804A118EF44AD4E8D97515-->  <AD_MESSAGE_ID><![CDATA[A0B273389C804A118EF44AD4E8D97515]]></AD_MESSAGE_ID>
 <!--A0B273389C804A118EF44AD4E8D97515-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1627,6 +1675,18 @@
 <!--EE57AA334D6846718FBA9E042EA4F5EF-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--EE57AA334D6846718FBA9E042EA4F5EF--></AD_MESSAGE>
 
+<!--EE5B54ACE057403B8436E84C9A409F2F--><AD_MESSAGE>
+<!--EE5B54ACE057403B8436E84C9A409F2F-->  <AD_MESSAGE_ID><![CDATA[EE5B54ACE057403B8436E84C9A409F2F]]></AD_MESSAGE_ID>
+<!--EE5B54ACE057403B8436E84C9A409F2F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EE5B54ACE057403B8436E84C9A409F2F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EE5B54ACE057403B8436E84C9A409F2F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EE5B54ACE057403B8436E84C9A409F2F-->  <VALUE><![CDATA[OBUIAPP_CalendarShowHideLanes]]></VALUE>
+<!--EE5B54ACE057403B8436E84C9A409F2F-->  <MSGTEXT><![CDATA[Show/Hide lanes in Day View]]></MSGTEXT>
+<!--EE5B54ACE057403B8436E84C9A409F2F-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--EE5B54ACE057403B8436E84C9A409F2F-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--EE5B54ACE057403B8436E84C9A409F2F-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--EE5B54ACE057403B8436E84C9A409F2F--></AD_MESSAGE>
+
 <!--EE6743B612B74EF5A934923ED8405B07--><AD_MESSAGE>
 <!--EE6743B612B74EF5A934923ED8405B07-->  <AD_MESSAGE_ID><![CDATA[EE6743B612B74EF5A934923ED8405B07]]></AD_MESSAGE_ID>
 <!--EE6743B612B74EF5A934923ED8405B07-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 13:08:31 2014 +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.21766]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION><![CDATA[2.1.22845]]></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[MP31]]></VERSION_LABEL>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->  <VERSION_LABEL><![CDATA[PR14Q2]]></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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 06 13:08:31 2014 +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.21766]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->  <STARTVERSION><![CDATA[2.1.22845]]></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.21766]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->  <STARTVERSION><![CDATA[2.1.22845]]></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.21766]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->  <STARTVERSION><![CDATA[3.0.22845]]></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.21766]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->  <STARTVERSION><![CDATA[8.1.22845]]></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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_PREFERENCE.xml	Tue May 06 13:08:31 2014 +0000
@@ -56,7 +56,10 @@
   {"id": "ViewGrid_DeleteSelectedRecords", "keyComb": {"key": "Delete"}},
   {"id": "ViewForm_OpenLinkOut", "keyComb": {"ctrl": true, "alt": true, "key": "Enter"}},
   {"id": "Selector_ShowPopup", "keyComb": {"ctrl": true, "key": "Enter"}},
-  {"id": "SelectorLink_ShowPopup", "keyComb": {"ctrl": true, "key": "Enter"}}
+  {"id": "SelectorLink_ShowPopup", "keyComb": {"ctrl": true, "key": "Enter"}},
+  {"id": "TreeItem_ShowPopup", "keyComb": {"ctrl": true, "key": "Enter"}},
+  {"id": "TreeItem_ShowTree", "keyComb": {"alt": true, "key": "Arrow_Down"}},
+  {"id": "TreeItem_MoveToTree", "keyComb": {"alt": false, "key": "Arrow_Down"}}
 ]]]></VALUE>
 <!--5EE6D055A7FE4C4DA7EB557F6C61D0EA-->  <PROPERTY><![CDATA[OBUIAPP_KeyboardShortcuts]]></PROPERTY>
 <!--5EE6D055A7FE4C4DA7EB557F6C61D0EA-->  <ISPROPERTYLIST><![CDATA[Y]]></ISPROPERTYLIST>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_REF_LIST.xml	Tue May 06 13:08:31 2014 +0000
@@ -153,6 +153,17 @@
 <!--57A4B4D636954DF88444CAD72B20598B-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
 <!--57A4B4D636954DF88444CAD72B20598B--></AD_REF_LIST>
 
+<!--67C9AE863A644F46BC21F563E4910F6C--><AD_REF_LIST>
+<!--67C9AE863A644F46BC21F563E4910F6C-->  <AD_REF_LIST_ID><![CDATA[67C9AE863A644F46BC21F563E4910F6C]]></AD_REF_LIST_ID>
+<!--67C9AE863A644F46BC21F563E4910F6C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--67C9AE863A644F46BC21F563E4910F6C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--67C9AE863A644F46BC21F563E4910F6C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--67C9AE863A644F46BC21F563E4910F6C-->  <VALUE><![CDATA[OBUIAPP_UseClassicTreeView]]></VALUE>
+<!--67C9AE863A644F46BC21F563E4910F6C-->  <NAME><![CDATA[Use Classic Popup Tree]]></NAME>
+<!--67C9AE863A644F46BC21F563E4910F6C-->  <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
+<!--67C9AE863A644F46BC21F563E4910F6C-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--67C9AE863A644F46BC21F563E4910F6C--></AD_REF_LIST>
+
 <!--6D7755B77E254D83AAC62B93D3A62ED9--><AD_REF_LIST>
 <!--6D7755B77E254D83AAC62B93D3A62ED9-->  <AD_REF_LIST_ID><![CDATA[6D7755B77E254D83AAC62B93D3A62ED9]]></AD_REF_LIST_ID>
 <!--6D7755B77E254D83AAC62B93D3A62ED9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TABLE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_TABLE.xml	Tue May 06 13:08:31 2014 +0000
@@ -20,6 +20,7 @@
 <!--090A37D22E61FE94012E620CD15D0030-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--090A37D22E61FE94012E620CD15D0030-->  <AD_PACKAGE_ID><![CDATA[BA250A68426F4D71BACAE830EF4EC696]]></AD_PACKAGE_ID>
 <!--090A37D22E61FE94012E620CD15D0030-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--090A37D22E61FE94012E620CD15D0030-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--090A37D22E61FE94012E620CD15D0030--></AD_TABLE>
 
 <!--1A801FD9F44E4EFFA2EA928693A6BBCB--><AD_TABLE>
@@ -41,6 +42,7 @@
 <!--1A801FD9F44E4EFFA2EA928693A6BBCB-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--1A801FD9F44E4EFFA2EA928693A6BBCB-->  <AD_PACKAGE_ID><![CDATA[BA250A68426F4D71BACAE830EF4EC696]]></AD_PACKAGE_ID>
 <!--1A801FD9F44E4EFFA2EA928693A6BBCB-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--1A801FD9F44E4EFFA2EA928693A6BBCB-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--1A801FD9F44E4EFFA2EA928693A6BBCB--></AD_TABLE>
 
 <!--30123B1001FC4E82BB4CB9725E069B48--><AD_TABLE>
@@ -62,6 +64,7 @@
 <!--30123B1001FC4E82BB4CB9725E069B48-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--30123B1001FC4E82BB4CB9725E069B48-->  <AD_PACKAGE_ID><![CDATA[BA250A68426F4D71BACAE830EF4EC696]]></AD_PACKAGE_ID>
 <!--30123B1001FC4E82BB4CB9725E069B48-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--30123B1001FC4E82BB4CB9725E069B48-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--30123B1001FC4E82BB4CB9725E069B48--></AD_TABLE>
 
 <!--5D50320222DD4865ADFD50364C84291D--><AD_TABLE>
@@ -86,6 +89,7 @@
 <!--5D50320222DD4865ADFD50364C84291D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--5D50320222DD4865ADFD50364C84291D-->  <AD_PACKAGE_ID><![CDATA[BA250A68426F4D71BACAE830EF4EC696]]></AD_PACKAGE_ID>
 <!--5D50320222DD4865ADFD50364C84291D-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--5D50320222DD4865ADFD50364C84291D-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--5D50320222DD4865ADFD50364C84291D--></AD_TABLE>
 
 <!--6EDC4A262444493BAE672E7E144A36F7--><AD_TABLE>
@@ -109,6 +113,7 @@
 <!--6EDC4A262444493BAE672E7E144A36F7-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--6EDC4A262444493BAE672E7E144A36F7-->  <AD_PACKAGE_ID><![CDATA[BA250A68426F4D71BACAE830EF4EC696]]></AD_PACKAGE_ID>
 <!--6EDC4A262444493BAE672E7E144A36F7-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--6EDC4A262444493BAE672E7E144A36F7-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--6EDC4A262444493BAE672E7E144A36F7--></AD_TABLE>
 
 <!--79127717F4514B459D9014C91E793CE9--><AD_TABLE>
@@ -134,6 +139,7 @@
 <!--79127717F4514B459D9014C91E793CE9-->  <ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT>
 <!--79127717F4514B459D9014C91E793CE9-->  <AD_PACKAGE_ID><![CDATA[BA250A68426F4D71BACAE830EF4EC696]]></AD_PACKAGE_ID>
 <!--79127717F4514B459D9014C91E793CE9-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--79127717F4514B459D9014C91E793CE9-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--79127717F4514B459D9014C91E793CE9--></AD_TABLE>
 
 <!--815D739C48414E01AF9F44EE3E8CCEBB--><AD_TABLE>
@@ -155,6 +161,7 @@
 <!--815D739C48414E01AF9F44EE3E8CCEBB-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--815D739C48414E01AF9F44EE3E8CCEBB-->  <AD_PACKAGE_ID><![CDATA[BA250A68426F4D71BACAE830EF4EC696]]></AD_PACKAGE_ID>
 <!--815D739C48414E01AF9F44EE3E8CCEBB-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--815D739C48414E01AF9F44EE3E8CCEBB-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--815D739C48414E01AF9F44EE3E8CCEBB--></AD_TABLE>
 
 <!--8A16662B37184121A1EDAA89890E160C--><AD_TABLE>
@@ -179,6 +186,7 @@
 <!--8A16662B37184121A1EDAA89890E160C-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--8A16662B37184121A1EDAA89890E160C-->  <AD_PACKAGE_ID><![CDATA[BA250A68426F4D71BACAE830EF4EC696]]></AD_PACKAGE_ID>
 <!--8A16662B37184121A1EDAA89890E160C-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--8A16662B37184121A1EDAA89890E160C-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--8A16662B37184121A1EDAA89890E160C--></AD_TABLE>
 
 <!--B733B9E74A0D4FE1A3EC2A100E0ADD47--><AD_TABLE>
@@ -202,6 +210,7 @@
 <!--B733B9E74A0D4FE1A3EC2A100E0ADD47-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--B733B9E74A0D4FE1A3EC2A100E0ADD47-->  <AD_PACKAGE_ID><![CDATA[BA250A68426F4D71BACAE830EF4EC696]]></AD_PACKAGE_ID>
 <!--B733B9E74A0D4FE1A3EC2A100E0ADD47-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--B733B9E74A0D4FE1A3EC2A100E0ADD47-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--B733B9E74A0D4FE1A3EC2A100E0ADD47--></AD_TABLE>
 
 <!--DEADAC2161894A56A041B81A74B02D9E--><AD_TABLE>
@@ -225,6 +234,7 @@
 <!--DEADAC2161894A56A041B81A74B02D9E-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--DEADAC2161894A56A041B81A74B02D9E-->  <AD_PACKAGE_ID><![CDATA[BA250A68426F4D71BACAE830EF4EC696]]></AD_PACKAGE_ID>
 <!--DEADAC2161894A56A041B81A74B02D9E-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--DEADAC2161894A56A041B81A74B02D9E-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--DEADAC2161894A56A041B81A74B02D9E--></AD_TABLE>
 
 <!--E6F29F8A30BC4603B1D1195051C4F3A6--><AD_TABLE>
@@ -248,6 +258,7 @@
 <!--E6F29F8A30BC4603B1D1195051C4F3A6-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--E6F29F8A30BC4603B1D1195051C4F3A6-->  <AD_PACKAGE_ID><![CDATA[BA250A68426F4D71BACAE830EF4EC696]]></AD_PACKAGE_ID>
 <!--E6F29F8A30BC4603B1D1195051C4F3A6-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--E6F29F8A30BC4603B1D1195051C4F3A6-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--E6F29F8A30BC4603B1D1195051C4F3A6--></AD_TABLE>
 
 <!--F167EB822B8A4284AC37D5B40B785D51--><AD_TABLE>
@@ -272,6 +283,7 @@
 <!--F167EB822B8A4284AC37D5B40B785D51-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--F167EB822B8A4284AC37D5B40B785D51-->  <AD_PACKAGE_ID><![CDATA[BA250A68426F4D71BACAE830EF4EC696]]></AD_PACKAGE_ID>
 <!--F167EB822B8A4284AC37D5B40B785D51-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--F167EB822B8A4284AC37D5B40B785D51-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--F167EB822B8A4284AC37D5B40B785D51--></AD_TABLE>
 
 <!--FF8081813157AED2013157B1F75F0007--><AD_TABLE>
@@ -294,6 +306,7 @@
 <!--FF8081813157AED2013157B1F75F0007-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--FF8081813157AED2013157B1F75F0007-->  <AD_PACKAGE_ID><![CDATA[BA250A68426F4D71BACAE830EF4EC696]]></AD_PACKAGE_ID>
 <!--FF8081813157AED2013157B1F75F0007-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--FF8081813157AED2013157B1F75F0007-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--FF8081813157AED2013157B1F75F0007--></AD_TABLE>
 
 <!--FF80818132D7FB620132D8129D1A0028--><AD_TABLE>
@@ -316,6 +329,7 @@
 <!--FF80818132D7FB620132D8129D1A0028-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--FF80818132D7FB620132D8129D1A0028-->  <AD_PACKAGE_ID><![CDATA[BA250A68426F4D71BACAE830EF4EC696]]></AD_PACKAGE_ID>
 <!--FF80818132D7FB620132D8129D1A0028-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--FF80818132D7FB620132D8129D1A0028-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--FF80818132D7FB620132D8129D1A0028--></AD_TABLE>
 
 <!--FF80818132D85DB50132D860924E0004--><AD_TABLE>
@@ -337,6 +351,7 @@
 <!--FF80818132D85DB50132D860924E0004-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--FF80818132D85DB50132D860924E0004-->  <AD_PACKAGE_ID><![CDATA[BA250A68426F4D71BACAE830EF4EC696]]></AD_PACKAGE_ID>
 <!--FF80818132D85DB50132D860924E0004-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--FF80818132D85DB50132D860924E0004-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--FF80818132D85DB50132D860924E0004--></AD_TABLE>
 
 <!--FF80818132F263D40132F26C10790010--><AD_TABLE>
@@ -358,6 +373,7 @@
 <!--FF80818132F263D40132F26C10790010-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--FF80818132F263D40132F26C10790010-->  <AD_PACKAGE_ID><![CDATA[BA250A68426F4D71BACAE830EF4EC696]]></AD_PACKAGE_ID>
 <!--FF80818132F263D40132F26C10790010-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--FF80818132F263D40132F26C10790010-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--FF80818132F263D40132F26C10790010--></AD_TABLE>
 
 </data>
--- a/model/modules/org.openbravo.client.application/src-db/database/sourcedata/OBCLKER_TEMPLATE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.client.application/src-db/database/sourcedata/OBCLKER_TEMPLATE.xml	Tue May 06 13:08:31 2014 +0000
@@ -120,6 +120,18 @@
 <!--91DD63545B674BE8801E1FA4F48FF4C6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--91DD63545B674BE8801E1FA4F48FF4C6--></OBCLKER_TEMPLATE>
 
+<!--9690A685A3D245899EA2A9C15D50D9FB--><OBCLKER_TEMPLATE>
+<!--9690A685A3D245899EA2A9C15D50D9FB-->  <OBCLKER_TEMPLATE_ID><![CDATA[9690A685A3D245899EA2A9C15D50D9FB]]></OBCLKER_TEMPLATE_ID>
+<!--9690A685A3D245899EA2A9C15D50D9FB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9690A685A3D245899EA2A9C15D50D9FB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9690A685A3D245899EA2A9C15D50D9FB-->  <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID>
+<!--9690A685A3D245899EA2A9C15D50D9FB-->  <NAME><![CDATA[Tree Selector Template]]></NAME>
+<!--9690A685A3D245899EA2A9C15D50D9FB-->  <TEMPLATECLASSPATHLOCATION><![CDATA[/org/openbravo/client/application/templates/ob-tree-selector.js.ftl]]></TEMPLATECLASSPATHLOCATION>
+<!--9690A685A3D245899EA2A9C15D50D9FB-->  <TEMPLATE_LANGUAGE><![CDATA[OBCLFRE_Freemarker]]></TEMPLATE_LANGUAGE>
+<!--9690A685A3D245899EA2A9C15D50D9FB-->  <COMPONENT_TYPE><![CDATA[OBUISEL_Selector]]></COMPONENT_TYPE>
+<!--9690A685A3D245899EA2A9C15D50D9FB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9690A685A3D245899EA2A9C15D50D9FB--></OBCLKER_TEMPLATE>
+
 <!--9E97FF309FE44C61A761F50801F79349--><OBCLKER_TEMPLATE>
 <!--9E97FF309FE44C61A761F50801F79349-->  <OBCLKER_TEMPLATE_ID><![CDATA[9E97FF309FE44C61A761F50801F79349]]></OBCLKER_TEMPLATE_ID>
 <!--9E97FF309FE44C61A761F50801F79349-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 13:08:31 2014 +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.21766]]></VERSION>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION><![CDATA[1.0.22845]]></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[MP31]]></VERSION_LABEL>
+<!--D393BE6F22BB44B7B728259B34FC795A-->  <VERSION_LABEL><![CDATA[PR14Q2]]></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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 06 13:08:31 2014 +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.21766]]></STARTVERSION>
+<!--DCE798FBC5B648F7A3C81A6941720A57-->  <STARTVERSION><![CDATA[2.1.22845]]></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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 13:08:31 2014 +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.21766]]></VERSION>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION><![CDATA[2.1.22845]]></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[MP31]]></VERSION_LABEL>
+<!--4B828F4D03264080AA1D2057B13F613C-->  <VERSION_LABEL><![CDATA[PR14Q2]]></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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 06 13:08:31 2014 +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.21766]]></STARTVERSION>
+<!--26B041893E844A53AFA58BC326C4F0D7-->  <STARTVERSION><![CDATA[3.0.22845]]></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.21766]]></STARTVERSION>
+<!--3AB045DA35ED4CA58EF7EB5BF04CDE3F-->  <STARTVERSION><![CDATA[1.1.22845]]></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.21766]]></STARTVERSION>
+<!--D7BA4BB0844942C58DC46B9E23CF8E67-->  <STARTVERSION><![CDATA[2.0.22845]]></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.kernel/src-db/database/sourcedata/AD_TABLE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_TABLE.xml	Tue May 06 13:08:31 2014 +0000
@@ -20,6 +20,7 @@
 <!--0B4D8D299242448DA1EA797FAA617297-->  <ISDEFAULTACCT><![CDATA[N]]></ISDEFAULTACCT>
 <!--0B4D8D299242448DA1EA797FAA617297-->  <AD_PACKAGE_ID><![CDATA[08DD12A80BB942E79C0F3BD94FD3A249]]></AD_PACKAGE_ID>
 <!--0B4D8D299242448DA1EA797FAA617297-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--0B4D8D299242448DA1EA797FAA617297-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--0B4D8D299242448DA1EA797FAA617297--></AD_TABLE>
 
 <!--457C2166008B451093B2DA54A0F7E2EC--><AD_TABLE>
@@ -44,6 +45,7 @@
 <!--457C2166008B451093B2DA54A0F7E2EC-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--457C2166008B451093B2DA54A0F7E2EC-->  <AD_PACKAGE_ID><![CDATA[08DD12A80BB942E79C0F3BD94FD3A249]]></AD_PACKAGE_ID>
 <!--457C2166008B451093B2DA54A0F7E2EC-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--457C2166008B451093B2DA54A0F7E2EC-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--457C2166008B451093B2DA54A0F7E2EC--></AD_TABLE>
 
 <!--558721361A024C3D8156095BD7C2716D--><AD_TABLE>
@@ -65,6 +67,7 @@
 <!--558721361A024C3D8156095BD7C2716D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--558721361A024C3D8156095BD7C2716D-->  <AD_PACKAGE_ID><![CDATA[08DD12A80BB942E79C0F3BD94FD3A249]]></AD_PACKAGE_ID>
 <!--558721361A024C3D8156095BD7C2716D-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--558721361A024C3D8156095BD7C2716D-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--558721361A024C3D8156095BD7C2716D--></AD_TABLE>
 
 <!--AB51D583178F4F4EB6B8DB44C64654BE--><AD_TABLE>
@@ -89,6 +92,7 @@
 <!--AB51D583178F4F4EB6B8DB44C64654BE-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--AB51D583178F4F4EB6B8DB44C64654BE-->  <AD_PACKAGE_ID><![CDATA[08DD12A80BB942E79C0F3BD94FD3A249]]></AD_PACKAGE_ID>
 <!--AB51D583178F4F4EB6B8DB44C64654BE-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--AB51D583178F4F4EB6B8DB44C64654BE-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--AB51D583178F4F4EB6B8DB44C64654BE--></AD_TABLE>
 
 </data>
--- a/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.client.kernel/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml	Tue May 06 13:08:31 2014 +0000
@@ -260,6 +260,16 @@
 <!--A512B3E41AAF4E8D8BE040FD43E01A60-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A512B3E41AAF4E8D8BE040FD43E01A60--></OBCLKER_UIDEFINITION>
 
+<!--A855B13D1C2C4F25A2FBB0D7BB4442E9--><OBCLKER_UIDEFINITION>
+<!--A855B13D1C2C4F25A2FBB0D7BB4442E9-->  <OBCLKER_UIDEFINITION_ID><![CDATA[A855B13D1C2C4F25A2FBB0D7BB4442E9]]></OBCLKER_UIDEFINITION_ID>
+<!--A855B13D1C2C4F25A2FBB0D7BB4442E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A855B13D1C2C4F25A2FBB0D7BB4442E9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A855B13D1C2C4F25A2FBB0D7BB4442E9-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--A855B13D1C2C4F25A2FBB0D7BB4442E9-->  <AD_REFERENCE_ID><![CDATA[478169542A1747BD942DD70C8B45089C]]></AD_REFERENCE_ID>
+<!--A855B13D1C2C4F25A2FBB0D7BB4442E9-->  <CLASSNAME><![CDATA[org.openbravo.client.kernel.reference.AbsoluteDateTimeUIDefinition]]></CLASSNAME>
+<!--A855B13D1C2C4F25A2FBB0D7BB4442E9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A855B13D1C2C4F25A2FBB0D7BB4442E9--></OBCLKER_UIDEFINITION>
+
 <!--AE5BF93C7BC244FAAEF7A76CA305094F--><OBCLKER_UIDEFINITION>
 <!--AE5BF93C7BC244FAAEF7A76CA305094F-->  <OBCLKER_UIDEFINITION_ID><![CDATA[AE5BF93C7BC244FAAEF7A76CA305094F]]></OBCLKER_UIDEFINITION_ID>
 <!--AE5BF93C7BC244FAAEF7A76CA305094F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -280,6 +290,16 @@
 <!--B4F7A519D66D4D9187A71A9DBCD09EAD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--B4F7A519D66D4D9187A71A9DBCD09EAD--></OBCLKER_UIDEFINITION>
 
+<!--B8A726E843FA40AD90255235E30A8E46--><OBCLKER_UIDEFINITION>
+<!--B8A726E843FA40AD90255235E30A8E46-->  <OBCLKER_UIDEFINITION_ID><![CDATA[B8A726E843FA40AD90255235E30A8E46]]></OBCLKER_UIDEFINITION_ID>
+<!--B8A726E843FA40AD90255235E30A8E46-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B8A726E843FA40AD90255235E30A8E46-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B8A726E843FA40AD90255235E30A8E46-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--B8A726E843FA40AD90255235E30A8E46-->  <AD_REFERENCE_ID><![CDATA[8C57A4A2E05F4261A1FADF47C30398AD]]></AD_REFERENCE_ID>
+<!--B8A726E843FA40AD90255235E30A8E46-->  <CLASSNAME><![CDATA[org.openbravo.client.kernel.reference.FKTreeUIDefinition]]></CLASSNAME>
+<!--B8A726E843FA40AD90255235E30A8E46-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B8A726E843FA40AD90255235E30A8E46--></OBCLKER_UIDEFINITION>
+
 <!--B93036D212284E62B29F0DEDAEEB9396--><OBCLKER_UIDEFINITION>
 <!--B93036D212284E62B29F0DEDAEEB9396-->  <OBCLKER_UIDEFINITION_ID><![CDATA[B93036D212284E62B29F0DEDAEEB9396]]></OBCLKER_UIDEFINITION_ID>
 <!--B93036D212284E62B29F0DEDAEEB9396-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -320,6 +340,16 @@
 <!--CE473FFF20B047D2A4464A9FC821D8B9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--CE473FFF20B047D2A4464A9FC821D8B9--></OBCLKER_UIDEFINITION>
 
+<!--DE1AAC08E7F345CEB1BB9C1CA5ABD0D2--><OBCLKER_UIDEFINITION>
+<!--DE1AAC08E7F345CEB1BB9C1CA5ABD0D2-->  <OBCLKER_UIDEFINITION_ID><![CDATA[DE1AAC08E7F345CEB1BB9C1CA5ABD0D2]]></OBCLKER_UIDEFINITION_ID>
+<!--DE1AAC08E7F345CEB1BB9C1CA5ABD0D2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DE1AAC08E7F345CEB1BB9C1CA5ABD0D2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DE1AAC08E7F345CEB1BB9C1CA5ABD0D2-->  <AD_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_MODULE_ID>
+<!--DE1AAC08E7F345CEB1BB9C1CA5ABD0D2-->  <AD_REFERENCE_ID><![CDATA[20D7C424C217463F914DF632E5CF5923]]></AD_REFERENCE_ID>
+<!--DE1AAC08E7F345CEB1BB9C1CA5ABD0D2-->  <CLASSNAME><![CDATA[org.openbravo.client.kernel.reference.AbsoluteTimeUIDefinition]]></CLASSNAME>
+<!--DE1AAC08E7F345CEB1BB9C1CA5ABD0D2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DE1AAC08E7F345CEB1BB9C1CA5ABD0D2--></OBCLKER_UIDEFINITION>
+
 <!--EF8645E319784280BC7DF5CA4E36AD95--><OBCLKER_UIDEFINITION>
 <!--EF8645E319784280BC7DF5CA4E36AD95-->  <OBCLKER_UIDEFINITION_ID><![CDATA[EF8645E319784280BC7DF5CA4E36AD95]]></OBCLKER_UIDEFINITION_ID>
 <!--EF8645E319784280BC7DF5CA4E36AD95-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 13:08:31 2014 +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.21766]]></VERSION>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION><![CDATA[2.1.22845]]></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[MP31]]></VERSION_LABEL>
+<!--2758CD25B2704AF6BBAD10365FC82C06-->  <VERSION_LABEL><![CDATA[PR14Q2]]></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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 06 13:08:31 2014 +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.21766]]></STARTVERSION>
+<!--15F51F03882F444CAB6593B4566DC929-->  <STARTVERSION><![CDATA[2.1.22845]]></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.21766]]></STARTVERSION>
+<!--E71B28FC949D481D9F59C17D01E46EF9-->  <STARTVERSION><![CDATA[3.0.22845]]></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.myob/src-db/database/sourcedata/AD_TABLE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_TABLE.xml	Tue May 06 13:08:31 2014 +0000
@@ -20,6 +20,7 @@
 <!--09C543CF4D854CB4A706E8EF1591F042-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--09C543CF4D854CB4A706E8EF1591F042-->  <AD_PACKAGE_ID><![CDATA[AC67D238397F4F9DA5AE76030C99C05F]]></AD_PACKAGE_ID>
 <!--09C543CF4D854CB4A706E8EF1591F042-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--09C543CF4D854CB4A706E8EF1591F042-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--09C543CF4D854CB4A706E8EF1591F042--></AD_TABLE>
 
 <!--3E14194316E64F89970960B9350907B3--><AD_TABLE>
@@ -42,6 +43,7 @@
 <!--3E14194316E64F89970960B9350907B3-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--3E14194316E64F89970960B9350907B3-->  <AD_PACKAGE_ID><![CDATA[AC67D238397F4F9DA5AE76030C99C05F]]></AD_PACKAGE_ID>
 <!--3E14194316E64F89970960B9350907B3-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--3E14194316E64F89970960B9350907B3-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--3E14194316E64F89970960B9350907B3--></AD_TABLE>
 
 <!--568FD0BE075149A98601DE94E571AABD--><AD_TABLE>
@@ -63,6 +65,7 @@
 <!--568FD0BE075149A98601DE94E571AABD-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--568FD0BE075149A98601DE94E571AABD-->  <AD_PACKAGE_ID><![CDATA[AC67D238397F4F9DA5AE76030C99C05F]]></AD_PACKAGE_ID>
 <!--568FD0BE075149A98601DE94E571AABD-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--568FD0BE075149A98601DE94E571AABD-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--568FD0BE075149A98601DE94E571AABD--></AD_TABLE>
 
 <!--5F20F3D554CA408891C1BA6545114D4D--><AD_TABLE>
@@ -85,6 +88,7 @@
 <!--5F20F3D554CA408891C1BA6545114D4D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--5F20F3D554CA408891C1BA6545114D4D-->  <AD_PACKAGE_ID><![CDATA[AC67D238397F4F9DA5AE76030C99C05F]]></AD_PACKAGE_ID>
 <!--5F20F3D554CA408891C1BA6545114D4D-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--5F20F3D554CA408891C1BA6545114D4D-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--5F20F3D554CA408891C1BA6545114D4D--></AD_TABLE>
 
 <!--74AEBEAB2C284163BCA76CF1E96DBC2C--><AD_TABLE>
@@ -106,6 +110,7 @@
 <!--74AEBEAB2C284163BCA76CF1E96DBC2C-->  <DEVELOPMENTSTATUS><![CDATA[DP]]></DEVELOPMENTSTATUS>
 <!--74AEBEAB2C284163BCA76CF1E96DBC2C-->  <AD_PACKAGE_ID><![CDATA[AC67D238397F4F9DA5AE76030C99C05F]]></AD_PACKAGE_ID>
 <!--74AEBEAB2C284163BCA76CF1E96DBC2C-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--74AEBEAB2C284163BCA76CF1E96DBC2C-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--74AEBEAB2C284163BCA76CF1E96DBC2C--></AD_TABLE>
 
 <!--CF1D8385DC364B97B6A1BA2EE76C8DA1--><AD_TABLE>
@@ -128,6 +133,7 @@
 <!--CF1D8385DC364B97B6A1BA2EE76C8DA1-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--CF1D8385DC364B97B6A1BA2EE76C8DA1-->  <AD_PACKAGE_ID><![CDATA[AC67D238397F4F9DA5AE76030C99C05F]]></AD_PACKAGE_ID>
 <!--CF1D8385DC364B97B6A1BA2EE76C8DA1-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--CF1D8385DC364B97B6A1BA2EE76C8DA1-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--CF1D8385DC364B97B6A1BA2EE76C8DA1--></AD_TABLE>
 
 <!--D1829E5F3A8441BF85DDBC06D49C1074--><AD_TABLE>
@@ -150,6 +156,7 @@
 <!--D1829E5F3A8441BF85DDBC06D49C1074-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--D1829E5F3A8441BF85DDBC06D49C1074-->  <AD_PACKAGE_ID><![CDATA[AC67D238397F4F9DA5AE76030C99C05F]]></AD_PACKAGE_ID>
 <!--D1829E5F3A8441BF85DDBC06D49C1074-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--D1829E5F3A8441BF85DDBC06D49C1074-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--D1829E5F3A8441BF85DDBC06D49C1074--></AD_TABLE>
 
 <!--E1C20B5D1AEB45FEB3D0E4B6C3F8B1A8--><AD_TABLE>
@@ -172,6 +179,7 @@
 <!--E1C20B5D1AEB45FEB3D0E4B6C3F8B1A8-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--E1C20B5D1AEB45FEB3D0E4B6C3F8B1A8-->  <AD_PACKAGE_ID><![CDATA[AC67D238397F4F9DA5AE76030C99C05F]]></AD_PACKAGE_ID>
 <!--E1C20B5D1AEB45FEB3D0E4B6C3F8B1A8-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--E1C20B5D1AEB45FEB3D0E4B6C3F8B1A8-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--E1C20B5D1AEB45FEB3D0E4B6C3F8B1A8--></AD_TABLE>
 
 <!--FF808181314242630131424606130001--><AD_TABLE>
@@ -193,6 +201,7 @@
 <!--FF808181314242630131424606130001-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--FF808181314242630131424606130001-->  <AD_PACKAGE_ID><![CDATA[AC67D238397F4F9DA5AE76030C99C05F]]></AD_PACKAGE_ID>
 <!--FF808181314242630131424606130001-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--FF808181314242630131424606130001-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--FF808181314242630131424606130001--></AD_TABLE>
 
 </data>
--- a/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 13:08:31 2014 +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.21766]]></VERSION>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION><![CDATA[1.0.22845]]></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[MP31]]></VERSION_LABEL>
+<!--0A060B2AF1974E8EAA8DB61388E9AECC-->  <VERSION_LABEL><![CDATA[PR14Q2]]></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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 06 13:08:31 2014 +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.21766]]></STARTVERSION>
+<!--26558497C31140BFAB067BA4BC47D799-->  <STARTVERSION><![CDATA[2.1.22845]]></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.querylist/src-db/database/sourcedata/AD_TABLE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_TABLE.xml	Tue May 06 13:08:31 2014 +0000
@@ -20,6 +20,7 @@
 <!--28B9A36691BA4D4EBCA68E39D5D4B1BE-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--28B9A36691BA4D4EBCA68E39D5D4B1BE-->  <AD_PACKAGE_ID><![CDATA[CB5966CA4E2945FE8CC3138D3934DB9E]]></AD_PACKAGE_ID>
 <!--28B9A36691BA4D4EBCA68E39D5D4B1BE-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--28B9A36691BA4D4EBCA68E39D5D4B1BE-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--28B9A36691BA4D4EBCA68E39D5D4B1BE--></AD_TABLE>
 
 <!--87AB97C7EED3429BBEFE9EF28EFACC08--><AD_TABLE>
@@ -42,6 +43,7 @@
 <!--87AB97C7EED3429BBEFE9EF28EFACC08-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--87AB97C7EED3429BBEFE9EF28EFACC08-->  <AD_PACKAGE_ID><![CDATA[CB5966CA4E2945FE8CC3138D3934DB9E]]></AD_PACKAGE_ID>
 <!--87AB97C7EED3429BBEFE9EF28EFACC08-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--87AB97C7EED3429BBEFE9EF28EFACC08-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--87AB97C7EED3429BBEFE9EF28EFACC08--></AD_TABLE>
 
 <!--8EE7634FA71B40FDB9ADF85374264BF6--><AD_TABLE>
@@ -64,6 +66,7 @@
 <!--8EE7634FA71B40FDB9ADF85374264BF6-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--8EE7634FA71B40FDB9ADF85374264BF6-->  <AD_PACKAGE_ID><![CDATA[CB5966CA4E2945FE8CC3138D3934DB9E]]></AD_PACKAGE_ID>
 <!--8EE7634FA71B40FDB9ADF85374264BF6-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--8EE7634FA71B40FDB9ADF85374264BF6-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--8EE7634FA71B40FDB9ADF85374264BF6--></AD_TABLE>
 
 </data>
--- a/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 13:08:31 2014 +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.21766]]></VERSION>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION><![CDATA[0.0.22845]]></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[MP31]]></VERSION_LABEL>
+<!--FF8080812D842086012D844F3CC0003E-->  <VERSION_LABEL><![CDATA[PR14Q2]]></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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.client.widgets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 06 13:08:31 2014 +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.21766]]></STARTVERSION>
+<!--FF8080812D842086012D845002070046-->  <STARTVERSION><![CDATA[2.1.22845]]></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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 13:08:31 2014 +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.21766]]></VERSION>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION><![CDATA[3.0.22845]]></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[MP31]]></VERSION_LABEL>
+<!--2A5EE903D7974AC298C0504FBC4501A7-->  <VERSION_LABEL><![CDATA[PR14Q2]]></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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 06 13:08:31 2014 +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.21766]]></STARTVERSION>
+<!--A3B449C4D5FE4D688CC58236FE33B802-->  <STARTVERSION><![CDATA[3.0.22845]]></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.financial.paymentreport/src-db/database/sourcedata/AD_PROCESS.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_PROCESS.xml	Tue May 06 13:08:31 2014 +0000
@@ -20,6 +20,7 @@
 <!--6AD04479EC134BD4826077F36B709876-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--6AD04479EC134BD4826077F36B709876-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--6AD04479EC134BD4826077F36B709876-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--6AD04479EC134BD4826077F36B709876-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--6AD04479EC134BD4826077F36B709876--></AD_PROCESS>
 
 </data>
--- a/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 13:08:31 2014 +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.21766]]></VERSION>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION><![CDATA[1.1.22845]]></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[MP31]]></VERSION_LABEL>
+<!--3A3A943684D64DEF9EC39F588A656848-->  <VERSION_LABEL><![CDATA[PR14Q2]]></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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 06 13:08:31 2014 +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.21766]]></STARTVERSION>
+<!--64060E9EE9EC408BBFFD0CC2DE25C86F-->  <STARTVERSION><![CDATA[3.0.22845]]></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.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_PROCESS.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_PROCESS.xml	Tue May 06 13:08:31 2014 +0000
@@ -20,6 +20,7 @@
 <!--3DAA5E63A30D45A8ABF87701F8BD91EF-->  <UIPATTERN><![CDATA[M]]></UIPATTERN>
 <!--3DAA5E63A30D45A8ABF87701F8BD91EF-->  <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE>
 <!--3DAA5E63A30D45A8ABF87701F8BD91EF-->  <PREVENTCONCURRENT><![CDATA[N]]></PREVENTCONCURRENT>
+<!--3DAA5E63A30D45A8ABF87701F8BD91EF-->  <IS_EXPLICIT_ACCESS><![CDATA[N]]></IS_EXPLICIT_ACCESS>
 <!--3DAA5E63A30D45A8ABF87701F8BD91EF--></AD_PROCESS>
 
 </data>
--- a/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MESSAGE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MESSAGE.xml	Tue May 06 13:08:31 2014 +0000
@@ -1,5 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <data>
+<!--C870CF6294D94AB190FFF0CDF46B1568--><AD_MESSAGE>
+<!--C870CF6294D94AB190FFF0CDF46B1568-->  <AD_MESSAGE_ID><![CDATA[C870CF6294D94AB190FFF0CDF46B1568]]></AD_MESSAGE_ID>
+<!--C870CF6294D94AB190FFF0CDF46B1568-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C870CF6294D94AB190FFF0CDF46B1568-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C870CF6294D94AB190FFF0CDF46B1568-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C870CF6294D94AB190FFF0CDF46B1568-->  <VALUE><![CDATA[OBSERDS_ReparentNotInDevTreeNode]]></VALUE>
+<!--C870CF6294D94AB190FFF0CDF46B1568-->  <MSGTEXT><![CDATA[The node must belong to a module that is in development in order to be reparented.]]></MSGTEXT>
+<!--C870CF6294D94AB190FFF0CDF46B1568-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--C870CF6294D94AB190FFF0CDF46B1568-->  <AD_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_MODULE_ID>
+<!--C870CF6294D94AB190FFF0CDF46B1568-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--C870CF6294D94AB190FFF0CDF46B1568--></AD_MESSAGE>
+
 <!--E7DFBB17F3104D5EA18467453C976C7A--><AD_MESSAGE>
 <!--E7DFBB17F3104D5EA18467453C976C7A-->  <AD_MESSAGE_ID><![CDATA[E7DFBB17F3104D5EA18467453C976C7A]]></AD_MESSAGE_ID>
 <!--E7DFBB17F3104D5EA18467453C976C7A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 13:08:31 2014 +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.21766]]></VERSION>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION><![CDATA[2.1.22845]]></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[MP31]]></VERSION_LABEL>
+<!--A44B9BA75C354D8FB2E3F7D6EB6BFDC4-->  <VERSION_LABEL><![CDATA[PR14Q2]]></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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 06 13:08:31 2014 +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.21766]]></STARTVERSION>
+<!--0BA071C783CC4984AC9C03BB7CAA87C7-->  <STARTVERSION><![CDATA[1.1.22845]]></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.21766]]></STARTVERSION>
+<!--3E531F0CD0A54130996F5AF3B6A2D01B-->  <STARTVERSION><![CDATA[2.0.22845]]></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.21766]]></STARTVERSION>
+<!--4FCE95802A854F7E8623AFF7C33D13EE-->  <STARTVERSION><![CDATA[3.0.22845]]></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.21766]]></STARTVERSION>
+<!--54AF8B39C55E4E7496902893ECD82786-->  <STARTVERSION><![CDATA[2.1.22845]]></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.21766]]></STARTVERSION>
+<!--D03C56D8A4E14F45A5466350E05C631F-->  <STARTVERSION><![CDATA[8.1.22845]]></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.datasource/src-db/database/sourcedata/AD_TABLE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_TABLE.xml	Tue May 06 13:08:31 2014 +0000
@@ -22,6 +22,7 @@
 <!--B3283A801AAC411582CAAF6B99640CD8-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--B3283A801AAC411582CAAF6B99640CD8-->  <AD_PACKAGE_ID><![CDATA[6410C86F580143D3B981F18A4B9C53EA]]></AD_PACKAGE_ID>
 <!--B3283A801AAC411582CAAF6B99640CD8-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--B3283A801AAC411582CAAF6B99640CD8-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--B3283A801AAC411582CAAF6B99640CD8--></AD_TABLE>
 
 <!--FC969D8F4327475095917840EC155462--><AD_TABLE>
@@ -45,6 +46,7 @@
 <!--FC969D8F4327475095917840EC155462-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--FC969D8F4327475095917840EC155462-->  <AD_PACKAGE_ID><![CDATA[6410C86F580143D3B981F18A4B9C53EA]]></AD_PACKAGE_ID>
 <!--FC969D8F4327475095917840EC155462-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--FC969D8F4327475095917840EC155462-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--FC969D8F4327475095917840EC155462--></AD_TABLE>
 
 </data>
--- a/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 13:08:31 2014 +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.21766]]></VERSION>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION><![CDATA[0.1.22845]]></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.
@@ -18,7 +18,7 @@
 <!--FF8080813129ADA401312CA1222A0005-->  <HASCHARTOFACCOUNTS><![CDATA[N]]></HASCHARTOFACCOUNTS>
 <!--FF8080813129ADA401312CA1222A0005-->  <ISTRANSLATIONMODULE><![CDATA[N]]></ISTRANSLATIONMODULE>
 <!--FF8080813129ADA401312CA1222A0005-->  <HASREFERENCEDATA><![CDATA[N]]></HASREFERENCEDATA>
-<!--FF8080813129ADA401312CA1222A0005-->  <VERSION_LABEL><![CDATA[MP31]]></VERSION_LABEL>
+<!--FF8080813129ADA401312CA1222A0005-->  <VERSION_LABEL><![CDATA[PR14Q2]]></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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 06 13:08:31 2014 +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.21766]]></STARTVERSION>
+<!--FF8080813141B198013141BA0F7D0012-->  <STARTVERSION><![CDATA[0.1.22845]]></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.21766]]></STARTVERSION>
+<!--FF8080813151AEE1013151C4ACE6001B-->  <STARTVERSION><![CDATA[2.1.22845]]></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.google/src-db/database/sourcedata/AD_TABLE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.service.integration.google/src-db/database/sourcedata/AD_TABLE.xml	Tue May 06 13:08:31 2014 +0000
@@ -19,6 +19,7 @@
 <!--FF8080813161A3D301316206A5840008-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--FF8080813161A3D301316206A5840008-->  <AD_PACKAGE_ID><![CDATA[FF8080813129ADA401312CAC54900029]]></AD_PACKAGE_ID>
 <!--FF8080813161A3D301316206A5840008-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--FF8080813161A3D301316206A5840008-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--FF8080813161A3D301316206A5840008--></AD_TABLE>
 
 </data>
--- a/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 13:08:31 2014 +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.21766]]></VERSION>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION><![CDATA[0.1.22845]]></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[MP31]]></VERSION_LABEL>
+<!--FF8080813141B198013141B86DD70003-->  <VERSION_LABEL><![CDATA[PR14Q2]]></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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 06 13:08:31 2014 +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.21766]]></STARTVERSION>
+<!--FF8080813141B198013141B8B21B0006-->  <STARTVERSION><![CDATA[3.0.22845]]></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.integration.openid/src-db/database/sourcedata/AD_TABLE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.service.integration.openid/src-db/database/sourcedata/AD_TABLE.xml	Tue May 06 13:08:31 2014 +0000
@@ -19,6 +19,7 @@
 <!--FF808081314B80C001314B976A49000C-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--FF808081314B80C001314B976A49000C-->  <AD_PACKAGE_ID><![CDATA[FF808081314B80C001314B95ADB90008]]></AD_PACKAGE_ID>
 <!--FF808081314B80C001314B976A49000C-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--FF808081314B80C001314B976A49000C-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--FF808081314B80C001314B976A49000C--></AD_TABLE>
 
 </data>
--- a/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 13:08:31 2014 +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.21766]]></VERSION>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION><![CDATA[2.0.22845]]></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[MP31]]></VERSION_LABEL>
+<!--F8D1B3ECB3474E8DA5C216473C840DF1-->  <VERSION_LABEL><![CDATA[PR14Q2]]></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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 06 13:08:31 2014 +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.21766]]></STARTVERSION>
+<!--9E3E7B42DB16405FB794496D309D7044-->  <STARTVERSION><![CDATA[3.0.22845]]></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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 13:08:31 2014 +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.21766]]></VERSION>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION><![CDATA[2.1.22845]]></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[MP31]]></VERSION_LABEL>
+<!--5EB4F15C80684ACA904756BDC12ADBE5-->  <VERSION_LABEL><![CDATA[PR14Q2]]></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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 06 13:08:31 2014 +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.21766]]></STARTVERSION>
+<!--38825CAED43941D38CA0C78DB04FCFA0-->  <STARTVERSION><![CDATA[8.1.22845]]></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.21766]]></STARTVERSION>
+<!--6DDE7B1A70174242AF82B5022FB89279-->  <STARTVERSION><![CDATA[2.1.22845]]></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.21766]]></STARTVERSION>
+<!--94F9CD2CB5EF4467A67475C786C984A7-->  <STARTVERSION><![CDATA[2.1.22845]]></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.21766]]></STARTVERSION>
+<!--BCCB5A08EC0446DE8BCE191C6BC607A4-->  <STARTVERSION><![CDATA[1.1.22845]]></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.21766]]></STARTVERSION>
+<!--C8DAC574B88649D08C9468521B343F12-->  <STARTVERSION><![CDATA[3.0.22845]]></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.21766]]></STARTVERSION>
+<!--F14EB17946BE4724A46F80CB1A47EC70-->  <STARTVERSION><![CDATA[2.1.22845]]></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.selector/src-db/database/sourcedata/AD_TABLE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_TABLE.xml	Tue May 06 13:08:31 2014 +0000
@@ -21,6 +21,7 @@
 <!--2AB26D8C93234EDFA52778276242BBA2-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--2AB26D8C93234EDFA52778276242BBA2-->  <AD_PACKAGE_ID><![CDATA[2F1EAE1A2DA24B9DBEA1E9E59E8C9DA4]]></AD_PACKAGE_ID>
 <!--2AB26D8C93234EDFA52778276242BBA2-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--2AB26D8C93234EDFA52778276242BBA2-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--2AB26D8C93234EDFA52778276242BBA2--></AD_TABLE>
 
 <!--7E50FCF61A884C9D966D1348705EC17C--><AD_TABLE>
@@ -44,6 +45,7 @@
 <!--7E50FCF61A884C9D966D1348705EC17C-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--7E50FCF61A884C9D966D1348705EC17C-->  <AD_PACKAGE_ID><![CDATA[2F1EAE1A2DA24B9DBEA1E9E59E8C9DA4]]></AD_PACKAGE_ID>
 <!--7E50FCF61A884C9D966D1348705EC17C-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--7E50FCF61A884C9D966D1348705EC17C-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--7E50FCF61A884C9D966D1348705EC17C--></AD_TABLE>
 
 <!--956C43EAF12D44EBA06071EF0610FA15--><AD_TABLE>
@@ -67,6 +69,7 @@
 <!--956C43EAF12D44EBA06071EF0610FA15-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--956C43EAF12D44EBA06071EF0610FA15-->  <AD_PACKAGE_ID><![CDATA[2F1EAE1A2DA24B9DBEA1E9E59E8C9DA4]]></AD_PACKAGE_ID>
 <!--956C43EAF12D44EBA06071EF0610FA15-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--956C43EAF12D44EBA06071EF0610FA15-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--956C43EAF12D44EBA06071EF0610FA15--></AD_TABLE>
 
 <!--A2F880F9981349E2A6A57BD58267EBCE--><AD_TABLE>
@@ -90,6 +93,7 @@
 <!--A2F880F9981349E2A6A57BD58267EBCE-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--A2F880F9981349E2A6A57BD58267EBCE-->  <AD_PACKAGE_ID><![CDATA[2F1EAE1A2DA24B9DBEA1E9E59E8C9DA4]]></AD_PACKAGE_ID>
 <!--A2F880F9981349E2A6A57BD58267EBCE-->  <DATAORIGINTYPE><![CDATA[Table]]></DATAORIGINTYPE>
+<!--A2F880F9981349E2A6A57BD58267EBCE-->  <ISTREE><![CDATA[N]]></ISTREE>
 <!--A2F880F9981349E2A6A57BD58267EBCE--></AD_TABLE>
 
 </data>
--- a/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 13:08:31 2014 +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.21766]]></VERSION>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION><![CDATA[2.0.22845]]></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[MP31]]></VERSION_LABEL>
+<!--96998CBC42744B3DBEE28AC8095C9335-->  <VERSION_LABEL><![CDATA[PR14Q2]]></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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.userinterface.skin.250to300Comp/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 06 13:08:31 2014 +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.21766]]></STARTVERSION>
+<!--39BF75AD9AB3453698BF5DE29E727AA9-->  <STARTVERSION><![CDATA[3.0.22845]]></STARTVERSION>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
 <!--39BF75AD9AB3453698BF5DE29E727AA9-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MESSAGE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MESSAGE.xml	Tue May 06 13:08:31 2014 +0000
@@ -486,7 +486,7 @@
 <!--810E2C3850AF44FC8A14D1C907BFC2A8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--810E2C3850AF44FC8A14D1C907BFC2A8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--810E2C3850AF44FC8A14D1C907BFC2A8-->  <VALUE><![CDATA[OBUISC_ListGrid.groupByText]]></VALUE>
-<!--810E2C3850AF44FC8A14D1C907BFC2A8-->  <MSGTEXT><![CDATA[Group by ${viewer.getSummaryTitle(field)}]]></MSGTEXT>
+<!--810E2C3850AF44FC8A14D1C907BFC2A8-->  <MSGTEXT><![CDATA[Group by ${title}]]></MSGTEXT>
 <!--810E2C3850AF44FC8A14D1C907BFC2A8-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--810E2C3850AF44FC8A14D1C907BFC2A8-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--810E2C3850AF44FC8A14D1C907BFC2A8-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
@@ -786,7 +786,7 @@
 <!--D6FC3718D50D463DAE7E7A7B67D348C0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--D6FC3718D50D463DAE7E7A7B67D348C0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D6FC3718D50D463DAE7E7A7B67D348C0-->  <VALUE><![CDATA[OBUISC_ListGrid.unfreezeFieldText]]></VALUE>
-<!--D6FC3718D50D463DAE7E7A7B67D348C0-->  <MSGTEXT><![CDATA[Unfreeze ${viewer.getSummaryTitle(field)}]]></MSGTEXT>
+<!--D6FC3718D50D463DAE7E7A7B67D348C0-->  <MSGTEXT><![CDATA[Unfreeze ${title}]]></MSGTEXT>
 <!--D6FC3718D50D463DAE7E7A7B67D348C0-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--D6FC3718D50D463DAE7E7A7B67D348C0-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--D6FC3718D50D463DAE7E7A7B67D348C0-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
@@ -822,7 +822,7 @@
 <!--E93E72E829124C699B64401EEA1F4884-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--E93E72E829124C699B64401EEA1F4884-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E93E72E829124C699B64401EEA1F4884-->  <VALUE><![CDATA[OBUISC_ListGrid.freezeFieldText]]></VALUE>
-<!--E93E72E829124C699B64401EEA1F4884-->  <MSGTEXT><![CDATA[Freeze ${viewer.getSummaryTitle(field)}]]></MSGTEXT>
+<!--E93E72E829124C699B64401EEA1F4884-->  <MSGTEXT><![CDATA[Freeze ${title}]]></MSGTEXT>
 <!--E93E72E829124C699B64401EEA1F4884-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--E93E72E829124C699B64401EEA1F4884-->  <AD_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_MODULE_ID>
 <!--E93E72E829124C699B64401EEA1F4884-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
--- a/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 13:08:31 2014 +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.21766]]></VERSION>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION><![CDATA[8.1.22845]]></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[MP31]]></VERSION_LABEL>
+<!--EC356CEE3D46416CA1EBEEB9AB82EDB9-->  <VERSION_LABEL><![CDATA[PR14Q2]]></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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 06 13:08:31 2014 +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.21766]]></STARTVERSION>
+<!--086331E18477496B8AC74D2CFEBD1307-->  <STARTVERSION><![CDATA[3.0.22845]]></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.21766]]></STARTVERSION>
+<!--DC5D4EF450244482BD2B458DAA496333-->  <STARTVERSION><![CDATA[2.1.22845]]></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.21766]]></STARTVERSION>
+<!--F2AF15C0AF5540E393D96BE506E20648-->  <STARTVERSION><![CDATA[1.1.22845]]></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.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 13:08:31 2014 +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.21766]]></VERSION>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION><![CDATA[3.0.22845]]></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[MP31]]></VERSION_LABEL>
+<!--883B5872CA0548F9AF2BBBE7D2DDFA61-->  <VERSION_LABEL><![CDATA[PR14Q2]]></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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 06 13:08:31 2014 +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.21766]]></STARTVERSION>
+<!--148A000EE9A04A3CA653B1296A00B8E6-->  <STARTVERSION><![CDATA[3.0.22845]]></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.21766]]></STARTVERSION>
+<!--30F966407A6F4E15965821BAEE34D25B-->  <STARTVERSION><![CDATA[3.0.22845]]></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.21766]]></STARTVERSION>
+<!--F93CE30003B24F8F8886510B0065EECC-->  <STARTVERSION><![CDATA[1.1.22845]]></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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 13:08:31 2014 +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.21766]]></VERSION>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION><![CDATA[2.1.22845]]></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[MP31]]></VERSION_LABEL>
+<!--7E48CDD73B7E493A8BED4F7253E7C989-->  <VERSION_LABEL><![CDATA[PR14Q2]]></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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 06 13:08:31 2014 +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.21766]]></STARTVERSION>
+<!--01E1BCCEC9114DE0960538DF34E30E6F-->  <STARTVERSION><![CDATA[2.1.22845]]></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.21766]]></STARTVERSION>
+<!--025B181F63CA47B48A920F6983242390-->  <STARTVERSION><![CDATA[3.0.22845]]></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.21766]]></STARTVERSION>
+<!--054B4FEAF919478AA3FF27098A46D1D6-->  <STARTVERSION><![CDATA[2.1.22845]]></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.21766]]></STARTVERSION>
+<!--1FA6BAA6DC3A4434A6E62A0D1319A9D7-->  <STARTVERSION><![CDATA[1.0.22845]]></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.21766]]></STARTVERSION>
+<!--224754C3EF674C93B0D468F47BAAB824-->  <STARTVERSION><![CDATA[2.1.22845]]></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.21766]]></STARTVERSION>
+<!--5B72D24032DD4879A950194139D961B6-->  <STARTVERSION><![CDATA[2.1.22845]]></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.21766]]></STARTVERSION>
+<!--8730CA6A4224439D82E0DD31B3806E36-->  <STARTVERSION><![CDATA[1.0.22845]]></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.21766]]></STARTVERSION>
+<!--98C47FF058F8413B8A2B26036061446E-->  <STARTVERSION><![CDATA[8.1.22845]]></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.21766]]></STARTVERSION>
+<!--A6D7BA917B3B4DEABD7CA1BA00B01E8A-->  <STARTVERSION><![CDATA[2.0.22845]]></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.21766]]></STARTVERSION>
+<!--A9CB99330AF34944877F889DD8A0AB3C-->  <STARTVERSION><![CDATA[2.1.22845]]></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.21766]]></STARTVERSION>
+<!--E72A053A403C4A98A189C105B850ADB0-->  <STARTVERSION><![CDATA[1.1.22845]]></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.21766]]></STARTVERSION>
+<!--F62443FC17DA4C0E84FBCA9F2E5B68C0-->  <STARTVERSION><![CDATA[2.0.22845]]></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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml	Tue May 06 13:08:31 2014 +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.21766]]></VERSION>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION><![CDATA[3.0.22845]]></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[MP31]]></VERSION_LABEL>
+<!--0138E7A89B5E4DC3932462252801FFBC-->  <VERSION_LABEL><![CDATA[PR14Q2]]></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 May 06 11:16:26 2014 +0200
+++ b/model/modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml	Tue May 06 13:08:31 2014 +0000
@@ -7,7 +7,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.21766]]></STARTVERSION>
+<!--4D11E3A70650475381139522373CD191-->  <STARTVERSION><![CDATA[2.1.22845]]></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>
@@ -21,7 +21,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.21766]]></STARTVERSION>
+<!--52CE523C40634C47A99C6EBBD9C3125C-->  <STARTVERSION><![CDATA[3.0.22845]]></STARTVERSION>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <DEPENDANT_MODULE_NAME><![CDATA[Payment Report]]></DEPENDANT_MODULE_NAME>
 <!--52CE523C40634C47A99C6EBBD9C3125C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -35,7 +35,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.21766]]></STARTVERSION>
+<!--60834727BB114764ACEF019F40A34562-->  <STARTVERSION><![CDATA[1.1.22845]]></STARTVERSION>
 <!--60834727BB114764ACEF019F40A34562-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--60834727BB114764ACEF019F40A34562-->  <DEPENDANT_MODULE_NAME><![CDATA[Orders Awaiting Delivery]]></DEPENDANT_MODULE_NAME>
 <!--60834727BB114764ACEF019F40A34562-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -49,7 +49,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.21766]]></STARTVERSION>
+<!--8418885E97D643138B6D907671351E3D-->  <STARTVERSION><![CDATA[3.0.22845]]></STARTVERSION>
 <!--8418885E97D643138B6D907671351E3D-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--8418885E97D643138B6D907671351E3D-->  <DEPENDANT_MODULE_NAME><![CDATA[Standard Roles]]></DEPENDANT_MODULE_NAME>
 <!--8418885E97D643138B6D907671351E3D-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -63,7 +63,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.21766]]></STARTVERSION>
+<!--A32F3279B3374FC0A6CFEA2368BB7053-->  <STARTVERSION><![CDATA[3.0.22845]]></STARTVERSION>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
 <!--A32F3279B3374FC0A6CFEA2368BB7053-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MINOR]]></DEPENDENCY_ENFORCEMENT>
@@ -77,7 +77,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.21766]]></STARTVERSION>
+<!--ED06CE9F2AFD4092871D9E9494AF42DD-->  <STARTVERSION><![CDATA[3.0.22845]]></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>
@@ -91,7 +91,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.21766]]></STARTVERSION>
+<!--FF8080813189932B013189B45B59003A-->  <STARTVERSION><![CDATA[0.1.22845]]></STARTVERSION>
 <!--FF8080813189932B013189B45B59003A-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDANT_MODULE_NAME><![CDATA[OpenID Service Integration]]></DEPENDANT_MODULE_NAME>
 <!--FF8080813189932B013189B45B59003A-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
@@ -105,7 +105,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.21766]]></STARTVERSION>
+<!--FF8080813189932B013189B4C00F003D-->  <STARTVERSION><![CDATA[0.1.22845]]></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>
@@ -119,7 +119,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.21766]]></STARTVERSION>
+<!--FF8081812E2F6F3C012E2F750109001C-->  <STARTVERSION><![CDATA[0.0.22845]]></STARTVERSION>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <ISINCLUDED><![CDATA[Y]]></ISINCLUDED>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDANT_MODULE_NAME><![CDATA[Widgets Collection]]></DEPENDANT_MODULE_NAME>
 <!--FF8081812E2F6F3C012E2F750109001C-->  <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
--- a/model/src-db/database/model/functions/AD_GET_ORG_LE_BU.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/functions/AD_GET_ORG_LE_BU.xml	Tue May 06 13:08:31 2014 +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) 2012 Openbravo SLU
+* All portions are Copyright (C) 2012-2014 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -47,7 +47,7 @@
       WHERE hh.node_id=v_org_header_id
         AND ad_org.isready='Y'
         AND EXISTS (SELECT 1 FROM ad_tree
-                    WHERE ad_tree.treetype='OO'
+                    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;
@@ -64,7 +64,7 @@
       WHERE hh.node_id=v_org_header_id
         AND ad_org.isready='Y'
         AND EXISTS (SELECT 1 FROM ad_tree
-                    WHERE ad_tree.treetype='OO'
+                    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;
@@ -81,7 +81,7 @@
       WHERE hh.node_id=v_org_header_id
         AND ad_org.isready='Y'
         AND EXISTS (SELECT 1 FROM ad_tree
-                    WHERE ad_tree.treetype='OO'
+                    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;
--- a/model/src-db/database/model/functions/AD_ORGTYPE_ISLE_ISBU.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/functions/AD_ORGTYPE_ISLE_ISBU.xml	Tue May 06 13:08:31 2014 +0000
@@ -13,7 +13,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2009 Openbravo SLU
+* All portions are Copyright (C) 2009-2014 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -40,7 +40,7 @@
                    WHERE pp.node_id = hh.parent_id
                    AND hh.ad_tree_id = pp.ad_tree_id
                    AND hh.parent_id=ad_org.ad_org_id 
-                   AND  EXISTS (SELECT 1 FROM ad_tree WHERE treetype='OO' AND hh.Ad_tree_id=ad_tree.ad_tree_id))
+                   AND  EXISTS (SELECT 1 FROM ad_tree WHERE ad_table_id='155' AND hh.Ad_tree_id=ad_tree.ad_tree_id))
   )
 
   LOOP
@@ -71,7 +71,7 @@
                   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.treetype='OO'
+                  AND ad_tree.ad_table_id='155'
                   AND t.ad_tree_id=ad_tree.ad_tree_id
                   );
                   
--- a/model/src-db/database/model/functions/AD_ORGTYPE_ISTRANS_ALLOWED.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/functions/AD_ORGTYPE_ISTRANS_ALLOWED.xml	Tue May 06 13:08:31 2014 +0000
@@ -13,7 +13,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2008 Openbravo SLU
+* All portions are Copyright (C) 2008-2014 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/      
@@ -63,7 +63,7 @@
                   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.treetype='OO'
+                  AND ad_tree.ad_table_id='155'
                   AND t.ad_tree_id=ad_tree.ad_tree_id
                   );
       
--- a/model/src-db/database/model/functions/AD_ORG_CHK_CALENDAR.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/functions/AD_ORG_CHK_CALENDAR.xml	Tue May 06 13:08:31 2014 +0000
@@ -13,7 +13,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2008-2009 Openbravo SLU
+* All portions are Copyright (C) 2008-2014 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/      
@@ -68,7 +68,7 @@
                   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.treetype='OO'
+                  AND ad_tree.ad_table_id='155'
                   AND t.ad_tree_id=ad_tree.ad_tree_id
                   AND IsReady='Y'
                   );
--- a/model/src-db/database/model/functions/AD_ORG_CHK_READY.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/functions/AD_ORG_CHK_READY.xml	Tue May 06 13:08:31 2014 +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 Openbravo SLU
+* All portions are Copyright (C) 2008-2014 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -41,7 +41,7 @@
                 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.treetype='OO'
+                AND ad_tree.ad_table_id='155'
                 AND t.ad_tree_id=ad_tree.ad_tree_id
                 );
     
--- a/model/src-db/database/model/functions/AD_ORG_CHK_SCHEMAS.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/functions/AD_ORG_CHK_SCHEMAS.xml	Tue May 06 13:08:31 2014 +0000
@@ -13,7 +13,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2008-2009 Openbravo SLU
+* All portions are Copyright (C) 2008-2014 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/      
@@ -57,7 +57,7 @@
                   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.treetype='OO'
+                  AND ad_tree.ad_table_id='155'
                   AND t.ad_tree_id=ad_tree.ad_tree_id
                   AND AD_Org.IsReady='Y'
                   );
--- a/model/src-db/database/model/functions/AD_ORG_GETCALENDAROWNER.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/functions/AD_ORG_GETCALENDAROWNER.xml	Tue May 06 13:08:31 2014 +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 Openbravo SLU
+* All portions are Copyright (C) 2008-2014 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -49,7 +49,7 @@
                   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.treetype='OO'
+                  AND ad_tree.ad_table_id='155'
                   AND t.ad_tree_id=ad_tree.ad_tree_id
                   );
 
--- a/model/src-db/database/model/functions/AD_ORG_GETPERIODCONTROLALLOW.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/functions/AD_ORG_GETPERIODCONTROLALLOW.xml	Tue May 06 13:08:31 2014 +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) 2009 Openbravo SLU
+* All portions are Copyright (C) 2009-2014 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -49,7 +49,7 @@
                   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.treetype='OO'
+                  AND ad_tree.ad_table_id='155'
                   AND t.ad_tree_id=ad_tree.ad_tree_id
                   );
 
--- a/model/src-db/database/model/functions/C_ACCTSCHEMA_DEFAULT_COPY.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/functions/C_ACCTSCHEMA_DEFAULT_COPY.xml	Tue May 06 13:08:31 2014 +0000
@@ -25,7 +25,7 @@
   * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
   * All Rights Reserved.
   * Contributor(s): Openbravo SLU
-  * Contributions are Copyright (C) 2001-2012 Openbravo, S.L.U.
+  * Contributions are Copyright (C) 2001-2014 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -359,6 +359,8 @@
         T_Credit_Acct=Cur_Acct.T_Credit_Acct,
         T_Receivables_Acct=Cur_Acct.T_Receivables_Acct,
         T_Expense_Acct=Cur_Acct.T_Expense_Acct,
+        T_Due_Trans_Acct=Cur_Acct.T_Due_Trans_Acct,
+        T_Credit_Trans_Acct=Cur_Acct.T_Credit_Trans_Acct,
         Updated=now(),
         UpdatedBy='0'
       WHERE C_Tax_Acct.C_AcctSchema_ID=Cur_Acct.C_AcctSchema_ID
@@ -374,12 +376,14 @@
           C_Tax_Acct_ID, C_Tax_ID, C_AcctSchema_ID, AD_Client_ID, AD_Org_ID,
           IsActive, Created, CreatedBy, Updated,
           UpdatedBy, T_Due_Acct, T_Liability_Acct, T_Credit_Acct,
-          T_Receivables_Acct, T_Expense_Acct
+          T_Receivables_Acct, T_Expense_Acct,
+          T_Due_Trans_Acct, T_Credit_Trans_Acct
         )
       SELECT get_uuid(), x.C_Tax_ID, Cur_Acct.C_AcctSchema_ID, x.AD_Client_ID, x.AD_Org_ID,
         'Y', now(), '0', now(), '0',
         Cur_Acct.T_Due_Acct, Cur_Acct.T_Liability_Acct, Cur_Acct.T_Credit_Acct, Cur_Acct.T_Receivables_Acct,
-        Cur_Acct.T_Expense_Acct
+        Cur_Acct.T_Expense_Acct,
+        Cur_Acct.T_Due_Trans_Acct, Cur_Acct.T_Credit_Trans_Acct
       FROM C_Tax x
       WHERE AD_Client_ID=Cur_Acct.AD_Client_ID
         AND NOT EXISTS
--- a/model/src-db/database/model/functions/C_GETTAX.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/functions/C_GETTAX.xml	Tue May 06 13:08:31 2014 +0000
@@ -200,14 +200,14 @@
           FROM  (SELECT C_Tax_ID, C_Country_ID, C_Region_ID, To_Country_Id,
                    To_Region_ID, ValidFrom, C_TaxCategory_ID,
                    Parent_Tax_ID, C_BP_TaxCategory_ID, SoPoType, c_Tax.ad_org_id,c_Tax.ad_client_id,IsDefault,
-                   isCashVAT
+                   isCashVAT, isWithholdingTax, rate
                  FROM c_Tax
                 WHERE c_Tax.isActive = 'Y'
                  UNION
                  SELECT tz.C_Tax_ID, tz.From_Country_ID, tz.From_Region_ID, tz.To_Country_ID,
                    tz.To_Region_ID, ValidFrom, C_TaxCategory_ID,
                    Parent_Tax_Id, C_BP_TaxCategory_ID, ct.SoPoType, ct.ad_org_id,ct.ad_client_id,ct.IsDefault,
-                   isCashVAT
+                   ct.isCashVAT, ct.isWithholdingTax, ct.rate
                  FROM c_Tax_Zone tz,
                       c_Tax ct
                  WHERE tz.C_Tax_ID = ct.C_Tax_ID
@@ -228,7 +228,7 @@
          --   AND ((t.C_BP_TaxCategory_ID = v_BPTaxCategory) OR (v_BPTaxCategory IS NULL))
             AND ((t.C_BP_TaxCategory_ID IS NOT NULL AND t.C_BP_TaxCategory_ID = v_BPTaxCategory) OR (t.C_BP_TaxCategory_ID IS NULL))
             AND (SoPoType = 'B' OR (SoPoType =(case when p_IsSOTrx='Y' then 'S' else 'P' end)))
-            AND t.isCashVAT = v_IsCashVAT
+            AND (t.isCashVAT = v_IsCashVAT OR (t.isCashVAT = 'N' and (t.isWithholdingTax = 'Y' or t.rate=0)))
           ORDER BY ad_isorgincluded(p_org_id, t.ad_org_id,t.ad_client_id),t.C_BP_TaxCategory_ID, t.IsDefault DESC,t.C_Country_ID, t.To_Country_ID, t.C_Region_ID, t.To_Region_ID, t.ValidFrom DESC
           )
         LOOP
@@ -242,14 +242,14 @@
               (SELECT C_Tax_ID, C_Country_ID, C_Region_ID, To_Country_Id,
                 To_Region_ID, ValidFrom, C_TaxCategory_ID,
                 Parent_Tax_ID, C_BP_TaxCategory_ID, SoPoType, c_Tax.ad_org_id,c_Tax.ad_client_id,IsDefault,
-                isCashVAT
+                isCashVAT, isWithholdingTax, rate
               FROM c_Tax
               WHERE c_Tax.isActive = 'Y'
               UNION
               SELECT tz.C_Tax_ID, tz.From_Country_ID, tz.From_Region_ID, tz.To_Country_ID,
                 tz.To_Region_ID, ValidFrom, C_TaxCategory_ID,
                 Parent_Tax_Id, C_BP_TaxCategory_ID, SoPoType, ct.ad_org_id, ct.ad_client_id,ct.IsDefault,
-                isCashVAT
+                ct.isCashVAT, ct.isWithholdingTax, ct.rate
               FROM c_Tax_Zone tz,
                 c_Tax ct
               WHERE tz.C_Tax_ID = ct.C_Tax_ID
@@ -271,7 +271,7 @@
               --AND ((t.C_BP_TaxCategory_ID = v_BPTaxCategory) OR (v_BPTaxCategory IS NULL))
               AND ((t.C_BP_TaxCategory_ID IS NOT NULL AND t.C_BP_TaxCategory_ID = v_BPTaxCategory) OR (t.C_BP_TaxCategory_ID IS NULL))
               AND (SoPoType = 'B' OR (SoPoType =(case when p_IsSOTrx='Y' then 'S' else 'P' end)))
-              AND t.isCashVAT = v_IsCashVAT
+              AND (t.isCashVAT = v_IsCashVAT OR (t.isCashVAT = 'N' and (t.isWithholdingTax = 'Y' or t.rate=0)))
             ORDER BY ad_isorgincluded(p_org_id, t.ad_org_id,t.ad_client_id),t.C_BP_TaxCategory_ID,t.IsDefault DESC,t.C_Country_ID, t.C_Region_ID, t.ValidFrom DESC
             )
           LOOP
@@ -293,7 +293,7 @@
               AND (SoPoType = 'B' OR (SoPoType =(case when p_IsSOTrx='Y' then 'S' else 'P' end)))
               AND t.isActive = 'Y'
               AND ad_isorgincluded(p_org_id, t.ad_org_id,t.ad_client_id) <> -1
-              AND t.isCashVAT = v_IsCashVAT
+              AND (t.isCashVAT = v_IsCashVAT OR (t.isCashVAT = 'N' and (t.isWithholdingTax = 'Y' or t.rate=0)))
             ORDER BY ad_isorgincluded(p_org_id, t.ad_org_id,t.ad_client_id),t.C_BP_TaxCategory_ID, t.ValidFrom DESC
             )
           LOOP
--- a/model/src-db/database/model/functions/C_INVOICE_CREATE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/functions/C_INVOICE_CREATE.xml	Tue May 06 13:08:31 2014 +0000
@@ -25,7 +25,7 @@
   * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
   * All Rights Reserved.
   * Contributor(s): Openbravo SLU
-  * Contributions are Copyright (C) 2001-2013 Openbravo, S.L.U.
+  * Contributions are Copyright (C) 2001-2014 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -73,6 +73,7 @@
     --
     v_LineNo NUMBER:=0;
     v_count NUMBER:=0;
+    v_isSchedule NUMBER:=0;
     
     v_isdeferredrevenue M_Product.IsDeferredRevenue%TYPE;
     v_revplantype M_Product.RevPlanType%TYPE;
@@ -126,7 +127,7 @@
           ol.Line,
           ol.DirectShip,
           ol.PriceStd,
-          ol.m_attributesetinstance_id,
+          sl.m_attributesetinstance_id,
           ol.taxbaseamt,
           ol.gross_unit_price,
           ol.grosspricestd,
@@ -233,7 +234,7 @@
         * Order Loop == all not completely invoiced orders == No Summary ==
         */
 
-          DBMS_OUTPUT.PUT_LINE('  C_Order_ID=' || v_C_Order_ID || ', BPartner_ID=' || v_BPartner_ID || ', AD_Org_ID=' || v_AD_Org_ID) ;
+          DBMS_OUTPUT.PUT_LINE('  C_Order_ID=' || coalesce(v_C_Order_ID, 'null') || ', BPartner_ID=' || coalesce(v_BPartner_ID, 'null') || ', AD_Org_ID=' || coalesce(v_AD_Org_ID, 'null')) ;
           -- For all Orders
           
           FOR Cur_Bpblocked IN(
@@ -799,12 +800,16 @@
               Cur_InOutLine_ISOPEN:=false;
             END IF;
           END LOOP; -- Order Loop
-
+   
+          SELECT count(*) 
+          INTO v_isSchedule
+          FROM DUAL WHERE EXISTS (SELECT 1 FROM C_ORDER WHERE ISSELECTED = 'Y' AND INVOICERULE = 'S');
+       
         /**
         * Invoice Schedule ======================================================
         */
-        IF(p_PInstance_ID IS NOT NULL AND v_C_Order_ID IS NULL) THEN -- Not when processing a single order
-          DECLARE
+        IF(p_PInstance_ID IS NOT NULL AND v_C_Order_ID IS NULL AND (v_isSchedule > 0 OR v_Selection = 'N')) THEN -- Not when processing a single order
+         DECLARE
             -- Invoice Schedule Lines
             Cur_InvoiceSchedule RECORD;
             v_Partner_ID VARCHAR2(32):='-1';
@@ -895,7 +900,7 @@
                 sh.movementDate,
                 ol.PriceStd,
                 ol.gross_unit_price,
-                ol.m_attributesetinstance_id,
+                sl.m_attributesetinstance_id,
                 ol.taxbaseamt, o.fin_paymentmethod_id,
                 pl.istaxincluded,
                 ol.grosspricestd,
--- a/model/src-db/database/model/functions/C_INVOICE_POST.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/functions/C_INVOICE_POST.xml	Tue May 06 13:08:31 2014 +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-2013 Openbravo, S.L.U.
+  * Contributions are Copyright (C) 2001-2014 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -317,6 +317,8 @@
     into v_count
     from c_invoicetax it inner join c_tax t on (it.c_tax_id = t.c_tax_id)
     where it.c_invoice_id = v_Record_ID
+    and t.iswithholdingtax = 'N'
+    and t.rate <> 0
     and t.IsCashVat <> v_iscashvat;
 
     IF (v_count > 0) THEN
@@ -511,6 +513,7 @@
         UPDATE C_INVOICELINE
         SET QtyInvoiced=0,
             LineNetAmt=0,
+            line_gross_amount=0,
             Updated=now(),
             UpdatedBy=v_UpdatedBy
         WHERE C_Invoice_ID=v_Record_ID;
--- a/model/src-db/database/model/functions/C_ORDER_POST1.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/functions/C_ORDER_POST1.xml	Tue May 06 13:08:31 2014 +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-2013 Openbravo SLU
+* All portions are Copyright (C) 2001-2014 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -294,7 +294,7 @@
     /**
     * Check if order has lines
     */
-    IF (v_DocAction = 'CO') THEN
+    IF (v_DocAction = 'CO' OR v_DocAction = 'PR') THEN
       SELECT COUNT(*)
         INTO v_Aux
        FROM C_ORDERLINE
@@ -310,6 +310,8 @@
       into v_Aux
       from c_ordertax ot inner join c_tax t on (ot.c_tax_id = t.c_tax_id)
       where ot.c_order_id = v_Record_ID
+      and t.iswithholdingtax = 'N'
+      and t.rate <> 0
       and t.IsCashVat <> v_iscashvat;
 
       IF (v_Aux > 0) THEN
--- a/model/src-db/database/model/functions/MA_PRODUCTION_COST.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/functions/MA_PRODUCTION_COST.xml	Tue May 06 13:08:31 2014 +0000
@@ -114,8 +114,8 @@
         , M_PRODUCTIONPLAN pp
       WHERE pr.m_production_id = p_Production_ID
         AND pr.m_production_id = pp.m_production_id
-        AND pp.m_productionplan_id = pl.m_productionplan_id
-        AND pl.calculated = 'N';
+        AND pp.m_productionplan_id = pl.m_productionplan_id;
+      v_costingdate := COALESCE(v_costingdate, v_productiondate);
     ELSE
       -- Costing engine not migrated
       SELECT MAX(pr.ad_client_id), MAX(pr.ad_org_id), MAX(movementdate), MAX(movementdate), COUNT (*), MAX(pr.DOCUMENTNO)
--- a/model/src-db/database/model/functions/MRP_RUN_INITIALIZE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/functions/MRP_RUN_INITIALIZE.xml	Tue May 06 13:08:31 2014 +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-2012 Openbravo SLU
+* All portions are Copyright (C) 2001-2014 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -92,6 +92,7 @@
                         AND p.ad_client_id = p_client_id
                         AND ((p_production = 'Y' AND p.ispurchased = 'N') OR (p_production = 'N' AND p.ispurchased = 'Y'))
                         AND p.isactive = 'Y'
+                        AND p.isgeneric = 'N'
                         AND (p_production = 'Y' OR
                              (p_vendor_id IS NULL
                              OR EXISTS (SELECT 1
@@ -233,6 +234,7 @@
               o.issotrx
          FROM c_orderline ol
               JOIN c_order o ON o.c_order_id = ol.c_order_id
+              JOIN c_doctype dt ON o.c_doctypetarget_id = dt.c_doctype_id
               LEFT JOIN (SELECT c_orderline_id, sum(qty) AS qty 
                         FROM m_matchpo
                         WHERE m_inoutline_id IS NOT NULL
@@ -257,7 +259,7 @@
                                        (CASE o.issotrx WHEN 'Y' THEN 'SO' ELSE 'PO' END),
                                        to_number(COALESCE(ol.datepromised, ol.dateordered, o.dateordered) - p_planningdate), p_timehorizon) <> -1
            AND ((o.issotrx = 'N' AND ol.qtyordered - COALESCE(matchpo.qty,0) > COALESCE(preres.reservedqty, 0))
-               OR (o.issotrx = 'Y' AND ol.qtyordered - COALESCE(ol.qtydelivered, 0) > COALESCE(res.reservedqty,0) - COALESCE(res.releasedqty, 0)))
+               OR (o.issotrx = 'Y' AND (dt.docsubtypeso <> 'OB') AND ol.qtyordered - COALESCE(ol.qtydelivered, 0) > COALESCE(res.reservedqty,0) - COALESCE(res.releasedqty, 0)))
            AND AD_ISORGINCLUDED(o.ad_org_id, p_org_id, p_client_id) > -1
            -- Only orders of warehouses in p_org_id and its childs
            AND AD_ISORGINCLUDED(w.ad_org_id, p_org_id, p_client_id) > -1
--- a/model/src-db/database/model/functions/M_EXPLODEBOMNOTSTOCK.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/functions/M_EXPLODEBOMNOTSTOCK.xml	Tue May 06 13:08:31 2014 +0000
@@ -30,6 +30,7 @@
   v_PriceList_ID VARCHAR2(32);
   v_PriceList_Version_ID VARCHAR2(32);
   v_Record_ID VARCHAR2(32);
+  v_C_Tax_ID VARCHAR2(32) ;
   TYPE RECORD IS REF CURSOR;
   Cur_Parameter RECORD;
   Cur_MPriceListVersion RECORD;
@@ -90,14 +91,14 @@
       v_PriceList_Version_ID:=Cur_MPriceListVersion.PriceList_Version_ID;
       EXIT;
     END LOOP;
- 
     -- Replace Lines
     v_ResultStr:='Inserting lines';
-    FOR CUR_BOM_Line IN
-      (SELECT *
-       FROM C_ORDERLINE l
+    For Cur_Bom_Line In
+      (SELECT l.*,o.M_Warehouse_ID as ord_m_warehouse_id,o.C_BPartner_Location_ID as ord_C_BPartner_Location_ID,o.issotrx
+       FROM C_ORDERLINE l,c_order o
        WHERE l.C_Orderline_ID=v_Record_ID
-         AND IsActive='Y'
+         AND l.c_order_id=o.c_order_id
+         AND l.IsActive='Y'
          AND EXISTS
            (SELECT *
             FROM M_PRODUCT p
@@ -119,6 +120,10 @@
          ORDER BY Line
          )
       LOOP
+        V_C_Tax_Id:=C_Gettax(Cur_Bom.M_Productbom_Id, Cur_Bom_Line.Dateordered, 
+        Cur_Bom_Line.Ad_Org_Id, Cur_Bom_Line.Ord_M_Warehouse_Id, Cur_Bom_Line.Ord_C_Bpartner_Location_Id, 
+        CUR_BOM_Line.ord_C_BPartner_Location_ID, null, CUR_BOM_Line.issotrx) ;
+
         v_Line:=v_Line + 1;
         INSERT
         INTO C_ORDERLINE
@@ -149,7 +154,7 @@
             M_BOM_PriceList(CUR_BOM.M_ProductBOM_ID, v_PriceList_Version_ID),
             M_Get_Offers_Price(CUR_BOM_Line.DateOrdered, v_CBPartner_ID, CUR_BOM.M_ProductBOM_ID, M_BOM_PriceStd(CUR_BOM.M_ProductBOM_ID, v_PriceList_Version_ID), CUR_BOM_Line.QtyInvoiced*CUR_BOM.BOMQty, v_PriceList_ID), M_BOM_PriceLimit(CUR_BOM.M_ProductBOM_ID, v_PriceList_Version_ID),
             M_Get_Offers_Price(CUR_BOM_Line.DateOrdered, v_CBPartner_ID, CUR_BOM.M_ProductBOM_ID, M_BOM_PriceStd(CUR_BOM.M_ProductBOM_ID, v_PriceList_Version_ID), CUR_BOM_Line.QtyInvoiced*CUR_BOM.BOMQty, v_PriceList_ID) * CUR_BOM_Line.QtyOrdered*CUR_BOM.BOMQty, CUR_BOM_Line.Discount,
-            CUR_BOM_Line.FreightAmt, CUR_BOM_Line.C_Charge_ID, CUR_BOM_Line.ChargeAmt, CUR_BOM_Line.C_Tax_ID,
+            CUR_BOM_Line.FreightAmt, CUR_BOM_Line.C_Charge_ID, CUR_BOM_Line.ChargeAmt, coalesce(v_C_Tax_ID,CUR_BOM_Line.c_tax_id),
             CUR_BOM_Line.QuantityOrder, CUR_BOM_Line.M_Product_UOM_ID, M_BOM_PriceStd(CUR_BOM.M_ProductBOM_ID, v_PriceList_Version_ID),
             CUR_BOM_Line.c_project_id, CUR_BOM_Line.a_asset_id, CUR_BOM_Line.c_costcenter_id,
             CUR_BOM_Line.user1_id, CUR_BOM_Line.user2_id, v_Record_ID
--- a/model/src-db/database/model/functions/M_INOUT_POST.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/functions/M_INOUT_POST.xml	Tue May 06 13:08:31 2014 +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-2013 Openbravo, S.L.U.
+  * Contributions are Copyright (C) 2001-2014 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -57,6 +57,7 @@
   v_is_ready AD_Org.IsReady%TYPE;
   v_is_tr_allow AD_OrgType.IsTransactionsAllowed%TYPE;
   v_DateAcct DATE;
+  v_DateDelivered C_OrderLine.DateDelivered%TYPE;
   v_isacctle AD_OrgType.IsAcctLegalEntity%TYPE;
   v_org_bule_id AD_Org.AD_Org_ID%TYPE;
   -- Parameter
@@ -66,6 +67,8 @@
     Cur_InOut RECORD;
     Cur_InOutLine RECORD;
     Cur_Order RECORD;
+    Cur_OrderLine RECORD;
+    Cur_Lines RECORD;
     --
     v_Result NUMBER:=1;
     v_AD_Org_ID VARCHAR2(32);
@@ -104,6 +107,7 @@
     v_goods_blocked VARCHAR2(1):='N';
     v_bpartner_name c_bpartner.name%TYPE;
     v_DocAction VARCHAR2(60);
+    v_voiddoccount NUMBER:=0;
 
   BEGIN
     IF(p_PInstance_ID IS NOT NULL) THEN
@@ -151,8 +155,8 @@
   BEGIN --BODY
   	IF(NOT FINISH_PROCESS) THEN
   	  v_PUser:=v_User;
-      SELECT io.AD_Client_ID, io.AD_Org_ID, io.CreatedBy, io.C_DocType_ID, io.DateAcct, dt.isreturn, io.m_warehouse_id, io.issotrx
-        INTO v_AD_Client_ID, v_AD_Org_ID, v_User, v_DocType_ID, v_DateAcct, v_isreturndoctype, v_M_Warehouse_ID, v_isSoTrx
+      SELECT io.AD_Client_ID, io.AD_Org_ID, io.CreatedBy, io.C_DocType_ID, io.DateAcct, dt.isreturn, io.m_warehouse_id, io.issotrx,docaction
+        INTO v_AD_Client_ID, v_AD_Org_ID, v_User, v_DocType_ID, v_DateAcct, v_isreturndoctype, v_M_Warehouse_ID, v_isSoTrx,v_DocAction
         FROM M_InOut io JOIN c_doctype dt ON io.c_doctype_id = dt.c_doctype_id
         WHERE io.M_InOut_ID=v_Record_ID;
         IF(v_PUser IS NOT NULL) THEN
@@ -176,6 +180,56 @@
           RAISE_APPLICATION_ERROR(-20000, '@NotCorrectOrgBpartnerInout@') ;
         END IF;
       END IF;
+       Declare
+       v_Message_product VARCHAR(2000) :='';
+       Begin
+          FOR Cur_Lines IN (
+                             SELECT M.line
+                             FROM M_InOut I,
+                                  M_InOutLine M
+                             WHERE I.M_InOut_ID=M.M_InOut_ID
+                               AND I.M_INOUT_ID=v_Record_ID
+                               AND (M.M_PRODUCT_ID IS NULL AND M.MOVEMENTQTY <> 0)
+                               ORDER BY M.line
+                            ) LOOP
+               v_Message_product:=v_Message_product||Cur_Lines.line||', ';
+          END LOOP;
+          if v_Message_product != '' then
+             RAISE_APPLICATION_ERROR(-20000, '@Inline@ '||v_Message_product||' '||'@ProductNullAndMovementQtyGreaterZero@') ;
+          end if ;
+	     End ;
+      if(v_isreturndoctype = 'N' AND v_isSoTrx = 'Y' and v_DocAction<>'RC') then
+        v_message := null;
+        for Cur_OrderLine in (
+          select c_orderline_id, line
+          from m_inoutline
+          where m_inout_id = v_Record_ID
+          and c_orderline_id is not null
+          order by line
+        ) loop
+          select COALESCE(sum(movementqty), 0)
+          into v_qty
+          from m_inoutline
+          where m_inout_id = v_Record_ID
+          and c_orderline_id = Cur_OrderLine.c_orderline_id;
+
+          select qtyordered, (coalesce(qtydelivered, 0) + v_qty)
+          into v_QuantityOrder, v_qty
+          from c_orderline
+          where c_orderline_id = Cur_OrderLine.c_orderline_id;
+
+          if(v_QuantityOrder < v_qty) then
+            if v_message is null THEN
+              v_message := Cur_OrderLine.line;
+            ELSE
+              v_message := v_message || ', ' || Cur_OrderLine.line;
+            END IF;
+          end if;
+        end loop;
+        if v_message is not null then
+          RAISE_APPLICATION_ERROR(-20000, '@MovementQtyCheck@'||' '||'@Inlines@'||' '||v_message);
+        end if;
+      end if;
 
       --Check whether warehouse belongs to the organization.
       SELECT count(AD_ORG_ID)
@@ -611,6 +665,24 @@
             END IF;
             v_ResultStr:='UpdateOrderLine';
             IF(Cur_InOutLine.C_OrderLine_ID IS NOT NULL) THEN
+              if(Cur_InOut.ISSOTRX='Y') THEN
+                -- Sets DateDelivered with the recent shipment date
+                -- of the shipment/s done for the orderline.
+                SELECT MAX(M.MOVEMENTDATE) INTO v_DateDelivered
+                FROM M_INOUTLINE ML, M_INOUT M
+                WHERE ML.C_OrderLine_ID = Cur_InOutLine.C_OrderLine_ID
+                AND ML.M_INOUT_ID = M.M_INOUT_ID
+                AND M.DOCSTATUS='CO';
+              ELSE
+                v_DateDelivered := null;
+              END IF;
+
+              IF(v_QtySO > 0) THEN
+                IF(v_DateDelivered IS NULL OR v_DateDelivered < Cur_InOut.MovementDate ) THEN
+                  v_DateDelivered:=Cur_InOut.MovementDate;
+                END IF;
+              END IF;
+              
               -- stocked product
               IF(Cur_InOutLine.M_Product_ID IS NOT NULL AND v_IsStocked=1) THEN
                 -- Update OrderLine (if C-, Qty is negative)
@@ -622,12 +694,14 @@
                 IF (v_DocStatus = 'DR') THEN
                   UPDATE C_ORDERLINE
                     SET QtyDelivered=QtyDelivered + v_QtySO,
+                    DATEDELIVERED=(CASE WHEN (QtyDelivered + v_QtySO) > 0 THEN v_DateDelivered ELSE NULL END),
                     Updated=now(),
                     UpdatedBy=v_User
                   WHERE C_OrderLine_ID=Cur_InOutLine.C_OrderLine_ID;
                 ELSE 
                   UPDATE C_ORDERLINE
                     SET QtyReserved=QtyReserved - v_QtyPO - v_QtySO,
+                    DATEDELIVERED=(CASE WHEN (QtyReserved - v_QtyPO - v_QtySO) > 0 THEN v_DateDelivered ELSE NULL END),
                     QtyDelivered=QtyDelivered + v_QtySO,
                     Updated=now(),
                     UpdatedBy=v_User
@@ -638,6 +712,7 @@
                 -- Update OrderLine (if C-, Qty is negative)
                 UPDATE C_ORDERLINE
                   SET QtyDelivered=QtyDelivered + v_QtySO,
+                  DATEDELIVERED=(CASE WHEN (QtyDelivered + v_QtySO) > 0 THEN v_DateDelivered ELSE NULL END),
                   Updated=now(),
                   UpdatedBy=v_User
                 WHERE C_OrderLine_ID=Cur_InOutLine.C_OrderLine_ID;
@@ -751,39 +826,47 @@
               END LOOP;
             END;
           ELSE
-            v_ResultStr:='Check delivery rule for sales orders';
-            v_Message_aux:='';
-            v_orderid_old:='0';
-            FOR Cur_Order IN 
-              (SELECT c_order.deliveryrule, m_inoutline.line, c_order.c_order_id,
-                      c_order.documentno, c_orderline.line as orderline
-               FROM M_InOutLine, C_Orderline, C_Order
-               WHERE M_Inoutline.c_orderline_id = c_orderline.c_orderline_id
-                 AND c_orderline.c_order_id = c_order.c_order_id
-                 AND m_inoutline.m_inout_id = cur_inout.m_inout_id
-                 AND ((c_order.deliveryrule = 'O'
-                      AND EXISTS (SELECT 1 FROM C_OrderLine ol
-                                  WHERE ol.C_Order_ID = C_order.c_order_id
-                                    and ol.qtyordered > ol.qtydelivered ))
-                      OR (c_order.deliveryrule = 'L' 
-                          AND c_orderline.qtyordered > c_orderline.qtydelivered))
-               ORDER BY c_order.c_order_id, c_orderline.line) LOOP
-              --Order lines not completely delivered with delivery rule O or L
-              IF (v_orderid_old <> cur_order.c_order_id OR cur_order.deliveryrule <> 'O' ) THEN
-                v_Message_aux := COALESCE(v_Message_aux,'') || '@Shipment@' || ' ' || cur_inout.documentno;
-                v_Message_aux := v_Message_aux || ' ' || '@line@' || ' ' || cur_order.line || ': ';
-                v_Message_aux := v_Message_aux || '@SalesOrderDocumentno@' || cur_order.documentno;
-                IF (cur_order.deliveryrule = 'O') THEN
-                  v_Message_aux := v_Message_aux || ' ' || '@notCompleteDeliveryRuleOrder@' || '<br>';
-                ELSE
-                  v_Message_aux := v_Message_aux || ' ' || '@line@' || ' ' || cur_order.orderline;
-                  v_Message_aux := v_Message_aux || ' ' || '@notCompleteDeliveryRuleLine@' || '<br>';
+            --Void document is created automatically from main document . 
+            --during completion of void document , we have to skip delivery rule for void document .
+            select COALESCE(instr(M_INOUT.Description,'*R*:'),0) 
+            into v_voiddoccount 
+            from M_INOUT
+            where M_INOUT.M_INOUT_id =v_Record_ID;
+            if v_voiddoccount = 0 then
+              v_ResultStr:='Check delivery rule for sales orders';
+              v_Message_aux:='';
+              v_orderid_old:='0';
+              FOR Cur_Order IN 
+                (SELECT c_order.deliveryrule, m_inoutline.line, c_order.c_order_id,
+                        c_order.documentno, c_orderline.line as orderline
+                 FROM M_InOutLine, C_Orderline, C_Order
+                 WHERE M_Inoutline.c_orderline_id = c_orderline.c_orderline_id
+                   AND c_orderline.c_order_id = c_order.c_order_id
+                   AND m_inoutline.m_inout_id = cur_inout.m_inout_id
+                   AND ((c_order.deliveryrule = 'O'
+                        AND EXISTS (SELECT 1 FROM C_OrderLine ol
+                                    WHERE ol.C_Order_ID = C_order.c_order_id
+                                      and ol.qtyordered > ol.qtydelivered ))
+                        OR (c_order.deliveryrule = 'L' 
+                            AND c_orderline.qtyordered > c_orderline.qtydelivered))
+                 ORDER BY c_order.c_order_id, c_orderline.line) LOOP
+                --Order lines not completely delivered with delivery rule O or L
+                IF (v_orderid_old <> cur_order.c_order_id OR cur_order.deliveryrule <> 'O' ) THEN
+                  v_Message_aux := COALESCE(v_Message_aux,'') || '@Shipment@' || ' ' || cur_inout.documentno;
+                  v_Message_aux := v_Message_aux || ' ' || '@line@' || ' ' || cur_order.line || ': ';
+                  v_Message_aux := v_Message_aux || '@SalesOrderDocumentno@' || cur_order.documentno;
+                  IF (cur_order.deliveryrule = 'O') THEN
+                    v_Message_aux := v_Message_aux || ' ' || '@notCompleteDeliveryRuleOrder@' || '<br>';
+                  ELSE
+                    v_Message_aux := v_Message_aux || ' ' || '@line@' || ' ' || cur_order.orderline;
+                    v_Message_aux := v_Message_aux || ' ' || '@notCompleteDeliveryRuleLine@' || '<br>';
+                  END IF;
                 END IF;
+                v_orderid_old := cur_order.c_order_id;
+              END LOOP;
+              IF (v_Message_aux IS NOT NULL AND v_Message_aux <> '') THEN
+                RAISE_APPLICATION_ERROR(-20000, v_Message_aux);
               END IF;
-              v_orderid_old := cur_order.c_order_id;
-            END LOOP;
-            IF (v_Message_aux IS NOT NULL AND v_Message_aux <> '') THEN
-              RAISE_APPLICATION_ERROR(-20000, v_Message_aux);
             END IF;
           END IF;
           -- Close Shipment
@@ -923,6 +1006,27 @@
                 Cur_InOutLine.explode 
               )
               ;
+
+            -- Create InOut acctounting dimension
+            v_ResultStr:='CreateInOutLineAcctDimension';
+            INSERT
+            INTO M_INOUTLINE_ACCTDIMENSION
+              (
+                M_InOutLine_Acctdimension_ID, M_InOutLine_ID, Quantity,
+                AD_Client_ID, AD_Org_ID, IsActive, Created,
+                CreatedBy, Updated, UpdatedBy, M_Product_ID, C_BPartner_ID,
+                C_Project_ID, C_Campaign_ID, C_Activity_ID, A_Asset_ID,
+                User1_ID, User2_ID, C_CostCenter_ID
+              )
+              SELECT
+                get_uuid(), v_NextNo, Quantity * -1,
+                AD_Client_ID, AD_Org_ID, 'Y', now(),
+                v_User, now(), v_User, M_Product_ID, C_BPartner_ID,
+                C_Project_ID, C_Campaign_ID, C_Activity_ID , A_Asset_ID,
+                User1_ID, User2_ID, C_CostCenter_ID
+              FROM M_INOUTLINE_ACCTDIMENSION where M_INOUTLINE_ID=Cur_InOutLine.M_INOUTLINE_ID
+              and IsActive = 'Y';
+
             INSERT INTO M_MATCHINV
               (M_MATCHINV_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, CREATED, CREATEDBY, UPDATED, UPDATEDBY,
               M_INOUTLINE_ID, C_INVOICELINE_ID, M_PRODUCT_ID, DATETRX, QTY, PROCESSING, PROCESSED, POSTED)
--- a/model/src-db/database/model/functions/M_INVEXPLODEBOMNOTSTOCK.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/functions/M_INVEXPLODEBOMNOTSTOCK.xml	Tue May 06 13:08:31 2014 +0000
@@ -30,6 +30,7 @@
   v_PriceList_ID VARCHAR2(32);
   v_PriceList_Version_ID VARCHAR2(32);
   v_Record_ID VARCHAR2(32);
+  v_C_Tax_ID VARCHAR2(32) ;
   TYPE RECORD IS REF CURSOR;
   Cur_Parameter RECORD;
   Cur_MPriceListVersion RECORD;
@@ -105,10 +106,11 @@
     v_ResultStr:='Inserting lines';
         
     FOR CUR_BOM_Line IN
-      (SELECT *
-       FROM C_INVOICELINE l
+      (SELECT l.*,i.dateinvoiced,i.C_BPartner_Location_ID,i.issotrx
+       FROM C_INVOICELINE l, c_invoice i
        WHERE l.C_invoiceline_ID=v_Record_ID
-         AND IsActive='Y'
+         AND l.c_invoice_id = i.c_invoice_id
+         AND l.IsActive='Y'
          AND EXISTS
            (SELECT *
             FROM M_PRODUCT p
@@ -166,6 +168,11 @@
             END IF;
           END IF;
         END IF;
+
+        v_C_Tax_ID:=C_Gettax(CUR_BOM.M_ProductBOM_ID, CUR_BOM_Line.dateinvoiced, 
+        CUR_BOM_Line.AD_Org_ID, null, CUR_BOM_Line.C_BPartner_Location_ID, 
+        CUR_BOM_Line.C_BPartner_Location_ID, null, CUR_BOM_Line.issotrx) ;
+
  
         INSERT INTO C_INVOICELINE
           (
@@ -189,7 +196,7 @@
             M_Get_Offers_Price(v_DateInvoiced, v_CBPartner_ID, CUR_BOM.M_ProductBOM_ID, M_BOM_PriceStd(CUR_BOM.M_ProductBOM_ID, v_PriceList_Version_ID),CUR_BOM_Line.QtyInvoiced*CUR_BOM.BOMQty, v_PriceList_ID),
             M_BOM_PriceLimit(CUR_BOM.M_ProductBOM_ID, v_PriceList_Version_ID),
             M_Get_Offers_Price(v_DateInvoiced, v_CBPartner_ID, CUR_BOM.M_ProductBOM_ID, M_BOM_PriceStd(CUR_BOM.M_ProductBOM_ID, v_PriceList_Version_ID),CUR_BOM_Line.QtyInvoiced*CUR_BOM.BOMQty, v_PriceList_ID) * CUR_BOM_Line.QtyInvoiced*CUR_BOM.BOMQty, CUR_BOM_Line.C_Charge_ID, CUR_BOM_Line.ChargeAmt,
-            CUR_BOM_Line.C_Tax_ID, M_BOM_PriceStd(CUR_BOM.M_ProductBOM_ID, v_PriceList_Version_ID),
+            coalesce(v_C_Tax_ID,CUR_BOM_Line.c_tax_id), M_BOM_PriceStd(CUR_BOM.M_ProductBOM_ID, v_PriceList_Version_ID),
             v_isdeferred_inv, v_defplantype_inv, v_periodnumber_inv, v_period_inv,
             CUR_BOM_Line.c_bpartner_id, CUR_BOM_Line.c_project_id, CUR_BOM_Line.c_projectline_id, CUR_BOM_Line.a_asset_id,
             CUR_BOM_Line.user1_id, CUR_BOM_Line.user2_id,v_Record_ID
--- a/model/src-db/database/model/functions/M_PRICELIST_CREATE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/functions/M_PRICELIST_CREATE.xml	Tue May 06 13:08:31 2014 +0000
@@ -516,18 +516,18 @@
           ;       
         ELSE    
          UPDATE M_ProductPrice
-          SET PriceList=(
+          SET PriceList=ROUND((
           CASE Cur_DiscountLine.List_Base WHEN 'C' THEN PriceList*(1+Cur_DiscountLine.LIST_MARGIN/100) ELSE PriceList
           END
-          ),
-          PriceStd=(
+          ), v_StdPrecision),
+          PriceStd=ROUND((
           CASE Cur_DiscountLine.Std_Base WHEN 'C' THEN PriceStd*(1+Cur_DiscountLine.STD_MARGIN/100) ELSE PriceStd 
           END
-          ),
-          PriceLimit=(
+          ), v_StdPrecision),
+          PriceLimit=ROUND((
           CASE Cur_DiscountLine.Limit_Base WHEN 'C' THEN PriceLimit*(1+Cur_DiscountLine.LIMIT_MARGIN/100) ELSE PriceLimit
           END
-          ),
+          ), v_StdPrecision),
 	      updated=now()
         WHERE M_PriceList_Version_ID=v_PriceList_Version_ID
           AND EXISTS
--- a/model/src-db/database/model/functions/M_PROMOTION_ADJUSTMENT.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/functions/M_PROMOTION_ADJUSTMENT.xml	Tue May 06 13:08:31 2014 +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) 2012 Openbravo SLU
+* All portions are Copyright (C) 2014 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -57,11 +57,13 @@
   v_origGrossAmt NUMBER;
   v_origLineNetAmt NUMBER;
   v_totalPromotion NUMBER;
+  v_ismultiple CHAR(1);
+  v_multiple NUMBER;
 BEGIN
   select fixed, coalesce(addamt, 0), coalesce(discount, 0),
-         qty_From, qty_To, apply_next
+         qty_From, qty_To, apply_next, ismultiple, multiple
     into v_fixed, v_add, v_discount,
-         v_qty_From, v_qty_To, v_apply_next
+         v_qty_From, v_qty_To, v_apply_next, v_ismultiple, v_multiple
     from m_offer
    where m_offer_id = p_rule_id;
 
@@ -81,7 +83,7 @@
 		where c_invoiceline_id = p_line_id;
   end if;
 
-  if (v_qty_From is not null and v_qty < v_qty_From) or (v_qty_To is not null and v_qty > v_qty_To) then
+  if (v_qty_From is not null and v_qty < v_qty_From) or (v_qty_To is not null and v_qty > v_qty_To) or (v_ismultiple = 'Y' and ((v_multiple is null) or (MOD(v_qty, v_multiple) <> 0))) then
     return 'Y'; -- rule not applied, apply next one if present
   end if;
    
--- a/model/src-db/database/model/functions/S_TIMEEXPENSE_POST.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/functions/S_TIMEEXPENSE_POST.xml	Tue May 06 13:08:31 2014 +0000
@@ -101,7 +101,7 @@
   GROUP BY S_TimeExpense.PROCESSED;
   IF (v_Processed = 'Y') THEN
     IF (v_CInvoicelineId IS NULL AND v_COrderlineId IS NULL) THEN
-        UPDATE S_TimeExpense SET Processed = 'N',Processing = 'N' WHERE S_TimeExpense_ID = v_Record_ID;
+        UPDATE S_TimeExpense SET Processed = 'N' WHERE S_TimeExpense_ID = v_Record_ID;
     ELSE
         v_Message:='@DocumentAssociated@';
      v_Result:=0;
@@ -121,7 +121,7 @@
        -- Checks come here
        -- Complete
          UPDATE S_TimeExpense
-           SET Processed='Y',processing = 'Y',
+           SET Processed='Y',
            Updated=now(),
            UpdatedBy=v_AD_User_ID
          WHERE S_TimeExpense_ID=CUR_te.S_TimeExpense_ID;
--- a/model/src-db/database/model/tables/AD_PROCESS.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/tables/AD_PROCESS.xml	Tue May 06 13:08:31 2014 +0000
@@ -113,6 +113,10 @@
         <default><![CDATA[N]]></default>
         <onCreateDefault><![CDATA['N']]></onCreateDefault>
       </column>
+      <column name="IS_EXPLICIT_ACCESS" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="AD_PROCESS_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -124,6 +128,7 @@
       </foreign-key>
       <check name="AD_PROCESS_ADV_CHCK"><![CDATA[ISADVANCEDFEATURE IN ('Y', 'N')]]></check>
       <check name="AD_PROCESS_CONCURRENT_CHCK"><![CDATA[PREVENTCONCURRENT IN ('Y', 'N')]]></check>
+      <check name="AD_PROCESS_EXPLICITACCESS_CK"><![CDATA[IS_EXPLICIT_ACCESS IN ('Y', 'N')]]></check>
       <check name="AD_PROCESS_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="AD_PROCESS_ISBACKGROUND_CHK"><![CDATA[ISBACKGROUND IN ('Y', 'N')]]></check>
       <check name="AD_PROCESS_ISDIRECTPRINT_CHK"><![CDATA[ISDIRECTPRINT IN ('Y', 'N')]]></check>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/tables/AD_REF_TREE.xml	Tue May 06 13:08:31 2014 +0000
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+  <database name="TABLE AD_REF_TREE">
+    <table name="AD_REF_TREE" primaryKey="AD_REF_TREE_KEY">
+      <column name="AD_REF_TREE_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="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="AD_REFERENCE_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_COLUMN_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="WHERECLAUSE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="VALUEFIELD_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="DISPLAYFIELD_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_TABLE_TREE_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="WHERECLAUSEROOTNODES" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_MODULE_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="AD_CLIENT" name="AD_REF_TREE_AD_CLIENT">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="AD_REF_TREE_AD_ORG">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_COLUMN" name="AD_REF_TREE_COL" onDelete="cascade">
+        <reference local="AD_COLUMN_ID" foreign="AD_COLUMN_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_REF_TREE_FIELD" name="AD_REF_TREE_DSPFLD">
+        <reference local="DISPLAYFIELD_ID" foreign="AD_REF_TREE_FIELD_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_MODULE" name="AD_REF_TREE_MODULE" onDelete="cascade">
+        <reference local="AD_MODULE_ID" foreign="AD_MODULE_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_TABLE" name="AD_REF_TREE_TABLE" onDelete="cascade">
+        <reference local="AD_TABLE_ID" foreign="AD_TABLE_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_TABLE_TREE" name="AD_REF_TREE_TABTREE" onDelete="cascade">
+        <reference local="AD_TABLE_TREE_ID" foreign="AD_TABLE_TREE_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_REF_TREE_FIELD" name="AD_REF_TREE_VALFLD">
+        <reference local="VALUEFIELD_ID" foreign="AD_REF_TREE_FIELD_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_REFERENCE" name="AD_REFERENCE_REFTREE" onDelete="cascade">
+        <reference local="AD_REFERENCE_ID" foreign="AD_REFERENCE_ID"/>
+      </foreign-key>
+      <unique name="AD_REF_TREE_UNIQTREEREF">
+        <unique-column name="AD_REFERENCE_ID"/>
+      </unique>
+      <check name="AD_REF_TREE_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+    </table>
+  </database>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/tables/AD_REF_TREE_FIELD.xml	Tue May 06 13:08:31 2014 +0000
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+  <database name="TABLE AD_REF_TREE_FIELD">
+    <table name="AD_REF_TREE_FIELD" primaryKey="AD_REF_TREE_FIELD_KEY">
+      <column name="AD_REF_TREE_FIELD_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_REF_TREE_ID" primaryKey="false" 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="AD_MODULE_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="NAME" primaryKey="false" required="true" type="NVARCHAR" size="60" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="PROPERTY" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISCENTRALLYMAINTAINED" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="SORT" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="FILTER" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="SEARCHINSUGGESTIONBOX" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="SHOWINGRID" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="SORTNO" primaryKey="false" required="true" type="DECIMAL" size="10,0" 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="SHOWINPICKLIST" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="AD_MODULE" name="AD_REFTREE_F_AD_MODULE">
+        <reference local="AD_MODULE_ID" foreign="AD_MODULE_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_CLIENT" name="AD_REFTREE_F_CLIENT">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="AD_REFTREE_F_ORG">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_REF_TREE" name="AD_REFTREE_F_REFTREE" onDelete="cascade">
+        <reference local="AD_REF_TREE_ID" foreign="AD_REF_TREE_ID"/>
+      </foreign-key>
+      <index name="AD_REFTREEF_TREEREF_IDX" unique="false">
+        <index-column name="AD_REF_TREE_ID"/>
+      </index>
+      <check name="AD_REFTREE_F_CM_CHECK"><![CDATA[ISCENTRALLYMAINTAINED IN ('Y', 'N')]]></check>
+      <check name="AD_REFTREE_F_FILTER_CHECK"><![CDATA[FILTER IN ('Y', 'N')]]></check>
+      <check name="AD_REFTREE_F_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+      <check name="AD_REFTREE_F_SBOX_CHECK"><![CDATA[SEARCHINSUGGESTIONBOX IN ('Y', 'N')]]></check>
+      <check name="AD_REFTREE_F_SHOWINGRID_CHECK"><![CDATA[SHOWINGRID IN ('Y', 'N')]]></check>
+      <check name="AD_REFTREE_F_SHOWINPICK_CHK"><![CDATA[SHOWINPICKLIST IN ('Y', 'N')]]></check>
+      <check name="AD_REFTREE_F_SORT_CHECK"><![CDATA[SORT IN ('Y', 'N')]]></check>
+    </table>
+  </database>
--- a/model/src-db/database/model/tables/AD_ROLE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/tables/AD_ROLE.xml	Tue May 06 13:08:31 2014 +0000
@@ -93,6 +93,10 @@
         <default><![CDATA[N]]></default>
         <onCreateDefault><![CDATA['N']]></onCreateDefault>
       </column>
+      <column name="ISWEBSERVICEENABLED" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['Y']]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="AD_TREE" name="AD_ROLE_AD_TREE_MENU">
         <reference local="AD_TREE_MENU_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
@@ -114,6 +118,7 @@
       <check name="AD_ROLE_ISCLIENTADMIN_CHECK"><![CDATA[IS_CLIENT_ADMIN IN ('Y', 'N')]]></check>
       <check name="AD_ROLE_ISPORTAL_CHECK"><![CDATA[ISPORTAL IN ('Y', 'N')]]></check>
       <check name="AD_ROLE_ISPORTALADMIN_CHECK"><![CDATA[ISPORTALADMIN IN ('Y', 'N')]]></check>
+      <check name="AD_ROLE_ISWEBSERVICEENABLED"><![CDATA[ISWEBSERVICEENABLED IN ('Y', 'N')]]></check>
       <check name="AD_ROLE_RESTRICTBACKEND"><![CDATA[ISRESTRICTBACKEND IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/AD_TAB.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/tables/AD_TAB.xml	Tue May 06 13:08:31 2014 +0000
@@ -169,6 +169,14 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="AD_TABLE_TREE_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="HQLTREEWHERECLAUSE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <column name="DISABLE_PARENT_KEY_PROPERTY" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
         <default><![CDATA[N]]></default>
         <onCreateDefault><![CDATA['N']]></onCreateDefault>
@@ -203,6 +211,9 @@
       <foreign-key foreignTable="AD_TAB" name="AD_TAB_INCLUDED_TAB">
         <reference local="INCLUDED_TAB_ID" foreign="AD_TAB_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_TABLE_TREE" name="AD_TAB_TABLETREE_FK">
+        <reference local="AD_TABLE_TREE_ID" foreign="AD_TABLE_TREE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_TABLE" name="AD_TABLE_TAB">
         <reference local="AD_TABLE_ID" foreign="AD_TABLE_ID"/>
       </foreign-key>
@@ -212,6 +223,9 @@
       <index name="AD_TAB_TABLE" unique="false">
         <index-column name="AD_TABLE_ID"/>
       </index>
+      <index name="AD_TAB_TABLETREE_FK" unique="false">
+        <index-column name="AD_TABLE_TREE_ID"/>
+      </index>
       <index name="AD_TAB_WINDOW" unique="false">
         <index-column name="AD_WINDOW_ID"/>
       </index>
--- a/model/src-db/database/model/tables/AD_TABLE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/tables/AD_TABLE.xml	Tue May 06 13:08:31 2014 +0000
@@ -133,6 +133,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="ISTREE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="OBSERDS_DATASOURCE" name="AD_COLUMN_DATASOURCE">
         <reference local="OBSERDS_DATASOURCE_ID" foreign="OBSERDS_DATASOURCE_ID"/>
       </foreign-key>
@@ -172,6 +176,7 @@
       <check name="AD_TABLE_ISFULLYAUDITED_CHK2"><![CDATA[(ISFULLYAUDITED = 'N') OR (UPPER((TABLENAME)) <> 'AD_AUDIT_TRAIL')]]></check>
       <check name="AD_TABLE_ISHIGHVOLUME_CHK"><![CDATA[ISHIGHVOLUME IN ('Y', 'N')]]></check>
       <check name="AD_TABLE_ISSECUR_YENABLED_CHK"><![CDATA[ISSECURITYENABLED IN ('Y', 'N')]]></check>
+      <check name="AD_TABLE_ISTREE_CHK"><![CDATA[ISTREE IN ('Y', 'N')]]></check>
       <check name="AD_TABLE_ISVIEW_CHK"><![CDATA[ISVIEW IN ('Y', 'N')]]></check>
     </table>
   </database>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/tables/AD_TABLE_TREE.xml	Tue May 06 13:08:31 2014 +0000
@@ -0,0 +1,117 @@
+<?xml version="1.0"?>
+  <database name="TABLE AD_TABLE_TREE">
+    <table name="AD_TABLE_TREE" primaryKey="AD_TABLETREE_KEY">
+      <column name="AD_TABLE_TREE_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="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="AD_TABLE_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="LINKTOPARENTCOLUMN" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="NODEIDCOLUMN" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="HASMULTIPARENTNODES" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_MODULE_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="APPLYWHERECLAUSETOCHILDNODES" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="200" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISPARENTSELECTIONALLOWED" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="ISORDERED" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="TREESTRUCTURE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="OBSERDS_DATASOURCE_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISHANDLENODESMANUALLY" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="ISMAINTREE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault><![CDATA['Y']]></onCreateDefault>
+      </column>
+      <foreign-key foreignTable="AD_CLIENT" name="AD_TABLETREE_AD_CLIENT">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_COLUMN" name="AD_TABLETREE_AD_COLPAR">
+        <reference local="LINKTOPARENTCOLUMN" foreign="AD_COLUMN_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_COLUMN" name="AD_TABLETREE_AD_IDCOL">
+        <reference local="NODEIDCOLUMN" foreign="AD_COLUMN_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="AD_TABLETREE_AD_ORG">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_TABLE" name="AD_TABLETREE_AD_TABLE" onDelete="cascade">
+        <reference local="AD_TABLE_ID" foreign="AD_TABLE_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="OBSERDS_DATASOURCE" name="AD_TABLETREE_DATASOURCE">
+        <reference local="OBSERDS_DATASOURCE_ID" foreign="OBSERDS_DATASOURCE_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_MODULE" name="AD_TABLTREE_AD_MODULE">
+        <reference local="AD_MODULE_ID" foreign="AD_MODULE_ID"/>
+      </foreign-key>
+      <index name="AD_TABLETREE_TABLE_IDX" unique="false">
+        <index-column name="AD_TABLE_ID"/>
+      </index>
+      <check name="AD_TABLETREE_APPLYHQL_CHK"><![CDATA[APPLYWHERECLAUSETOCHILDNODES IN ('Y', 'N')]]></check>
+      <check name="AD_TABLETREE_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+      <check name="AD_TABLETREE_ISMAINTREE_CHK"><![CDATA[ISMAINTREE IN ('Y', 'N')]]></check>
+      <check name="AD_TABLETREE_MULTPAR_CHK"><![CDATA[HASMULTIPARENTNODES IN ('Y', 'N')]]></check>
+    </table>
+  </database>
--- a/model/src-db/database/model/tables/AD_TREE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/tables/AD_TREE.xml	Tue May 06 13:08:31 2014 +0000
@@ -49,12 +49,19 @@
         <default><![CDATA[Y]]></default>
         <onCreateDefault/>
       </column>
+      <column name="AD_TABLE_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="AD_TREE_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="AD_TREE_AD_ORG">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_TABLE" name="AD_TREE_AD_TABLE">
+        <reference local="AD_TABLE_ID" foreign="AD_TABLE_ID"/>
+      </foreign-key>
       <unique name="AD_TREE_NAME">
         <unique-column name="AD_CLIENT_ID"/>
         <unique-column name="NAME"/>
--- a/model/src-db/database/model/tables/C_INVOICE.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/tables/C_INVOICE.xml	Tue May 06 13:08:31 2014 +0000
@@ -357,6 +357,9 @@
       <index name="C_INVOICE_DOCNO" unique="false">
         <index-column name="DOCUMENTNO"/>
       </index>
+      <index name="C_INVOICE_ORDER" unique="false">
+        <index-column name="C_ORDER_ID"/>
+      </index>
       <index name="C_INVOICE_UPDATED" unique="false">
         <index-column name="UPDATED"/>
       </index>
--- a/model/src-db/database/model/tables/C_ORDER.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/tables/C_ORDER.xml	Tue May 06 13:08:31 2014 +0000
@@ -337,6 +337,10 @@
         <default><![CDATA[N]]></default>
         <onCreateDefault/>
       </column>
+      <column name="RM_PICKFROMRECEIPT" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="C_DOCTYPE" name="C_DOCTYPE_CORDER">
         <reference local="C_DOCTYPE_ID" foreign="C_DOCTYPE_ID"/>
       </foreign-key>
--- a/model/src-db/database/model/tables/FIN_FINACC_PAYMENTMETHOD.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/tables/FIN_FINACC_PAYMENTMETHOD.xml	Tue May 06 13:08:31 2014 +0000
@@ -125,6 +125,14 @@
         <default><![CDATA[N]]></default>
         <onCreateDefault/>
       </column>
+      <column name="PAYIN_INVOICEPAIDSTATUS" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false">
+        <default><![CDATA[RPR]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="PAYOUT_INVOICEPAIDSTATUS" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false">
+        <default><![CDATA[PPM]]></default>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="FIN_FINACC_PAYMETHOD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
--- a/model/src-db/database/model/tables/FIN_PAYMENT_SCHEDULEDETAIL.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/tables/FIN_PAYMENT_SCHEDULEDETAIL.xml	Tue May 06 13:08:31 2014 +0000
@@ -97,6 +97,10 @@
         <default><![CDATA[0]]></default>
         <onCreateDefault/>
       </column>
+      <column name="ISINVOICEPAID" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="FIN_AD_CLIENT_SCHEDULEDETAIL">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -149,5 +153,6 @@
         <index-column name="FIN_PAYMENT_DETAIL_ID"/>
       </index>
       <check name="FIN_PAY_SCHE_DETAIL_ISCANC_CHK"><![CDATA[ISCANCELED IN ('Y', 'N')]]></check>
+      <check name="FIN_PAY_SCHE_DETAIL_ISPAID_CHK"><![CDATA[ISINVOICEPAID IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/tables/M_OFFER.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/tables/M_OFFER.xml	Tue May 06 13:08:31 2014 +0000
@@ -109,6 +109,14 @@
         <default><![CDATA[Y]]></default>
         <onCreateDefault><![CDATA['Y']]></onCreateDefault>
       </column>
+      <column name="ISMULTIPLE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
+      <column name="MULTIPLE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="M_OFFER_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
--- a/model/src-db/database/model/tables/M_RESERVATION.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/tables/M_RESERVATION.xml	Tue May 06 13:08:31 2014 +0000
@@ -89,6 +89,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="RESERVEDGOODMNT_PE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="M_ATTRIBUTESETINSTANCE" name="M_RESERVATION_ATTRSETINSTANCE">
         <reference local="M_ATTRIBUTESETINSTANCE_ID" foreign="M_ATTRIBUTESETINSTANCE_ID"/>
       </foreign-key>
--- a/model/src-db/database/model/tables/M_TRANSACTION.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/tables/M_TRANSACTION.xml	Tue May 06 13:08:31 2014 +0000
@@ -121,6 +121,10 @@
         <default><![CDATA[Y]]></default>
         <onCreateDefault/>
       </column>
+      <column name="ISPROCESSED" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault><![CDATA['N']]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="M_INTERNAL_CONSUMPTIONLINE" name="M_INTL_CONSUMP_MTRANSACTION">
         <reference local="M_INTERNAL_CONSUMPTIONLINE_ID" foreign="M_INTERNAL_CONSUMPTIONLINE_ID"/>
       </foreign-key>
@@ -188,5 +192,6 @@
       <check name="M_TRANSACTION_CURRENCY"><![CDATA[(TRANSACTIONCOST IS NULL) OR ((TRANSACTIONCOST IS NOT NULL) AND (C_CURRENCY_ID IS NOT NULL))]]></check>
       <check name="M_TRANSACTION_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
       <check name="M_TRANSACTION_ISCOSTCALC_TRX"><![CDATA[ISCOSTCALCULATED IN ('Y', 'N')]]></check>
+      <check name="M_TRANSACTION_ISPROCESSED"><![CDATA[ISPROCESSED IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/model/src-db/database/model/triggers/AD_SYSTEM_INFO_TRG2.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/triggers/AD_SYSTEM_INFO_TRG2.xml	Tue May 06 13:08:31 2014 +0000
@@ -21,6 +21,7 @@
 ************************************************************************/
 
 exist NUMBER:= 0;
+existDisabled NUMBER:= 0;
 indTempName NVARCHAR2(50) := 'System Customization';
 indTempPackage NVARCHAR2(50) := 'mySystem.CustomizationTemplate';
 idCustomizationModule NVARCHAR2(50);
@@ -43,44 +44,57 @@
     if (exist > 0) then
       RAISE_APPLICATION_ERROR(-20000,'@20631@');
     else
-      idCustomizationModule:=get_uuid();
-      Insert into AD_MODULE (
-        AD_MODULE_ID,AD_CLIENT_ID,AD_ORG_ID,ISACTIVE,CREATED,CREATEDBY,UPDATED,UPDATEDBY,
-        NAME,VERSION,DESCRIPTION,
-        HELP,
-        URL,TYPE,LICENSE,
-        ISINDEVELOPMENT,ISDEFAULT,SEQNO,JAVAPACKAGE,
-        LICENSETYPE,AUTHOR,STATUS,UPDATE_AVAILABLE,ISTRANSLATIONREQUIRED,AD_LANGUAGE,HASCHARTOFACCOUNTS,
-        ISTRANSLATIONMODULE,HASREFERENCEDATA,ISREGISTERED,UPDATEINFO,UPDATE_VER_ID) 
-      values (
-        to_char(idCustomizationModule),'0','0','Y',now(),'0',now(),'0',
-        to_char(indTempName),'1.0.0', to_char(indTempName) || ' is an autogenerated industry template to store all the customizations made to module core.',
-        to_char(indTempName) || ' is an autogenerated industry template to store all the customizations made to module core. Only one industry template can be active at the same time.',
-        null,'T','The Openbravo Public License Version 1.1 ("OBPL") consists of the Mozilla Public License Version 1.1, modified to be specific to Openbravo, with the Additional Terms in Exhibit B. The original Mozilla Public License 1.1 can be found at: http://www.mozilla.org/MPL/MPL-1.1.html',
-        'Y','N',null,to_char(indTempPackage),
-        'OtherOS',null,null,null,'Y','en_US','N',
-        'N','N',null,null,null);
+      select count(*) into existDisabled
+      from AD_MODULE
+      where TYPE = 'T'
+      and ISINDEVELOPMENT = 'N'
+      and NAME = indTempName;
+
+      if (existDisabled > 0) then
+        update AD_MODULE
+        set isindevelopment = 'Y'
+        where name = indTempName;
+      else
+        idCustomizationModule:=get_uuid();
+        Insert into AD_MODULE (
+          AD_MODULE_ID,AD_CLIENT_ID,AD_ORG_ID,ISACTIVE,CREATED,CREATEDBY,UPDATED,UPDATEDBY,
+          NAME,VERSION,DESCRIPTION,
+          HELP,
+          URL,TYPE,LICENSE,
+          ISINDEVELOPMENT,ISDEFAULT,SEQNO,JAVAPACKAGE,
+          LICENSETYPE,AUTHOR,STATUS,UPDATE_AVAILABLE,ISTRANSLATIONREQUIRED,AD_LANGUAGE,HASCHARTOFACCOUNTS,
+          ISTRANSLATIONMODULE,HASREFERENCEDATA,ISREGISTERED,UPDATEINFO,UPDATE_VER_ID)
+        values (
+          to_char(idCustomizationModule),'0','0','Y',now(),'0',now(),'0',
+          to_char(indTempName),'1.0.0', to_char(indTempName) || ' is an autogenerated industry template to store all the customizations made to module core.',
+          to_char(indTempName) || ' is an autogenerated industry template to store all the customizations made to module core. Only one industry template can be active at the same time.',
+          null,'T','The Openbravo Public License Version 1.1 ("OBPL") consists of the Mozilla Public License Version 1.1, modified to be specific to Openbravo, with the Additional Terms in Exhibit B. The original Mozilla Public License 1.1 can be found at: http://www.mozilla.org/MPL/MPL-1.1.html',
+          'Y','N',null,to_char(indTempPackage),
+          'OtherOS',null,null,null,'Y','en_US','N',
+          'N','N',null,null,null);
         
-      -- add dependency on the core module
-      select version into coreVersion 
-      from AD_MODULE 
-      where AD_MODULE_ID='0';
+        -- add dependency on the core module
+        select version into coreVersion
+        from AD_MODULE
+        where AD_MODULE_ID='0';
       
-      Insert into AD_MODULE_DEPENDENCY (
-         AD_MODULE_DEPENDENCY_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, CREATED, CREATEDBY,
-         UPDATED, UPDATEDBY, AD_MODULE_ID, AD_DEPENDENT_MODULE_ID, 
-         STARTVERSION, ENDVERSION, ISINCLUDED, DEPENDANT_MODULE_NAME,
-         DEPENDENCY_ENFORCEMENT, USER_EDITABLE_ENFORCEMENT, INSTANCE_ENFORCEMENT)
-      values(
-         get_uuid(),'0','0', 'Y', now(), '0',
-         now(),'0', to_char(idCustomizationModule), '0', 
-         to_char(coreVersion), null, 'N', 'Will be overwritten by insert/update trigger',
-         'MAJOR', 'N', null);
+        Insert into AD_MODULE_DEPENDENCY (
+           AD_MODULE_DEPENDENCY_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, CREATED, CREATEDBY,
+           UPDATED, UPDATEDBY, AD_MODULE_ID, AD_DEPENDENT_MODULE_ID,
+           STARTVERSION, ENDVERSION, ISINCLUDED, DEPENDANT_MODULE_NAME,
+           DEPENDENCY_ENFORCEMENT, USER_EDITABLE_ENFORCEMENT, INSTANCE_ENFORCEMENT)
+        values(
+           get_uuid(),'0','0', 'Y', now(), '0',
+           now(),'0', to_char(idCustomizationModule), '0',
+           to_char(coreVersion), null, 'N', 'Will be overwritten by insert/update trigger',
+           'MAJOR', 'N', null);
+      end if;
     end if;
   end if;
   
   If (:old.customization_Allowed='Y' and :new.customization_Allowed='N') then
-    delete from AD_MODULE
+    update AD_MODULE
+    set isindevelopment = 'N'
     where name = indTempName;
   end if;
  
--- a/model/src-db/database/model/triggers/C_ACCTSCHEMA_ELEMENT_TRG.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/triggers/C_ACCTSCHEMA_ELEMENT_TRG.xml	Tue May 06 13:08:31 2014 +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-2014 Openbravo, S.L.U.
     *
     * Specifically, this derivative work is based upon the following Compiere
     * file and version.
@@ -26,6 +26,10 @@
     * when element becomes mandatory
     **/
     v_UpdateIt BOOLEAN:=FALSE;
+    TYPE RECORD IS REF CURSOR;
+    v_CreateCombination BOOLEAN :=FALSE;
+    v_count NUMBER;
+		cur_ElementValue RECORD;
     
 BEGIN
     
@@ -38,6 +42,16 @@
     IF(:new.IsMandatory='Y') THEN
       v_UpdateIt:=TRUE;
     END IF;
+    IF(:new.ElementType='AC' AND :new.C_Element_ID IS NOT NULL) THEN
+			IF(INSERTING) THEN
+				v_CreateCombination:=TRUE;
+			END IF;
+			IF(UPDATING) THEN 
+			  IF(COALESCE(:NEW.C_Element_ID,'0') <> COALESCE(:OLD.C_Element_ID,'0')) THEN
+					v_CreateCombination:=TRUE;
+				END IF;
+			END IF;
+		END IF;
   END IF;
   --
   IF(v_UpdateIt) THEN
@@ -90,6 +104,34 @@
       WHERE User2_ID IS NULL;
     END IF;
   END IF;
+  IF(V_CreateCombination) THEN
+		FOR cur_ElementValue IN
+		(SELECT C_ElementValue_ID, Value FROM C_ElementValue
+			WHERE C_ElementValue.C_Element_ID = :new.C_Element_ID
+			AND C_ElementValue.ElementLevel='S'
+		)
+    LOOP
+			v_Count:=0;
+			SELECT COUNT(*) INTO v_Count FROM C_VALIDCOMBINATION
+				WHERE C_AcctSchema_ID = :new.C_AcctSchema_ID
+				AND ACCOUNT_ID = cur_ElementValue.C_ElementValue_ID
+				AND ISACTIVE='Y';
+			IF(v_Count=0) THEN
+				INSERT INTO C_VALIDCOMBINATION
+					(C_VALIDCOMBINATION_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE, CREATED, CREATEDBY,
+					UPDATED, UPDATEDBY, ALIAS, COMBINATION, DESCRIPTION, ISFULLYQUALIFIED,
+					C_ACCTSCHEMA_ID, ACCOUNT_ID, M_PRODUCT_ID, C_BPARTNER_ID, AD_ORGTRX_ID, C_LOCFROM_ID,
+					C_LOCTO_ID, C_SALESREGION_ID, C_PROJECT_ID, C_CAMPAIGN_ID, C_ACTIVITY_ID, USER1_ID,
+					USER2_ID)
+				VALUES (
+					GET_UUID(), :new.AD_Client_ID, :new.AD_Org_ID, :new.IsActive, :new.Created, :new.CreatedBy,
+					:new.Updated, :new.UpdatedBy, cur_ElementValue.value, cur_ElementValue.value, '', 'Y',
+					:new.C_AcctSchema_ID, cur_ElementValue.C_ElementValue_ID, null, null, null, null,
+					null, null, null, null, null, null,
+					null);
+			END IF;
+		END LOOP;
+  END IF;
   --
 END C_ACCTSCHEMA_ELEMENT_TRG
 ]]></body>
--- a/model/src-db/database/model/triggers/C_BPARTNER_TRG.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/triggers/C_BPARTNER_TRG.xml	Tue May 06 13:08:31 2014 +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-2014 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -271,13 +271,14 @@
          RAISE_APPLICATION_ERROR(-20000, '@C_BPWithCreditPriceList@' || ' ' || v_currency_iso || '. ' || '@C_BPWithCreditPriceList2@');
 			 END IF;
      END IF;
-
-     UPDATE C_BP_CUSTOMER_ACCT SET AD_ORG_ID = :new.AD_Org_ID
-     WHERE C_BPARTNER_ID = :new.C_BPartner_ID;
-     UPDATE C_BP_VENDOR_ACCT SET AD_ORG_ID = :new.AD_Org_ID
-     WHERE C_BPARTNER_ID = :new.C_BPartner_ID;
-     UPDATE C_BP_EMPLOYEE_ACCT SET AD_ORG_ID = :new.AD_Org_ID
-     WHERE C_BPARTNER_ID = :new.C_BPartner_ID;
+     IF(:old.AD_Org_ID <> :new.AD_Org_ID) THEN 
+	     UPDATE C_BP_CUSTOMER_ACCT SET AD_ORG_ID = :new.AD_Org_ID
+	     WHERE C_BPARTNER_ID = :new.C_BPartner_ID;
+	     UPDATE C_BP_VENDOR_ACCT SET AD_ORG_ID = :new.AD_Org_ID
+	     WHERE C_BPARTNER_ID = :new.C_BPartner_ID;
+	     UPDATE C_BP_EMPLOYEE_ACCT SET AD_ORG_ID = :new.AD_Org_ID
+	     WHERE C_BPARTNER_ID = :new.C_BPartner_ID;
+	   END IF;
   END IF;
 EXCEPTION
  WHEN NO_DATA_FOUND THEN
--- a/model/src-db/database/model/triggers/C_INVOICELINE_TRG.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/triggers/C_INVOICELINE_TRG.xml	Tue May 06 13:08:31 2014 +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) 2001-2013 Openbravo SLU
+* All portions are Copyright (C) 2001-2014 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -40,7 +40,9 @@
  v_AttrSetValueType M_Product.AttrSetValueType%TYPE;
  v_count NUMBER;
  v_IsCashVAT_Tax C_Tax.IsCashVAT%TYPE;
+ v_IsWithholding_Tax C_Tax.IsWithholdingTax%TYPE;
  v_IsCashVAT_Invoice C_Invoice.IsCashVAT%TYPE;
+ v_Rate_Tax C_Tax.Rate%TYPE;
     
 BEGIN
     
@@ -106,22 +108,25 @@
  -- Update C_Invoice.IsCashVAT flag from the line tax rate.
  -- We do it this way to force any invoicing process to properly set the C_Invoice.IsCashVAT
  -- If a user manually changes the tax rate when entering a line, the invoice's header IsCash VAT may change
+ -- This will just work for not withholding tax rates
  IF (INSERTING OR UPDATING) THEN
   IF (:NEW.C_TAX_ID IS NOT NULL) THEN
-   SELECT COALESCE(IsCashVAT, 'N')
-   INTO v_IsCashVAT_Tax
+   SELECT COALESCE(iswithholdingtax, 'N'), COALESCE(IsCashVAT, 'N'), COALESCE(rate, 0)
+   INTO v_IsWithholding_Tax, v_IsCashVAT_Tax, v_Rate_Tax
    FROM C_Tax
    WHERE C_Tax_ID=:NEW.C_Tax_ID;
 
-   SELECT COALESCE(IsCashVAT, 'N')
-   INTO v_IsCashVAT_Invoice
-   FROM C_Invoice
-   WHERE C_Invoice_ID=:NEW.C_Invoice_ID;
+   IF (v_IsWithholding_Tax='N' AND v_Rate_Tax<>0) THEN
+    SELECT COALESCE(IsCashVAT, 'N')
+    INTO v_IsCashVAT_Invoice
+    FROM C_Invoice
+    WHERE C_Invoice_ID=:NEW.C_Invoice_ID;
 
-   IF (v_IsCashVAT_Tax <> v_IsCashVAT_Invoice) THEN
-     UPDATE C_Invoice
-     SET IsCashVAT = v_IsCashVAT_Tax
-     WHERE C_Invoice_ID=:NEW.C_Invoice_ID;
+    IF (v_IsCashVAT_Tax <> v_IsCashVAT_Invoice) THEN
+      UPDATE C_Invoice
+      SET IsCashVAT = v_IsCashVAT_Tax
+      WHERE C_Invoice_ID=:NEW.C_Invoice_ID;
+    END IF;
    END IF;
   END IF;
  END IF;
--- a/model/src-db/database/model/triggers/C_ORDER_TRG.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/triggers/C_ORDER_TRG.xml	Tue May 06 13:08:31 2014 +0000
@@ -54,11 +54,14 @@
     )
     THEN  RAISE_APPLICATION_ERROR(-20000, '@20501@') ;
     END IF;
-  -- Propagate Description changes
-  UPDATE C_Invoice
-   SET Description=:new.Description,
-   POReference=:new.POReference
-  WHERE C_Order_ID=:new.C_Order_ID;
+    IF (COALESCE(:old.POReference, '.') <> COALESCE(:NEW.POReference, '.')
+    OR COALESCE(:old.Description, '0') <> COALESCE(:NEW.Description, '0')) THEN
+		  -- Propagate Description changes
+		  UPDATE C_Invoice
+		   SET Description=:new.Description,
+		   POReference=:new.POReference
+		  WHERE C_Order_ID=:new.C_Order_ID;
+		END IF;
   END IF;
  END IF;
 END C_ORDER_TRG
--- a/model/src-db/database/model/triggers/FIN_FINANCIAL_ACCOUNT_TRG.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/triggers/FIN_FINANCIAL_ACCOUNT_TRG.xml	Tue May 06 13:08:31 2014 +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) 2010-2012 Openbravo SLU
+    * All portions are Copyright (C) 2010-2014 Openbravo SLU
     * All Rights Reserved.
     * Contributor(s):  ______________________________________.
     ************************************************************************/
@@ -66,8 +66,10 @@
 
     END LOOP;
   ELSIF (UPDATING) THEN
-    UPDATE fin_financial_account_acct SET AD_ORG_ID = :new.AD_ORG_ID
-    WHERE fin_financial_account_id = :new.fin_financial_account_id;
+		IF (:OLD.AD_ORG_ID <> :NEW.AD_ORG_ID) THEN
+			UPDATE fin_financial_account_acct SET AD_ORG_ID = :new.AD_ORG_ID
+			WHERE fin_financial_account_id = :new.fin_financial_account_id;
+		END IF;
   END IF;
 END FIN_FINANCIAL_ACCOUNT_TRG
 ]]></body>
--- a/model/src-db/database/model/triggers/M_CHARACTERISTIC_TRG.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/triggers/M_CHARACTERISTIC_TRG.xml	Tue May 06 13:08:31 2014 +0000
@@ -43,11 +43,11 @@
         INSERT INTO ad_tree (
             ad_tree_id, ad_client_id, ad_org_id, isactive,
             created, createdby, updated, updatedby,
-            name, description, treetype, isallnodes
+            name, description, treetype, isallnodes, ad_table_id
         ) VALUES (
             v_tree_id, :NEW.ad_client_id, '0', :NEW.isactive,
             now(), :NEW.createdby, now(), :NEW.updatedby,
-            'Product Characteristic tree', null, 'CH', 'Y'
+            'Product Characteristic tree', null, 'CH', 'Y', 'E913D17C9B3847CF92235082DBE2EC44'
         );
         :NEW.ad_tree_id := v_tree_id;
       END IF;
--- a/model/src-db/database/model/triggers/M_PRODUCT_TRG.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/triggers/M_PRODUCT_TRG.xml	Tue May 06 13:08:31 2014 +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-2013 Openbravo, S.L.U.
+  * Contributions are Copyright (C) 2001-2014 Openbravo, S.L.U.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -25,6 +25,7 @@
 
    TYPE RECORD IS REF CURSOR;
    Cur_Defaults RECORD;
+   Cur_Product RECORD;
 
     v_xTree_ID    			           varchar2(32);
     v_xParent_ID  			           varchar2(32);
@@ -46,7 +47,10 @@
     v_Sequence_No			             VARCHAR2(32);
     v_C_AcctSchema_ID			         VARCHAR2(32);
     v_Count 	 	               NUMBER;
-    v_qtyin_hand 	 	       NUMBER;
+    v_QtyOnHand							   NUMBER;
+    v_QtyReserved 						 NUMBER;
+    v_QtyOrdered 							 NUMBER;
+    v_Message                  VARCHAR(2000);
   			
 BEGIN
     IF AD_isTriggerEnabled()='N' THEN RETURN;
@@ -62,7 +66,9 @@
       OR (COALESCE(:new.m_attributeset_id,'null') <> COALESCE(:old.m_attributeset_id,'null'))
       OR (COALESCE(:new.c_uom_id,'null') <> COALESCE(:old.c_uom_id,'null'))
       OR (:old.isStocked='Y' AND :new.isStocked='N')) THEN
-   SELECT  COALESCE(SUM(QtyOnHand)+SUM(QtyReserved)*.111+SUM(QtyOrdered)*999, 0) INTO v_ControlNo
+   SELECT  COALESCE(SUM(QtyOnHand)+SUM(QtyReserved)*.111+SUM(QtyOrdered)*999, 0) ,
+   COALESCE(sum(QtyOnHand),0), COALESCE(SUM(QtyReserved),0) , COALESCE(SUM(QtyOrdered),0)
+   INTO v_ControlNo, v_QtyOnHand, v_QtyReserved, v_QtyOrdered
    FROM (SELECT QtyOnHand, 0 AS QtyReserved, 0 AS QtyOrdered
    FROM M_Storage_Detail s
    WHERE s.M_Product_ID=:new.M_Product_ID
@@ -70,26 +76,35 @@
    SELECT 0 AS QtyOnHand, QtyReserved, QtyOrdered
    FROM M_Storage_Pending s
    WHERE s.M_Product_ID=:new.M_Product_ID) A;
-   select COALESCE(sum(QtyOnHand),0) Into v_qtyin_hand from (
-   SELECT QtyOnHand
-   FROM M_Storage_Detail s
-   WHERE s.M_Product_ID=:new.M_Product_ID
-   UNION
-   SELECT 0 AS QtyOnHand
-   FROM M_Storage_Pending s
-   WHERE s.M_Product_ID=:new.M_Product_ID )A;
    IF (v_ControlNo <> 0) THEN
-    IF (COALESCE(:new.m_attributeset_id,'null') <> COALESCE(:old.m_attributeset_id,'null')) THEN
-      RAISE_APPLICATION_ERROR(-20000, '@20633@');
-    ELSIF (COALESCE(:new.c_uom_id,'null') <> COALESCE(:old.c_uom_id,'null')) THEN
-      RAISE_APPLICATION_ERROR(-20000, '@20634@');
-    ELSIF (:old.isStocked = 'Y' AND :new.isStocked = 'N') THEN
-      RAISE_APPLICATION_ERROR(-20000, '@StockedProductWithMovements@');
-    ELSIF (v_qtyin_hand=0) THEN
-      RAISE_APPLICATION_ERROR(-20000, '@ActivePoSo@');
-    ELSE
-      RAISE_APPLICATION_ERROR(-20000, '@20400@');
-    END IF;
+		IF (v_QtyOnHand <> 0) THEN
+			IF (COALESCE(:new.m_attributeset_id,'null') <> COALESCE(:old.m_attributeset_id,'null')) THEN
+				RAISE_APPLICATION_ERROR(-20000, '@20633@');
+			ELSIF (COALESCE(:new.c_uom_id,'null') <> COALESCE(:old.c_uom_id,'null')) THEN
+				RAISE_APPLICATION_ERROR(-20000, '@20634@');
+			ELSIF (:old.isStocked = 'Y' AND :new.isStocked = 'N') THEN
+				RAISE_APPLICATION_ERROR(-20000, '@StockedProductWithMovements@');
+			ELSE
+				RAISE_APPLICATION_ERROR(-20000, '@20400@');
+			END IF;
+		END IF;
+		IF(v_QtyOrdered <> 0 OR v_QtyReserved <>0) THEN
+		v_Message:='';
+		FOR Cur_Product IN (
+			SELECT dt.name, o.documentno
+			from c_orderline ol
+			left join c_order o ON o.c_order_id = ol.c_order_id
+			left join c_doctype dt on dt.c_doctype_id = o.c_doctype_id
+			WHERE ol.m_product_id = :new.m_product_id
+			AND o.docstatus='CO'
+			AND o.processed='Y'
+			AND ((o.issotrx = 'N' AND (ol.qtyordered + ol.qtyreserved) <> 0) OR 
+			(o.issotrx='Y' AND (ol.qtyordered - ol.qtydelivered) <> 0)))
+		LOOP
+			v_Message:= v_Message || Cur_Product.name ||'-'|| Cur_Product.documentno||',';
+		END LOOP;
+			RAISE_APPLICATION_ERROR(-20000, v_Message||'@ActivePoSo@');
+		END IF;
    END IF;
   END IF;
 
--- a/model/src-db/database/model/triggers/M_TRANSACTION_TRG2.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/triggers/M_TRANSACTION_TRG2.xml	Tue May 06 13:08:31 2014 +0000
@@ -63,7 +63,7 @@
           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;
-        IF (v_onhand - v_reserved < ABS(:NEW.movementqty)) THEN
+        IF (v_onhand - v_reserved < ABS(:NEW.movementqty) AND v_reserved > 0) THEN
 	  SELECT value
             INTO v_product_value
           FROM M_Product
@@ -88,7 +88,7 @@
             WHERE M_Locator_ID = :NEW.m_locator_id;
           END IF;
           IF (:NEW.Checkreservedqty='Y') THEN
-          RAISE_APPLICATION_ERROR(-20000, '@CannotTakeOutReservedStock@' || ' @of@' || ' @Product@: ' || v_product_value || ', @AttributeSetInstance@: ' || COALESCE(v_attr_description, '-') || ', @UOM@: ' || v_uom_value || ' @And@'||' @StorageBin@: ' || COALESCE(v_locator_value, '-'));
+          RAISE_APPLICATION_ERROR(-20000, '@CannotTakeOutReservedStock@' || ' @of@' || ' @Product@: ' || v_product_value || ', @AttributeSetInstance@: ' || COALESCE(v_attr_description, '-') || ', @UOM@: ' || COALESCE(v_uom_value, '-') || ' @And@'||' @StorageBin@: ' || COALESCE(v_locator_value, '-'));
           END IF;
         END IF;
       END IF;
--- a/model/src-db/database/model/views/M_INOUT_CANDIDATE_V.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/model/views/M_INOUT_CANDIDATE_V.xml	Tue May 06 13:08:31 2014 +0000
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
   <database name="VIEW M_INOUT_CANDIDATE_V">
-    <view name="M_INOUT_CANDIDATE_V"><![CDATA[SELECT o.ad_client_id, o.ad_org_id, o.c_bpartner_id, o.c_order_id, o.documentno, o.dateordered, o.c_doctype_id, o.totallines AS amountlines, sum((l.qtyordered - l.qtydelivered) * l.priceactual) AS totallines FROM c_order o JOIN c_orderline l ON o.c_order_id = l.c_order_id WHERE o.docstatus = 'CO' AND o.isdelivered = 'N' AND (o.c_doctype_id IN (SELECT c_doctype.c_doctype_id FROM c_doctype WHERE c_doctype.docbasetype = 'SOO' AND (c_doctype.docsubtypeso NOT IN ('ON', 'OB', 'WR')))) AND l.qtyordered <> l.qtydelivered AND l.directship = 'N' AND l.m_product_id IS NOT NULL GROUP BY o.ad_client_id, o.ad_org_id, o.c_bpartner_id, o.c_order_id, o.documentno, o.dateordered, o.totallines, o.c_doctype_id]]></view>
+    <view name="M_INOUT_CANDIDATE_V"><![CDATA[SELECT o.ad_client_id, o.ad_org_id, o.c_bpartner_id, o.c_order_id, o.documentno, o.dateordered, o.c_doctype_id, o.totallines AS amountlines, sum((l.qtyordered - l.qtydelivered) * l.priceactual) AS totallines FROM c_order o JOIN c_orderline l ON o.c_order_id = l.c_order_id WHERE o.docstatus = 'CO' AND o.isdelivered = 'N' AND (o.c_doctype_id IN (SELECT c_doctype.c_doctype_id FROM c_doctype WHERE c_doctype.docbasetype = 'SOO' AND (c_doctype.docsubtypeso NOT IN ('ON', 'OB')))) AND l.qtyordered <> l.qtydelivered AND l.directship = 'N' AND l.m_product_id IS NOT NULL GROUP BY o.ad_client_id, o.ad_org_id, o.c_bpartner_id, o.c_order_id, o.documentno, o.dateordered, o.totallines, o.c_doctype_id]]></view>
   </database>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/model/src-db/database/model/views/M_RESERVEDGOODMNT_PICK_EDIT.xml	Tue May 06 13:08:31 2014 +0000
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+  <database name="VIEW M_RESERVEDGOODMNT_PICK_EDIT">
+    <view name="M_RESERVEDGOODMNT_PICK_EDIT"><![CDATA[SELECT rs.m_reservation_stock_id AS m_reservedgoodmnt_pick_edit_id, rs.m_reservation_id, r.ad_client_id, r.ad_org_id, rs.isactive, r.updated, r.updatedby, r.created, r.createdby, to_char('N') AS ob_selected, rs.m_locator_id, r.c_orderline_id, rs.quantity, COALESCE(rs.releasedqty, 0) AS releasedqty, NULL AS m_locatorto_id, to_number('0') AS movementqty, rs.m_attributesetinstance_id FROM m_reservation r JOIN m_reservation_stock rs ON r.m_reservation_id = rs.m_reservation_id WHERE rs.m_locator_id IS NOT NULL AND (rs.quantity - COALESCE(rs.releasedqty, 0)) > 0]]></view>
+  </database>
--- a/model/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Tue May 06 13:08:31 2014 +0000
@@ -816,6 +816,19 @@
 <!--0E03F64542694568B5C08A0E088A67F0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--0E03F64542694568B5C08A0E088A67F0--></AD_AUXILIARINPUT>
 
+<!--0E3BC489C55F423BAB4B45F144DFFAF1--><AD_AUXILIARINPUT>
+<!--0E3BC489C55F423BAB4B45F144DFFAF1-->  <AD_AUXILIARINPUT_ID><![CDATA[0E3BC489C55F423BAB4B45F144DFFAF1]]></AD_AUXILIARINPUT_ID>
+<!--0E3BC489C55F423BAB4B45F144DFFAF1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0E3BC489C55F423BAB4B45F144DFFAF1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0E3BC489C55F423BAB4B45F144DFFAF1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0E3BC489C55F423BAB4B45F144DFFAF1-->  <AD_TAB_ID><![CDATA[23691259D1BD4496BCC5F32645BCA4B9]]></AD_TAB_ID>
+<!--0E3BC489C55F423BAB4B45F144DFFAF1-->  <NAME><![CDATA[Parent_AD_Org]]></NAME>
+<!--0E3BC489C55F423BAB4B45F144DFFAF1-->  <CODE><![CDATA[@SQL= SELECT AD_ORG_ID
+FROM FIN_Financial_Account
+WHERE FIN_Financial_Account_ID = @FIN_Financial_Account_ID@]]></CODE>
+<!--0E3BC489C55F423BAB4B45F144DFFAF1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0E3BC489C55F423BAB4B45F144DFFAF1--></AD_AUXILIARINPUT>
+
 <!--0F3BE3F4353D49C08AE84C7786095A6C--><AD_AUXILIARINPUT>
 <!--0F3BE3F4353D49C08AE84C7786095A6C-->  <AD_AUXILIARINPUT_ID><![CDATA[0F3BE3F4353D49C08AE84C7786095A6C]]></AD_AUXILIARINPUT_ID>
 <!--0F3BE3F4353D49C08AE84C7786095A6C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -996,6 +1009,17 @@
 <!--1FEA6AF375714E1A962C67E094001342-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1FEA6AF375714E1A962C67E094001342--></AD_AUXILIARINPUT>
 
+<!--1FF62A68BA95425CA76E4317DD195C62--><AD_AUXILIARINPUT>
+<!--1FF62A68BA95425CA76E4317DD195C62-->  <AD_AUXILIARINPUT_ID><![CDATA[1FF62A68BA95425CA76E4317DD195C62]]></AD_AUXILIARINPUT_ID>
+<!--1FF62A68BA95425CA76E4317DD195C62-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1FF62A68BA95425CA76E4317DD195C62-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1FF62A68BA95425CA76E4317DD195C62-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1FF62A68BA95425CA76E4317DD195C62-->  <AD_TAB_ID><![CDATA[2845D761A8394468BD3BA4710AA888D4]]></AD_TAB_ID>
+<!--1FF62A68BA95425CA76E4317DD195C62-->  <NAME><![CDATA[DRAFTRECONCILIATION]]></NAME>
+<!--1FF62A68BA95425CA76E4317DD195C62-->  <CODE><![CDATA[@SQL=select coalesce(fin_reconciliation_id,'') from fin_reconciliation where fin_financial_account_id = @FIN_Financial_Account_ID@ and processed = 'N']]></CODE>
+<!--1FF62A68BA95425CA76E4317DD195C62-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1FF62A68BA95425CA76E4317DD195C62--></AD_AUXILIARINPUT>
+
 <!--21B56210EEAD4C08AB3A0A1A4F781FE6--><AD_AUXILIARINPUT>
 <!--21B56210EEAD4C08AB3A0A1A4F781FE6-->  <AD_AUXILIARINPUT_ID><![CDATA[21B56210EEAD4C08AB3A0A1A4F781FE6]]></AD_AUXILIARINPUT_ID>
 <!--21B56210EEAD4C08AB3A0A1A4F781FE6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1304,6 +1328,17 @@
 <!--35586436B2FB4809B66D519BC02230F4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--35586436B2FB4809B66D519BC02230F4--></AD_AUXILIARINPUT>
 
+<!--364291215E9147639E19489DCE02B97F--><AD_AUXILIARINPUT>
+<!--364291215E9147639E19489DCE02B97F-->  <AD_AUXILIARINPUT_ID><![CDATA[364291215E9147639E19489DCE02B97F]]></AD_AUXILIARINPUT_ID>
+<!--364291215E9147639E19489DCE02B97F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--364291215E9147639E19489DCE02B97F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--364291215E9147639E19489DCE02B97F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--364291215E9147639E19489DCE02B97F-->  <AD_TAB_ID><![CDATA[106]]></AD_TAB_ID>
+<!--364291215E9147639E19489DCE02B97F-->  <NAME><![CDATA[IsTreeTable]]></NAME>
+<!--364291215E9147639E19489DCE02B97F-->  <CODE><![CDATA[@SQL=SELECT istree FROM ad_table WHERE ad_table_id = @ad_table_id@]]></CODE>
+<!--364291215E9147639E19489DCE02B97F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--364291215E9147639E19489DCE02B97F--></AD_AUXILIARINPUT>
+
 <!--3648B8ACFDE44EF4A649B7933D9DBD97--><AD_AUXILIARINPUT>
 <!--3648B8ACFDE44EF4A649B7933D9DBD97-->  <AD_AUXILIARINPUT_ID><![CDATA[3648B8ACFDE44EF4A649B7933D9DBD97]]></AD_AUXILIARINPUT_ID>
 <!--3648B8ACFDE44EF4A649B7933D9DBD97-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1660,6 +1695,20 @@
 <!--4D9613116EAA46A585AEDB75237D5140-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4D9613116EAA46A585AEDB75237D5140--></AD_AUXILIARINPUT>
 
+<!--4FD70C86888041D695C59CFA792BBCC6--><AD_AUXILIARINPUT>
+<!--4FD70C86888041D695C59CFA792BBCC6-->  <AD_AUXILIARINPUT_ID><![CDATA[4FD70C86888041D695C59CFA792BBCC6]]></AD_AUXILIARINPUT_ID>
+<!--4FD70C86888041D695C59CFA792BBCC6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4FD70C86888041D695C59CFA792BBCC6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4FD70C86888041D695C59CFA792BBCC6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4FD70C86888041D695C59CFA792BBCC6-->  <AD_TAB_ID><![CDATA[2845D761A8394468BD3BA4710AA888D4]]></AD_TAB_ID>
+<!--4FD70C86888041D695C59CFA792BBCC6-->  <NAME><![CDATA[LASTRECON]]></NAME>
+<!--4FD70C86888041D695C59CFA792BBCC6-->  <CODE><![CDATA[@SQL=select fin_reconciliation_id from fin_reconciliation where created = (
+select max(created)
+from fin_reconciliation 
+where fin_financial_account_id = @FIN_Financial_Account_ID@)]]></CODE>
+<!--4FD70C86888041D695C59CFA792BBCC6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4FD70C86888041D695C59CFA792BBCC6--></AD_AUXILIARINPUT>
+
 <!--51568B79156646C8966F49F82EE51CB7--><AD_AUXILIARINPUT>
 <!--51568B79156646C8966F49F82EE51CB7-->  <AD_AUXILIARINPUT_ID><![CDATA[51568B79156646C8966F49F82EE51CB7]]></AD_AUXILIARINPUT_ID>
 <!--51568B79156646C8966F49F82EE51CB7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -2447,6 +2496,25 @@
 <!--9E0F5BB107EE463B8E4F18395952D8F2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--9E0F5BB107EE463B8E4F18395952D8F2--></AD_AUXILIARINPUT>
 
+<!--9E5EF28335254D948E30BAF9BF41B3A7--><AD_AUXILIARINPUT>
+<!--9E5EF28335254D948E30BAF9BF41B3A7-->  <AD_AUXILIARINPUT_ID><![CDATA[9E5EF28335254D948E30BAF9BF41B3A7]]></AD_AUXILIARINPUT_ID>
+<!--9E5EF28335254D948E30BAF9BF41B3A7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9E5EF28335254D948E30BAF9BF41B3A7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9E5EF28335254D948E30BAF9BF41B3A7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9E5EF28335254D948E30BAF9BF41B3A7-->  <AD_TAB_ID><![CDATA[290]]></AD_TAB_ID>
+<!--9E5EF28335254D948E30BAF9BF41B3A7-->  <NAME><![CDATA[showAddPayment]]></NAME>
+<!--9E5EF28335254D948E30BAF9BF41B3A7-->  <CODE><![CDATA[@SQL=select case when sum(fpsd.amount)=ci.GrandTotal then 'N' else 'Y' end 
+          from fin_payment_scheduledetail fpsd
+              left join fin_payment_detail fpd on fpsd.fin_payment_detail_id=fpd.fin_payment_detail_id
+               left join fin_payment fp on fpd.fin_payment_id=fp.fin_payment_id
+                left join fin_payment_schedule ps ON ps.fin_payment_schedule_id = fpsd.fin_payment_schedule_invoice
+                left join c_invoice ci on ci.c_invoice_id=ps.c_invoice_id
+                WHERE ps.c_invoice_id =@c_invoice_id@
+                and to_number(aprm_seqnumberpaymentstatus(fp.status)) >= 40
+                group by ci.GrandTotal]]></CODE>
+<!--9E5EF28335254D948E30BAF9BF41B3A7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9E5EF28335254D948E30BAF9BF41B3A7--></AD_AUXILIARINPUT>
+
 <!--9EC3A191A6D84253A26520E4849B73EF--><AD_AUXILIARINPUT>
 <!--9EC3A191A6D84253A26520E4849B73EF-->  <AD_AUXILIARINPUT_ID><![CDATA[9EC3A191A6D84253A26520E4849B73EF]]></AD_AUXILIARINPUT_ID>
 <!--9EC3A191A6D84253A26520E4849B73EF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3841,4 +3909,23 @@
 <!--FF80818132916D6E013291C49E7E00E6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--FF80818132916D6E013291C49E7E00E6--></AD_AUXILIARINPUT>
 
+<!--FFA925AAC4BB49D5A67C05DAD16EFA32--><AD_AUXILIARINPUT>
+<!--FFA925AAC4BB49D5A67C05DAD16EFA32-->  <AD_AUXILIARINPUT_ID><![CDATA[FFA925AAC4BB49D5A67C05DAD16EFA32]]></AD_AUXILIARINPUT_ID>
+<!--FFA925AAC4BB49D5A67C05DAD16EFA32-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--FFA925AAC4BB49D5A67C05DAD16EFA32-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--FFA925AAC4BB49D5A67C05DAD16EFA32-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--FFA925AAC4BB49D5A67C05DAD16EFA32-->  <AD_TAB_ID><![CDATA[263]]></AD_TAB_ID>
+<!--FFA925AAC4BB49D5A67C05DAD16EFA32-->  <NAME><![CDATA[showAddPayment]]></NAME>
+<!--FFA925AAC4BB49D5A67C05DAD16EFA32-->  <CODE><![CDATA[@SQL=select case when sum(fpsd.amount)=ci.GrandTotal then 'N' else 'Y' end 
+          from fin_payment_scheduledetail fpsd
+              left join fin_payment_detail fpd on fpsd.fin_payment_detail_id=fpd.fin_payment_detail_id
+               left join fin_payment fp on fpd.fin_payment_id=fp.fin_payment_id
+                left join fin_payment_schedule ps ON ps.fin_payment_schedule_id = fpsd.fin_payment_schedule_invoice
+                left join c_invoice ci on ci.c_invoice_id=ps.c_invoice_id
+                WHERE ps.c_invoice_id =@c_invoice_id@
+                and to_number(aprm_seqnumberpaymentstatus(fp.status)) >= 40
+                group by ci.GrandTotal]]></CODE>
+<!--FFA925AAC4BB49D5A67C05DAD16EFA32-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--FFA925AAC4BB49D5A67C05DAD16EFA32--></AD_AUXILIARINPUT>
+
 </data>
--- a/model/src-db/database/sourcedata/AD_COLUMN.xml	Tue May 06 11:16:26 2014 +0200
+++ b/model/src-db/database/sourcedata/AD_COLUMN.xml	Tue May 06 13:08:31 2014 +0000
@@ -30455,7 +30455,7 @@
 <!--2202-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
 <!--2202-->  <AD_REFERENCE_VALUE_ID><![CDATA[263693E51C7847BF90C897ADB830E2BB]]></AD_REFERENCE_VALUE_ID>
 <!--2202-->  <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
-<!--2202-->  <DEFAULTVALUE><![CDATA[@SQL=select m_warehouse_id from ad_org_warehouse  where ad_org_id = @ad_org_id@ group by m_warehouse_id, priority having min(priority) = priority
+<!--2202-->  <DEFAULTVALUE><![CDATA[@SQL=select m_warehouse_id from ad_org_warehouse ow where ad_org_id = @ad_org_id@ and (select isactive from m_warehouse where m_warehouse_id=ow.m_warehouse_id)='Y' group by m_warehouse_id, priority having min(priority) = priority
 ]]></DEFAULTVALUE>
 <!--2202-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--2202-->  <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -43501,8 +43501,7 @@
 <!--2866-->  <HELP><![CDATA[The Tree Type / Area field determines the type of tree this is.  For example, you may define one tree for your Products and another tree for your Business Partners.]]></HELP>
 <!--2866-->  <COLUMNNAME><![CDATA[TreeType]]></COLUMNNAME>
 <!--2866-->  <AD_TABLE_ID><![CDATA[288]]></AD_TABLE_ID>
-<!--2866-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
-<!--2866-->  <AD_REFERENCE_VALUE_ID><![CDATA[120]]></AD_REFERENCE_VALUE_ID>
+<!--2866-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
 <!--2866-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
 <!--2866-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--2866-->  <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -56553,7 +56552,7 @@
 <!--3540-->  <AD_TABLE_ID><![CDATA[320]]></AD_TABLE_ID>
 <!--3540-->  <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
 <!--3540-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
-<!--3540-->  <DEFAULTVALUE><![CDATA[1]]></DEFAULTVALUE>
+<!--3540-->  <DEFAULTVALUE><![CDATA[0]]></DEFAULTVALUE>
 <!--3540-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--3540-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--3540-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
@@ -56698,7 +56697,7 @@
 <!--3544-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--3544-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--3544-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--3544-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--3544-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
 <!--3544-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
 <!--3544-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--3544-->  <SEQNO><![CDATA[100]]></SEQNO>
@@ -58601,7 +58600,7 @@
 <!--3598-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--3598-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--3598-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--3598-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--3598-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
 <!--3598-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--3598-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--3598-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -109489,8 +109488,8 @@
 <!--8584-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--8584-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8584-->  <NAME><![CDATA[Web Session]]></NAME>
-<!--8584-->  <DESCRIPTION><![CDATA[Web Session ID]]></DESCRIPTION>
-<!--8584-->  <HELP><![CDATA[Web Session identifier]]></HELP>
+<!--8584-->  <DESCRIPTION><![CDATA[Tomcat Session ID]]></DESCRIPTION>
+<!--8584-->  <HELP><![CDATA[Identifier assigned to the session by the Servlet Container (Tomcat).]]></HELP>
 <!--8584-->  <COLUMNNAME><![CDATA[WebSession]]></COLUMNNAME>
 <!--8584-->  <AD_TABLE_ID><![CDATA[566]]></AD_TABLE_ID>
 <!--8584-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
@@ -152772,7 +152771,7 @@
 <!--801510-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--801510-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--801510-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--801510-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--801510-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
 <!--801510-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--801510-->  <SEQNO><![CDATA[30]]></SEQNO>
 <!--801510-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -200293,8 +200292,8 @@
 <!--803636-->  <HELP><![CDATA[The Parent indicates the value used to represent a summary level or report to level for a record]]></HELP>
 <!--803636-->  <COLUMNNAME><![CDATA[Parent_ID]]></COLUMNNAME>
 <!--803636-->  <AD_TABLE_ID><![CDATA[800219]]></AD_TABLE_ID>
-<!--803636-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
-<!--803636-->  <AD_REFERENCE_VALUE_ID><![CDATA[800100]]></AD_REFERENCE_VALUE_ID>
+<!--803636-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--803636-->  <AD_REFERENCE_VALUE_ID><![CDATA[689DF2175C944B70AF0DF7D57C3411A6]]></AD_REFERENCE_VALUE_ID>
 <!--803636-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
 <!--803636-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--803636-->  <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -220056,6 +220055,41 @@
 <!--00D6BA2224034FAD99CEA36332A9CE0D-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--00D6BA2224034FAD99CEA36332A9CE0D--></AD_COLUMN>
 
+<!--00ED8F7CB93B4006AA002FA9F3244E03--><AD_COLUMN>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <AD_COLUMN_ID><![CDATA[00ED8F7CB93B4006AA002FA9F3244E03]]></AD_COLUMN_ID>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <NAME><![CDATA[Created By]]></NAME>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <COLUMNNAME><![CDATA[Createdby]]></COLUMNNAME>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <AD_TABLE_ID><![CDATA[48F5363A7C0C44DE8114627C64DB4BDA]]></AD_TABLE_ID>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <POSITION><![CDATA[6]]></POSITION>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--00ED8F7CB93B4006AA002FA9F3244E03-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--00ED8F7CB93B4006AA002FA9F3244E03--></AD_COLUMN>
+
 <!--00FA42F2239C49ACA79CAC3A030F8DCD--><AD_COLUMN>
 <!--00FA42F2239C49ACA79CAC3A030F8DCD-->  <AD_COLUMN_ID><![CDATA[00FA42F2239C49ACA79CAC3A030F8DCD]]></AD_COLUMN_ID>
 <!--00FA42F2239C49ACA79CAC3A030F8DCD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -220628,6 +220662,41 @@
 <!--035D75B7C93D4685A94B5EA7D0A082DC-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--035D75B7C93D4685A94B5EA7D0A082DC--></AD_COLUMN>
 
+<!--0364AA91A4644B46897B566346F1EA02--><AD_COLUMN>
+<!--0364AA91A4644B46897B566346F1EA02-->  <AD_COLUMN_ID><![CDATA[0364AA91A4644B46897B566346F1EA02]]></AD_COLUMN_ID>
+<!--0364AA91A4644B46897B566346F1EA02-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0364AA91A4644B46897B566346F1EA02-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0364AA91A4644B46897B566346F1EA02-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0364AA91A4644B46897B566346F1EA02-->  <NAME><![CDATA[Updated]]></NAME>
+<!--0364AA91A4644B46897B566346F1EA02-->  <DESCRIPTION><![CDATA[The date that this record was last updated]]></DESCRIPTION>
+<!--0364AA91A4644B46897B566346F1EA02-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
+<!--0364AA91A4644B46897B566346F1EA02-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
+<!--0364AA91A4644B46897B566346F1EA02-->  <AD_TABLE_ID><![CDATA[EFF678F4887E45B2B7C35C6AF6A8357A]]></AD_TABLE_ID>
+<!--0364AA91A4644B46897B566346F1EA02-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--0364AA91A4644B46897B566346F1EA02-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--0364AA91A4644B46897B566346F1EA02-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--0364AA91A4644B46897B566346F1EA02-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--0364AA91A4644B46897B566346F1EA02-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--0364AA91A4644B46897B566346F1EA02-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--0364AA91A4644B46897B566346F1EA02-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--0364AA91A4644B46897B566346F1EA02-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--0364AA91A4644B46897B566346F1EA02-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--0364AA91A4644B46897B566346F1EA02-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--0364AA91A4644B46897B566346F1EA02-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--0364AA91A4644B46897B566346F1EA02-->  <AD_ELEMENT_ID><![CDATA[607]]></AD_ELEMENT_ID>
+<!--0364AA91A4644B46897B566346F1EA02-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--0364AA91A4644B46897B566346F1EA02-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--0364AA91A4644B46897B566346F1EA02-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--0364AA91A4644B46897B566346F1EA02-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--0364AA91A4644B46897B566346F1EA02-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0364AA91A4644B46897B566346F1EA02-->  <POSITION><![CDATA[6]]></POSITION>
+<!--0364AA91A4644B46897B566346F1EA02-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--0364AA91A4644B46897B566346F1EA02-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--0364AA91A4644B46897B566346F1EA02-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--0364AA91A4644B46897B566346F1EA02-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--0364AA91A4644B46897B566346F1EA02-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--0364AA91A4644B46897B566346F1EA02--></AD_COLUMN>
+
 <!--036625CD981E42A3BA32166228287C0D--><AD_COLUMN>
 <!--036625CD981E42A3BA32166228287C0D-->  <AD_COLUMN_ID><![CDATA[036625CD981E42A3BA32166228287C0D]]></AD_COLUMN_ID>
 <!--036625CD981E42A3BA32166228287C0D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -220985,6 +221054,80 @@
 <!--04FC9DA93B104BC1BB03B854371A0211-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--04FC9DA93B104BC1BB03B854371A0211--></AD_COLUMN>
 
+<!--051C9694814F4161AFA2669DB1B92E21--><AD_COLUMN>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <AD_COLUMN_ID><![CDATA[051C9694814F4161AFA2669DB1B92E21]]></AD_COLUMN_ID>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <NAME><![CDATA[Property]]></NAME>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <DESCRIPTION><![CDATA[Configuration Property to assign value]]></DESCRIPTION>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <HELP><![CDATA[It is the "Configuration Property" this record sets value to. 
+
+Configuration Properties are defined by modules with the purpose other modules are capable to assign them values.]]></HELP>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <COLUMNNAME><![CDATA[Property]]></COLUMNNAME>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <AD_TABLE_ID><![CDATA[10DF9CD898D1492BBD0620FDE6051B76]]></AD_TABLE_ID>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <AD_REFERENCE_ID><![CDATA[95E2A8B50A254B2AAE6774B8C2F28120]]></AD_REFERENCE_ID>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <AD_REFERENCE_VALUE_ID><![CDATA[45B39681AFBC4808A64C9B776A290BA4]]></AD_REFERENCE_VALUE_ID>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <FIELDLENGTH><![CDATA[255]]></FIELDLENGTH>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <AD_ELEMENT_ID><![CDATA[841CB823976F391BE040007F0101218F]]></AD_ELEMENT_ID>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <POSITION><![CDATA[10]]></POSITION>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--051C9694814F4161AFA2669DB1B92E21-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--051C9694814F4161AFA2669DB1B92E21--></AD_COLUMN>
+
+<!--05427493B64040A2870A3EC49EB606CC--><AD_COLUMN>
+<!--05427493B64040A2870A3EC49EB606CC-->  <AD_COLUMN_ID><![CDATA[05427493B64040A2870A3EC49EB606CC]]></AD_COLUMN_ID>
+<!--05427493B64040A2870A3EC49EB606CC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--05427493B64040A2870A3EC49EB606CC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--05427493B64040A2870A3EC49EB606CC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--05427493B64040A2870A3EC49EB606CC-->  <NAME><![CDATA[Valuefield_ID]]></NAME>
+<!--05427493B64040A2870A3EC49EB606CC-->  <DESCRIPTION><![CDATA[The value of this field will be set in the foreign key column. ]]></DESCRIPTION>
+<!--05427493B64040A2870A3EC49EB606CC-->  <HELP><![CDATA[The value of this field will be set in the foreign key column. ]]></HELP>
+<!--05427493B64040A2870A3EC49EB606CC-->  <COLUMNNAME><![CDATA[Valuefield_ID]]></COLUMNNAME>
+<!--05427493B64040A2870A3EC49EB606CC-->  <AD_TABLE_ID><![CDATA[58977D8AC43D4557B1176BBA5FBEB871]]></AD_TABLE_ID>
+<!--05427493B64040A2870A3EC49EB606CC-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
+<!--05427493B64040A2870A3EC49EB606CC-->  <AD_REFERENCE_VALUE_ID><![CDATA[BE0FDF9E98DA43908E1DACC43893E1F6]]></AD_REFERENCE_VALUE_ID>
+<!--05427493B64040A2870A3EC49EB606CC-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--05427493B64040A2870A3EC49EB606CC-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--05427493B64040A2870A3EC49EB606CC-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--05427493B64040A2870A3EC49EB606CC-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--05427493B64040A2870A3EC49EB606CC-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--05427493B64040A2870A3EC49EB606CC-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--05427493B64040A2870A3EC49EB606CC-->  <SEQNO><![CDATA[170]]></SEQNO>
+<!--05427493B64040A2870A3EC49EB606CC-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--05427493B64040A2870A3EC49EB606CC-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--05427493B64040A2870A3EC49EB606CC-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--05427493B64040A2870A3EC49EB606CC-->  <AD_ELEMENT_ID><![CDATA[5D272070F3EE4507BE9C0F3549E043D6]]></AD_ELEMENT_ID>
+<!--05427493B64040A2870A3EC49EB606CC-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--05427493B64040A2870A3EC49EB606CC-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--05427493B64040A2870A3EC49EB606CC-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--05427493B64040A2870A3EC49EB606CC-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--05427493B64040A2870A3EC49EB606CC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--05427493B64040A2870A3EC49EB606CC-->  <POSITION><![CDATA[15]]></POSITION>
+<!--05427493B64040A2870A3EC49EB606CC-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--05427493B64040A2870A3EC49EB606CC-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--05427493B64040A2870A3EC49EB606CC-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--05427493B64040A2870A3EC49EB606CC-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--05427493B64040A2870A3EC49EB606CC-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--05427493B64040A2870A3EC49EB606CC--></AD_COLUMN>
+
 <!--0548F126F1054F2280D9F63F48E559DB--><AD_COLUMN>
 <!--0548F126F1054F2280D9F63F48E559DB-->  <AD_COLUMN_ID><![CDATA[0548F126F1054F2280D9F63F48E559DB]]></AD_COLUMN_ID>
 <!--0548F126F1054F2280D9F63F48E559DB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -221205,6 +221348,43 @@
 <!--05C088F54F974D8482C0DFDAE726D0C5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--05C088F54F974D8482C0DFDAE726D0C5--></AD_COLUMN>
 
+<!--05C58E74CB76448CBA4AF4CA43E193E3--><AD_COLUMN>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <AD_COLUMN_ID><![CDATA[05C58E74CB76448CBA4AF4CA43E193E3]]></AD_COLUMN_ID>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <NAME><![CDATA[Module]]></NAME>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <DESCRIPTION><![CDATA[Module]]></DESCRIPTION>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <HELP><![CDATA[Indicates the module the element forms part of.]]></HELP>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <COLUMNNAME><![CDATA[AD_Module_ID]]></COLUMNNAME>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <AD_TABLE_ID><![CDATA[10DF9CD898D1492BBD0620FDE6051B76]]></AD_TABLE_ID>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <AD_VAL_RULE_ID><![CDATA[C45CFD74FF5145B0A356E9233D49996F]]></AD_VAL_RULE_ID>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <DEFAULTVALUE><![CDATA[@SQL=SELECT AD_MODULE_ID FROM AD_REF_TREE WHERE AD_REF_TREE_ID = @AD_REF_TREE_ID@]]></DEFAULTVALUE>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <AD_ELEMENT_ID><![CDATA[565E666A619A2693E040007F01002851]]></AD_ELEMENT_ID>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <POSITION><![CDATA[5]]></POSITION>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--05C58E74CB76448CBA4AF4CA43E193E3-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--05C58E74CB76448CBA4AF4CA43E193E3--></AD_COLUMN>
+
 <!--060657E87C824FD29A132A97802331F1--><AD_COLUMN>
 <!--060657E87C824FD29A132A97802331F1-->  <AD_COLUMN_ID><![CDATA[060657E87C824FD29A132A97802331F1]]></AD_COLUMN_ID>
 <!--060657E87C824FD29A132A97802331F1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -221242,6 +221422,42 @@
 <!--060657E87C824FD29A132A97802331F1-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--060657E87C824FD29A132A97802331F1--></AD_COLUMN>
 
+<!--06146353992C48FE945CB1C60A28E7FC--><AD_COLUMN>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <AD_COLUMN_ID><![CDATA[06146353992C48FE945CB1C60A28E7FC]]></AD_COLUMN_ID>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <NAME><![CDATA[Organization]]></NAME>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <AD_TABLE_ID><![CDATA[10DF9CD898D1492BBD0620FDE6051B76]]></AD_TABLE_ID>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <POSITION><![CDATA[4]]></POSITION>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--06146353992C48FE945CB1C60A28E7FC-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--06146353992C48FE945CB1C60A28E7FC--></AD_COLUMN>
+
 <!--0665AD61112844B18C999D519EDB12A0--><AD_COLUMN>
 <!--0665AD61112844B18C999D519EDB12A0-->  <AD_COLUMN_ID><![CDATA[0665AD61112844B18C999D519EDB12A0]]></AD_COLUMN_ID>
 <!--0665AD61112844B18C999D519EDB12A0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -221414,6 +221630,42 @@
 <!--077BD0CB4F424D8A882FB287671BD4B4-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--077BD0CB4F424D8A882FB287671BD4B4--></AD_COLUMN>
 
+<!--07F45EC615C04578A19F1796FFB741BC--><AD_COLUMN>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <AD_COLUMN_ID><![CDATA[07F45EC615C04578A19F1796FFB741BC]]></AD_COLUMN_ID>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <NAME><![CDATA[Organization]]></NAME>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <AD_TABLE_ID><![CDATA[EFF678F4887E45B2B7C35C6AF6A8357A]]></AD_TABLE_ID>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <POSITION><![CDATA[4]]></POSITION>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--07F45EC615C04578A19F1796FFB741BC-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--07F45EC615C04578A19F1796FFB741BC--></AD_COLUMN>
+
 <!--082084D736FE4EEB9B5B95E9D3CBF489--><AD_COLUMN>
 <!--082084D736FE4EEB9B5B95E9D3CBF489-->  <AD_COLUMN_ID><![CDATA[082084D736FE4EEB9B5B95E9D3CBF489]]></AD_COLUMN_ID>
 <!--082084D736FE4EEB9B5B95E9D3CBF489-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -221975,6 +222227,42 @@
 <!--0BD260C46B9547BDB318DEBBDAB70536-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--0BD260C46B9547BDB318DEBBDAB70536--></AD_COLUMN>
 
+<!--0C1DE920F9734332A37F459F72CE5045--><AD_COLUMN>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <AD_COLUMN_ID><![CDATA[0C1DE920F9734332A37F459F72CE5045]]></AD_COLUMN_ID>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <NAME><![CDATA[Column]]></NAME>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <DESCRIPTION><![CDATA[A link to the database column of the table.]]></DESCRIPTION>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <HELP><![CDATA[Link to the database column of the table]]></HELP>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <COLUMNNAME><![CDATA[AD_Column_ID]]></COLUMNNAME>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <AD_TABLE_ID><![CDATA[58977D8AC43D4557B1176BBA5FBEB871]]></AD_TABLE_ID>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <AD_VAL_RULE_ID><![CDATA[100]]></AD_VAL_RULE_ID>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <SEQNO><![CDATA[140]]></SEQNO>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <AD_ELEMENT_ID><![CDATA[104]]></AD_ELEMENT_ID>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <POSITION><![CDATA[12]]></POSITION>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--0C1DE920F9734332A37F459F72CE5045-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--0C1DE920F9734332A37F459F72CE5045--></AD_COLUMN>
+
 <!--0C6CC9768B5144EBB4827B9B98976816--><AD_COLUMN>
 <!--0C6CC9768B5144EBB4827B9B98976816-->  <AD_COLUMN_ID><![CDATA[0C6CC9768B5144EBB4827B9B98976816]]></AD_COLUMN_ID>
 <!--0C6CC9768B5144EBB4827B9B98976816-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -222501,6 +222789,42 @@
 <!--0ECBF3A6F9054BB3B46A02F7EBA78894-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--0ECBF3A6F9054BB3B46A02F7EBA78894--></AD_COLUMN>
 
+<!--0EFB6265D90B409EA1BA785F06A54F3A--><AD_COLUMN>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <AD_COLUMN_ID><![CDATA[0EFB6265D90B409EA1BA785F06A54F3A]]></AD_COLUMN_ID>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <NAME><![CDATA[Client]]></NAME>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <AD_TABLE_ID><![CDATA[48F5363A7C0C44DE8114627C64DB4BDA]]></AD_TABLE_ID>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <POSITION><![CDATA[2]]></POSITION>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--0EFB6265D90B409EA1BA785F06A54F3A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--0EFB6265D90B409EA1BA785F06A54F3A--></AD_COLUMN>
+
 <!--0F050666DA634EAE8919F239440ACF8A--><AD_COLUMN>
 <!--0F050666DA634EAE8919F239440ACF8A-->  <AD_COLUMN_ID><![CDATA[0F050666DA634EAE8919F239440ACF8A]]></AD_COLUMN_ID>
 <!--0F050666DA634EAE8919F239440ACF8A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -222572,6 +222896,42 @@
 <!--0F1394CAD68C4E1EBEC90416205E521B-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--0F1394CAD68C4E1EBEC90416205E521B--></AD_COLUMN>
 
+<!--0FA23D0D90E34E8790627C9928566EE3--><AD_COLUMN>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <AD_COLUMN_ID><![CDATA[0FA23D0D90E34E8790627C9928566EE3]]></AD_COLUMN_ID>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <NAME><![CDATA[Link to Parent Column]]></NAME>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <DESCRIPTION><![CDATA[For Link to Parent tables: column that points to the node id of the parent node]]></DESCRIPTION>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <HELP><![CDATA[This field is only used in Link To Parent tables. This field represents the column that points to the node id of the row that represents the parent of a node]]></HELP>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <COLUMNNAME><![CDATA[Linktoparentcolumn]]></COLUMNNAME>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <AD_TABLE_ID><![CDATA[48F5363A7C0C44DE8114627C64DB4BDA]]></AD_TABLE_ID>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <AD_REFERENCE_VALUE_ID><![CDATA[E125179F7310445E880814C659CA9F5A]]></AD_REFERENCE_VALUE_ID>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <AD_ELEMENT_ID><![CDATA[D4D7E2ED15CA403C88268790EB09C018]]></AD_ELEMENT_ID>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <POSITION><![CDATA[11]]></POSITION>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--0FA23D0D90E34E8790627C9928566EE3-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--0FA23D0D90E34E8790627C9928566EE3-