merged from pi revision 8585:594ab4625cfa
authorGorka Ion Damián <gorkaion.damian@openbravo.com>
Thu, 21 Oct 2010 18:38:18 +0200
changeset 8741 5c69ef7f3980
parent 8740 d9200efa4af7 (current diff)
parent 8613 594ab4625cfa (diff)
child 8742 e8e32dd85644
merged from pi revision 8585:594ab4625cfa
src-db/database/sourcedata/AD_AUXILIARINPUT.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_ELEMENT.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_MESSAGE.xml
src-db/database/sourcedata/AD_MODEL_OBJECT.xml
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
src-db/database/sourcedata/AD_PROCESS.xml
src-db/database/sourcedata/AD_REF_LIST.xml
src-db/database/sourcedata/AD_TAB.xml
src-db/database/sourcedata/AD_TABLE.xml
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
src-db/database/sourcedata/AD_WINDOW.xml
src-wad/src/org/openbravo/wad/javasource.javaxml
src/org/openbravo/erpCommon/ad_forms/InstanceManagement.html
Binary file src-db/database/lib/dbsourcemanager.jar has changed
--- a/src-db/database/model/functions/C_BANKSTATEMENT_POST.xml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-db/database/model/functions/C_BANKSTATEMENT_POST.xml	Thu Oct 21 18:38:18 2010 +0200
@@ -65,6 +65,7 @@
   TYPE RECORD IS REF CURSOR;
     Cur_Parameter RECORD;
     Cur_BankstatementDebtpayment RECORD;
+    Cur_BankstatementLine RECORD;
     -- Parameter Variables
     --  Parameter Variables
     v_Processed CHAR(1) ;
@@ -80,6 +81,8 @@
     v_BS_Date DATE;
     v_AD_Org_ID VARCHAR2(32);
     v_AD_Client_ID VARCHAR2(32) ;
+    v_ValutadatePeriod_ID NUMBER(10) ;
+    v_DateacctPeriod_ID NUMBER(10) ;
     FINISH_PROCESS BOOLEAN:=false;
   BEGIN
     --  Update AD_PInstance
@@ -371,6 +374,19 @@
        RAISE_APPLICATION_ERROR(-20000, '@Inline@'||v_line||' '||'@DebtAmountsSamemoneyNoMatch@') ;
       END IF;
     END IF;--FINISH_PROCESS
+    FOR Cur_BankstatementLine IN 
+      (SELECT valutadate, 
+              dateacct 
+      FROM C_BANKSTATEMENTLINE
+      WHERE C_BANKSTATEMENT_ID = v_Record_ID
+      AND ISACTIVE='Y')
+    LOOP
+      v_ValutadatePeriod_ID := C_CHK_OPEN_PERIOD (v_AD_Org_ID, Cur_BankstatementLine.valutadate, 'CMB',NULL);
+      v_DateacctPeriod_ID := C_CHK_OPEN_PERIOD (v_AD_Org_ID, Cur_BankstatementLine.dateacct, 'CMB',NULL);
+      IF (v_ValutadatePeriod_ID <> 1 OR v_DateacctPeriod_ID <> 1) THEN
+        RAISE_APPLICATION_ERROR(-20000, '@PeriodNotAvailable@') ;
+      END IF;
+    END LOOP;
     IF(NOT FINISH_PROCESS) THEN
       SELECT COUNT(*),
         MAX(bsl.Line)
--- a/src-db/database/model/functions/C_DEBT_PAYMENT_CREATE.xml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-db/database/model/functions/C_DEBT_PAYMENT_CREATE.xml	Thu Oct 21 18:38:18 2010 +0200
@@ -16,7 +16,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SLU
-* All portions are Copyright (C) 2001-2006 Openbravo SLU
+* All portions are Copyright (C) 2001-2010 Openbravo SLU
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -51,6 +51,7 @@
     v_c_withholding_id C_DEBT_PAYMENT.C_Withholding_ID%TYPE;
     v_withholdingamount C_DEBT_PAYMENT.withholdingamount%TYPE;
     v_count NUMBER;
+    v_dateacct C_BankStatementLine.DateAcct%TYPE;
   BEGIN
     --  Update AD_PInstance
     DBMS_OUTPUT.PUT_LINE('Updating PInstance - Processing ' || p_PInstance_ID) ;
@@ -113,10 +114,12 @@
     v_ResultStr:='ReadingBankStatementLine '||v_record_Id;
     SELECT L.AD_Client_ID,
       L.AD_Org_ID,
-      B.C_BankAccount_ID
+      B.C_BankAccount_ID,
+      L.DateAcct
     INTO v_Client_ID,
       v_AD_Org_ID,
-      v_CBankAccount_ID
+      v_CBankAccount_ID,
+      v_dateacct
     FROM C_BankStatementLine L,
       C_BankStatement B
     WHERE L.C_BankStatementLine_ID=v_Record_ID
@@ -155,7 +158,7 @@
       (
         v_SettlementID, v_Client_ID, v_AD_Org_ID, 'Y',
         now(), v_AD_User_ID, now(), v_AD_User_ID,
-        '*DPC*'||v_SDocumentNo, trunc(now()), trunc(now()), 'C',
+        '*DPC*'||v_SDocumentNo, v_dateacct, v_dateacct, 'C',
         v_SettlementDocType_ID, 'N', 'N', 'N',
         v_C_Currency_ID, v_Description, 'Y'
       )
--- a/src-db/database/model/functions/C_INVOICE_POST.xml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-db/database/model/functions/C_INVOICE_POST.xml	Thu Oct 21 18:38:18 2010 +0200
@@ -422,7 +422,12 @@
       SELECT COUNT(*) INTO v_Count
       FROM C_INVOICE C,
            C_DOCTYPE
-      WHERE C_DOCTYPE.DocBaseType IN ('ARI', 'API','ARC','APC')
+      WHERE C_DOCTYPE.DocBaseType IN (
+                                      select docbasetype
+                                      from c_doctype
+                                      where ad_table_id='318'
+                                        and isactive='Y'
+                                        and ad_client_id=C.AD_Client_ID)
         AND C_DOCTYPE.IsSOTrx=C.ISSOTRX
         AND Ad_Isorgincluded(C.AD_Org_ID,C_DOCTYPE.AD_Org_ID, C.AD_Client_ID) <> -1
         AND C.C_DOCTYPETARGET_ID = C_DOCTYPE.C_DOCTYPE_ID
@@ -1555,12 +1560,12 @@
               FROM C_DEBT_PAYMENT DP
               WHERE C_BPartner_ID=v_BPartner_ID
                 AND C_Debt_Payment_Status(C_Settlement_Cancel_ID, Cancel_Processed, Generate_Processed, IsPaid, IsValid, C_Cashline_ID, C_BankstatementLine_ID)='P'
+                AND ISRECEIPT=v_IsSOTrx
                 AND (-1) *Amount=v_paymentAmount
                 AND c_currency_ID=v_Currency_ID
                 AND C_SETTLEMENT_GENERATE_ID IS NOT NULL
                 AND Ad_Isorgincluded(v_Org_id, dp.ad_org_id,v_Client_ID) != -1
                 AND ad_client_id = v_Client_ID
-                AND C_INVOICE_ID=v_Record_ID
                 AND EXISTS (SELECT 1
                             FROM C_SETTLEMENT S
                             WHERE DP.C_SETTLEMENT_GENERATE_ID = S.C_Settlement_ID
--- a/src-db/database/model/functions/MRP_PURCHASEORDER.xml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-db/database/model/functions/MRP_PURCHASEORDER.xml	Thu Oct 21 18:38:18 2010 +0200
@@ -51,6 +51,8 @@
   v_PriceStd NUMBER;
   v_TaxId varchar2(32);
   v_ProductName NVARCHAR2(90);
+  v_IsAPRMinstalled NUMBER;
+  v_DefaultPaymentRule VARCHAR2(60):=null;
 
   v_Count NUMBER;
 
@@ -133,6 +135,13 @@
           AND ISBILLTO='Y'
           AND C_BPARTNER_ID=Cur_workproposal.C_BPARTNER_ID;
 
+        SELECT COUNT(1) INTO v_IsAPRMinstalled
+        FROM ad_preference
+        WHERE property = 'FinancialManagement' AND ad_module_id <> '0';
+        IF (v_IsAPRMinstalled > 0) THEN
+          v_DefaultPaymentRule := 'P';
+        END IF;
+
         INSERT INTO C_Order
           (C_ORDER_ID, AD_CLIENT_ID, AD_ORG_ID, ISACTIVE,
            CREATED, CREATEDBY, UPDATED, UPDATEDBY,
@@ -150,7 +159,7 @@
          'N', v_DocumentNo,  'DR', 'CO','N',
           v_CDocTypeID, v_CDocTypeID, v_Description,
           v_DateDoc,v_DateDoc, Cur_workproposal.C_BPartner_ID,v_BillTo_ID,
-          v_BPartner_Location_ID, Cur_workproposal.C_Currency_ID, Cur_workproposal.paymentrule, Cur_workproposal.C_PAYMENTTERM_ID,
+          v_BPartner_Location_ID, Cur_workproposal.C_Currency_ID, COALESCE(Cur_workproposal.paymentrule, v_DefaultPaymentRule), Cur_workproposal.C_PAYMENTTERM_ID,
           'D', 'A', 'I',COALESCE(Cur_workproposal.DeliveryViaRule,'D'),
           '5',0,0,
           v_M_Warehouse_ID, Cur_workproposal.PO_PRICELIST_ID, 'N', v_DateDoc,
--- a/src-db/database/model/tables/AD_USER.xml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-db/database/model/tables/AD_USER.xml	Thu Oct 21 18:38:18 2010 +0200
@@ -152,7 +152,7 @@
       <foreign-key foreignTable="AD_ORG" name="AD_USER_AD_ORGTRX">
         <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_BPARTNER" name="AD_USER_C_BPARTNER">
+      <foreign-key foreignTable="C_BPARTNER" name="AD_USER_C_BPARTNER" onDelete="cascade">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_BPARTNER_LOCATION" name="AD_USER_C_BPARTNER_LOCATION">
--- a/src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT.xml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT.xml	Thu Oct 21 18:38:18 2010 +0200
@@ -97,6 +97,10 @@
         <default><![CDATA[0]]></default>
         <onCreateDefault/>
       </column>
+      <column name="INITIALBALANCE" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false">
+        <default><![CDATA[0]]></default>
+        <onCreateDefault/>
+      </column>
       <column name="CREDITLIMIT" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false">
         <default><![CDATA[0]]></default>
         <onCreateDefault/>
--- a/src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT_ACCT.xml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-db/database/model/tables/FIN_FINANCIAL_ACCOUNT_ACCT.xml	Thu Oct 21 18:38:18 2010 +0200
@@ -65,15 +65,15 @@
         <default/>
         <onCreateDefault/>
       </column>
-      <column name="FIN_BANKFEE_ACCT" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+      <column name="FIN_BANKFEE_ACCT" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
         <default/>
         <onCreateDefault/>
       </column>
-      <column name="FIN_BANKREVALUATIONGAIN_ACCT" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+      <column name="FIN_BANKREVALUATIONGAIN_ACCT" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
         <default/>
         <onCreateDefault/>
       </column>
-      <column name="FIN_BANKREVALUATIONLOSS_ACCT" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+      <column name="FIN_BANKREVALUATIONLOSS_ACCT" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
         <default/>
         <onCreateDefault/>
       </column>
--- a/src-db/database/model/triggers/AD_ROLE_ORGACCESS_TRG.xml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-db/database/model/triggers/AD_ROLE_ORGACCESS_TRG.xml	Thu Oct 21 18:38:18 2010 +0200
@@ -61,17 +61,21 @@
       )
     LOOP
       IF(v_Client_ID <> Cur_Org.AD_Client_ID) THEN
-        v_Client_ID:=Cur_Org.AD_Client_ID;
-        IF(LENGTH(v_ClientList) <> 0) THEN
-          v_ClientList:=v_ClientList || ',';
+        IF (v_ClientList IS NULL OR (LENGTH(v_ClientList) + LENGTH(Cur_Org.AD_Client_ID) + 1 < 2000)) THEN
+            v_Client_ID:=Cur_Org.AD_Client_ID;
+            IF(LENGTH(v_ClientList) <> 0) THEN
+              v_ClientList:=v_ClientList || ',';
+            END IF;
+            v_ClientList:=v_ClientList || Cur_Org.AD_Client_ID;
         END IF;
-        v_ClientList:=v_ClientList || Cur_Org.AD_Client_ID;
       END IF;
       -- Org
-      IF(LENGTH(v_OrgList) <> 0) THEN
-        v_OrgList:=v_OrgList || ',';
+      IF (v_OrgList IS NULL OR (LENGTH(v_OrgList) + LENGTH(Cur_Org.AD_Org_ID) + 1 < 2000)) THEN
+          IF(LENGTH(v_OrgList) <> 0) THEN
+            v_OrgList:=v_OrgList || ',';
+          END IF;
+          v_OrgList:=v_OrgList || Cur_Org.AD_Org_ID;
       END IF;
-      v_OrgList:=v_OrgList || Cur_Org.AD_Org_ID;
     END LOOP;
     -- Org
     --
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/triggers/C_ACTIVITY_TRG.xml	Thu Oct 21 18:38:18 2010 +0200
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+  <database name="TRIGGER C_ACTIVITY_TRG">
+    <trigger name="C_ACTIVITY_TRG" table="C_ACTIVITY" fires="before" insert="true" update="true" delete="false" foreach="row">
+      <body><![CDATA[
+/*************************************************************************
+* The contents of this file are subject to the Openbravo  Public  License
+* Version  1.0  (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) 2010 Openbravo SLU
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+  v_xTree_ID VARCHAR2(32);
+  v_xParent_ID VARCHAR2(32);
+  v_NextNo     VARCHAR2(32);
+    
+BEGIN
+    
+    IF AD_isTriggerEnabled()='N' THEN RETURN;
+    END IF;
+
+
+  -- Insert AD_Menu Trigger
+  --  for Translation
+  --  and TreeNode
+  IF INSERTING THEN
+    --  get AD_Tree_ID and ParentID
+    SELECT AD_TREE_ID,
+      0
+    INTO v_xTree_ID,
+      v_xParent_ID
+    FROM AD_TREE
+    WHERE treetype='AY'
+      AND AD_Client_ID=:NEW.AD_Client_ID;
+    --  Insert into TreeNode
+    INSERT
+    INTO AD_TREENODE
+      (
+        AD_TreeNode_Id, AD_Client_ID, AD_Org_ID, IsActive,
+        Created, CreatedBy, Updated,
+        UpdatedBy, AD_Tree_ID, Node_ID,
+        Parent_ID, SeqNo
+      )
+      VALUES
+      (
+        get_uuid(), :NEW.AD_Client_ID, :NEW.AD_Org_ID, :NEW.IsActive,
+        :NEW.Created, :NEW.CreatedBy, :NEW.Updated,
+        :NEW.UpdatedBy, v_xTree_ID, :NEW.C_ACTIVITY_ID,
+        v_xParent_ID,(
+        CASE :NEW.IsSummary
+          WHEN 'Y'
+          THEN 100
+          ELSE 999
+        END
+        )
+      )
+      ;
+    -- Summary Nodes first
+  END IF;
+  IF UPDATING THEN
+    IF((COALESCE(:OLD.NAME, '.') <> COALESCE(:NEW.NAME, '.')
+   OR COALESCE(:OLD.Description, '.') <> COALESCE(:NEW.Description, '.')
+   OR COALESCE(:OLD.IsActive, '.') <> COALESCE(:NEW.IsActive, '.')))
+  THEN
+      IF(:OLD.IsActive!=:NEW.IsActive) THEN
+        UPDATE AD_TREENODE
+          SET IsActive=:NEW.IsActive
+        WHERE AD_Tree_ID=v_xTree_ID
+          AND Node_ID=:NEW.C_ACTIVITY_ID;
+      END IF;
+    END IF;
+  END IF;
+END C_ACTIVITY_TRG
+]]></body>
+    </trigger>
+  </database>
--- a/src-db/database/model/triggers/C_INVOICE_TRG2.xml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-db/database/model/triggers/C_INVOICE_TRG2.xml	Thu Oct 21 18:38:18 2010 +0200
@@ -34,16 +34,18 @@
 
   FOR Cur_Discounts IN
     (
-    SELECT C_DISCOUNT_ID,
-      LINE,
-      CASCADE
-    FROM C_BPARTNER_DISCOUNT
-    WHERE C_BPARTNER_ID=:NEW.C_BPARTNER_ID
-      AND ISACTIVE='Y'
-      AND(ISCUSTOMER=:NEW.ISSOTRX
-      OR ISVENDOR <> :NEW.ISSOTRX)
-      AND APPLYINORDER='N'
-    ORDER BY LINE
+    SELECT BPD.C_DISCOUNT_ID,
+      BPD.LINE,
+      BPD.CASCADE
+    FROM C_BPARTNER_DISCOUNT BPD, C_DISCOUNT D
+    WHERE BPD.C_BPARTNER_ID=:NEW.C_BPARTNER_ID
+      AND D.C_DISCOUNT_ID = BPD.C_DISCOUNT_ID
+      AND BPD.ISACTIVE='Y'
+      AND D.ISACTIVE='Y'
+      AND(BPD.ISCUSTOMER=:NEW.ISSOTRX
+      OR BPD.ISVENDOR <> :NEW.ISSOTRX)
+      AND BPD.APPLYINORDER='N'
+    ORDER BY BPD.LINE
     )
   LOOP
     Ad_Sequence_Next('C_Invoice_Discount', :NEW.AD_Client_ID, v_Key) ;
--- a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Thu Oct 21 18:38:18 2010 +0200
@@ -1156,6 +1156,18 @@
 <!--51568B79156646C8966F49F82EE51CB7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--51568B79156646C8966F49F82EE51CB7--></AD_AUXILIARINPUT>
 
+<!--52AAC076AFF84DB58F19D32FBCE8F678--><AD_AUXILIARINPUT>
+<!--52AAC076AFF84DB58F19D32FBCE8F678-->  <AD_AUXILIARINPUT_ID><![CDATA[52AAC076AFF84DB58F19D32FBCE8F678]]></AD_AUXILIARINPUT_ID>
+<!--52AAC076AFF84DB58F19D32FBCE8F678-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--52AAC076AFF84DB58F19D32FBCE8F678-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--52AAC076AFF84DB58F19D32FBCE8F678-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--52AAC076AFF84DB58F19D32FBCE8F678-->  <AD_TAB_ID><![CDATA[8391062D5C6A47EA94A83A304AD720BE]]></AD_TAB_ID>
+<!--52AAC076AFF84DB58F19D32FBCE8F678-->  <NAME><![CDATA[isBank]]></NAME>
+<!--52AAC076AFF84DB58F19D32FBCE8F678-->  <CODE><![CDATA[@SQL=SELECT CASE WHEN TYPE='B' THEN 'Y' ELSE 'N' END FROM FIN_FINANCIAL_ACCOUNT WHERE FIN_FINANCIAL_ACCOUNT_ID = @FIN_FINANCIAL_ACCOUNT_ID@
+]]></CODE>
+<!--52AAC076AFF84DB58F19D32FBCE8F678-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--52AAC076AFF84DB58F19D32FBCE8F678--></AD_AUXILIARINPUT>
+
 <!--52BCE83D589C498B9803D32847553A8D--><AD_AUXILIARINPUT>
 <!--52BCE83D589C498B9803D32847553A8D-->  <AD_AUXILIARINPUT_ID><![CDATA[52BCE83D589C498B9803D32847553A8D]]></AD_AUXILIARINPUT_ID>
 <!--52BCE83D589C498B9803D32847553A8D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Thu Oct 21 18:38:18 2010 +0200
@@ -8113,7 +8113,7 @@
 <!--535-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--535-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--535-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--535-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--535-->  <DEVELOPMENTSTATUS><![CDATA[DP]]></DEVELOPMENTSTATUS>
 <!--535-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--535-->  <POSITION><![CDATA[12]]></POSITION>
 <!--535-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
@@ -8146,7 +8146,7 @@
 <!--536-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--536-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--536-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--536-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--536-->  <DEVELOPMENTSTATUS><![CDATA[DP]]></DEVELOPMENTSTATUS>
 <!--536-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--536-->  <POSITION><![CDATA[13]]></POSITION>
 <!--536-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
@@ -34076,7 +34076,7 @@
 <!--2225-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2225-->  <NAME><![CDATA[Reserved Quantity]]></NAME>
 <!--2225-->  <DESCRIPTION><![CDATA[Reserved Quantity]]></DESCRIPTION>
-<!--2225-->  <HELP><![CDATA[The Reserved Quantity indicates the quantity of a product that is currently reserved for other orders.]]></HELP>
+<!--2225-->  <HELP><![CDATA[The Reserved Quantity indicates the quantity of a product that is currently reserved for this order.]]></HELP>
 <!--2225-->  <COLUMNNAME><![CDATA[QtyReserved]]></COLUMNNAME>
 <!--2225-->  <AD_TABLE_ID><![CDATA[260]]></AD_TABLE_ID>
 <!--2225-->  <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
@@ -71161,7 +71161,7 @@
 <!--4367-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--4367-->  <NAME><![CDATA[Reserved Quantity]]></NAME>
 <!--4367-->  <DESCRIPTION><![CDATA[Reserved Quantity]]></DESCRIPTION>
-<!--4367-->  <HELP><![CDATA[The Reserved Quantity indicates the quantity of a product that is currently reserved for other orders.]]></HELP>
+<!--4367-->  <HELP><![CDATA[The Reserved Quantity indicates the quantity of a product that is currently reserved for this order.]]></HELP>
 <!--4367-->  <COLUMNNAME><![CDATA[QtyReserved]]></COLUMNNAME>
 <!--4367-->  <AD_TABLE_ID><![CDATA[360]]></AD_TABLE_ID>
 <!--4367-->  <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
@@ -175753,7 +175753,7 @@
 <!--800656-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--800656-->  <NAME><![CDATA[Reserved Quantity]]></NAME>
 <!--800656-->  <DESCRIPTION><![CDATA[Reserved Quantity]]></DESCRIPTION>
-<!--800656-->  <HELP><![CDATA[The Reserved Quantity indicates the quantity of a product that is currently reserved for other orders.]]></HELP>
+<!--800656-->  <HELP><![CDATA[The Reserved Quantity indicates the quantity of a product that is currently reserved for this order.]]></HELP>
 <!--800656-->  <COLUMNNAME><![CDATA[QtyReserved]]></COLUMNNAME>
 <!--800656-->  <AD_TABLE_ID><![CDATA[800037]]></AD_TABLE_ID>
 <!--800656-->  <AD_REFERENCE_ID><![CDATA[29]]></AD_REFERENCE_ID>
@@ -267018,6 +267018,40 @@
 <!--4F6FBAF242EE43B98923BAC82AB94165-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
 <!--4F6FBAF242EE43B98923BAC82AB94165--></AD_COLUMN>
 
+<!--515A9DFD91C243D3BECAA9D0149063C4--><AD_COLUMN>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <AD_COLUMN_ID><![CDATA[515A9DFD91C243D3BECAA9D0149063C4]]></AD_COLUMN_ID>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <NAME><![CDATA[InitialBalance]]></NAME>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <DESCRIPTION><![CDATA[Initial balance of the financial account. Amount of the account at the time of registering the financial account.]]></DESCRIPTION>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <HELP><![CDATA[Amount of the account at the time of registering the financial account. This amount is used to initialize financial account and will be used as last reconciliation amount for first reconciliation in OB for the given financial account.]]></HELP>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <COLUMNNAME><![CDATA[InitialBalance]]></COLUMNNAME>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <AD_TABLE_ID><![CDATA[B129E53BC0E747879F7BA17F0AECEC32]]></AD_TABLE_ID>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <DEFAULTVALUE><![CDATA[0]]></DEFAULTVALUE>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <SEQNO><![CDATA[290]]></SEQNO>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <AD_ELEMENT_ID><![CDATA[50574D2DA84B4F3E9ED8272F414D3B1A]]></AD_ELEMENT_ID>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <POSITION><![CDATA[25]]></POSITION>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--515A9DFD91C243D3BECAA9D0149063C4-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--515A9DFD91C243D3BECAA9D0149063C4--></AD_COLUMN>
+
 <!--521EA21E6E7577ABE040007F010016C0--><AD_COLUMN>
 <!--521EA21E6E7577ABE040007F010016C0-->  <AD_COLUMN_ID><![CDATA[521EA21E6E7577ABE040007F010016C0]]></AD_COLUMN_ID>
 <!--521EA21E6E7577ABE040007F010016C0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -281317,7 +281351,7 @@
 <!--60FCCD631EA3EDF8E040007F01013AD4-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
 <!--60FCCD631EA3EDF8E040007F01013AD4-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
 <!--60FCCD631EA3EDF8E040007F01013AD4-->  <AD_TABLE_ID><![CDATA[CB391C8A13D74B688A34017B5B5D1F5D]]></AD_TABLE_ID>
-<!--60FCCD631EA3EDF8E040007F01013AD4-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--60FCCD631EA3EDF8E040007F01013AD4-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
 <!--60FCCD631EA3EDF8E040007F01013AD4-->  <AD_VAL_RULE_ID><![CDATA[103]]></AD_VAL_RULE_ID>
 <!--60FCCD631EA3EDF8E040007F01013AD4-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--60FCCD631EA3EDF8E040007F01013AD4-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
@@ -281352,7 +281386,7 @@
 <!--60FCCD631EA4EDF8E040007F01013AD4-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
 <!--60FCCD631EA4EDF8E040007F01013AD4-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
 <!--60FCCD631EA4EDF8E040007F01013AD4-->  <AD_TABLE_ID><![CDATA[CB391C8A13D74B688A34017B5B5D1F5D]]></AD_TABLE_ID>
-<!--60FCCD631EA4EDF8E040007F01013AD4-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--60FCCD631EA4EDF8E040007F01013AD4-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
 <!--60FCCD631EA4EDF8E040007F01013AD4-->  <AD_VAL_RULE_ID><![CDATA[104]]></AD_VAL_RULE_ID>
 <!--60FCCD631EA4EDF8E040007F01013AD4-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--60FCCD631EA4EDF8E040007F01013AD4-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
@@ -281394,7 +281428,7 @@
 <!--60FCCD631EA5EDF8E040007F01013AD4-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--60FCCD631EA5EDF8E040007F01013AD4-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--60FCCD631EA5EDF8E040007F01013AD4-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--60FCCD631EA5EDF8E040007F01013AD4-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--60FCCD631EA5EDF8E040007F01013AD4-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
 <!--60FCCD631EA5EDF8E040007F01013AD4-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--60FCCD631EA5EDF8E040007F01013AD4-->  <SEQNO><![CDATA[40]]></SEQNO>
 <!--60FCCD631EA5EDF8E040007F01013AD4-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -281554,10 +281588,10 @@
 <!--60FCCD631EAAEDF8E040007F01013AD4-->  <HELP><![CDATA[The Period indicates an exclusive range of dates for a calendar.]]></HELP>
 <!--60FCCD631EAAEDF8E040007F01013AD4-->  <COLUMNNAME><![CDATA[C_Period_ID]]></COLUMNNAME>
 <!--60FCCD631EAAEDF8E040007F01013AD4-->  <AD_TABLE_ID><![CDATA[CB391C8A13D74B688A34017B5B5D1F5D]]></AD_TABLE_ID>
-<!--60FCCD631EAAEDF8E040007F01013AD4-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--60FCCD631EAAEDF8E040007F01013AD4-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
 <!--60FCCD631EAAEDF8E040007F01013AD4-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--60FCCD631EAAEDF8E040007F01013AD4-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--60FCCD631EAAEDF8E040007F01013AD4-->  <ISPARENT><![CDATA[Y]]></ISPARENT>
+<!--60FCCD631EAAEDF8E040007F01013AD4-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--60FCCD631EAAEDF8E040007F01013AD4-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
 <!--60FCCD631EAAEDF8E040007F01013AD4-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
 <!--60FCCD631EAAEDF8E040007F01013AD4-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
@@ -281593,7 +281627,7 @@
 <!--60FCCD631EABEDF8E040007F01013AD4-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--60FCCD631EABEDF8E040007F01013AD4-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--60FCCD631EABEDF8E040007F01013AD4-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--60FCCD631EABEDF8E040007F01013AD4-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--60FCCD631EABEDF8E040007F01013AD4-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
 <!--60FCCD631EABEDF8E040007F01013AD4-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--60FCCD631EABEDF8E040007F01013AD4-->  <SEQNO><![CDATA[110]]></SEQNO>
 <!--60FCCD631EABEDF8E040007F01013AD4-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -281627,7 +281661,7 @@
 <!--60FCCD631EACEDF8E040007F01013AD4-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--60FCCD631EACEDF8E040007F01013AD4-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--60FCCD631EACEDF8E040007F01013AD4-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--60FCCD631EACEDF8E040007F01013AD4-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--60FCCD631EACEDF8E040007F01013AD4-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
 <!--60FCCD631EACEDF8E040007F01013AD4-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--60FCCD631EACEDF8E040007F01013AD4-->  <SEQNO><![CDATA[140]]></SEQNO>
 <!--60FCCD631EACEDF8E040007F01013AD4-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -281661,7 +281695,7 @@
 <!--60FCCD631EADEDF8E040007F01013AD4-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--60FCCD631EADEDF8E040007F01013AD4-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--60FCCD631EADEDF8E040007F01013AD4-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--60FCCD631EADEDF8E040007F01013AD4-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--60FCCD631EADEDF8E040007F01013AD4-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
 <!--60FCCD631EADEDF8E040007F01013AD4-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--60FCCD631EADEDF8E040007F01013AD4-->  <SEQNO><![CDATA[120]]></SEQNO>
 <!--60FCCD631EADEDF8E040007F01013AD4-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -281794,7 +281828,7 @@
 <!--60FCCD631EB1EDF8E040007F01013AD4-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--60FCCD631EB1EDF8E040007F01013AD4-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--60FCCD631EB1EDF8E040007F01013AD4-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--60FCCD631EB1EDF8E040007F01013AD4-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--60FCCD631EB1EDF8E040007F01013AD4-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
 <!--60FCCD631EB1EDF8E040007F01013AD4-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--60FCCD631EB1EDF8E040007F01013AD4-->  <SEQNO><![CDATA[160]]></SEQNO>
 <!--60FCCD631EB1EDF8E040007F01013AD4-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -281827,7 +281861,7 @@
 <!--60FCCD631EB2EDF8E040007F01013AD4-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--60FCCD631EB2EDF8E040007F01013AD4-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--60FCCD631EB2EDF8E040007F01013AD4-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--60FCCD631EB2EDF8E040007F01013AD4-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--60FCCD631EB2EDF8E040007F01013AD4-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
 <!--60FCCD631EB2EDF8E040007F01013AD4-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
 <!--60FCCD631EB2EDF8E040007F01013AD4-->  <SEQNO><![CDATA[170]]></SEQNO>
 <!--60FCCD631EB2EDF8E040007F01013AD4-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -281855,7 +281889,7 @@
 <!--60FCDCE9EE1EA8BEE040007F01013AC1-->  <HELP><![CDATA[The Calendar uniquely identifies an accounting calendar.  Multiple calendars can be used.  For example you may need a standard calendar that runs from Jan 1 to Dec 31 and a fiscal calendar that runs from July 1 to June 30.]]></HELP>
 <!--60FCDCE9EE1EA8BEE040007F01013AC1-->  <COLUMNNAME><![CDATA[C_Calendar_ID]]></COLUMNNAME>
 <!--60FCDCE9EE1EA8BEE040007F01013AC1-->  <AD_TABLE_ID><![CDATA[CB391C8A13D74B688A34017B5B5D1F5D]]></AD_TABLE_ID>
-<!--60FCDCE9EE1EA8BEE040007F01013AC1-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--60FCDCE9EE1EA8BEE040007F01013AC1-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
 <!--60FCDCE9EE1EA8BEE040007F01013AC1-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--60FCDCE9EE1EA8BEE040007F01013AC1-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--60FCDCE9EE1EA8BEE040007F01013AC1-->  <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -286569,7 +286603,7 @@
 <!--7079E2FD4AA7799EE040007F010104AD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7079E2FD4AA7799EE040007F010104AD-->  <NAME><![CDATA[Commercial]]></NAME>
 <!--7079E2FD4AA7799EE040007F010104AD-->  <DESCRIPTION><![CDATA[Commercial Module]]></DESCRIPTION>
-<!--7079E2FD4AA7799EE040007F010104AD-->  <HELP><![CDATA[Commercial modules are only available to Professional Subscription active Instances whereas non commercial ones can be downloaded and installed in Community Edition Instances.
+<!--7079E2FD4AA7799EE040007F010104AD-->  <HELP><![CDATA[Commercial modules are only available to Professional and Basic Edition instances whereas non commercial ones can be downloaded and installed in Community Edition Instances.
 Commercial modules can have a fee to be payed before they can be installed.]]></HELP>
 <!--7079E2FD4AA7799EE040007F010104AD-->  <COLUMNNAME><![CDATA[IsCommercial]]></COLUMNNAME>
 <!--7079E2FD4AA7799EE040007F010104AD-->  <AD_TABLE_ID><![CDATA[9D36D488605044F5A0264D7C8B916657]]></AD_TABLE_ID>
@@ -295759,7 +295793,7 @@
 <!--804880D7B0EE1126E040007F01004F9E-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
 <!--804880D7B0EE1126E040007F01004F9E-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
 <!--804880D7B0EE1126E040007F01004F9E-->  <AD_TABLE_ID><![CDATA[6F98C7AB59D3410CB828DB25D638DE2C]]></AD_TABLE_ID>
-<!--804880D7B0EE1126E040007F01004F9E-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--804880D7B0EE1126E040007F01004F9E-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
 <!--804880D7B0EE1126E040007F01004F9E-->  <AD_VAL_RULE_ID><![CDATA[130]]></AD_VAL_RULE_ID>
 <!--804880D7B0EE1126E040007F01004F9E-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--804880D7B0EE1126E040007F01004F9E-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
@@ -297087,7 +297121,7 @@
 <!--8189F49FFEA26E56E040007F01003E83-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
 <!--8189F49FFEA26E56E040007F01003E83-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
 <!--8189F49FFEA26E56E040007F01003E83-->  <AD_TABLE_ID><![CDATA[D4C23A17190649E7B78F55A05AF3438C]]></AD_TABLE_ID>
-<!--8189F49FFEA26E56E040007F01003E83-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--8189F49FFEA26E56E040007F01003E83-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
 <!--8189F49FFEA26E56E040007F01003E83-->  <AD_VAL_RULE_ID><![CDATA[129]]></AD_VAL_RULE_ID>
 <!--8189F49FFEA26E56E040007F01003E83-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8189F49FFEA26E56E040007F01003E83-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
@@ -297122,7 +297156,7 @@
 <!--8189F49FFEA36E56E040007F01003E83-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
 <!--8189F49FFEA36E56E040007F01003E83-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
 <!--8189F49FFEA36E56E040007F01003E83-->  <AD_TABLE_ID><![CDATA[D4C23A17190649E7B78F55A05AF3438C]]></AD_TABLE_ID>
-<!--8189F49FFEA36E56E040007F01003E83-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--8189F49FFEA36E56E040007F01003E83-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
 <!--8189F49FFEA36E56E040007F01003E83-->  <AD_VAL_RULE_ID><![CDATA[130]]></AD_VAL_RULE_ID>
 <!--8189F49FFEA36E56E040007F01003E83-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8189F49FFEA36E56E040007F01003E83-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
@@ -299821,7 +299855,7 @@
 <!--828EE0AE7FEB5FA1E040007F010067C7-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
 <!--828EE0AE7FEB5FA1E040007F010067C7-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
 <!--828EE0AE7FEB5FA1E040007F010067C7-->  <AD_TABLE_ID><![CDATA[AC389EBD8A774AAE8223A77F692983D8]]></AD_TABLE_ID>
-<!--828EE0AE7FEB5FA1E040007F010067C7-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--828EE0AE7FEB5FA1E040007F010067C7-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
 <!--828EE0AE7FEB5FA1E040007F010067C7-->  <AD_VAL_RULE_ID><![CDATA[103]]></AD_VAL_RULE_ID>
 <!--828EE0AE7FEB5FA1E040007F010067C7-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--828EE0AE7FEB5FA1E040007F010067C7-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
@@ -299856,7 +299890,7 @@
 <!--828EE0AE7FEC5FA1E040007F010067C7-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
 <!--828EE0AE7FEC5FA1E040007F010067C7-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
 <!--828EE0AE7FEC5FA1E040007F010067C7-->  <AD_TABLE_ID><![CDATA[AC389EBD8A774AAE8223A77F692983D8]]></AD_TABLE_ID>
-<!--828EE0AE7FEC5FA1E040007F010067C7-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--828EE0AE7FEC5FA1E040007F010067C7-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
 <!--828EE0AE7FEC5FA1E040007F010067C7-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--828EE0AE7FEC5FA1E040007F010067C7-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
 <!--828EE0AE7FEC5FA1E040007F010067C7-->  <ISKEY><![CDATA[N]]></ISKEY>
@@ -300060,6 +300094,7 @@
 <!--828EE0AE7FF25FA1E040007F010067C7-->  <COLUMNNAME><![CDATA[FIN_Paymentmethod_ID]]></COLUMNNAME>
 <!--828EE0AE7FF25FA1E040007F010067C7-->  <AD_TABLE_ID><![CDATA[AC389EBD8A774AAE8223A77F692983D8]]></AD_TABLE_ID>
 <!--828EE0AE7FF25FA1E040007F010067C7-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--828EE0AE7FF25FA1E040007F010067C7-->  <AD_VAL_RULE_ID><![CDATA[9D87FCD2F19D4CB7AA55F15F5A6C0FBA]]></AD_VAL_RULE_ID>
 <!--828EE0AE7FF25FA1E040007F010067C7-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--828EE0AE7FF25FA1E040007F010067C7-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--828EE0AE7FF25FA1E040007F010067C7-->  <ISPARENT><![CDATA[Y]]></ISPARENT>
@@ -300261,7 +300296,7 @@
 <!--828EE0AE80025FA1E040007F010067C7-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--828EE0AE80025FA1E040007F010067C7-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--828EE0AE80025FA1E040007F010067C7-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--828EE0AE80025FA1E040007F010067C7-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--828EE0AE80025FA1E040007F010067C7-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--828EE0AE80025FA1E040007F010067C7-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
 <!--828EE0AE80025FA1E040007F010067C7-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--828EE0AE80025FA1E040007F010067C7-->  <SEQNO><![CDATA[170]]></SEQNO>
@@ -300293,7 +300328,7 @@
 <!--828EE0AE80035FA1E040007F010067C7-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--828EE0AE80035FA1E040007F010067C7-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--828EE0AE80035FA1E040007F010067C7-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--828EE0AE80035FA1E040007F010067C7-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--828EE0AE80035FA1E040007F010067C7-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--828EE0AE80035FA1E040007F010067C7-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
 <!--828EE0AE80035FA1E040007F010067C7-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--828EE0AE80035FA1E040007F010067C7-->  <SEQNO><![CDATA[180]]></SEQNO>
@@ -300325,7 +300360,7 @@
 <!--828EE0AE80045FA1E040007F010067C7-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--828EE0AE80045FA1E040007F010067C7-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--828EE0AE80045FA1E040007F010067C7-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--828EE0AE80045FA1E040007F010067C7-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--828EE0AE80045FA1E040007F010067C7-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--828EE0AE80045FA1E040007F010067C7-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
 <!--828EE0AE80045FA1E040007F010067C7-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
 <!--828EE0AE80045FA1E040007F010067C7-->  <SEQNO><![CDATA[190]]></SEQNO>
@@ -300789,6 +300824,7 @@
 <!--828EE0AE80255FA1E040007F010067C7-->  <COLUMNNAME><![CDATA[FIN_Paymentmethod_ID]]></COLUMNNAME>
 <!--828EE0AE80255FA1E040007F010067C7-->  <AD_TABLE_ID><![CDATA[203]]></AD_TABLE_ID>
 <!--828EE0AE80255FA1E040007F010067C7-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--828EE0AE80255FA1E040007F010067C7-->  <AD_VAL_RULE_ID><![CDATA[34A2733B41B04DC19B3E54F764753D19]]></AD_VAL_RULE_ID>
 <!--828EE0AE80255FA1E040007F010067C7-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--828EE0AE80255FA1E040007F010067C7-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--828EE0AE80255FA1E040007F010067C7-->  <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -300821,6 +300857,7 @@
 <!--828EE0AE802B5FA1E040007F010067C7-->  <COLUMNNAME><![CDATA[FIN_Paymentmethod_ID]]></COLUMNNAME>
 <!--828EE0AE802B5FA1E040007F010067C7-->  <AD_TABLE_ID><![CDATA[800003]]></AD_TABLE_ID>
 <!--828EE0AE802B5FA1E040007F010067C7-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--828EE0AE802B5FA1E040007F010067C7-->  <AD_VAL_RULE_ID><![CDATA[34A2733B41B04DC19B3E54F764753D19]]></AD_VAL_RULE_ID>
 <!--828EE0AE802B5FA1E040007F010067C7-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--828EE0AE802B5FA1E040007F010067C7-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--828EE0AE802B5FA1E040007F010067C7-->  <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -300853,6 +300890,7 @@
 <!--828EE0AE802C5FA1E040007F010067C7-->  <COLUMNNAME><![CDATA[FIN_Paymentmethod_ID]]></COLUMNNAME>
 <!--828EE0AE802C5FA1E040007F010067C7-->  <AD_TABLE_ID><![CDATA[259]]></AD_TABLE_ID>
 <!--828EE0AE802C5FA1E040007F010067C7-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--828EE0AE802C5FA1E040007F010067C7-->  <AD_VAL_RULE_ID><![CDATA[34A2733B41B04DC19B3E54F764753D19]]></AD_VAL_RULE_ID>
 <!--828EE0AE802C5FA1E040007F010067C7-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--828EE0AE802C5FA1E040007F010067C7-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--828EE0AE802C5FA1E040007F010067C7-->  <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -300887,6 +300925,7 @@
 <!--828EE0AE802D5FA1E040007F010067C7-->  <AD_TABLE_ID><![CDATA[291]]></AD_TABLE_ID>
 <!--828EE0AE802D5FA1E040007F010067C7-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
 <!--828EE0AE802D5FA1E040007F010067C7-->  <AD_REFERENCE_VALUE_ID><![CDATA[EED0EF97D4A7421687F3B365D009E7A6]]></AD_REFERENCE_VALUE_ID>
+<!--828EE0AE802D5FA1E040007F010067C7-->  <AD_VAL_RULE_ID><![CDATA[34A2733B41B04DC19B3E54F764753D19]]></AD_VAL_RULE_ID>
 <!--828EE0AE802D5FA1E040007F010067C7-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--828EE0AE802D5FA1E040007F010067C7-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--828EE0AE802D5FA1E040007F010067C7-->  <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -300920,6 +300959,7 @@
 <!--828EE0AE802E5FA1E040007F010067C7-->  <AD_TABLE_ID><![CDATA[291]]></AD_TABLE_ID>
 <!--828EE0AE802E5FA1E040007F010067C7-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
 <!--828EE0AE802E5FA1E040007F010067C7-->  <AD_REFERENCE_VALUE_ID><![CDATA[EED0EF97D4A7421687F3B365D009E7A6]]></AD_REFERENCE_VALUE_ID>
+<!--828EE0AE802E5FA1E040007F010067C7-->  <AD_VAL_RULE_ID><![CDATA[34A2733B41B04DC19B3E54F764753D19]]></AD_VAL_RULE_ID>
 <!--828EE0AE802E5FA1E040007F010067C7-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--828EE0AE802E5FA1E040007F010067C7-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--828EE0AE802E5FA1E040007F010067C7-->  <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -301021,6 +301061,7 @@
 <!--828EE0AE80385FA1E040007F010067C7-->  <COLUMNNAME><![CDATA[FIN_Paymentmethod_ID]]></COLUMNNAME>
 <!--828EE0AE80385FA1E040007F010067C7-->  <AD_TABLE_ID><![CDATA[318]]></AD_TABLE_ID>
 <!--828EE0AE80385FA1E040007F010067C7-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--828EE0AE80385FA1E040007F010067C7-->  <AD_VAL_RULE_ID><![CDATA[34A2733B41B04DC19B3E54F764753D19]]></AD_VAL_RULE_ID>
 <!--828EE0AE80385FA1E040007F010067C7-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--828EE0AE80385FA1E040007F010067C7-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--828EE0AE80385FA1E040007F010067C7-->  <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -301054,6 +301095,7 @@
 <!--828EE0AE80395FA1E040007F010067C7-->  <COLUMNNAME><![CDATA[FIN_Paymentmethod_ID]]></COLUMNNAME>
 <!--828EE0AE80395FA1E040007F010067C7-->  <AD_TABLE_ID><![CDATA[800058]]></AD_TABLE_ID>
 <!--828EE0AE80395FA1E040007F010067C7-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--828EE0AE80395FA1E040007F010067C7-->  <AD_VAL_RULE_ID><![CDATA[34A2733B41B04DC19B3E54F764753D19]]></AD_VAL_RULE_ID>
 <!--828EE0AE80395FA1E040007F010067C7-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--828EE0AE80395FA1E040007F010067C7-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--828EE0AE80395FA1E040007F010067C7-->  <ISPARENT><![CDATA[N]]></ISPARENT>
@@ -301567,7 +301609,7 @@
 <!--828EE0AE80535FA1E040007F010067C7-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--828EE0AE80535FA1E040007F010067C7-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--828EE0AE80535FA1E040007F010067C7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--828EE0AE80535FA1E040007F010067C7-->  <POSITION><![CDATA[25]]></POSITION>
+<!--828EE0AE80535FA1E040007F010067C7-->  <POSITION><![CDATA[26]]></POSITION>
 <!--828EE0AE80535FA1E040007F010067C7-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--828EE0AE80535FA1E040007F010067C7-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--828EE0AE80535FA1E040007F010067C7-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -301600,7 +301642,7 @@
 <!--828EE0AE80545FA1E040007F010067C7-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--828EE0AE80545FA1E040007F010067C7-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--828EE0AE80545FA1E040007F010067C7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--828EE0AE80545FA1E040007F010067C7-->  <POSITION><![CDATA[26]]></POSITION>
+<!--828EE0AE80545FA1E040007F010067C7-->  <POSITION><![CDATA[27]]></POSITION>
 <!--828EE0AE80545FA1E040007F010067C7-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--828EE0AE80545FA1E040007F010067C7-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--828EE0AE80545FA1E040007F010067C7-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -301634,7 +301676,7 @@
 <!--828EE0AE80555FA1E040007F010067C7-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--828EE0AE80555FA1E040007F010067C7-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--828EE0AE80555FA1E040007F010067C7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--828EE0AE80555FA1E040007F010067C7-->  <POSITION><![CDATA[27]]></POSITION>
+<!--828EE0AE80555FA1E040007F010067C7-->  <POSITION><![CDATA[28]]></POSITION>
 <!--828EE0AE80555FA1E040007F010067C7-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--828EE0AE80555FA1E040007F010067C7-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--828EE0AE80555FA1E040007F010067C7-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -305409,7 +305451,7 @@
 <!--89C6C4F0065443B383FF5F11C923AA1B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--89C6C4F0065443B383FF5F11C923AA1B-->  <NAME><![CDATA[IsCommercial]]></NAME>
 <!--89C6C4F0065443B383FF5F11C923AA1B-->  <DESCRIPTION><![CDATA[Commercial Module]]></DESCRIPTION>
-<!--89C6C4F0065443B383FF5F11C923AA1B-->  <HELP><![CDATA[Commercial modules are only available to Professional Subscription active Instances whereas non commercial ones can be downloaded and installed in Community Edition Instances.
+<!--89C6C4F0065443B383FF5F11C923AA1B-->  <HELP><![CDATA[Commercial modules are only available to Professional and Basic Edition instances whereas non commercial ones can be downloaded and installed in Community Edition Instances.
 Commercial modules can have a fee to be payed before they can be installed.]]></HELP>
 <!--89C6C4F0065443B383FF5F11C923AA1B-->  <COLUMNNAME><![CDATA[Iscommercial]]></COLUMNNAME>
 <!--89C6C4F0065443B383FF5F11C923AA1B-->  <AD_TABLE_ID><![CDATA[8FD3DEA921D74CAFB5D4296A0375E958]]></AD_TABLE_ID>
@@ -305864,8 +305906,8 @@
 <!--8BCFEC1D2692D1A8E040007F010135A9-->  <NAME><![CDATA[Tier]]></NAME>
 <!--8BCFEC1D2692D1A8E040007F010135A9-->  <DESCRIPTION><![CDATA[Tier for commercial modules]]></DESCRIPTION>
 <!--8BCFEC1D2692D1A8E040007F010135A9-->  <HELP><![CDATA[Commercial modules are defined in different tiers:
-1st Tier: The module can be installed in any Professional instance that has bought the module.
-2nd Tier: The module can be installed in Standard Professional Edition instances that have bought it.]]></HELP>
+1st Tier: The module can be installed in Professional and Basic Edition instances once it has been purchased.
+2nd Tier: The module can be installed in Professional Edition instances once it has been purchased.]]></HELP>
 <!--8BCFEC1D2692D1A8E040007F010135A9-->  <COLUMNNAME><![CDATA[Commercial_Tier]]></COLUMNNAME>
 <!--8BCFEC1D2692D1A8E040007F010135A9-->  <AD_TABLE_ID><![CDATA[9D36D488605044F5A0264D7C8B916657]]></AD_TABLE_ID>
 <!--8BCFEC1D2692D1A8E040007F010135A9-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
@@ -305900,8 +305942,8 @@
 <!--8BD0E076B9695E1BE040007F01013C3C-->  <NAME><![CDATA[Tier]]></NAME>
 <!--8BD0E076B9695E1BE040007F01013C3C-->  <DESCRIPTION><![CDATA[Tier for commercial modules]]></DESCRIPTION>
 <!--8BD0E076B9695E1BE040007F01013C3C-->  <HELP><![CDATA[Commercial modules are defined in different tiers:
-1st Tier: The module can be installed in any Professional instance that has bought the module.
-2nd Tier: The module can be installed in Standard Professional Edition instances that have bought it.]]></HELP>
+1st Tier: The module can be installed in Professional and Basic Edition instances once it has been purchased.
+2nd Tier: The module can be installed in Professional Edition instances once it has been purchased.]]></HELP>
 <!--8BD0E076B9695E1BE040007F01013C3C-->  <COLUMNNAME><![CDATA[Commercial_Tier]]></COLUMNNAME>
 <!--8BD0E076B9695E1BE040007F01013C3C-->  <AD_TABLE_ID><![CDATA[8FD3DEA921D74CAFB5D4296A0375E958]]></AD_TABLE_ID>
 <!--8BD0E076B9695E1BE040007F01013C3C-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
@@ -310754,7 +310796,7 @@
 <!--D160BFBF2CD74DAEB9FF7C425874E282-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--D160BFBF2CD74DAEB9FF7C425874E282-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--D160BFBF2CD74DAEB9FF7C425874E282-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--D160BFBF2CD74DAEB9FF7C425874E282-->  <POSITION><![CDATA[28]]></POSITION>
+<!--D160BFBF2CD74DAEB9FF7C425874E282-->  <POSITION><![CDATA[29]]></POSITION>
 <!--D160BFBF2CD74DAEB9FF7C425874E282-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--D160BFBF2CD74DAEB9FF7C425874E282-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--D160BFBF2CD74DAEB9FF7C425874E282-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Oct 21 18:38:18 2010 +0200
@@ -3692,7 +3692,7 @@
 <!--532-->  <NAME><![CDATA[Reserved Quantity]]></NAME>
 <!--532-->  <PRINTNAME><![CDATA[Reserved Qty]]></PRINTNAME>
 <!--532-->  <DESCRIPTION><![CDATA[Reserved Quantity]]></DESCRIPTION>
-<!--532-->  <HELP><![CDATA[The Reserved Quantity indicates the quantity of a product that is currently reserved for other orders.]]></HELP>
+<!--532-->  <HELP><![CDATA[The Reserved Quantity indicates the quantity of a product that is currently reserved for this order.]]></HELP>
 <!--532-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--532--></AD_ELEMENT>
 
@@ -22315,6 +22315,19 @@
 <!--4AFD554ABDCB488B87F326A3101B50DE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4AFD554ABDCB488B87F326A3101B50DE--></AD_ELEMENT>
 
+<!--50574D2DA84B4F3E9ED8272F414D3B1A--><AD_ELEMENT>
+<!--50574D2DA84B4F3E9ED8272F414D3B1A-->  <AD_ELEMENT_ID><![CDATA[50574D2DA84B4F3E9ED8272F414D3B1A]]></AD_ELEMENT_ID>
+<!--50574D2DA84B4F3E9ED8272F414D3B1A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--50574D2DA84B4F3E9ED8272F414D3B1A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--50574D2DA84B4F3E9ED8272F414D3B1A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--50574D2DA84B4F3E9ED8272F414D3B1A-->  <COLUMNNAME><![CDATA[InitialBalance]]></COLUMNNAME>
+<!--50574D2DA84B4F3E9ED8272F414D3B1A-->  <NAME><![CDATA[Initial Balance]]></NAME>
+<!--50574D2DA84B4F3E9ED8272F414D3B1A-->  <PRINTNAME><![CDATA[Initial Balance]]></PRINTNAME>
+<!--50574D2DA84B4F3E9ED8272F414D3B1A-->  <DESCRIPTION><![CDATA[Initial balance of the financial account. Amount of the account at the time of registering the financial account.]]></DESCRIPTION>
+<!--50574D2DA84B4F3E9ED8272F414D3B1A-->  <HELP><![CDATA[Amount of the account at the time of registering the financial account. This amount is used to initialize financial account and will be used as last reconciliation amount for first reconciliation in OB for the given financial account.]]></HELP>
+<!--50574D2DA84B4F3E9ED8272F414D3B1A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--50574D2DA84B4F3E9ED8272F414D3B1A--></AD_ELEMENT>
+
 <!--521EA21E6E7777ABE040007F010016C0--><AD_ELEMENT>
 <!--521EA21E6E7777ABE040007F010016C0-->  <AD_ELEMENT_ID><![CDATA[521EA21E6E7777ABE040007F010016C0]]></AD_ELEMENT_ID>
 <!--521EA21E6E7777ABE040007F010016C0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -25006,7 +25019,7 @@
 <!--7079E2FD4AA8799EE040007F010104AD-->  <NAME><![CDATA[Commercial]]></NAME>
 <!--7079E2FD4AA8799EE040007F010104AD-->  <PRINTNAME><![CDATA[Commercial]]></PRINTNAME>
 <!--7079E2FD4AA8799EE040007F010104AD-->  <DESCRIPTION><![CDATA[Commercial Module]]></DESCRIPTION>
-<!--7079E2FD4AA8799EE040007F010104AD-->  <HELP><![CDATA[Commercial modules are only available to Professional Subscription active Instances whereas non commercial ones can be downloaded and installed in Community Edition Instances.
+<!--7079E2FD4AA8799EE040007F010104AD-->  <HELP><![CDATA[Commercial modules are only available to Professional and Basic Edition instances whereas non commercial ones can be downloaded and installed in Community Edition Instances.
 Commercial modules can have a fee to be payed before they can be installed.]]></HELP>
 <!--7079E2FD4AA8799EE040007F010104AD-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7079E2FD4AA8799EE040007F010104AD--></AD_ELEMENT>
@@ -26336,8 +26349,8 @@
 <!--828EE0AE80325FA1E040007F010067C7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--828EE0AE80325FA1E040007F010067C7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--828EE0AE80325FA1E040007F010067C7-->  <COLUMNNAME><![CDATA[PO_Financial_Account_ID]]></COLUMNNAME>
-<!--828EE0AE80325FA1E040007F010067C7-->  <NAME><![CDATA[PO Financial account]]></NAME>
-<!--828EE0AE80325FA1E040007F010067C7-->  <PRINTNAME><![CDATA[PO Financial account]]></PRINTNAME>
+<!--828EE0AE80325FA1E040007F010067C7-->  <NAME><![CDATA[PO Financial Account]]></NAME>
+<!--828EE0AE80325FA1E040007F010067C7-->  <PRINTNAME><![CDATA[PO Financial Account]]></PRINTNAME>
 <!--828EE0AE80325FA1E040007F010067C7-->  <DESCRIPTION><![CDATA[Financial account used to deposit / withdrawal money such as bank accounts or petty cash]]></DESCRIPTION>
 <!--828EE0AE80325FA1E040007F010067C7-->  <HELP><![CDATA[Financial account used to deposit / withdrawal money such as bank accounts or petty cash]]></HELP>
 <!--828EE0AE80325FA1E040007F010067C7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -26816,8 +26829,8 @@
 <!--8BCFEC1D2693D1A8E040007F010135A9-->  <PRINTNAME><![CDATA[Tier]]></PRINTNAME>
 <!--8BCFEC1D2693D1A8E040007F010135A9-->  <DESCRIPTION><![CDATA[Tier for commercial modules]]></DESCRIPTION>
 <!--8BCFEC1D2693D1A8E040007F010135A9-->  <HELP><![CDATA[Commercial modules are defined in different tiers:
-1st Tier: The module can be installed in any Professional instance that has bought the module.
-2nd Tier: The module can be installed in Standard Professional Edition instances that have bought it.]]></HELP>
+1st Tier: The module can be installed in Professional and Basic Edition instances once it has been purchased.
+2nd Tier: The module can be installed in Professional Edition instances once it has been purchased.]]></HELP>
 <!--8BCFEC1D2693D1A8E040007F010135A9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8BCFEC1D2693D1A8E040007F010135A9--></AD_ELEMENT>
 
--- a/src-db/database/sourcedata/AD_FIELD.xml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Thu Oct 21 18:38:18 2010 +0200
@@ -14468,7 +14468,7 @@
 <!--1131-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1131-->  <NAME><![CDATA[Reserved Quantity]]></NAME>
 <!--1131-->  <DESCRIPTION><![CDATA[Reserved Quantity]]></DESCRIPTION>
-<!--1131-->  <HELP><![CDATA[The Reserved Quantity indicates the quantity of a product that is currently reserved for other orders.]]></HELP>
+<!--1131-->  <HELP><![CDATA[The Reserved Quantity indicates the quantity of a product that is currently reserved for this order.]]></HELP>
 <!--1131-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--1131-->  <AD_TAB_ID><![CDATA[187]]></AD_TAB_ID>
 <!--1131-->  <AD_COLUMN_ID><![CDATA[2225]]></AD_COLUMN_ID>
@@ -34896,7 +34896,7 @@
 <!--3048-->  <AD_TAB_ID><![CDATA[132]]></AD_TAB_ID>
 <!--3048-->  <AD_COLUMN_ID><![CDATA[3898]]></AD_COLUMN_ID>
 <!--3048-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--3048-->  <DISPLAYLOGIC><![CDATA[@ElementType@='A' & @IsBankAccount@='Y']]></DISPLAYLOGIC>
+<!--3048-->  <DISPLAYLOGIC><![CDATA[@ElementType@='A' & @IsBankAccount@='Y' & @FinancialManagement@='']]></DISPLAYLOGIC>
 <!--3048-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--3048-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--3048-->  <SEQNO><![CDATA[180]]></SEQNO>
@@ -34920,7 +34920,7 @@
 <!--3049-->  <AD_TAB_ID><![CDATA[132]]></AD_TAB_ID>
 <!--3049-->  <AD_COLUMN_ID><![CDATA[3897]]></AD_COLUMN_ID>
 <!--3049-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--3049-->  <DISPLAYLOGIC><![CDATA[@ElementType@='A']]></DISPLAYLOGIC>
+<!--3049-->  <DISPLAYLOGIC><![CDATA[@ElementType@='A' & @FinancialManagement@='']]></DISPLAYLOGIC>
 <!--3049-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--3049-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--3049-->  <SEQNO><![CDATA[170]]></SEQNO>
@@ -39633,7 +39633,7 @@
 <!--3390-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3390-->  <NAME><![CDATA[Reserved Quantity]]></NAME>
 <!--3390-->  <DESCRIPTION><![CDATA[Reserved Quantity]]></DESCRIPTION>
-<!--3390-->  <HELP><![CDATA[The Reserved Quantity indicates the quantity of a product that is currently reserved for other orders.]]></HELP>
+<!--3390-->  <HELP><![CDATA[The Reserved Quantity indicates the quantity of a product that is currently reserved for this order.]]></HELP>
 <!--3390-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--3390-->  <AD_TAB_ID><![CDATA[293]]></AD_TAB_ID>
 <!--3390-->  <AD_COLUMN_ID><![CDATA[2225]]></AD_COLUMN_ID>
@@ -45975,7 +45975,7 @@
 <!--3790-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--3790-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3790-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--3790-->  <NAME><![CDATA[Create/Post Production]]></NAME>
+<!--3790-->  <NAME><![CDATA[Create/Process Production]]></NAME>
 <!--3790-->  <DESCRIPTION><![CDATA[Create production lines, if not created - otherwise process the production]]></DESCRIPTION>
 <!--3790-->  <HELP><![CDATA[Create/Post Production will generate the production lines and process the production.  If the production lines already exists, the production will be processed]]></HELP>
 <!--3790-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -114489,7 +114489,7 @@
 <!--800348-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--800348-->  <NAME><![CDATA[Reserved Quantity]]></NAME>
 <!--800348-->  <DESCRIPTION><![CDATA[Reserved Quantity]]></DESCRIPTION>
-<!--800348-->  <HELP><![CDATA[The Reserved Quantity indicates the quantity of a product that is currently reserved for other orders.]]></HELP>
+<!--800348-->  <HELP><![CDATA[The Reserved Quantity indicates the quantity of a product that is currently reserved for this order.]]></HELP>
 <!--800348-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--800348-->  <AD_TAB_ID><![CDATA[800022]]></AD_TAB_ID>
 <!--800348-->  <AD_COLUMN_ID><![CDATA[2225]]></AD_COLUMN_ID>
@@ -120562,7 +120562,7 @@
 <!--800726-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--800726-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--800726-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--800726-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--800726-->  <SEQNO><![CDATA[40]]></SEQNO>
 <!--800726-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800726-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--800726-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -120586,7 +120586,7 @@
 <!--800727-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--800727-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--800727-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--800727-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--800727-->  <SEQNO><![CDATA[50]]></SEQNO>
 <!--800727-->  <SORTNO><![CDATA[1]]></SORTNO>
 <!--800727-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800727-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
@@ -127440,7 +127440,7 @@
 <!--801078-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--801078-->  <DISPLAYLENGTH><![CDATA[2000]]></DISPLAYLENGTH>
 <!--801078-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--801078-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--801078-->  <SEQNO><![CDATA[70]]></SEQNO>
 <!--801078-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--801078-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--801078-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -181431,8 +181431,8 @@
 <!--0629343F02CA4C2DB79C17D5F05CB3C6-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--0629343F02CA4C2DB79C17D5F05CB3C6-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
 <!--0629343F02CA4C2DB79C17D5F05CB3C6-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--0629343F02CA4C2DB79C17D5F05CB3C6-->  <SEQNO><![CDATA[120]]></SEQNO>
-<!--0629343F02CA4C2DB79C17D5F05CB3C6-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
+<!--0629343F02CA4C2DB79C17D5F05CB3C6-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--0629343F02CA4C2DB79C17D5F05CB3C6-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--0629343F02CA4C2DB79C17D5F05CB3C6-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--0629343F02CA4C2DB79C17D5F05CB3C6-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--0629343F02CA4C2DB79C17D5F05CB3C6-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
@@ -181682,7 +181682,7 @@
 <!--0F13AA1FF6B148B38E364AC49DE20DAB-->  <AD_COLUMN_ID><![CDATA[804880D7B0EE1126E040007F01004F9E]]></AD_COLUMN_ID>
 <!--0F13AA1FF6B148B38E364AC49DE20DAB-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--0F13AA1FF6B148B38E364AC49DE20DAB-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
-<!--0F13AA1FF6B148B38E364AC49DE20DAB-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--0F13AA1FF6B148B38E364AC49DE20DAB-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
 <!--0F13AA1FF6B148B38E364AC49DE20DAB-->  <SEQNO><![CDATA[20]]></SEQNO>
 <!--0F13AA1FF6B148B38E364AC49DE20DAB-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--0F13AA1FF6B148B38E364AC49DE20DAB-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
@@ -181774,7 +181774,7 @@
 <!--0FEAE3D3D9D0433D8DE11C24EB9CFB5C-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--0FEAE3D3D9D0433D8DE11C24EB9CFB5C-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--0FEAE3D3D9D0433D8DE11C24EB9CFB5C-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--0FEAE3D3D9D0433D8DE11C24EB9CFB5C-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--0FEAE3D3D9D0433D8DE11C24EB9CFB5C-->  <SEQNO><![CDATA[70]]></SEQNO>
 <!--0FEAE3D3D9D0433D8DE11C24EB9CFB5C-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--0FEAE3D3D9D0433D8DE11C24EB9CFB5C-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--0FEAE3D3D9D0433D8DE11C24EB9CFB5C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -181868,8 +181868,8 @@
 <!--133B82E6E63D42A8BF22920E72A3A5EA-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--133B82E6E63D42A8BF22920E72A3A5EA-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--133B82E6E63D42A8BF22920E72A3A5EA-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--133B82E6E63D42A8BF22920E72A3A5EA-->  <SEQNO><![CDATA[100]]></SEQNO>
-<!--133B82E6E63D42A8BF22920E72A3A5EA-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
+<!--133B82E6E63D42A8BF22920E72A3A5EA-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--133B82E6E63D42A8BF22920E72A3A5EA-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--133B82E6E63D42A8BF22920E72A3A5EA-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--133B82E6E63D42A8BF22920E72A3A5EA-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--133B82E6E63D42A8BF22920E72A3A5EA-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
@@ -182469,7 +182469,7 @@
 <!--1DD2CD8ED9BA4F4EB757808526E41B4B-->  <AD_COLUMN_ID><![CDATA[804880D7B0ED1126E040007F01004F9E]]></AD_COLUMN_ID>
 <!--1DD2CD8ED9BA4F4EB757808526E41B4B-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--1DD2CD8ED9BA4F4EB757808526E41B4B-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
-<!--1DD2CD8ED9BA4F4EB757808526E41B4B-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--1DD2CD8ED9BA4F4EB757808526E41B4B-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
 <!--1DD2CD8ED9BA4F4EB757808526E41B4B-->  <SEQNO><![CDATA[10]]></SEQNO>
 <!--1DD2CD8ED9BA4F4EB757808526E41B4B-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--1DD2CD8ED9BA4F4EB757808526E41B4B-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
@@ -182560,6 +182560,7 @@
 <!--1FDCBB4CB99E4F268395F71CA08DA589-->  <AD_COLUMN_ID><![CDATA[828EE0AE80025FA1E040007F010067C7]]></AD_COLUMN_ID>
 <!--1FDCBB4CB99E4F268395F71CA08DA589-->  <AD_FIELDGROUP_ID><![CDATA[113]]></AD_FIELDGROUP_ID>
 <!--1FDCBB4CB99E4F268395F71CA08DA589-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--1FDCBB4CB99E4F268395F71CA08DA589-->  <DISPLAYLOGIC><![CDATA[@IsBank@='Y']]></DISPLAYLOGIC>
 <!--1FDCBB4CB99E4F268395F71CA08DA589-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--1FDCBB4CB99E4F268395F71CA08DA589-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--1FDCBB4CB99E4F268395F71CA08DA589-->  <SEQNO><![CDATA[60]]></SEQNO>
@@ -183879,7 +183880,7 @@
 <!--442155661F0311DE9D79FB818B325E82-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--442155661F0311DE9D79FB818B325E82-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--442155661F0311DE9D79FB818B325E82-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--442155661F0311DE9D79FB818B325E82-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--442155661F0311DE9D79FB818B325E82-->  <SEQNO><![CDATA[60]]></SEQNO>
 <!--442155661F0311DE9D79FB818B325E82-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--442155661F0311DE9D79FB818B325E82-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--442155661F0311DE9D79FB818B325E82-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -186244,8 +186245,8 @@
 <!--54F726EB911F4D54905F7DCC4F8DC951-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--54F726EB911F4D54905F7DCC4F8DC951-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
 <!--54F726EB911F4D54905F7DCC4F8DC951-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--54F726EB911F4D54905F7DCC4F8DC951-->  <SEQNO><![CDATA[50]]></SEQNO>
-<!--54F726EB911F4D54905F7DCC4F8DC951-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
+<!--54F726EB911F4D54905F7DCC4F8DC951-->  <SEQNO><![CDATA[150]]></SEQNO>
+<!--54F726EB911F4D54905F7DCC4F8DC951-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--54F726EB911F4D54905F7DCC4F8DC951-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--54F726EB911F4D54905F7DCC4F8DC951-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--54F726EB911F4D54905F7DCC4F8DC951-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
@@ -190013,6 +190014,7 @@
 <!--58B6888DCF874A9EA3ABBDD43854503C-->  <AD_TAB_ID><![CDATA[8391062D5C6A47EA94A83A304AD720BE]]></AD_TAB_ID>
 <!--58B6888DCF874A9EA3ABBDD43854503C-->  <AD_COLUMN_ID><![CDATA[828EE0AE80035FA1E040007F010067C7]]></AD_COLUMN_ID>
 <!--58B6888DCF874A9EA3ABBDD43854503C-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--58B6888DCF874A9EA3ABBDD43854503C-->  <DISPLAYLOGIC><![CDATA[@IsBank@='Y']]></DISPLAYLOGIC>
 <!--58B6888DCF874A9EA3ABBDD43854503C-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--58B6888DCF874A9EA3ABBDD43854503C-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--58B6888DCF874A9EA3ABBDD43854503C-->  <SEQNO><![CDATA[70]]></SEQNO>
@@ -193492,7 +193494,7 @@
 <!--68BFB03020DB4D599CD407BDB8B09AA1-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y']]></DISPLAYLOGIC>
 <!--68BFB03020DB4D599CD407BDB8B09AA1-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--68BFB03020DB4D599CD407BDB8B09AA1-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--68BFB03020DB4D599CD407BDB8B09AA1-->  <SEQNO><![CDATA[220]]></SEQNO>
+<!--68BFB03020DB4D599CD407BDB8B09AA1-->  <SEQNO><![CDATA[250]]></SEQNO>
 <!--68BFB03020DB4D599CD407BDB8B09AA1-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--68BFB03020DB4D599CD407BDB8B09AA1-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--68BFB03020DB4D599CD407BDB8B09AA1-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -194101,7 +194103,7 @@
 <!--7079E2FD4AA9799EE040007F010104AD-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7079E2FD4AA9799EE040007F010104AD-->  <NAME><![CDATA[Commercial]]></NAME>
 <!--7079E2FD4AA9799EE040007F010104AD-->  <DESCRIPTION><![CDATA[Commercial Module]]></DESCRIPTION>
-<!--7079E2FD4AA9799EE040007F010104AD-->  <HELP><![CDATA[Commercial modules are only available to Professional Subscription active Instances whereas non commercial ones can be downloaded and installed in Community Edition Instances.
+<!--7079E2FD4AA9799EE040007F010104AD-->  <HELP><![CDATA[Commercial modules are only available to Professional and Basic Edition instances whereas non commercial ones can be downloaded and installed in Community Edition Instances.
 Commercial modules can have a fee to be payed before they can be installed.]]></HELP>
 <!--7079E2FD4AA9799EE040007F010104AD-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--7079E2FD4AA9799EE040007F010104AD-->  <AD_TAB_ID><![CDATA[F53E35A11C564F20BE4082A7B8CFF6B7]]></AD_TAB_ID>
@@ -195375,10 +195377,10 @@
 <!--7C541AC0C767FDD7E040007F01016B4D-->  <AD_TAB_ID><![CDATA[C4B6506838E14A349D6717D6856F1B56]]></AD_TAB_ID>
 <!--7C541AC0C767FDD7E040007F01016B4D-->  <AD_COLUMN_ID><![CDATA[7891269C83E5655DE040007F010155CE]]></AD_COLUMN_ID>
 <!--7C541AC0C767FDD7E040007F01016B4D-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--7C541AC0C767FDD7E040007F01016B4D-->  <DISPLAYLOGIC><![CDATA[@Processed@='Y']]></DISPLAYLOGIC>
+<!--7C541AC0C767FDD7E040007F01016B4D-->  <DISPLAYLOGIC><![CDATA[@Status@!'RPAE' & @Processed@='Y']]></DISPLAYLOGIC>
 <!--7C541AC0C767FDD7E040007F01016B4D-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--7C541AC0C767FDD7E040007F01016B4D-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--7C541AC0C767FDD7E040007F01016B4D-->  <SEQNO><![CDATA[220]]></SEQNO>
+<!--7C541AC0C767FDD7E040007F01016B4D-->  <SEQNO><![CDATA[250]]></SEQNO>
 <!--7C541AC0C767FDD7E040007F01016B4D-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--7C541AC0C767FDD7E040007F01016B4D-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--7C541AC0C767FDD7E040007F01016B4D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -195443,7 +195445,7 @@
 <!--7C541AC0C76AFDD7E040007F01016B4D-->  <AD_TAB_ID><![CDATA[C4B6506838E14A349D6717D6856F1B56]]></AD_TAB_ID>
 <!--7C541AC0C76AFDD7E040007F01016B4D-->  <AD_COLUMN_ID><![CDATA[7891269C83E1655DE040007F010155CE]]></AD_COLUMN_ID>
 <!--7C541AC0C76AFDD7E040007F01016B4D-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--7C541AC0C76AFDD7E040007F01016B4D-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
+<!--7C541AC0C76AFDD7E040007F01016B4D-->  <DISPLAYLENGTH><![CDATA[40]]></DISPLAYLENGTH>
 <!--7C541AC0C76AFDD7E040007F01016B4D-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--7C541AC0C76AFDD7E040007F01016B4D-->  <SEQNO><![CDATA[50]]></SEQNO>
 <!--7C541AC0C76AFDD7E040007F01016B4D-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
@@ -196070,7 +196072,7 @@
 <!--7E35F16BB0F8C186E040007F010014C7-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--7E35F16BB0F8C186E040007F010014C7-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--7E35F16BB0F8C186E040007F010014C7-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--7E35F16BB0F8C186E040007F010014C7-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--7E35F16BB0F8C186E040007F010014C7-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
 <!--7E35F16BB0F8C186E040007F010014C7-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--7E35F16BB0F8C186E040007F010014C7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7E35F16BB0F8C186E040007F010014C7--></AD_FIELD>
@@ -199259,8 +199261,8 @@
 <!--82F2E8A160E7472CE040007F01005324-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--82F2E8A160E7472CE040007F01005324-->  <NAME><![CDATA[Location / Address]]></NAME>
 <!--82F2E8A160E7472CE040007F01005324-->  <DESCRIPTION><![CDATA[A specific place or residence.]]></DESCRIPTION>
-<!--82F2E8A160E7472CE040007F01005324-->  <HELP><![CDATA[The Location / Address field defines the location of an entity.]]></HELP>
-<!--82F2E8A160E7472CE040007F01005324-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--82F2E8A160E7472CE040007F01005324-->  <HELP><![CDATA[Address/Location of the the Financial Account within the Enterprise.]]></HELP>
+<!--82F2E8A160E7472CE040007F01005324-->  <ISCENTRALLYMAINTAINED><![CDATA[N]]></ISCENTRALLYMAINTAINED>
 <!--82F2E8A160E7472CE040007F01005324-->  <AD_TAB_ID><![CDATA[2845D761A8394468BD3BA4710AA888D4]]></AD_TAB_ID>
 <!--82F2E8A160E7472CE040007F01005324-->  <AD_COLUMN_ID><![CDATA[828EE0AE80485FA1E040007F010067C7]]></AD_COLUMN_ID>
 <!--82F2E8A160E7472CE040007F01005324-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
@@ -199652,7 +199654,7 @@
 <!--830698140BF04AC3E040007F01000289-->  <DISPLAYLOGIC><![CDATA[@$Element_U1@='Y']]></DISPLAYLOGIC>
 <!--830698140BF04AC3E040007F01000289-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--830698140BF04AC3E040007F01000289-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--830698140BF04AC3E040007F01000289-->  <SEQNO><![CDATA[200]]></SEQNO>
+<!--830698140BF04AC3E040007F01000289-->  <SEQNO><![CDATA[210]]></SEQNO>
 <!--830698140BF04AC3E040007F01000289-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--830698140BF04AC3E040007F01000289-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--830698140BF04AC3E040007F01000289-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -199677,7 +199679,7 @@
 <!--830698140BF14AC3E040007F01000289-->  <DISPLAYLOGIC><![CDATA[@$Element_U2@='Y']]></DISPLAYLOGIC>
 <!--830698140BF14AC3E040007F01000289-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--830698140BF14AC3E040007F01000289-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--830698140BF14AC3E040007F01000289-->  <SEQNO><![CDATA[210]]></SEQNO>
+<!--830698140BF14AC3E040007F01000289-->  <SEQNO><![CDATA[200]]></SEQNO>
 <!--830698140BF14AC3E040007F01000289-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--830698140BF14AC3E040007F01000289-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--830698140BF14AC3E040007F01000289-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -201628,8 +201630,8 @@
 <!--8BD10BA993814495E040007F010135AB-->  <NAME><![CDATA[Tier]]></NAME>
 <!--8BD10BA993814495E040007F010135AB-->  <DESCRIPTION><![CDATA[Tier for commercial modules]]></DESCRIPTION>
 <!--8BD10BA993814495E040007F010135AB-->  <HELP><![CDATA[Commercial modules are defined in different tiers:
-1st Tier: The module can be installed in any Professional instance that has bought the module.
-2nd Tier: The module can be installed in Standard Professional Edition instances that have bought it.]]></HELP>
+1st Tier: The module can be installed in Professional and Basic Edition instances once it has been purchased.
+2nd Tier: The module can be installed in Professional Edition instances once it has been purchased.]]></HELP>
 <!--8BD10BA993814495E040007F010135AB-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--8BD10BA993814495E040007F010135AB-->  <AD_TAB_ID><![CDATA[F53E35A11C564F20BE4082A7B8CFF6B7]]></AD_TAB_ID>
 <!--8BD10BA993814495E040007F010135AB-->  <AD_COLUMN_ID><![CDATA[8BCFEC1D2692D1A8E040007F010135A9]]></AD_COLUMN_ID>
@@ -203457,7 +203459,7 @@
 <!--9A944E3EB5034539BC402A922F14C811-->  <AD_COLUMN_ID><![CDATA[828EE0AE7FEC5FA1E040007F010067C7]]></AD_COLUMN_ID>
 <!--9A944E3EB5034539BC402A922F14C811-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--9A944E3EB5034539BC402A922F14C811-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
-<!--9A944E3EB5034539BC402A922F14C811-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--9A944E3EB5034539BC402A922F14C811-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
 <!--9A944E3EB5034539BC402A922F14C811-->  <SEQNO><![CDATA[20]]></SEQNO>
 <!--9A944E3EB5034539BC402A922F14C811-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--9A944E3EB5034539BC402A922F14C811-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
@@ -203503,7 +203505,7 @@
 <!--9B255A20E9AC41A2AA3028A0D5BCF0B9-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--9B255A20E9AC41A2AA3028A0D5BCF0B9-->  <DISPLAYLENGTH><![CDATA[19]]></DISPLAYLENGTH>
 <!--9B255A20E9AC41A2AA3028A0D5BCF0B9-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--9B255A20E9AC41A2AA3028A0D5BCF0B9-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--9B255A20E9AC41A2AA3028A0D5BCF0B9-->  <SEQNO><![CDATA[110]]></SEQNO>
 <!--9B255A20E9AC41A2AA3028A0D5BCF0B9-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--9B255A20E9AC41A2AA3028A0D5BCF0B9-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--9B255A20E9AC41A2AA3028A0D5BCF0B9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -204534,7 +204536,7 @@
 <!--BE6F3373766744648039EAE64DBFCABA-->  <AD_COLUMN_ID><![CDATA[828EE0AE7FEB5FA1E040007F010067C7]]></AD_COLUMN_ID>
 <!--BE6F3373766744648039EAE64DBFCABA-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--BE6F3373766744648039EAE64DBFCABA-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
-<!--BE6F3373766744648039EAE64DBFCABA-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--BE6F3373766744648039EAE64DBFCABA-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
 <!--BE6F3373766744648039EAE64DBFCABA-->  <SEQNO><![CDATA[10]]></SEQNO>
 <!--BE6F3373766744648039EAE64DBFCABA-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--BE6F3373766744648039EAE64DBFCABA-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
@@ -205043,7 +205045,7 @@
 <!--CF89E182C6014DE29EB3C3B5E03AF84E-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--CF89E182C6014DE29EB3C3B5E03AF84E-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--CF89E182C6014DE29EB3C3B5E03AF84E-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--CF89E182C6014DE29EB3C3B5E03AF84E-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--CF89E182C6014DE29EB3C3B5E03AF84E-->  <SEQNO><![CDATA[60]]></SEQNO>
 <!--CF89E182C6014DE29EB3C3B5E03AF84E-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--CF89E182C6014DE29EB3C3B5E03AF84E-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--CF89E182C6014DE29EB3C3B5E03AF84E-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -205357,6 +205359,29 @@
 <!--D784EC5346E94D6DA1C349CF289DED36-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--D784EC5346E94D6DA1C349CF289DED36--></AD_FIELD>
 
+<!--D90513BC049C4CD5A0589E641DAFC4A0--><AD_FIELD>
+<!--D90513BC049C4CD5A0589E641DAFC4A0-->  <AD_FIELD_ID><![CDATA[D90513BC049C4CD5A0589E641DAFC4A0]]></AD_FIELD_ID>
+<!--D90513BC049C4CD5A0589E641DAFC4A0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D90513BC049C4CD5A0589E641DAFC4A0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D90513BC049C4CD5A0589E641DAFC4A0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D90513BC049C4CD5A0589E641DAFC4A0-->  <NAME><![CDATA[Initial Balance]]></NAME>
+<!--D90513BC049C4CD5A0589E641DAFC4A0-->  <DESCRIPTION><![CDATA[Initial balance of the financial account. Amount of the account at the time of registering the financial account.]]></DESCRIPTION>
+<!--D90513BC049C4CD5A0589E641DAFC4A0-->  <HELP><![CDATA[Amount of the account at the time of registering the financial account. This amount is used to initialize financial account and will be used as last reconciliation amount for first reconciliation in OB for the given financial account.]]></HELP>
+<!--D90513BC049C4CD5A0589E641DAFC4A0-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--D90513BC049C4CD5A0589E641DAFC4A0-->  <AD_TAB_ID><![CDATA[2845D761A8394468BD3BA4710AA888D4]]></AD_TAB_ID>
+<!--D90513BC049C4CD5A0589E641DAFC4A0-->  <AD_COLUMN_ID><![CDATA[515A9DFD91C243D3BECAA9D0149063C4]]></AD_COLUMN_ID>
+<!--D90513BC049C4CD5A0589E641DAFC4A0-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--D90513BC049C4CD5A0589E641DAFC4A0-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
+<!--D90513BC049C4CD5A0589E641DAFC4A0-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--D90513BC049C4CD5A0589E641DAFC4A0-->  <SEQNO><![CDATA[220]]></SEQNO>
+<!--D90513BC049C4CD5A0589E641DAFC4A0-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--D90513BC049C4CD5A0589E641DAFC4A0-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--D90513BC049C4CD5A0589E641DAFC4A0-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D90513BC049C4CD5A0589E641DAFC4A0-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--D90513BC049C4CD5A0589E641DAFC4A0-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--D90513BC049C4CD5A0589E641DAFC4A0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D90513BC049C4CD5A0589E641DAFC4A0--></AD_FIELD>
+
 <!--D926D7DDA4E54F5491960BB3256D9C74--><AD_FIELD>
 <!--D926D7DDA4E54F5491960BB3256D9C74-->  <AD_FIELD_ID><![CDATA[D926D7DDA4E54F5491960BB3256D9C74]]></AD_FIELD_ID>
 <!--D926D7DDA4E54F5491960BB3256D9C74-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -205486,7 +205511,7 @@
 <!--DCEAB518CBA44FFAA59E886AB5482055-->  <DISPLAYLOGIC><![CDATA[@Type@ = 'B']]></DISPLAYLOGIC>
 <!--DCEAB518CBA44FFAA59E886AB5482055-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--DCEAB518CBA44FFAA59E886AB5482055-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--DCEAB518CBA44FFAA59E886AB5482055-->  <SEQNO><![CDATA[220]]></SEQNO>
+<!--DCEAB518CBA44FFAA59E886AB5482055-->  <SEQNO><![CDATA[230]]></SEQNO>
 <!--DCEAB518CBA44FFAA59E886AB5482055-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--DCEAB518CBA44FFAA59E886AB5482055-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--DCEAB518CBA44FFAA59E886AB5482055-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -206050,6 +206075,7 @@
 <!--F9729DBFE7B446D3A96EC15752E0F063-->  <AD_TAB_ID><![CDATA[8391062D5C6A47EA94A83A304AD720BE]]></AD_TAB_ID>
 <!--F9729DBFE7B446D3A96EC15752E0F063-->  <AD_COLUMN_ID><![CDATA[828EE0AE80045FA1E040007F010067C7]]></AD_COLUMN_ID>
 <!--F9729DBFE7B446D3A96EC15752E0F063-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--F9729DBFE7B446D3A96EC15752E0F063-->  <DISPLAYLOGIC><![CDATA[@IsBank@='Y']]></DISPLAYLOGIC>
 <!--F9729DBFE7B446D3A96EC15752E0F063-->  <DISPLAYLENGTH><![CDATA[32]]></DISPLAYLENGTH>
 <!--F9729DBFE7B446D3A96EC15752E0F063-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--F9729DBFE7B446D3A96EC15752E0F063-->  <SEQNO><![CDATA[80]]></SEQNO>
--- a/src-db/database/sourcedata/AD_MESSAGE.xml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml	Thu Oct 21 18:38:18 2010 +0200
@@ -29735,7 +29735,7 @@
 <!--0FC7B0C6F4FC4F04BEAD06F30E895516-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0FC7B0C6F4FC4F04BEAD06F30E895516-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0FC7B0C6F4FC4F04BEAD06F30E895516-->  <VALUE><![CDATA[OBPSAnyEdition]]></VALUE>
-<!--0FC7B0C6F4FC4F04BEAD06F30E895516-->  <MSGTEXT><![CDATA[Professional Edition]]></MSGTEXT>
+<!--0FC7B0C6F4FC4F04BEAD06F30E895516-->  <MSGTEXT><![CDATA[Professional or Basic Edition]]></MSGTEXT>
 <!--0FC7B0C6F4FC4F04BEAD06F30E895516-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--0FC7B0C6F4FC4F04BEAD06F30E895516-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--0FC7B0C6F4FC4F04BEAD06F30E895516--></AD_MESSAGE>
@@ -29950,6 +29950,17 @@
 <!--17456DF6F0804BF2996AE696DFA31EC9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--17456DF6F0804BF2996AE696DFA31EC9--></AD_MESSAGE>
 
+<!--177D043CB3EC463DB0781C41CC5706B0--><AD_MESSAGE>
+<!--177D043CB3EC463DB0781C41CC5706B0-->  <AD_MESSAGE_ID><![CDATA[177D043CB3EC463DB0781C41CC5706B0]]></AD_MESSAGE_ID>
+<!--177D043CB3EC463DB0781C41CC5706B0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--177D043CB3EC463DB0781C41CC5706B0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--177D043CB3EC463DB0781C41CC5706B0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--177D043CB3EC463DB0781C41CC5706B0-->  <VALUE><![CDATA[CR_IsAvailable]]></VALUE>
+<!--177D043CB3EC463DB0781C41CC5706B0-->  <MSGTEXT><![CDATA[is available]]></MSGTEXT>
+<!--177D043CB3EC463DB0781C41CC5706B0-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--177D043CB3EC463DB0781C41CC5706B0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--177D043CB3EC463DB0781C41CC5706B0--></AD_MESSAGE>
+
 <!--17EB942A41BC417FA70FDFCA35027276--><AD_MESSAGE>
 <!--17EB942A41BC417FA70FDFCA35027276-->  <AD_MESSAGE_ID><![CDATA[17EB942A41BC417FA70FDFCA35027276]]></AD_MESSAGE_ID>
 <!--17EB942A41BC417FA70FDFCA35027276-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -29967,7 +29978,7 @@
 <!--17F9F89C2965434E9190E5E6FF92CF20-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--17F9F89C2965434E9190E5E6FF92CF20-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--17F9F89C2965434E9190E5E6FF92CF20-->  <VALUE><![CDATA[OBPSStandardEdition]]></VALUE>
-<!--17F9F89C2965434E9190E5E6FF92CF20-->  <MSGTEXT><![CDATA[Standard Professional Edition]]></MSGTEXT>
+<!--17F9F89C2965434E9190E5E6FF92CF20-->  <MSGTEXT><![CDATA[Professional Edition]]></MSGTEXT>
 <!--17F9F89C2965434E9190E5E6FF92CF20-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--17F9F89C2965434E9190E5E6FF92CF20-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--17F9F89C2965434E9190E5E6FF92CF20--></AD_MESSAGE>
@@ -31270,7 +31281,7 @@
 <!--5F53F7FE0703477883226EA1287EC5BF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--5F53F7FE0703477883226EA1287EC5BF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--5F53F7FE0703477883226EA1287EC5BF-->  <VALUE><![CDATA[OPS_INSTANCE_NOT_ACTIVE]]></VALUE>
-<!--5F53F7FE0703477883226EA1287EC5BF-->  <MSGTEXT><![CDATA[Your Professional Subscription has expired. However no data has been lost.<br>To renew your Professional Subscription, contact your assigned partner.<br>Only System Administrator users can log in.]]></MSGTEXT>
+<!--5F53F7FE0703477883226EA1287EC5BF-->  <MSGTEXT><![CDATA[Your Professional/Basic Edition subscription has expired. However no data has been lost.<br>To renew your Professional/Basic Edition subscription, contact your assigned partner.<br>Only System Administrator users can log in.]]></MSGTEXT>
 <!--5F53F7FE0703477883226EA1287EC5BF-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
 <!--5F53F7FE0703477883226EA1287EC5BF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5F53F7FE0703477883226EA1287EC5BF--></AD_MESSAGE>
@@ -31610,6 +31621,17 @@
 <!--74560B0C1A2C42DABDEFE33B6AEB3B86-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--74560B0C1A2C42DABDEFE33B6AEB3B86--></AD_MESSAGE>
 
+<!--7483DF96F3C34BB38C67B66BFAC79404--><AD_MESSAGE>
+<!--7483DF96F3C34BB38C67B66BFAC79404-->  <AD_MESSAGE_ID><![CDATA[7483DF96F3C34BB38C67B66BFAC79404]]></AD_MESSAGE_ID>
+<!--7483DF96F3C34BB38C67B66BFAC79404-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7483DF96F3C34BB38C67B66BFAC79404-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7483DF96F3C34BB38C67B66BFAC79404-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7483DF96F3C34BB38C67B66BFAC79404-->  <VALUE><![CDATA[CR_ButOnlyVersion]]></VALUE>
+<!--7483DF96F3C34BB38C67B66BFAC79404-->  <MSGTEXT><![CDATA[but only version]]></MSGTEXT>
+<!--7483DF96F3C34BB38C67B66BFAC79404-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--7483DF96F3C34BB38C67B66BFAC79404-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7483DF96F3C34BB38C67B66BFAC79404--></AD_MESSAGE>
+
 <!--7687410573FA477BBDDD8B54FDBB74CD--><AD_MESSAGE>
 <!--7687410573FA477BBDDD8B54FDBB74CD-->  <AD_MESSAGE_ID><![CDATA[7687410573FA477BBDDD8B54FDBB74CD]]></AD_MESSAGE_ID>
 <!--7687410573FA477BBDDD8B54FDBB74CD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -32121,6 +32143,17 @@
 <!--9210E705A80B442688E09A6C7C6BAEBA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--9210E705A80B442688E09A6C7C6BAEBA--></AD_MESSAGE>
 
+<!--94381D627E23402C9A1C80F254AFA741--><AD_MESSAGE>
+<!--94381D627E23402C9A1C80F254AFA741-->  <AD_MESSAGE_ID><![CDATA[94381D627E23402C9A1C80F254AFA741]]></AD_MESSAGE_ID>
+<!--94381D627E23402C9A1C80F254AFA741-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--94381D627E23402C9A1C80F254AFA741-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--94381D627E23402C9A1C80F254AFA741-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--94381D627E23402C9A1C80F254AFA741-->  <VALUE><![CDATA[CR_NameNotAvailable]]></VALUE>
+<!--94381D627E23402C9A1C80F254AFA741-->  <MSGTEXT><![CDATA[name not available]]></MSGTEXT>
+<!--94381D627E23402C9A1C80F254AFA741-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--94381D627E23402C9A1C80F254AFA741-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--94381D627E23402C9A1C80F254AFA741--></AD_MESSAGE>
+
 <!--964970901F024B758E76DA42A008349E--><AD_MESSAGE>
 <!--964970901F024B758E76DA42A008349E-->  <AD_MESSAGE_ID><![CDATA[964970901F024B758E76DA42A008349E]]></AD_MESSAGE_ID>
 <!--964970901F024B758E76DA42A008349E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -32270,7 +32303,7 @@
 <!--A29E0EA08B7B49B6A89722E6DD67A4EE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A29E0EA08B7B49B6A89722E6DD67A4EE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A29E0EA08B7B49B6A89722E6DD67A4EE-->  <VALUE><![CDATA[CannotDeactivateWithCommercialModules]]></VALUE>
-<!--A29E0EA08B7B49B6A89722E6DD67A4EE-->  <MSGTEXT><![CDATA[You cannot deactivate your Professional Edition because you have active commercial modules installed. Please uninstall or disable all the commercial modules and try again.]]></MSGTEXT>
+<!--A29E0EA08B7B49B6A89722E6DD67A4EE-->  <MSGTEXT><![CDATA[You cannot deactivate your Professional/Basic Edition because you have active commercial modules installed. Please uninstall or disable all the commercial modules and try again.]]></MSGTEXT>
 <!--A29E0EA08B7B49B6A89722E6DD67A4EE-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
 <!--A29E0EA08B7B49B6A89722E6DD67A4EE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--A29E0EA08B7B49B6A89722E6DD67A4EE--></AD_MESSAGE>
@@ -32341,6 +32374,17 @@
 <!--A62EAD507C264420B0C20FB9239C9D45-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--A62EAD507C264420B0C20FB9239C9D45--></AD_MESSAGE>
 
+<!--A6688A1ACA9F47D0B86C54890D41C2E2--><AD_MESSAGE>
+<!--A6688A1ACA9F47D0B86C54890D41C2E2-->  <AD_MESSAGE_ID><![CDATA[A6688A1ACA9F47D0B86C54890D41C2E2]]></AD_MESSAGE_ID>
+<!--A6688A1ACA9F47D0B86C54890D41C2E2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A6688A1ACA9F47D0B86C54890D41C2E2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A6688A1ACA9F47D0B86C54890D41C2E2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A6688A1ACA9F47D0B86C54890D41C2E2-->  <VALUE><![CDATA[APRM_FinancialAccountChk]]></VALUE>
+<!--A6688A1ACA9F47D0B86C54890D41C2E2-->  <MSGTEXT><![CDATA[Bank Fee, Revaluation Gain and Revaluation loss accounts are mandatory and can not be left empty when financial account is of type Bank.]]></MSGTEXT>
+<!--A6688A1ACA9F47D0B86C54890D41C2E2-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--A6688A1ACA9F47D0B86C54890D41C2E2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A6688A1ACA9F47D0B86C54890D41C2E2--></AD_MESSAGE>
+
 <!--A68C3053E180449ABF364A71CBAC9CF0--><AD_MESSAGE>
 <!--A68C3053E180449ABF364A71CBAC9CF0-->  <AD_MESSAGE_ID><![CDATA[A68C3053E180449ABF364A71CBAC9CF0]]></AD_MESSAGE_ID>
 <!--A68C3053E180449ABF364A71CBAC9CF0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -32597,6 +32641,17 @@
 <!--B5B771C2ACC04FE4A75C39249BFAD2EC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--B5B771C2ACC04FE4A75C39249BFAD2EC--></AD_MESSAGE>
 
+<!--B782432DAF61408CBFE037F717CD6B11--><AD_MESSAGE>
+<!--B782432DAF61408CBFE037F717CD6B11-->  <AD_MESSAGE_ID><![CDATA[B782432DAF61408CBFE037F717CD6B11]]></AD_MESSAGE_ID>
+<!--B782432DAF61408CBFE037F717CD6B11-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B782432DAF61408CBFE037F717CD6B11-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B782432DAF61408CBFE037F717CD6B11-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B782432DAF61408CBFE037F717CD6B11-->  <VALUE><![CDATA[ModuleUpdatesRemoved]]></VALUE>
+<!--B782432DAF61408CBFE037F717CD6B11-->  <MSGTEXT><![CDATA[The update information for the installed modules has been erased due to the settings changes.]]></MSGTEXT>
+<!--B782432DAF61408CBFE037F717CD6B11-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
+<!--B782432DAF61408CBFE037F717CD6B11-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B782432DAF61408CBFE037F717CD6B11--></AD_MESSAGE>
+
 <!--B785B8EF16CB412DB2E0FE32F55E9869--><AD_MESSAGE>
 <!--B785B8EF16CB412DB2E0FE32F55E9869-->  <AD_MESSAGE_ID><![CDATA[B785B8EF16CB412DB2E0FE32F55E9869]]></AD_MESSAGE_ID>
 <!--B785B8EF16CB412DB2E0FE32F55E9869-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -32834,7 +32889,7 @@
 <!--C3172067BB244F8693A584A9FAFBEE38-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--C3172067BB244F8693A584A9FAFBEE38-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C3172067BB244F8693A584A9FAFBEE38-->  <VALUE><![CDATA[OPSNotActiveTill]]></VALUE>
-<!--C3172067BB244F8693A584A9FAFBEE38-->  <MSGTEXT><![CDATA[Your Professional Subscription will not be active until ]]></MSGTEXT>
+<!--C3172067BB244F8693A584A9FAFBEE38-->  <MSGTEXT><![CDATA[Your Professional/Basic Edition will not be active until ]]></MSGTEXT>
 <!--C3172067BB244F8693A584A9FAFBEE38-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
 <!--C3172067BB244F8693A584A9FAFBEE38-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--C3172067BB244F8693A584A9FAFBEE38--></AD_MESSAGE>
@@ -33001,7 +33056,7 @@
 <!--C8433C64354D44C6A76F2A09CAF85907-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--C8433C64354D44C6A76F2A09CAF85907-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--C8433C64354D44C6A76F2A09CAF85907-->  <VALUE><![CDATA[OBPSNeededForAudit]]></VALUE>
-<!--C8433C64354D44C6A76F2A09CAF85907-->  <MSGTEXT><![CDATA[Openbravo Professional Subscription is needed in order to be able to keep track of audit.]]></MSGTEXT>
+<!--C8433C64354D44C6A76F2A09CAF85907-->  <MSGTEXT><![CDATA[Openbravo Professional/Basic Edition is needed in order to be able to keep track of audit.]]></MSGTEXT>
 <!--C8433C64354D44C6A76F2A09CAF85907-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
 <!--C8433C64354D44C6A76F2A09CAF85907-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--C8433C64354D44C6A76F2A09CAF85907--></AD_MESSAGE>
@@ -33390,7 +33445,7 @@
 <!--E3EBB7F6B97348EAA669732392EEF310-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--E3EBB7F6B97348EAA669732392EEF310-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E3EBB7F6B97348EAA669732392EEF310-->  <VALUE><![CDATA[OPSActivationExpired]]></VALUE>
-<!--E3EBB7F6B97348EAA669732392EEF310-->  <MSGTEXT><![CDATA[Your Professional Subscription expired on ]]></MSGTEXT>
+<!--E3EBB7F6B97348EAA669732392EEF310-->  <MSGTEXT><![CDATA[Your Professional/Basic Edition expired on ]]></MSGTEXT>
 <!--E3EBB7F6B97348EAA669732392EEF310-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
 <!--E3EBB7F6B97348EAA669732392EEF310-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--E3EBB7F6B97348EAA669732392EEF310--></AD_MESSAGE>
@@ -33802,7 +33857,7 @@
 <!--FBD240BC51C8471F85D65EFB40E079B6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--FBD240BC51C8471F85D65EFB40E079B6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--FBD240BC51C8471F85D65EFB40E079B6-->  <VALUE><![CDATA[OBPS_SUBSCRIPTION_REQUIRED]]></VALUE>
-<!--FBD240BC51C8471F85D65EFB40E079B6-->  <MSGTEXT><![CDATA[The following module(s) are commercial module(s) that require a subscription to an Openbravo Professional Edition:&nbsp;<b>@MODULE_LIST@</b>]]></MSGTEXT>
+<!--FBD240BC51C8471F85D65EFB40E079B6-->  <MSGTEXT><![CDATA[The following module(s) are commercial module(s) that require a subscription to an Openbravo Professional or Basic Edition:&nbsp;<b>@MODULE_LIST@</b>]]></MSGTEXT>
 <!--FBD240BC51C8471F85D65EFB40E079B6-->  <MSGTIP><![CDATA[@MODULE_LIST@ is a place holder for a list of modules. It must be not changed.]]></MSGTIP>
 <!--FBD240BC51C8471F85D65EFB40E079B6-->  <MSGTYPE><![CDATA[I]]></MSGTYPE>
 <!--FBD240BC51C8471F85D65EFB40E079B6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
--- a/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Thu Oct 21 18:38:18 2010 +0200
@@ -16252,7 +16252,7 @@
 <!--3634A40511484AF08B91A29AFF9D6CA0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3634A40511484AF08B91A29AFF9D6CA0-->  <ACTION><![CDATA[W]]></ACTION>
 <!--3634A40511484AF08B91A29AFF9D6CA0-->  <AD_TAB_ID><![CDATA[07F009753DA647C2AF38697BA9F1B1A0]]></AD_TAB_ID>
-<!--3634A40511484AF08B91A29AFF9D6CA0-->  <CLASSNAME><![CDATA[org.openbravo.erpWindows.MakePayment.Lines]]></CLASSNAME>
+<!--3634A40511484AF08B91A29AFF9D6CA0-->  <CLASSNAME><![CDATA[org.openbravo.erpWindows.PaymentOut.Lines]]></CLASSNAME>
 <!--3634A40511484AF08B91A29AFF9D6CA0-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--3634A40511484AF08B91A29AFF9D6CA0-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
 <!--3634A40511484AF08B91A29AFF9D6CA0--></AD_MODEL_OBJECT>
@@ -17280,7 +17280,7 @@
 <!--7C541AC0C751FDD7E040007F01016B4D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7C541AC0C751FDD7E040007F01016B4D-->  <ACTION><![CDATA[W]]></ACTION>
 <!--7C541AC0C751FDD7E040007F01016B4D-->  <AD_TAB_ID><![CDATA[C4B6506838E14A349D6717D6856F1B56]]></AD_TAB_ID>
-<!--7C541AC0C751FDD7E040007F01016B4D-->  <CLASSNAME><![CDATA[org.openbravo.erpWindows.ReceivePayments.Header]]></CLASSNAME>
+<!--7C541AC0C751FDD7E040007F01016B4D-->  <CLASSNAME><![CDATA[org.openbravo.erpWindows.PaymentIn.Header]]></CLASSNAME>
 <!--7C541AC0C751FDD7E040007F01016B4D-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--7C541AC0C751FDD7E040007F01016B4D-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
 <!--7C541AC0C751FDD7E040007F01016B4D--></AD_MODEL_OBJECT>
@@ -17304,7 +17304,7 @@
 <!--7C667247C7BC2B30E040007F01010C8C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7C667247C7BC2B30E040007F01010C8C-->  <ACTION><![CDATA[W]]></ACTION>
 <!--7C667247C7BC2B30E040007F01010C8C-->  <AD_TAB_ID><![CDATA[173B46EC4F91406E9B68DCF6464BB308]]></AD_TAB_ID>
-<!--7C667247C7BC2B30E040007F01010C8C-->  <CLASSNAME><![CDATA[org.openbravo.erpWindows.ReceivePayments.Lines]]></CLASSNAME>
+<!--7C667247C7BC2B30E040007F01010C8C-->  <CLASSNAME><![CDATA[org.openbravo.erpWindows.PaymentIn.Lines]]></CLASSNAME>
 <!--7C667247C7BC2B30E040007F01010C8C-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--7C667247C7BC2B30E040007F01010C8C-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
 <!--7C667247C7BC2B30E040007F01010C8C--></AD_MODEL_OBJECT>
@@ -17859,7 +17859,7 @@
 <!--9FFDFC752BDA410CAC856F6F00BB6CF8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9FFDFC752BDA410CAC856F6F00BB6CF8-->  <ACTION><![CDATA[W]]></ACTION>
 <!--9FFDFC752BDA410CAC856F6F00BB6CF8-->  <AD_TAB_ID><![CDATA[F7A52FDAAA0346EFA07D53C125B40404]]></AD_TAB_ID>
-<!--9FFDFC752BDA410CAC856F6F00BB6CF8-->  <CLASSNAME><![CDATA[org.openbravo.erpWindows.MakePayment.Header]]></CLASSNAME>
+<!--9FFDFC752BDA410CAC856F6F00BB6CF8-->  <CLASSNAME><![CDATA[org.openbravo.erpWindows.PaymentOut.Header]]></CLASSNAME>
 <!--9FFDFC752BDA410CAC856F6F00BB6CF8-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--9FFDFC752BDA410CAC856F6F00BB6CF8-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
 <!--9FFDFC752BDA410CAC856F6F00BB6CF8--></AD_MODEL_OBJECT>
@@ -18127,7 +18127,7 @@
 <!--D394D71C4BAC480EA29D9258366B079B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--D394D71C4BAC480EA29D9258366B079B-->  <ACTION><![CDATA[W]]></ACTION>
 <!--D394D71C4BAC480EA29D9258366B079B-->  <AD_TAB_ID><![CDATA[ABD19F77982D41F7A53F7A61948A137D]]></AD_TAB_ID>
-<!--D394D71C4BAC480EA29D9258366B079B-->  <CLASSNAME><![CDATA[org.openbravo.erpWindows.ReceivePayments.ExecutionHistory]]></CLASSNAME>
+<!--D394D71C4BAC480EA29D9258366B079B-->  <CLASSNAME><![CDATA[org.openbravo.erpWindows.PaymentIn.ExecutionHistory]]></CLASSNAME>
 <!--D394D71C4BAC480EA29D9258366B079B-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--D394D71C4BAC480EA29D9258366B079B-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
 <!--D394D71C4BAC480EA29D9258366B079B--></AD_MODEL_OBJECT>
@@ -18312,7 +18312,7 @@
 <!--F3DC5E0699BE45E08C4AEE07274D1034-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F3DC5E0699BE45E08C4AEE07274D1034-->  <ACTION><![CDATA[W]]></ACTION>
 <!--F3DC5E0699BE45E08C4AEE07274D1034-->  <AD_TAB_ID><![CDATA[719D6C8507CA4B27886C0D8A7859B543]]></AD_TAB_ID>
-<!--F3DC5E0699BE45E08C4AEE07274D1034-->  <CLASSNAME><![CDATA[org.openbravo.erpWindows.MakePayment.ExecutionHistory]]></CLASSNAME>
+<!--F3DC5E0699BE45E08C4AEE07274D1034-->  <CLASSNAME><![CDATA[org.openbravo.erpWindows.PaymentOut.ExecutionHistory]]></CLASSNAME>
 <!--F3DC5E0699BE45E08C4AEE07274D1034-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--F3DC5E0699BE45E08C4AEE07274D1034-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
 <!--F3DC5E0699BE45E08C4AEE07274D1034--></AD_MODEL_OBJECT>
--- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	Thu Oct 21 18:38:18 2010 +0200
@@ -24846,7 +24846,7 @@
 <!--03D2B79220404DBD9B6D744773B673D8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--03D2B79220404DBD9B6D744773B673D8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--03D2B79220404DBD9B6D744773B673D8-->  <AD_MODEL_OBJECT_ID><![CDATA[9FFDFC752BDA410CAC856F6F00BB6CF8]]></AD_MODEL_OBJECT_ID>
-<!--03D2B79220404DBD9B6D744773B673D8-->  <MAPPINGNAME><![CDATA[/MakePayment/Header_Edition.html]]></MAPPINGNAME>
+<!--03D2B79220404DBD9B6D744773B673D8-->  <MAPPINGNAME><![CDATA[/PaymentOut/Header_Edition.html]]></MAPPINGNAME>
 <!--03D2B79220404DBD9B6D744773B673D8-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--03D2B79220404DBD9B6D744773B673D8--></AD_MODEL_OBJECT_MAPPING>
 
@@ -24936,7 +24936,7 @@
 <!--0E2415530146445CA736D6E6617BA088-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--0E2415530146445CA736D6E6617BA088-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--0E2415530146445CA736D6E6617BA088-->  <AD_MODEL_OBJECT_ID><![CDATA[F3DC5E0699BE45E08C4AEE07274D1034]]></AD_MODEL_OBJECT_ID>
-<!--0E2415530146445CA736D6E6617BA088-->  <MAPPINGNAME><![CDATA[/MakePayment/ExecutionHistory_Relation.html]]></MAPPINGNAME>
+<!--0E2415530146445CA736D6E6617BA088-->  <MAPPINGNAME><![CDATA[/PaymentOut/ExecutionHistory_Relation.html]]></MAPPINGNAME>
 <!--0E2415530146445CA736D6E6617BA088-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--0E2415530146445CA736D6E6617BA088--></AD_MODEL_OBJECT_MAPPING>
 
@@ -24956,7 +24956,7 @@
 <!--10A648F1A1124FF682BC350599E5D1A9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--10A648F1A1124FF682BC350599E5D1A9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--10A648F1A1124FF682BC350599E5D1A9-->  <AD_MODEL_OBJECT_ID><![CDATA[F3DC5E0699BE45E08C4AEE07274D1034]]></AD_MODEL_OBJECT_ID>
-<!--10A648F1A1124FF682BC350599E5D1A9-->  <MAPPINGNAME><![CDATA[/MakePayment/ExecutionHistory_Excel.xls]]></MAPPINGNAME>
+<!--10A648F1A1124FF682BC350599E5D1A9-->  <MAPPINGNAME><![CDATA[/PaymentOut/ExecutionHistory_Excel.xls]]></MAPPINGNAME>
 <!--10A648F1A1124FF682BC350599E5D1A9-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--10A648F1A1124FF682BC350599E5D1A9--></AD_MODEL_OBJECT_MAPPING>
 
@@ -25006,7 +25006,7 @@
 <!--1632BF8A81B749C89AD3F8D5A5A28775-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--1632BF8A81B749C89AD3F8D5A5A28775-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1632BF8A81B749C89AD3F8D5A5A28775-->  <AD_MODEL_OBJECT_ID><![CDATA[3634A40511484AF08B91A29AFF9D6CA0]]></AD_MODEL_OBJECT_ID>
-<!--1632BF8A81B749C89AD3F8D5A5A28775-->  <MAPPINGNAME><![CDATA[/MakePayment/Lines_Relation.html]]></MAPPINGNAME>
+<!--1632BF8A81B749C89AD3F8D5A5A28775-->  <MAPPINGNAME><![CDATA[/PaymentOut/Lines_Relation.html]]></MAPPINGNAME>
 <!--1632BF8A81B749C89AD3F8D5A5A28775-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--1632BF8A81B749C89AD3F8D5A5A28775--></AD_MODEL_OBJECT_MAPPING>
 
@@ -25216,7 +25216,7 @@
 <!--372196838EB64077891EE927D5DE635C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--372196838EB64077891EE927D5DE635C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--372196838EB64077891EE927D5DE635C-->  <AD_MODEL_OBJECT_ID><![CDATA[D394D71C4BAC480EA29D9258366B079B]]></AD_MODEL_OBJECT_ID>
-<!--372196838EB64077891EE927D5DE635C-->  <MAPPINGNAME><![CDATA[/ReceivePayments/ExecutionHistory_Relation.html]]></MAPPINGNAME>
+<!--372196838EB64077891EE927D5DE635C-->  <MAPPINGNAME><![CDATA[/PaymentIn/ExecutionHistory_Relation.html]]></MAPPINGNAME>
 <!--372196838EB64077891EE927D5DE635C-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--372196838EB64077891EE927D5DE635C--></AD_MODEL_OBJECT_MAPPING>
 
@@ -25226,7 +25226,7 @@
 <!--391464C0820D445FB264EAB6A53BE26A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--391464C0820D445FB264EAB6A53BE26A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--391464C0820D445FB264EAB6A53BE26A-->  <AD_MODEL_OBJECT_ID><![CDATA[9FFDFC752BDA410CAC856F6F00BB6CF8]]></AD_MODEL_OBJECT_ID>
-<!--391464C0820D445FB264EAB6A53BE26A-->  <MAPPINGNAME><![CDATA[/MakePayment/Header_Excel.xls]]></MAPPINGNAME>
+<!--391464C0820D445FB264EAB6A53BE26A-->  <MAPPINGNAME><![CDATA[/PaymentOut/Header_Excel.xls]]></MAPPINGNAME>
 <!--391464C0820D445FB264EAB6A53BE26A-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--391464C0820D445FB264EAB6A53BE26A--></AD_MODEL_OBJECT_MAPPING>
 
@@ -25356,7 +25356,7 @@
 <!--52524C56BABF4E3784FD103DA1A0DB17-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--52524C56BABF4E3784FD103DA1A0DB17-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--52524C56BABF4E3784FD103DA1A0DB17-->  <AD_MODEL_OBJECT_ID><![CDATA[D394D71C4BAC480EA29D9258366B079B]]></AD_MODEL_OBJECT_ID>
-<!--52524C56BABF4E3784FD103DA1A0DB17-->  <MAPPINGNAME><![CDATA[/ReceivePayments/ExecutionHistory_Edition.html]]></MAPPINGNAME>
+<!--52524C56BABF4E3784FD103DA1A0DB17-->  <MAPPINGNAME><![CDATA[/PaymentIn/ExecutionHistory_Edition.html]]></MAPPINGNAME>
 <!--52524C56BABF4E3784FD103DA1A0DB17-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--52524C56BABF4E3784FD103DA1A0DB17--></AD_MODEL_OBJECT_MAPPING>
 
@@ -26566,7 +26566,7 @@
 <!--7C541AC0C752FDD7E040007F01016B4D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7C541AC0C752FDD7E040007F01016B4D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7C541AC0C752FDD7E040007F01016B4D-->  <AD_MODEL_OBJECT_ID><![CDATA[7C541AC0C751FDD7E040007F01016B4D]]></AD_MODEL_OBJECT_ID>
-<!--7C541AC0C752FDD7E040007F01016B4D-->  <MAPPINGNAME><![CDATA[/ReceivePayments/Header_Relation.html]]></MAPPINGNAME>
+<!--7C541AC0C752FDD7E040007F01016B4D-->  <MAPPINGNAME><![CDATA[/PaymentIn/Header_Relation.html]]></MAPPINGNAME>
 <!--7C541AC0C752FDD7E040007F01016B4D-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--7C541AC0C752FDD7E040007F01016B4D--></AD_MODEL_OBJECT_MAPPING>
 
@@ -26576,7 +26576,7 @@
 <!--7C541AC0C753FDD7E040007F01016B4D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7C541AC0C753FDD7E040007F01016B4D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7C541AC0C753FDD7E040007F01016B4D-->  <AD_MODEL_OBJECT_ID><![CDATA[7C541AC0C751FDD7E040007F01016B4D]]></AD_MODEL_OBJECT_ID>
-<!--7C541AC0C753FDD7E040007F01016B4D-->  <MAPPINGNAME><![CDATA[/ReceivePayments/Header_Edition.html]]></MAPPINGNAME>
+<!--7C541AC0C753FDD7E040007F01016B4D-->  <MAPPINGNAME><![CDATA[/PaymentIn/Header_Edition.html]]></MAPPINGNAME>
 <!--7C541AC0C753FDD7E040007F01016B4D-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--7C541AC0C753FDD7E040007F01016B4D--></AD_MODEL_OBJECT_MAPPING>
 
@@ -26586,7 +26586,7 @@
 <!--7C541AC0C754FDD7E040007F01016B4D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7C541AC0C754FDD7E040007F01016B4D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7C541AC0C754FDD7E040007F01016B4D-->  <AD_MODEL_OBJECT_ID><![CDATA[7C541AC0C751FDD7E040007F01016B4D]]></AD_MODEL_OBJECT_ID>
-<!--7C541AC0C754FDD7E040007F01016B4D-->  <MAPPINGNAME><![CDATA[/ReceivePayments/Header_Excel.xls]]></MAPPINGNAME>
+<!--7C541AC0C754FDD7E040007F01016B4D-->  <MAPPINGNAME><![CDATA[/PaymentIn/Header_Excel.xls]]></MAPPINGNAME>
 <!--7C541AC0C754FDD7E040007F01016B4D-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--7C541AC0C754FDD7E040007F01016B4D--></AD_MODEL_OBJECT_MAPPING>
 
@@ -26606,7 +26606,7 @@
 <!--7C667247C7BD2B30E040007F01010C8C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7C667247C7BD2B30E040007F01010C8C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7C667247C7BD2B30E040007F01010C8C-->  <AD_MODEL_OBJECT_ID><![CDATA[7C667247C7BC2B30E040007F01010C8C]]></AD_MODEL_OBJECT_ID>
-<!--7C667247C7BD2B30E040007F01010C8C-->  <MAPPINGNAME><![CDATA[/ReceivePayments/Lines_Relation.html]]></MAPPINGNAME>
+<!--7C667247C7BD2B30E040007F01010C8C-->  <MAPPINGNAME><![CDATA[/PaymentIn/Lines_Relation.html]]></MAPPINGNAME>
 <!--7C667247C7BD2B30E040007F01010C8C-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--7C667247C7BD2B30E040007F01010C8C--></AD_MODEL_OBJECT_MAPPING>
 
@@ -26616,7 +26616,7 @@
 <!--7C667247C7BE2B30E040007F01010C8C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7C667247C7BE2B30E040007F01010C8C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7C667247C7BE2B30E040007F01010C8C-->  <AD_MODEL_OBJECT_ID><![CDATA[7C667247C7BC2B30E040007F01010C8C]]></AD_MODEL_OBJECT_ID>
-<!--7C667247C7BE2B30E040007F01010C8C-->  <MAPPINGNAME><![CDATA[/ReceivePayments/Lines_Edition.html]]></MAPPINGNAME>
+<!--7C667247C7BE2B30E040007F01010C8C-->  <MAPPINGNAME><![CDATA[/PaymentIn/Lines_Edition.html]]></MAPPINGNAME>
 <!--7C667247C7BE2B30E040007F01010C8C-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--7C667247C7BE2B30E040007F01010C8C--></AD_MODEL_OBJECT_MAPPING>
 
@@ -26626,7 +26626,7 @@
 <!--7C667247C7BF2B30E040007F01010C8C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7C667247C7BF2B30E040007F01010C8C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--7C667247C7BF2B30E040007F01010C8C-->  <AD_MODEL_OBJECT_ID><![CDATA[7C667247C7BC2B30E040007F01010C8C]]></AD_MODEL_OBJECT_ID>
-<!--7C667247C7BF2B30E040007F01010C8C-->  <MAPPINGNAME><![CDATA[/ReceivePayments/Lines_Excel.xls]]></MAPPINGNAME>
+<!--7C667247C7BF2B30E040007F01010C8C-->  <MAPPINGNAME><![CDATA[/PaymentIn/Lines_Excel.xls]]></MAPPINGNAME>
 <!--7C667247C7BF2B30E040007F01010C8C-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--7C667247C7BF2B30E040007F01010C8C--></AD_MODEL_OBJECT_MAPPING>
 
@@ -27396,7 +27396,7 @@
 <!--9456012F208C4AAC9FC746B9C4F3429A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--9456012F208C4AAC9FC746B9C4F3429A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9456012F208C4AAC9FC746B9C4F3429A-->  <AD_MODEL_OBJECT_ID><![CDATA[F3DC5E0699BE45E08C4AEE07274D1034]]></AD_MODEL_OBJECT_ID>
-<!--9456012F208C4AAC9FC746B9C4F3429A-->  <MAPPINGNAME><![CDATA[/MakePayment/ExecutionHistory_Edition.html]]></MAPPINGNAME>
+<!--9456012F208C4AAC9FC746B9C4F3429A-->  <MAPPINGNAME><![CDATA[/PaymentOut/ExecutionHistory_Edition.html]]></MAPPINGNAME>
 <!--9456012F208C4AAC9FC746B9C4F3429A-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--9456012F208C4AAC9FC746B9C4F3429A--></AD_MODEL_OBJECT_MAPPING>
 
@@ -27406,7 +27406,7 @@
 <!--97F8586B71CA4B2EA8EF3E5EE4DE2B1D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--97F8586B71CA4B2EA8EF3E5EE4DE2B1D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--97F8586B71CA4B2EA8EF3E5EE4DE2B1D-->  <AD_MODEL_OBJECT_ID><![CDATA[D394D71C4BAC480EA29D9258366B079B]]></AD_MODEL_OBJECT_ID>
-<!--97F8586B71CA4B2EA8EF3E5EE4DE2B1D-->  <MAPPINGNAME><![CDATA[/ReceivePayments/ExecutionHistory_Excel.xls]]></MAPPINGNAME>
+<!--97F8586B71CA4B2EA8EF3E5EE4DE2B1D-->  <MAPPINGNAME><![CDATA[/PaymentIn/ExecutionHistory_Excel.xls]]></MAPPINGNAME>
 <!--97F8586B71CA4B2EA8EF3E5EE4DE2B1D-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--97F8586B71CA4B2EA8EF3E5EE4DE2B1D--></AD_MODEL_OBJECT_MAPPING>
 
@@ -27426,7 +27426,7 @@
 <!--A08189D07A2F4BE29CEECBC154133CC6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A08189D07A2F4BE29CEECBC154133CC6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A08189D07A2F4BE29CEECBC154133CC6-->  <AD_MODEL_OBJECT_ID><![CDATA[9FFDFC752BDA410CAC856F6F00BB6CF8]]></AD_MODEL_OBJECT_ID>
-<!--A08189D07A2F4BE29CEECBC154133CC6-->  <MAPPINGNAME><![CDATA[/MakePayment/Header_Relation.html]]></MAPPINGNAME>
+<!--A08189D07A2F4BE29CEECBC154133CC6-->  <MAPPINGNAME><![CDATA[/PaymentOut/Header_Relation.html]]></MAPPINGNAME>
 <!--A08189D07A2F4BE29CEECBC154133CC6-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--A08189D07A2F4BE29CEECBC154133CC6--></AD_MODEL_OBJECT_MAPPING>
 
@@ -27466,7 +27466,7 @@
 <!--A568643D79F8428C88ADB6AC80E04D25-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--A568643D79F8428C88ADB6AC80E04D25-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--A568643D79F8428C88ADB6AC80E04D25-->  <AD_MODEL_OBJECT_ID><![CDATA[3634A40511484AF08B91A29AFF9D6CA0]]></AD_MODEL_OBJECT_ID>
-<!--A568643D79F8428C88ADB6AC80E04D25-->  <MAPPINGNAME><![CDATA[/MakePayment/Lines_Edition.html]]></MAPPINGNAME>
+<!--A568643D79F8428C88ADB6AC80E04D25-->  <MAPPINGNAME><![CDATA[/PaymentOut/Lines_Edition.html]]></MAPPINGNAME>
 <!--A568643D79F8428C88ADB6AC80E04D25-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--A568643D79F8428C88ADB6AC80E04D25--></AD_MODEL_OBJECT_MAPPING>
 
@@ -27796,7 +27796,7 @@
 <!--E7992452F83D4AEC89BD0B02ED1FE61B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--E7992452F83D4AEC89BD0B02ED1FE61B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E7992452F83D4AEC89BD0B02ED1FE61B-->  <AD_MODEL_OBJECT_ID><![CDATA[3634A40511484AF08B91A29AFF9D6CA0]]></AD_MODEL_OBJECT_ID>
-<!--E7992452F83D4AEC89BD0B02ED1FE61B-->  <MAPPINGNAME><![CDATA[/MakePayment/Lines_Excel.xls]]></MAPPINGNAME>
+<!--E7992452F83D4AEC89BD0B02ED1FE61B-->  <MAPPINGNAME><![CDATA[/PaymentOut/Lines_Excel.xls]]></MAPPINGNAME>
 <!--E7992452F83D4AEC89BD0B02ED1FE61B-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
 <!--E7992452F83D4AEC89BD0B02ED1FE61B--></AD_MODEL_OBJECT_MAPPING>
 
--- a/src-db/database/sourcedata/AD_PROCESS.xml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-db/database/sourcedata/AD_PROCESS.xml	Thu Oct 21 18:38:18 2010 +0200
@@ -692,7 +692,7 @@
 <!--137-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--137-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--137-->  <VALUE><![CDATA[M_Production]]></VALUE>
-<!--137-->  <NAME><![CDATA[Create/Post Production]]></NAME>
+<!--137-->  <NAME><![CDATA[Create/Process Production]]></NAME>
 <!--137-->  <DESCRIPTION><![CDATA[Create production lines, if not created - otherwise process the production]]></DESCRIPTION>
 <!--137-->  <HELP><![CDATA[Create/Post Production will generate the production lines and process the production.  If the production lines already exists, the production will be processed]]></HELP>
 <!--137-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
@@ -702,6 +702,7 @@
 <!--137-->  <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT>
 <!--137-->  <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND>
 <!--137-->  <ISJASPER><![CDATA[N]]></ISJASPER>
+<!--137-->  <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE>
 <!--137-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--137-->  <UIPATTERN><![CDATA[S]]></UIPATTERN>
 <!--137--></AD_PROCESS>
--- a/src-db/database/sourcedata/AD_REF_LIST.xml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml	Thu Oct 21 18:38:18 2010 +0200
@@ -833,7 +833,7 @@
 <!--169-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--169-->  <ISACTIVE><![CDATA[N]]></ISACTIVE>
 <!--169-->  <VALUE><![CDATA[TE]]></VALUE>
-<!--169-->  <NAME><![CDATA[Transfer error]]></NAME>
+<!--169-->  <NAME><![CDATA[Transfer Error]]></NAME>
 <!--169-->  <AD_REFERENCE_ID><![CDATA[131]]></AD_REFERENCE_ID>
 <!--169-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--169--></AD_REF_LIST>
@@ -1267,7 +1267,7 @@
 <!--214-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--214-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--214-->  <VALUE><![CDATA[O]]></VALUE>
-<!--214-->  <NAME><![CDATA[After Order delivered]]></NAME>
+<!--214-->  <NAME><![CDATA[After Order Delivered]]></NAME>
 <!--214-->  <DESCRIPTION><![CDATA[Invoice for every order]]></DESCRIPTION>
 <!--214-->  <AD_REFERENCE_ID><![CDATA[150]]></AD_REFERENCE_ID>
 <!--214-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -1291,7 +1291,7 @@
 <!--216-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--216-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--216-->  <VALUE><![CDATA[S]]></VALUE>
-<!--216-->  <NAME><![CDATA[Customer Schedule after Delivery]]></NAME>
+<!--216-->  <NAME><![CDATA[Customer Schedule After Delivery]]></NAME>
 <!--216-->  <DESCRIPTION><![CDATA[Invoice per Customer Invoice Schedule]]></DESCRIPTION>
 <!--216-->  <AD_REFERENCE_ID><![CDATA[150]]></AD_REFERENCE_ID>
 <!--216-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -2445,7 +2445,7 @@
 <!--341-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--341-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--341-->  <VALUE><![CDATA[IP]]></VALUE>
-<!--341-->  <NAME><![CDATA[Under way]]></NAME>
+<!--341-->  <NAME><![CDATA[Under Way]]></NAME>
 <!--341-->  <AD_REFERENCE_ID><![CDATA[131]]></AD_REFERENCE_ID>
 <!--341-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--341--></AD_REF_LIST>
@@ -2501,7 +2501,7 @@
 <!--346-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--346-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--346-->  <VALUE><![CDATA[WP]]></VALUE>
-<!--346-->  <NAME><![CDATA[Not paid]]></NAME>
+<!--346-->  <NAME><![CDATA[Not Paid]]></NAME>
 <!--346-->  <AD_REFERENCE_ID><![CDATA[131]]></AD_REFERENCE_ID>
 <!--346-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--346--></AD_REF_LIST>
@@ -5787,7 +5787,7 @@
 <!--800064-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--800064-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--800064-->  <VALUE><![CDATA[N]]></VALUE>
-<!--800064-->  <NAME><![CDATA[Do not invoice]]></NAME>
+<!--800064-->  <NAME><![CDATA[Do Not Invoice]]></NAME>
 <!--800064-->  <DESCRIPTION><![CDATA[Order should not be invoiced trough Process Invoice]]></DESCRIPTION>
 <!--800064-->  <AD_REFERENCE_ID><![CDATA[150]]></AD_REFERENCE_ID>
 <!--800064-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -8910,6 +8910,18 @@
 <!--4B320699808A4088930E96843DCBAF6D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4B320699808A4088930E96843DCBAF6D--></AD_REF_LIST>
 
+<!--4BED47D608B841EC8016441CFA05F2FA--><AD_REF_LIST>
+<!--4BED47D608B841EC8016441CFA05F2FA-->  <AD_REF_LIST_ID><![CDATA[4BED47D608B841EC8016441CFA05F2FA]]></AD_REF_LIST_ID>
+<!--4BED47D608B841EC8016441CFA05F2FA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4BED47D608B841EC8016441CFA05F2FA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4BED47D608B841EC8016441CFA05F2FA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4BED47D608B841EC8016441CFA05F2FA-->  <VALUE><![CDATA[ForcedLoginURL]]></VALUE>
+<!--4BED47D608B841EC8016441CFA05F2FA-->  <NAME><![CDATA[Forced Login URL]]></NAME>
+<!--4BED47D608B841EC8016441CFA05F2FA-->  <DESCRIPTION><![CDATA[If this property is set and the Openbravo login page is accessed using a different URL, it will be redirected to this one. Value for this property should be assigned at system level.]]></DESCRIPTION>
+<!--4BED47D608B841EC8016441CFA05F2FA-->  <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
+<!--4BED47D608B841EC8016441CFA05F2FA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4BED47D608B841EC8016441CFA05F2FA--></AD_REF_LIST>
+
 <!--4C6B4B638FC74B72AD5646519F92AB57--><AD_REF_LIST>
 <!--4C6B4B638FC74B72AD5646519F92AB57-->  <AD_REF_LIST_ID><![CDATA[4C6B4B638FC74B72AD5646519F92AB57]]></AD_REF_LIST_ID>
 <!--4C6B4B638FC74B72AD5646519F92AB57-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_TAB.xml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-db/database/sourcedata/AD_TAB.xml	Thu Oct 21 18:38:18 2010 +0200
@@ -13159,10 +13159,10 @@
 <!--6BC4F7D2CBE94AEE939CCB5990B55FEA-->  <ISTRANSLATIONTAB><![CDATA[N]]></ISTRANSLATIONTAB>
 <!--6BC4F7D2CBE94AEE939CCB5990B55FEA-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
 <!--6BC4F7D2CBE94AEE939CCB5990B55FEA-->  <HASTREE><![CDATA[N]]></HASTREE>
-<!--6BC4F7D2CBE94AEE939CCB5990B55FEA-->  <ORDERBYCLAUSE><![CDATA[Year DESC, Startdate ASC]]></ORDERBYCLAUSE>
 <!--6BC4F7D2CBE94AEE939CCB5990B55FEA-->  <PROCESSING><![CDATA[N]]></PROCESSING>
 <!--6BC4F7D2CBE94AEE939CCB5990B55FEA-->  <IMPORTFIELDS><![CDATA[N]]></IMPORTFIELDS>
 <!--6BC4F7D2CBE94AEE939CCB5990B55FEA-->  <ISSORTTAB><![CDATA[N]]></ISSORTTAB>
+<!--6BC4F7D2CBE94AEE939CCB5990B55FEA-->  <FILTERCLAUSE><![CDATA[PeriodStatus='O']]></FILTERCLAUSE>
 <!--6BC4F7D2CBE94AEE939CCB5990B55FEA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6BC4F7D2CBE94AEE939CCB5990B55FEA-->  <UIPATTERN><![CDATA[RO]]></UIPATTERN>
 <!--6BC4F7D2CBE94AEE939CCB5990B55FEA--></AD_TAB>
--- a/src-db/database/sourcedata/AD_TABLE.xml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-db/database/sourcedata/AD_TABLE.xml	Thu Oct 21 18:38:18 2010 +0200
@@ -11112,8 +11112,9 @@
 <!--CB391C8A13D74B688A34017B5B5D1F5D-->  <CLASSNAME><![CDATA[PeriodControlV]]></CLASSNAME>
 <!--CB391C8A13D74B688A34017B5B5D1F5D-->  <ISVIEW><![CDATA[Y]]></ISVIEW>
 <!--CB391C8A13D74B688A34017B5B5D1F5D-->  <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL>
+<!--CB391C8A13D74B688A34017B5B5D1F5D-->  <AD_WINDOW_ID><![CDATA[110]]></AD_WINDOW_ID>
 <!--CB391C8A13D74B688A34017B5B5D1F5D-->  <ISSECURITYENABLED><![CDATA[N]]></ISSECURITYENABLED>
-<!--CB391C8A13D74B688A34017B5B5D1F5D-->  <ISDELETEABLE><![CDATA[Y]]></ISDELETEABLE>
+<!--CB391C8A13D74B688A34017B5B5D1F5D-->  <ISDELETEABLE><![CDATA[N]]></ISDELETEABLE>
 <!--CB391C8A13D74B688A34017B5B5D1F5D-->  <ISHIGHVOLUME><![CDATA[N]]></ISHIGHVOLUME>
 <!--CB391C8A13D74B688A34017B5B5D1F5D-->  <IMPORTTABLE><![CDATA[N]]></IMPORTTABLE>
 <!--CB391C8A13D74B688A34017B5B5D1F5D-->  <ISCHANGELOG><![CDATA[N]]></ISCHANGELOG>
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Thu Oct 21 18:38:18 2010 +0200
@@ -1988,17 +1988,6 @@
 <!--802541-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--802541--></AD_TEXTINTERFACES>
 
-<!--802564--><AD_TEXTINTERFACES>
-<!--802564-->  <AD_TEXTINTERFACES_ID><![CDATA[802564]]></AD_TEXTINTERFACES_ID>
-<!--802564-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--802564-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--802564-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--802564-->  <TEXT><![CDATA[Organization1]]></TEXT>
-<!--802564-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder.html]]></FILENAME>
-<!--802564-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--802564-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--802564--></AD_TEXTINTERFACES>
-
 <!--802571--><AD_TEXTINTERFACES>
 <!--802571-->  <AD_TEXTINTERFACES_ID><![CDATA[802571]]></AD_TEXTINTERFACES_ID>
 <!--802571-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -3646,17 +3635,6 @@
 <!--803734-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--803734--></AD_TEXTINTERFACES>
 
-<!--803740--><AD_TEXTINTERFACES>
-<!--803740-->  <AD_TEXTINTERFACES_ID><![CDATA[803740]]></AD_TEXTINTERFACES_ID>
-<!--803740-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--803740-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--803740-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--803740-->  <TEXT><![CDATA[Enterprise N-1:  ]]></TEXT>
-<!--803740-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo]]></FILENAME>
-<!--803740-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--803740-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--803740--></AD_TEXTINTERFACES>
-
 <!--803742--><AD_TEXTINTERFACES>
 <!--803742-->  <AD_TEXTINTERFACES_ID><![CDATA[803742]]></AD_TEXTINTERFACES_ID>
 <!--803742-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -16623,6 +16601,17 @@
 <!--48AF9E125D2143669AFAAA89D52473D3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--48AF9E125D2143669AFAAA89D52473D3--></AD_TEXTINTERFACES>
 
+<!--49CC005EEE51425CBEC072A4BFFFC929--><AD_TEXTINTERFACES>
+<!--49CC005EEE51425CBEC072A4BFFFC929-->  <AD_TEXTINTERFACES_ID><![CDATA[49CC005EEE51425CBEC072A4BFFFC929]]></AD_TEXTINTERFACES_ID>
+<!--49CC005EEE51425CBEC072A4BFFFC929-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--49CC005EEE51425CBEC072A4BFFFC929-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--49CC005EEE51425CBEC072A4BFFFC929-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--49CC005EEE51425CBEC072A4BFFFC929-->  <TEXT><![CDATA[ N-1:  ]]></TEXT>
+<!--49CC005EEE51425CBEC072A4BFFFC929-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo]]></FILENAME>
+<!--49CC005EEE51425CBEC072A4BFFFC929-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--49CC005EEE51425CBEC072A4BFFFC929-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--49CC005EEE51425CBEC072A4BFFFC929--></AD_TEXTINTERFACES>
+
 <!--4B1D50A666314B7494E607B737A9D2D0--><AD_TEXTINTERFACES>
 <!--4B1D50A666314B7494E607B737A9D2D0-->  <AD_TEXTINTERFACES_ID><![CDATA[4B1D50A666314B7494E607B737A9D2D0]]></AD_TEXTINTERFACES_ID>
 <!--4B1D50A666314B7494E607B737A9D2D0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -19329,17 +19318,6 @@
 <!--6E59421C5B36AB25E040007F01016FD1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6E59421C5B36AB25E040007F01016FD1--></AD_TEXTINTERFACES>
 
-<!--6E59421C5B37AB25E040007F01016FD1--><AD_TEXTINTERFACES>
-<!--6E59421C5B37AB25E040007F01016FD1-->  <AD_TEXTINTERFACES_ID><![CDATA[6E59421C5B37AB25E040007F01016FD1]]></AD_TEXTINTERFACES_ID>
-<!--6E59421C5B37AB25E040007F01016FD1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--6E59421C5B37AB25E040007F01016FD1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--6E59421C5B37AB25E040007F01016FD1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6E59421C5B37AB25E040007F01016FD1-->  <TEXT><![CDATA[Activate the instance with the Activation File you downloaded and the System Key you received upon purchasing of an Openbravo Professional Subscription.]]></TEXT>
-<!--6E59421C5B37AB25E040007F01016FD1-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateLocal.html]]></FILENAME>
-<!--6E59421C5B37AB25E040007F01016FD1-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--6E59421C5B37AB25E040007F01016FD1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6E59421C5B37AB25E040007F01016FD1--></AD_TEXTINTERFACES>
-
 <!--6E59421C5B38AB25E040007F01016FD1--><AD_TEXTINTERFACES>
 <!--6E59421C5B38AB25E040007F01016FD1-->  <AD_TEXTINTERFACES_ID><![CDATA[6E59421C5B38AB25E040007F01016FD1]]></AD_TEXTINTERFACES_ID>
 <!--6E59421C5B38AB25E040007F01016FD1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -19593,17 +19571,6 @@
 <!--6E59421C5B50AB25E040007F01016FD1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6E59421C5B50AB25E040007F01016FD1--></AD_TEXTINTERFACES>
 
-<!--6E59421C5B51AB25E040007F01016FD1--><AD_TEXTINTERFACES>
-<!--6E59421C5B51AB25E040007F01016FD1-->  <AD_TEXTINTERFACES_ID><![CDATA[6E59421C5B51AB25E040007F01016FD1]]></AD_TEXTINTERFACES_ID>
-<!--6E59421C5B51AB25E040007F01016FD1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--6E59421C5B51AB25E040007F01016FD1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--6E59421C5B51AB25E040007F01016FD1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6E59421C5B51AB25E040007F01016FD1-->  <TEXT><![CDATA[You need to renew the System’s Openbravo Professional Subscription. Users will not be able to login, until you do so.]]></TEXT>
-<!--6E59421C5B51AB25E040007F01016FD1-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
-<!--6E59421C5B51AB25E040007F01016FD1-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--6E59421C5B51AB25E040007F01016FD1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6E59421C5B51AB25E040007F01016FD1--></AD_TEXTINTERFACES>
-
 <!--6E59421C5B52AB25E040007F01016FD1--><AD_TEXTINTERFACES>
 <!--6E59421C5B52AB25E040007F01016FD1-->  <AD_TEXTINTERFACES_ID><![CDATA[6E59421C5B52AB25E040007F01016FD1]]></AD_TEXTINTERFACES_ID>
 <!--6E59421C5B52AB25E040007F01016FD1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -19615,39 +19582,6 @@
 <!--6E59421C5B52AB25E040007F01016FD1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6E59421C5B52AB25E040007F01016FD1--></AD_TEXTINTERFACES>
 
-<!--6E59421C5B53AB25E040007F01016FD1--><AD_TEXTINTERFACES>
-<!--6E59421C5B53AB25E040007F01016FD1-->  <AD_TEXTINTERFACES_ID><![CDATA[6E59421C5B53AB25E040007F01016FD1]]></AD_TEXTINTERFACES_ID>
-<!--6E59421C5B53AB25E040007F01016FD1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--6E59421C5B53AB25E040007F01016FD1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--6E59421C5B53AB25E040007F01016FD1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6E59421C5B53AB25E040007F01016FD1-->  <TEXT><![CDATA[You are now running Openbravo ERP Community. Openbravo provides this software as is, without any warranties of any kind.]]></TEXT>
-<!--6E59421C5B53AB25E040007F01016FD1-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
-<!--6E59421C5B53AB25E040007F01016FD1-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--6E59421C5B53AB25E040007F01016FD1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6E59421C5B53AB25E040007F01016FD1--></AD_TEXTINTERFACES>
-
-<!--6E59421C5B54AB25E040007F01016FD1--><AD_TEXTINTERFACES>
-<!--6E59421C5B54AB25E040007F01016FD1-->  <AD_TEXTINTERFACES_ID><![CDATA[6E59421C5B54AB25E040007F01016FD1]]></AD_TEXTINTERFACES_ID>
-<!--6E59421C5B54AB25E040007F01016FD1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--6E59421C5B54AB25E040007F01016FD1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--6E59421C5B54AB25E040007F01016FD1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6E59421C5B54AB25E040007F01016FD1-->  <TEXT><![CDATA[If you are looking for a professional supported system, you should upgrade to Openbravo ERP Professional.]]></TEXT>
-<!--6E59421C5B54AB25E040007F01016FD1-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
-<!--6E59421C5B54AB25E040007F01016FD1-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--6E59421C5B54AB25E040007F01016FD1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6E59421C5B54AB25E040007F01016FD1--></AD_TEXTINTERFACES>
-
-<!--6E59421C5B55AB25E040007F01016FD1--><AD_TEXTINTERFACES>
-<!--6E59421C5B55AB25E040007F01016FD1-->  <AD_TEXTINTERFACES_ID><![CDATA[6E59421C5B55AB25E040007F01016FD1]]></AD_TEXTINTERFACES_ID>
-<!--6E59421C5B55AB25E040007F01016FD1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--6E59421C5B55AB25E040007F01016FD1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--6E59421C5B55AB25E040007F01016FD1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6E59421C5B55AB25E040007F01016FD1-->  <TEXT><![CDATA[Learn more about Openbravo Professional Subscription options]]></TEXT>
-<!--6E59421C5B55AB25E040007F01016FD1-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
-<!--6E59421C5B55AB25E040007F01016FD1-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--6E59421C5B55AB25E040007F01016FD1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6E59421C5B55AB25E040007F01016FD1--></AD_TEXTINTERFACES>
-
 <!--6E59421C5B56AB25E040007F01016FD1--><AD_TEXTINTERFACES>
 <!--6E59421C5B56AB25E040007F01016FD1-->  <AD_TEXTINTERFACES_ID><![CDATA[6E59421C5B56AB25E040007F01016FD1]]></AD_TEXTINTERFACES_ID>
 <!--6E59421C5B56AB25E040007F01016FD1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -19703,17 +19637,6 @@
 <!--6E59421C5B5AAB25E040007F01016FD1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6E59421C5B5AAB25E040007F01016FD1--></AD_TEXTINTERFACES>
 
-<!--6E59421C5B5BAB25E040007F01016FD1--><AD_TEXTINTERFACES>
-<!--6E59421C5B5BAB25E040007F01016FD1-->  <AD_TEXTINTERFACES_ID><![CDATA[6E59421C5B5BAB25E040007F01016FD1]]></AD_TEXTINTERFACES_ID>
-<!--6E59421C5B5BAB25E040007F01016FD1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--6E59421C5B5BAB25E040007F01016FD1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--6E59421C5B5BAB25E040007F01016FD1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6E59421C5B5BAB25E040007F01016FD1-->  <TEXT><![CDATA[A System Key is required to activate an Openbravo Professional Subscription.]]></TEXT>
-<!--6E59421C5B5BAB25E040007F01016FD1-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
-<!--6E59421C5B5BAB25E040007F01016FD1-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--6E59421C5B5BAB25E040007F01016FD1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6E59421C5B5BAB25E040007F01016FD1--></AD_TEXTINTERFACES>
-
 <!--6E59421C5B5CAB25E040007F01016FD1--><AD_TEXTINTERFACES>
 <!--6E59421C5B5CAB25E040007F01016FD1-->  <AD_TEXTINTERFACES_ID><![CDATA[6E59421C5B5CAB25E040007F01016FD1]]></AD_TEXTINTERFACES_ID>
 <!--6E59421C5B5CAB25E040007F01016FD1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -19791,17 +19714,6 @@
 <!--6E59421C5B62AB25E040007F01016FD1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6E59421C5B62AB25E040007F01016FD1--></AD_TEXTINTERFACES>
 
-<!--6E59421C5B63AB25E040007F01016FD1--><AD_TEXTINTERFACES>
-<!--6E59421C5B63AB25E040007F01016FD1-->  <AD_TEXTINTERFACES_ID><![CDATA[6E59421C5B63AB25E040007F01016FD1]]></AD_TEXTINTERFACES_ID>
-<!--6E59421C5B63AB25E040007F01016FD1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--6E59421C5B63AB25E040007F01016FD1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--6E59421C5B63AB25E040007F01016FD1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6E59421C5B63AB25E040007F01016FD1-->  <TEXT><![CDATA[To reactivate an expired Professional Subscription, you need to refresh your Activation File.]]></TEXT>
-<!--6E59421C5B63AB25E040007F01016FD1-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
-<!--6E59421C5B63AB25E040007F01016FD1-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--6E59421C5B63AB25E040007F01016FD1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6E59421C5B63AB25E040007F01016FD1--></AD_TEXTINTERFACES>
-
 <!--6E59421C5B64AB25E040007F01016FD1--><AD_TEXTINTERFACES>
 <!--6E59421C5B64AB25E040007F01016FD1-->  <AD_TEXTINTERFACES_ID><![CDATA[6E59421C5B64AB25E040007F01016FD1]]></AD_TEXTINTERFACES_ID>
 <!--6E59421C5B64AB25E040007F01016FD1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -19923,17 +19835,6 @@
 <!--6E59421C5B71AB25E040007F01016FD1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6E59421C5B71AB25E040007F01016FD1--></AD_TEXTINTERFACES>
 
-<!--6E59421C5B72AB25E040007F01016FD1--><AD_TEXTINTERFACES>
-<!--6E59421C5B72AB25E040007F01016FD1-->  <AD_TEXTINTERFACES_ID><![CDATA[6E59421C5B72AB25E040007F01016FD1]]></AD_TEXTINTERFACES_ID>
-<!--6E59421C5B72AB25E040007F01016FD1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--6E59421C5B72AB25E040007F01016FD1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--6E59421C5B72AB25E040007F01016FD1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6E59421C5B72AB25E040007F01016FD1-->  <TEXT><![CDATA[Activate the instance online with the System Key you received upon purchasing of an Openbravo Professional Subscription.]]></TEXT>
-<!--6E59421C5B72AB25E040007F01016FD1-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateOnline.html]]></FILENAME>
-<!--6E59421C5B72AB25E040007F01016FD1-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--6E59421C5B72AB25E040007F01016FD1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6E59421C5B72AB25E040007F01016FD1--></AD_TEXTINTERFACES>
-
 <!--6E59421C5B73AB25E040007F01016FD1--><AD_TEXTINTERFACES>
 <!--6E59421C5B73AB25E040007F01016FD1-->  <AD_TEXTINTERFACES_ID><![CDATA[6E59421C5B73AB25E040007F01016FD1]]></AD_TEXTINTERFACES_ID>
 <!--6E59421C5B73AB25E040007F01016FD1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21010,61 +20911,6 @@
 <!--8D64836D4BAC13F1E040007F010150D9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8D64836D4BAC13F1E040007F010150D9--></AD_TEXTINTERFACES>
 
-<!--8D64836D4BAE13F1E040007F010150D9--><AD_TEXTINTERFACES>
-<!--8D64836D4BAE13F1E040007F010150D9-->  <AD_TEXTINTERFACES_ID><![CDATA[8D64836D4BAE13F1E040007F010150D9]]></AD_TEXTINTERFACES_ID>
-<!--8D64836D4BAE13F1E040007F010150D9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D64836D4BAE13F1E040007F010150D9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D64836D4BAE13F1E040007F010150D9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D64836D4BAE13F1E040007F010150D9-->  <TEXT><![CDATA[This action will convert your Professional Edition to a Community Edition. Do you want to continue?]]></TEXT>
-<!--8D64836D4BAE13F1E040007F010150D9-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagementDeactivate.html]]></FILENAME>
-<!--8D64836D4BAE13F1E040007F010150D9-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--8D64836D4BAE13F1E040007F010150D9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D64836D4BAE13F1E040007F010150D9--></AD_TEXTINTERFACES>
-
-<!--8D64836D4BB013F1E040007F010150D9--><AD_TEXTINTERFACES>
-<!--8D64836D4BB013F1E040007F010150D9-->  <AD_TEXTINTERFACES_ID><![CDATA[8D64836D4BB013F1E040007F010150D9]]></AD_TEXTINTERFACES_ID>
-<!--8D64836D4BB013F1E040007F010150D9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D64836D4BB013F1E040007F010150D9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D64836D4BB013F1E040007F010150D9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D64836D4BB013F1E040007F010150D9-->  <TEXT><![CDATA[This action will cancel your Professional Edition. Your system will remain a Professional Edition and you will continue to be able to use your currently installed commercial modules but you will no longer able to install new commercial modules or update existing ones. Do you want to continue?]]></TEXT>
-<!--8D64836D4BB013F1E040007F010150D9-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagementDeactivate.html]]></FILENAME>
-<!--8D64836D4BB013F1E040007F010150D9-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--8D64836D4BB013F1E040007F010150D9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D64836D4BB013F1E040007F010150D9--></AD_TEXTINTERFACES>
-
-<!--8D64836D4BB213F1E040007F010150D9--><AD_TEXTINTERFACES>
-<!--8D64836D4BB213F1E040007F010150D9-->  <AD_TEXTINTERFACES_ID><![CDATA[8D64836D4BB213F1E040007F010150D9]]></AD_TEXTINTERFACES_ID>
-<!--8D64836D4BB213F1E040007F010150D9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D64836D4BB213F1E040007F010150D9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D64836D4BB213F1E040007F010150D9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D64836D4BB213F1E040007F010150D9-->  <TEXT><![CDATA[You canceled your Professional Edition subscription and you are no longer entitled to update or install commercial modules. You cannot update or install the following module(s) which are released under a commercial license: ]]></TEXT>
-<!--8D64836D4BB213F1E040007F010150D9-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html]]></FILENAME>
-<!--8D64836D4BB213F1E040007F010150D9-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--8D64836D4BB213F1E040007F010150D9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D64836D4BB213F1E040007F010150D9--></AD_TEXTINTERFACES>
-
-<!--8D64836D4BB413F1E040007F010150D9--><AD_TEXTINTERFACES>
-<!--8D64836D4BB413F1E040007F010150D9-->  <AD_TEXTINTERFACES_ID><![CDATA[8D64836D4BB413F1E040007F010150D9]]></AD_TEXTINTERFACES_ID>
-<!--8D64836D4BB413F1E040007F010150D9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D64836D4BB413F1E040007F010150D9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D64836D4BB413F1E040007F010150D9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D64836D4BB413F1E040007F010150D9-->  <TEXT><![CDATA[You may convert back your Professional Edition to Community Edition by pressing the Deactivate button.]]></TEXT>
-<!--8D64836D4BB413F1E040007F010150D9-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
-<!--8D64836D4BB413F1E040007F010150D9-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--8D64836D4BB413F1E040007F010150D9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D64836D4BB413F1E040007F010150D9--></AD_TEXTINTERFACES>
-
-<!--8D64836D4BB613F1E040007F010150D9--><AD_TEXTINTERFACES>
-<!--8D64836D4BB613F1E040007F010150D9-->  <AD_TEXTINTERFACES_ID><![CDATA[8D64836D4BB613F1E040007F010150D9]]></AD_TEXTINTERFACES_ID>
-<!--8D64836D4BB613F1E040007F010150D9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D64836D4BB613F1E040007F010150D9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D64836D4BB613F1E040007F010150D9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D64836D4BB613F1E040007F010150D9-->  <TEXT><![CDATA[Please notice that all of installed commercial modules must be uninstalled or disabled first.]]></TEXT>
-<!--8D64836D4BB613F1E040007F010150D9-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
-<!--8D64836D4BB613F1E040007F010150D9-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--8D64836D4BB613F1E040007F010150D9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D64836D4BB613F1E040007F010150D9--></AD_TEXTINTERFACES>
-
 <!--8D64836D4BB813F1E040007F010150D9--><AD_TEXTINTERFACES>
 <!--8D64836D4BB813F1E040007F010150D9-->  <AD_TEXTINTERFACES_ID><![CDATA[8D64836D4BB813F1E040007F010150D9]]></AD_TEXTINTERFACES_ID>
 <!--8D64836D4BB813F1E040007F010150D9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21076,17 +20922,6 @@
 <!--8D64836D4BB813F1E040007F010150D9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8D64836D4BB813F1E040007F010150D9--></AD_TEXTINTERFACES>
 
-<!--8D64836D4BBA13F1E040007F010150D9--><AD_TEXTINTERFACES>
-<!--8D64836D4BBA13F1E040007F010150D9-->  <AD_TEXTINTERFACES_ID><![CDATA[8D64836D4BBA13F1E040007F010150D9]]></AD_TEXTINTERFACES_ID>
-<!--8D64836D4BBA13F1E040007F010150D9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D64836D4BBA13F1E040007F010150D9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D64836D4BBA13F1E040007F010150D9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D64836D4BBA13F1E040007F010150D9-->  <TEXT><![CDATA[Your system will remain a Professional Edition and you will continue to be able to use your currently installed commercial modules but you will no longer able to install new commercial modules or update existing ones.]]></TEXT>
-<!--8D64836D4BBA13F1E040007F010150D9-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
-<!--8D64836D4BBA13F1E040007F010150D9-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--8D64836D4BBA13F1E040007F010150D9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D64836D4BBA13F1E040007F010150D9--></AD_TEXTINTERFACES>
-
 <!--8D64836D4BBC13F1E040007F010150D9--><AD_TEXTINTERFACES>
 <!--8D64836D4BBC13F1E040007F010150D9-->  <AD_TEXTINTERFACES_ID><![CDATA[8D64836D4BBC13F1E040007F010150D9]]></AD_TEXTINTERFACES_ID>
 <!--8D64836D4BBC13F1E040007F010150D9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21131,17 +20966,6 @@
 <!--8DB301CB8DC98C89E040007F010121DB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8DB301CB8DC98C89E040007F010121DB--></AD_TEXTINTERFACES>
 
-<!--8DB301CB8DCD8C89E040007F010121DB--><AD_TEXTINTERFACES>
-<!--8DB301CB8DCD8C89E040007F010121DB-->  <AD_TEXTINTERFACES_ID><![CDATA[8DB301CB8DCD8C89E040007F010121DB]]></AD_TEXTINTERFACES_ID>
-<!--8DB301CB8DCD8C89E040007F010121DB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8DB301CB8DCD8C89E040007F010121DB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8DB301CB8DCD8C89E040007F010121DB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8DB301CB8DCD8C89E040007F010121DB-->  <TEXT><![CDATA[Automated click-thru update to this Core version is only available to Professional Edition subscribers.]]></TEXT>
-<!--8DB301CB8DCD8C89E040007F010121DB-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html]]></FILENAME>
-<!--8DB301CB8DCD8C89E040007F010121DB-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--8DB301CB8DCD8C89E040007F010121DB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8DB301CB8DCD8C89E040007F010121DB--></AD_TEXTINTERFACES>
-
 <!--8DB301CB8DCF8C89E040007F010121DB--><AD_TEXTINTERFACES>
 <!--8DB301CB8DCF8C89E040007F010121DB-->  <AD_TEXTINTERFACES_ID><![CDATA[8DB301CB8DCF8C89E040007F010121DB]]></AD_TEXTINTERFACES_ID>
 <!--8DB301CB8DCF8C89E040007F010121DB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21164,39 +20988,6 @@
 <!--8DB301CB8DD18C89E040007F010121DB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8DB301CB8DD18C89E040007F010121DB--></AD_TEXTINTERFACES>
 
-<!--8DB301CB8DD38C89E040007F010121DB--><AD_TEXTINTERFACES>
-<!--8DB301CB8DD38C89E040007F010121DB-->  <AD_TEXTINTERFACES_ID><![CDATA[8DB301CB8DD38C89E040007F010121DB]]></AD_TEXTINTERFACES_ID>
-<!--8DB301CB8DD38C89E040007F010121DB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8DB301CB8DD38C89E040007F010121DB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8DB301CB8DD38C89E040007F010121DB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8DB301CB8DD38C89E040007F010121DB-->  <TEXT><![CDATA[Subscribe to Basic Professional Edition]]></TEXT>
-<!--8DB301CB8DD38C89E040007F010121DB-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html]]></FILENAME>
-<!--8DB301CB8DD38C89E040007F010121DB-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--8DB301CB8DD38C89E040007F010121DB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8DB301CB8DD38C89E040007F010121DB--></AD_TEXTINTERFACES>
-
-<!--8DB301CB8DD58C89E040007F010121DB--><AD_TEXTINTERFACES>
-<!--8DB301CB8DD58C89E040007F010121DB-->  <AD_TEXTINTERFACES_ID><![CDATA[8DB301CB8DD58C89E040007F010121DB]]></AD_TEXTINTERFACES_ID>
-<!--8DB301CB8DD58C89E040007F010121DB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8DB301CB8DD58C89E040007F010121DB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8DB301CB8DD58C89E040007F010121DB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8DB301CB8DD58C89E040007F010121DB-->  <TEXT><![CDATA[Subscribe to Standard Professional Edition]]></TEXT>
-<!--8DB301CB8DD58C89E040007F010121DB-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html]]></FILENAME>
-<!--8DB301CB8DD58C89E040007F010121DB-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--8DB301CB8DD58C89E040007F010121DB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8DB301CB8DD58C89E040007F010121DB--></AD_TEXTINTERFACES>
-
-<!--8DB301CB8DD78C89E040007F010121DB--><AD_TEXTINTERFACES>
-<!--8DB301CB8DD78C89E040007F010121DB-->  <AD_TEXTINTERFACES_ID><![CDATA[8DB301CB8DD78C89E040007F010121DB]]></AD_TEXTINTERFACES_ID>
-<!--8DB301CB8DD78C89E040007F010121DB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8DB301CB8DD78C89E040007F010121DB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8DB301CB8DD78C89E040007F010121DB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8DB301CB8DD78C89E040007F010121DB-->  <TEXT><![CDATA[Upgrade your Basic Professional Edition subscription to Standard Professional Edition]]></TEXT>
-<!--8DB301CB8DD78C89E040007F010121DB-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html]]></FILENAME>
-<!--8DB301CB8DD78C89E040007F010121DB-->  <ISUSED><![CDATA[Y]]></ISUSED>
-<!--8DB301CB8DD78C89E040007F010121DB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8DB301CB8DD78C89E040007F010121DB--></AD_TEXTINTERFACES>
-
 <!--8DB301CB8DD98C89E040007F010121DB--><AD_TEXTINTERFACES>
 <!--8DB301CB8DD98C89E040007F010121DB-->  <AD_TEXTINTERFACES_ID><![CDATA[8DB301CB8DD98C89E040007F010121DB]]></AD_TEXTINTERFACES_ID>
 <!--8DB301CB8DD98C89E040007F010121DB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -21428,6 +21219,204 @@
 <!--92F888AFA3FD4E8DBA0DAA44B6CC6A21-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--92F888AFA3FD4E8DBA0DAA44B6CC6A21--></AD_TEXTINTERFACES>
 
+<!--92F8938BA8B2D098E040007F01002E3E--><AD_TEXTINTERFACES>
+<!--92F8938BA8B2D098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8B2D098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
+<!--92F8938BA8B2D098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--92F8938BA8B2D098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--92F8938BA8B2D098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--92F8938BA8B2D098E040007F01002E3E-->  <TEXT><![CDATA[You need to renew the system’s Openbravo Professional/Basic Edition subscription. Users will not be able to login, until you do so.]]></TEXT>
+<!--92F8938BA8B2D098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
+<!--92F8938BA8B2D098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--92F8938BA8B2D098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--92F8938BA8B2D098E040007F01002E3E--></AD_TEXTINTERFACES>
+
+<!--92F8938BA8B5D098E040007F01002E3E--><AD_TEXTINTERFACES>
+<!--92F8938BA8B5D098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8B5D098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
+<!--92F8938BA8B5D098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--92F8938BA8B5D098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--92F8938BA8B5D098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--92F8938BA8B5D098E040007F01002E3E-->  <TEXT><![CDATA[You are now running Openbravo Community. Openbravo provides this software as is, without any warranties of any kind.]]></TEXT>
+<!--92F8938BA8B5D098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
+<!--92F8938BA8B5D098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--92F8938BA8B5D098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--92F8938BA8B5D098E040007F01002E3E--></AD_TEXTINTERFACES>
+
+<!--92F8938BA8B8D098E040007F01002E3E--><AD_TEXTINTERFACES>
+<!--92F8938BA8B8D098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8B8D098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
+<!--92F8938BA8B8D098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--92F8938BA8B8D098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--92F8938BA8B8D098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--92F8938BA8B8D098E040007F01002E3E-->  <TEXT><![CDATA[If you are looking for a professional supported system, you should upgrade to Openbravo Professional or Basic Edition.]]></TEXT>
+<!--92F8938BA8B8D098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
+<!--92F8938BA8B8D098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--92F8938BA8B8D098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--92F8938BA8B8D098E040007F01002E3E--></AD_TEXTINTERFACES>
+
+<!--92F8938BA8BBD098E040007F01002E3E--><AD_TEXTINTERFACES>
+<!--92F8938BA8BBD098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8BBD098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
+<!--92F8938BA8BBD098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--92F8938BA8BBD098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--92F8938BA8BBD098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--92F8938BA8BBD098E040007F01002E3E-->  <TEXT><![CDATA[Learn more about Openbravo Professional/Basic Edition subscription options]]></TEXT>
+<!--92F8938BA8BBD098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
+<!--92F8938BA8BBD098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--92F8938BA8BBD098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--92F8938BA8BBD098E040007F01002E3E--></AD_TEXTINTERFACES>
+
+<!--92F8938BA8BED098E040007F01002E3E--><AD_TEXTINTERFACES>
+<!--92F8938BA8BED098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8BED098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
+<!--92F8938BA8BED098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--92F8938BA8BED098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--92F8938BA8BED098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--92F8938BA8BED098E040007F01002E3E-->  <TEXT><![CDATA[A System Key is required to activate an Openbravo Professional or Basic Edition.]]></TEXT>
+<!--92F8938BA8BED098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
+<!--92F8938BA8BED098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--92F8938BA8BED098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--92F8938BA8BED098E040007F01002E3E--></AD_TEXTINTERFACES>
+
+<!--92F8938BA8C1D098E040007F01002E3E--><AD_TEXTINTERFACES>
+<!--92F8938BA8C1D098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8C1D098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
+<!--92F8938BA8C1D098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--92F8938BA8C1D098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--92F8938BA8C1D098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--92F8938BA8C1D098E040007F01002E3E-->  <TEXT><![CDATA[To reactivate an expired Professional or Basic Edition, you need to refresh your Activation File.]]></TEXT>
+<!--92F8938BA8C1D098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
+<!--92F8938BA8C1D098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--92F8938BA8C1D098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--92F8938BA8C1D098E040007F01002E3E--></AD_TEXTINTERFACES>
+
+<!--92F8938BA8C4D098E040007F01002E3E--><AD_TEXTINTERFACES>
+<!--92F8938BA8C4D098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8C4D098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
+<!--92F8938BA8C4D098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--92F8938BA8C4D098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--92F8938BA8C4D098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--92F8938BA8C4D098E040007F01002E3E-->  <TEXT><![CDATA[You may revert back to the Community Edition from your Professional/Basic Edition by pressing the Deactivate button.]]></TEXT>
+<!--92F8938BA8C4D098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
+<!--92F8938BA8C4D098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--92F8938BA8C4D098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--92F8938BA8C4D098E040007F01002E3E--></AD_TEXTINTERFACES>
+
+<!--92F8938BA8C7D098E040007F01002E3E--><AD_TEXTINTERFACES>
+<!--92F8938BA8C7D098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8C7D098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
+<!--92F8938BA8C7D098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--92F8938BA8C7D098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--92F8938BA8C7D098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--92F8938BA8C7D098E040007F01002E3E-->  <TEXT><![CDATA[Please notice that all installed commercial modules must be uninstalled or disabled first.]]></TEXT>
+<!--92F8938BA8C7D098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
+<!--92F8938BA8C7D098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--92F8938BA8C7D098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--92F8938BA8C7D098E040007F01002E3E--></AD_TEXTINTERFACES>
+
+<!--92F8938BA8CAD098E040007F01002E3E--><AD_TEXTINTERFACES>
+<!--92F8938BA8CAD098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8CAD098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
+<!--92F8938BA8CAD098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--92F8938BA8CAD098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--92F8938BA8CAD098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--92F8938BA8CAD098E040007F01002E3E-->  <TEXT><![CDATA[Your system will remain a Professional/Basic Edition and you will continue to be able to use your currently installed commercial modules but you will no longer able to install new commercial modules or update existing ones.]]></TEXT>
+<!--92F8938BA8CAD098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagement.html]]></FILENAME>
+<!--92F8938BA8CAD098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--92F8938BA8CAD098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--92F8938BA8CAD098E040007F01002E3E--></AD_TEXTINTERFACES>
+
+<!--92F8938BA8CDD098E040007F01002E3E--><AD_TEXTINTERFACES>
+<!--92F8938BA8CDD098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8CDD098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
+<!--92F8938BA8CDD098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--92F8938BA8CDD098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--92F8938BA8CDD098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--92F8938BA8CDD098E040007F01002E3E-->  <TEXT><![CDATA[This action will convert your Professional/Basic Edition to a Community Edition. Do you want to continue?]]></TEXT>
+<!--92F8938BA8CDD098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagementDeactivate.html]]></FILENAME>
+<!--92F8938BA8CDD098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--92F8938BA8CDD098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--92F8938BA8CDD098E040007F01002E3E--></AD_TEXTINTERFACES>
+
+<!--92F8938BA8D0D098E040007F01002E3E--><AD_TEXTINTERFACES>
+<!--92F8938BA8D0D098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8D0D098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
+<!--92F8938BA8D0D098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--92F8938BA8D0D098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--92F8938BA8D0D098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--92F8938BA8D0D098E040007F01002E3E-->  <TEXT><![CDATA[This action will cancel your Professional/Basic Edition. Your system will remain a Professional/Basic Edition and you will continue to be able to use your currently installed commercial modules but you will no longer able to install new commercial modules or update existing ones. Do you want to continue?]]></TEXT>
+<!--92F8938BA8D0D098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagementDeactivate.html]]></FILENAME>
+<!--92F8938BA8D0D098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--92F8938BA8D0D098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--92F8938BA8D0D098E040007F01002E3E--></AD_TEXTINTERFACES>
+
+<!--92F8938BA8D3D098E040007F01002E3E--><AD_TEXTINTERFACES>
+<!--92F8938BA8D3D098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8D3D098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
+<!--92F8938BA8D3D098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--92F8938BA8D3D098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--92F8938BA8D3D098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--92F8938BA8D3D098E040007F01002E3E-->  <TEXT><![CDATA[Activate the instance with the Activation File you downloaded and the System Key you received upon purchasing of an Openbravo Professional/Basic Edition.]]></TEXT>
+<!--92F8938BA8D3D098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateLocal.html]]></FILENAME>
+<!--92F8938BA8D3D098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--92F8938BA8D3D098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--92F8938BA8D3D098E040007F01002E3E--></AD_TEXTINTERFACES>
+
+<!--92F8938BA8D6D098E040007F01002E3E--><AD_TEXTINTERFACES>
+<!--92F8938BA8D6D098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8D6D098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
+<!--92F8938BA8D6D098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--92F8938BA8D6D098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--92F8938BA8D6D098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--92F8938BA8D6D098E040007F01002E3E-->  <TEXT><![CDATA[Activate the instance online with the System Key you received upon purchasing of an Openbravo Professional/Basic Edition.]]></TEXT>
+<!--92F8938BA8D6D098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateOnline.html]]></FILENAME>
+<!--92F8938BA8D6D098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--92F8938BA8D6D098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--92F8938BA8D6D098E040007F01002E3E--></AD_TEXTINTERFACES>
+
+<!--92F8938BA8D9D098E040007F01002E3E--><AD_TEXTINTERFACES>
+<!--92F8938BA8D9D098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8D9D098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
+<!--92F8938BA8D9D098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--92F8938BA8D9D098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--92F8938BA8D9D098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--92F8938BA8D9D098E040007F01002E3E-->  <TEXT><![CDATA[Automated click-thru update to this Core version is only available to Professional and Basic Edition subscribers.]]></TEXT>
+<!--92F8938BA8D9D098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html]]></FILENAME>
+<!--92F8938BA8D9D098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--92F8938BA8D9D098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--92F8938BA8D9D098E040007F01002E3E--></AD_TEXTINTERFACES>
+
+<!--92F8938BA8DCD098E040007F01002E3E--><AD_TEXTINTERFACES>
+<!--92F8938BA8DCD098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8DCD098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
+<!--92F8938BA8DCD098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--92F8938BA8DCD098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--92F8938BA8DCD098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--92F8938BA8DCD098E040007F01002E3E-->  <TEXT><![CDATA[You canceled your Professional/Basic Edition subscription and you are no longer entitled to update or install commercial modules. You cannot update or install the following module(s) which are released under a commercial license: ]]></TEXT>
+<!--92F8938BA8DCD098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html]]></FILENAME>
+<!--92F8938BA8DCD098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--92F8938BA8DCD098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--92F8938BA8DCD098E040007F01002E3E--></AD_TEXTINTERFACES>
+
+<!--92F8938BA8DFD098E040007F01002E3E--><AD_TEXTINTERFACES>
+<!--92F8938BA8DFD098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8DFD098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
+<!--92F8938BA8DFD098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--92F8938BA8DFD098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--92F8938BA8DFD098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--92F8938BA8DFD098E040007F01002E3E-->  <TEXT><![CDATA[Subscribe to Basic Edition]]></TEXT>
+<!--92F8938BA8DFD098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html]]></FILENAME>
+<!--92F8938BA8DFD098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--92F8938BA8DFD098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--92F8938BA8DFD098E040007F01002E3E--></AD_TEXTINTERFACES>
+
+<!--92F8938BA8E2D098E040007F01002E3E--><AD_TEXTINTERFACES>
+<!--92F8938BA8E2D098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8E2D098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
+<!--92F8938BA8E2D098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--92F8938BA8E2D098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--92F8938BA8E2D098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--92F8938BA8E2D098E040007F01002E3E-->  <TEXT><![CDATA[Subscribe to Professional Edition]]></TEXT>
+<!--92F8938BA8E2D098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html]]></FILENAME>
+<!--92F8938BA8E2D098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--92F8938BA8E2D098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--92F8938BA8E2D098E040007F01002E3E--></AD_TEXTINTERFACES>
+
+<!--92F8938BA8E5D098E040007F01002E3E--><AD_TEXTINTERFACES>
+<!--92F8938BA8E5D098E040007F01002E3E-->  <AD_TEXTINTERFACES_ID><![CDATA[92F8938BA8E5D098E040007F01002E3E]]></AD_TEXTINTERFACES_ID>
+<!--92F8938BA8E5D098E040007F01002E3E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--92F8938BA8E5D098E040007F01002E3E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--92F8938BA8E5D098E040007F01002E3E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--92F8938BA8E5D098E040007F01002E3E-->  <TEXT><![CDATA[Upgrade your Basic Edition subscription to Professional Edition]]></TEXT>
+<!--92F8938BA8E5D098E040007F01002E3E-->  <FILENAME><![CDATA[/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html]]></FILENAME>
+<!--92F8938BA8E5D098E040007F01002E3E-->  <ISUSED><![CDATA[Y]]></ISUSED>
+<!--92F8938BA8E5D098E040007F01002E3E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--92F8938BA8E5D098E040007F01002E3E--></AD_TEXTINTERFACES>
+
 <!--9335C6A4F2B811DD9667001D09C4A2FE--><AD_TEXTINTERFACES>
 <!--9335C6A4F2B811DD9667001D09C4A2FE-->  <AD_TEXTINTERFACES_ID><![CDATA[9335C6A4F2B811DD9667001D09C4A2FE]]></AD_TEXTINTERFACES_ID>
 <!--9335C6A4F2B811DD9667001D09C4A2FE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_VAL_RULE.xml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-db/database/sourcedata/AD_VAL_RULE.xml	Thu Oct 21 18:38:18 2010 +0200
@@ -1055,7 +1055,7 @@
 <!--800022-->  <NAME><![CDATA[AD_Client of Role]]></NAME>
 <!--800022-->  <DESCRIPTION><![CDATA[Filter Role's Clients]]></DESCRIPTION>
 <!--800022-->  <TYPE><![CDATA[S]]></TYPE>
-<!--800022-->  <CODE><![CDATA[AD_CLIENT.AD_CLIENT_ID IN (SELECT CLIENTLIST FROM AD_ROLE WHERE AD_ROLE_ID = @Default_AD_Role_ID@)]]></CODE>
+<!--800022-->  <CODE><![CDATA[AD_CLIENT.ISACTIVE = 'Y' AND EXISTS (SELECT 1 FROM AD_ROLE_ORGACCESS WHERE AD_ROLE_ORGACCESS.AD_CLIENT_ID = AD_CLIENT.AD_CLIENT_ID AND AD_ROLE_ORGACCESS.AD_ROLE_ID = @Default_AD_Role_ID@ AND AD_ROLE_ORGACCESS.ISACTIVE = 'Y')]]></CODE>
 <!--800022-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--800022--></AD_VAL_RULE>
 
@@ -1292,6 +1292,18 @@
 <!--324A9767D9B94A8A8154DEB3ACA6E063-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--324A9767D9B94A8A8154DEB3ACA6E063--></AD_VAL_RULE>
 
+<!--34A2733B41B04DC19B3E54F764753D19--><AD_VAL_RULE>
+<!--34A2733B41B04DC19B3E54F764753D19-->  <AD_VAL_RULE_ID><![CDATA[34A2733B41B04DC19B3E54F764753D19]]></AD_VAL_RULE_ID>
+<!--34A2733B41B04DC19B3E54F764753D19-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--34A2733B41B04DC19B3E54F764753D19-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--34A2733B41B04DC19B3E54F764753D19-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--34A2733B41B04DC19B3E54F764753D19-->  <NAME><![CDATA[FIN_PaymentMethodsWithAccount]]></NAME>
+<!--34A2733B41B04DC19B3E54F764753D19-->  <DESCRIPTION><![CDATA[Filters only the payment methods that belong to a financial account]]></DESCRIPTION>
+<!--34A2733B41B04DC19B3E54F764753D19-->  <TYPE><![CDATA[S]]></TYPE>
+<!--34A2733B41B04DC19B3E54F764753D19-->  <CODE><![CDATA[EXISTS (SELECT 1 FROM FIN_FinAcc_PaymentMethod fapm WHERE FIN_PaymentMethod.FIN_PaymentMethod_ID=fapm.FIN_PaymentMethod_ID AND (AD_ISORGINCLUDED(FIN_PaymentMethod.AD_Org_ID, @AD_Org_ID@, @#AD_Client_ID@) <> '-1' or AD_ISORGINCLUDED(@AD_Org_ID@, FIN_PaymentMethod.AD_Org_ID, @#AD_Client_ID@) <> '-1'))]]></CODE>
+<!--34A2733B41B04DC19B3E54F764753D19-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--34A2733B41B04DC19B3E54F764753D19--></AD_VAL_RULE>
+
 <!--412A6B4D1F2E4A6B930262AE30F07775--><AD_VAL_RULE>
 <!--412A6B4D1F2E4A6B930262AE30F07775-->  <AD_VAL_RULE_ID><![CDATA[412A6B4D1F2E4A6B930262AE30F07775]]></AD_VAL_RULE_ID>
 <!--412A6B4D1F2E4A6B930262AE30F07775-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1515,6 +1527,18 @@
 <!--9C6989B15CEA4987A502C0F5FF02B171-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--9C6989B15CEA4987A502C0F5FF02B171--></AD_VAL_RULE>
 
+<!--9D87FCD2F19D4CB7AA55F15F5A6C0FBA--><AD_VAL_RULE>
+<!--9D87FCD2F19D4CB7AA55F15F5A6C0FBA-->  <AD_VAL_RULE_ID><![CDATA[9D87FCD2F19D4CB7AA55F15F5A6C0FBA]]></AD_VAL_RULE_ID>
+<!--9D87FCD2F19D4CB7AA55F15F5A6C0FBA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9D87FCD2F19D4CB7AA55F15F5A6C0FBA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9D87FCD2F19D4CB7AA55F15F5A6C0FBA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9D87FCD2F19D4CB7AA55F15F5A6C0FBA-->  <NAME><![CDATA[FIN_PaymentMethodsInSameTree]]></NAME>
+<!--9D87FCD2F19D4CB7AA55F15F5A6C0FBA-->  <DESCRIPTION><![CDATA[Filters the payment methods available in the same organization tree.]]></DESCRIPTION>
+<!--9D87FCD2F19D4CB7AA55F15F5A6C0FBA-->  <TYPE><![CDATA[S]]></TYPE>
+<!--9D87FCD2F19D4CB7AA55F15F5A6C0FBA-->  <CODE><![CDATA[AD_ISORGINCLUDED(FIN_PaymentMethod.AD_Org_ID, @AD_Org_ID@, @#AD_Client_ID@) <> '-1' or AD_ISORGINCLUDED(@AD_Org_ID@, FIN_PaymentMethod.AD_Org_ID, @#AD_Client_ID@) <> '-1']]></CODE>
+<!--9D87FCD2F19D4CB7AA55F15F5A6C0FBA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9D87FCD2F19D4CB7AA55F15F5A6C0FBA--></AD_VAL_RULE>
+
 <!--9FC2173799A04679A6D2CBFF5FD84435--><AD_VAL_RULE>
 <!--9FC2173799A04679A6D2CBFF5FD84435-->  <AD_VAL_RULE_ID><![CDATA[9FC2173799A04679A6D2CBFF5FD84435]]></AD_VAL_RULE_ID>
 <!--9FC2173799A04679A6D2CBFF5FD84435-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_WINDOW.xml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-db/database/sourcedata/AD_WINDOW.xml	Thu Oct 21 18:38:18 2010 +0200
@@ -3049,7 +3049,7 @@
 <!--6F8F913FA60F4CBD93DC1D3AA696E76E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--6F8F913FA60F4CBD93DC1D3AA696E76E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--6F8F913FA60F4CBD93DC1D3AA696E76E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6F8F913FA60F4CBD93DC1D3AA696E76E-->  <NAME><![CDATA[Make Payment]]></NAME>
+<!--6F8F913FA60F4CBD93DC1D3AA696E76E-->  <NAME><![CDATA[Payment Out]]></NAME>
 <!--6F8F913FA60F4CBD93DC1D3AA696E76E-->  <WINDOWTYPE><![CDATA[T]]></WINDOWTYPE>
 <!--6F8F913FA60F4CBD93DC1D3AA696E76E-->  <ISSOTRX><![CDATA[N]]></ISSOTRX>
 <!--6F8F913FA60F4CBD93DC1D3AA696E76E-->  <PROCESSING><![CDATA[N]]></PROCESSING>
@@ -3147,7 +3147,7 @@
 <!--E547CE89D4C04429B6340FFA44E70716-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--E547CE89D4C04429B6340FFA44E70716-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--E547CE89D4C04429B6340FFA44E70716-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--E547CE89D4C04429B6340FFA44E70716-->  <NAME><![CDATA[Receive Payments]]></NAME>
+<!--E547CE89D4C04429B6340FFA44E70716-->  <NAME><![CDATA[Payment In]]></NAME>
 <!--E547CE89D4C04429B6340FFA44E70716-->  <DESCRIPTION><![CDATA[Window to manage the payments done by customers ]]></DESCRIPTION>
 <!--E547CE89D4C04429B6340FFA44E70716-->  <HELP><![CDATA[Window to manage the payments done by customers]]></HELP>
 <!--E547CE89D4C04429B6340FFA44E70716-->  <WINDOWTYPE><![CDATA[T]]></WINDOWTYPE>
--- a/src-test/org/openbravo/test/AllWebserviceTests.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-test/org/openbravo/test/AllWebserviceTests.java	Thu Oct 21 18:38:18 2010 +0200
@@ -22,7 +22,6 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-import org.openbravo.test.webservice.BaseWSTest;
 import org.openbravo.test.webservice.PerformanceTest;
 import org.openbravo.test.webservice.WSReadTest;
 import org.openbravo.test.webservice.WSUpdateTest;
--- a/src-test/org/openbravo/test/dal/DalTest.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-test/org/openbravo/test/dal/DalTest.java	Thu Oct 21 18:38:18 2010 +0200
@@ -24,8 +24,10 @@
 import org.apache.log4j.Logger;
 import org.hibernate.criterion.Expression;
 import org.openbravo.base.exception.OBSecurityException;
+import org.openbravo.base.model.Property;
 import org.openbravo.base.provider.OBProvider;
 import org.openbravo.base.structure.BaseOBObject;
+import org.openbravo.dal.core.DalUtil;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.core.SessionHandler;
 import org.openbravo.dal.service.OBCriteria;
@@ -356,4 +358,9 @@
     }
     OBDal.getInstance().remove(OBDal.getInstance().get(CashBook.class, cashBookId));
   }
+
+  public void testGetPropertyFromColumnName() {
+    final Property property = DalUtil.getProperty("AD_COLUMN", "AD_COLUMN_ID");
+    assertNotNull(property);
+  }
 }
\ No newline at end of file
--- a/src-test/org/openbravo/test/webservice/WSUpdateTest.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-test/org/openbravo/test/webservice/WSUpdateTest.java	Thu Oct 21 18:38:18 2010 +0200
@@ -20,6 +20,7 @@
 package org.openbravo.test.webservice;
 
 import java.io.FileNotFoundException;
+import java.net.HttpURLConnection;
 
 import org.apache.log4j.Logger;
 import org.openbravo.base.provider.OBProvider;
@@ -117,6 +118,20 @@
    * @throws Exception
    */
   public void testReadAddDeleteCity() throws Exception {
+    if (cityId == null) {
+      testACreateCity();
+    }
+    doTestReadAddDeleteCity(false);
+  }
+
+  public void testReadAddDeleteQueryCity() throws Exception {
+    if (cityId == null) {
+      testACreateCity();
+    }
+    doTestReadAddDeleteCity(true);
+  }
+
+  private void doTestReadAddDeleteCity(boolean doDeleteQuery) throws Exception {
     final String city = doTestGetRequest("/ws/dal/City/" + cityId, null, 200);
     String newCity = city.replaceAll("</name>", (System.currentTimeMillis() + "").substring(6)
         + "</name>");
@@ -165,7 +180,11 @@
     assertTrue(indexCity2 != -1);
 
     // delete it
-    doDirectDeleteRequest("/ws/dal/City/" + id, 200);
+    if (doDeleteQuery) {
+      doDirectDeleteRequest("/ws/dal/City?where=name='" + newName + "'", 200);
+    } else {
+      doDirectDeleteRequest("/ws/dal/City/" + id, 200);
+    }
 
     // sleep 1 seconds, so that the city is deleted
     Thread.sleep(1000);
@@ -181,6 +200,16 @@
   }
 
   /**
+   * Tests issue 14973 https://issues.openbravo.com/view.php?id=14973 DalWebServiceServlet does not
+   * report errors which occur at commit time
+   */
+  public void test14973() throws Exception {
+    final HttpURLConnection hc = createConnection("/ws/dal/Product/1000004", "DELETE");
+    hc.connect();
+    assertEquals(500, hc.getResponseCode());
+  }
+
+  /**
    * Add a new city using the wrong HTTP method.
    * 
    * @throws Exception
--- a/src-wad/src/org/openbravo/wad/javasource.javaxml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src-wad/src/org/openbravo/wad/javasource.javaxml	Thu Oct 21 18:38:18 2010 +0200
@@ -29,7 +29,7 @@
 import org.openbravo.erpCommon.ad_actionButton.*;
 </PARAMETER_TMP>
 
-
+import org.codehaus.jettison.json.JSONObject;
 import org.openbravo.erpCommon.utility.*;
 import org.openbravo.data.FieldProvider;
 import org.openbravo.utils.FormatUtilities;
@@ -640,6 +640,33 @@
         if (log4j.isDebugEnabled() &amp;&amp; myError!=null) log4j.debug(myError.getMessage());
         printPageClosePopUp(response, vars);
 </FIELDS_TMP>
+    } else if (vars.commandIn("SAVE_XHR")) {
+      <PARAMETER_TMP id="parent">String strP<PARENT_TMP id="keyParent">Almacen</PARENT_TMP> = vars.getGlobalVariable("inp<PARENT_TMP id="keyParentINP">Almacen</PARENT_TMP>", windowId + "|<PARENT_TMP id="keyParent">Almacen</PARENT_TMP>");</PARAMETER_TMP>
+      OBError myError = new OBError();
+      JSONObject result = new JSONObject();
+      String commandType = vars.getStringParameter("inpCommandType");
+      char saveType = "NEW".equals(commandType) ? 'I' : 'U';
+      try {
+        int total = saveRecord(vars, myError, saveType<PARAMETER_TMP id="parent">, strP<PARENT_TMP id="keyParent">Almacen</PARENT_TMP></PARAMETER_TMP>);
+        if (myError.isEmpty()) {
+          myError = Utility.translateError(this, vars, vars.getLanguage(), "@CODE=RowsUpdated");
+          myError.setMessage(total + " " + myError.getMessage());
+          myError.setType("Success");
+        }
+        result.put("oberror", myError.toMap());
+        result.put("tabid", vars.getStringParameter("tabID"));
+        result.put("redirect", strDireccion + request.getServletPath() + "?Command=" + commandType);
+      } catch (Exception e) {
+        log4j.error("Error saving record (XHR request): " + e.getMessage(), e);
+        myError.setType("Error");
+        myError.setMessage(e.getMessage());
+      }
+
+      response.setContentType("application/json");
+      PrintWriter out = response.getWriter();
+      out.print(result.toString());
+      out.flush();
+      out.close();
     } else if (vars.getCommand().toUpperCase().startsWith("BUTTON") || vars.getCommand().toUpperCase().startsWith("SAVE_BUTTON")) {
       pageErrorPopUp(response);
     } else pageError(response);
--- a/src/build.xml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/build.xml	Thu Oct 21 18:38:18 2010 +0200
@@ -243,9 +243,10 @@
     <taskdef name="workflow" classpathref="project.class.path" classname="org.openbravo.base.gen.GenerateEntitiesTask" />
     <!-- debug="true" will perform the in-memory model initialization before generating entities
 	if an error occurs then, then a stacktrace is printed. -->
-    <workflow debug="false" srcGenPath="${base.src.gen}" propertiesFile="${base.config}/Openbravo.properties" file="${base.src}/org/openbravo/base/gen/gen_entity.oaw" fork="true" maxmemory="${build.maxmemory}">
+    <workflow debug="false" friendlyWarnings="${friendlyWarnings}" srcGenPath="${base.src.gen}" propertiesFile="${base.config}/Openbravo.properties" file="${base.src}/org/openbravo/base/gen/gen_entity.oaw" fork="true" maxmemory="${build.maxmemory}">
       <param name="ob.properties.location" value="${base.config}/Openbravo.properties" />
       <param name="base.src.gen" value="${base.src.gen}" />
+      <param name="friendlyWarnings" value="${friendlyWarnings}"/>
       <classpath>
         <path refid="project.class.path" />
       </classpath>
@@ -279,9 +280,10 @@
     <taskdef name="workflow" classpathref="project.class.path" classname="org.openbravo.base.gen.GenerateEntitiesTask" />
     <!-- debug="true" will perform the in-memory model initialization before generating entities
 	if an error occurs then, then a stacktrace is printed. -->
-    <workflow debug="false" srcGenPath="${base.src.gen}" propertiesFile="${base.config}/Openbravo.properties" file="${base.src}/org/openbravo/base/gen/gen_entity.oaw" fork="true" maxmemory="${build.maxmemory}">
+    <workflow debug="false" friendlyWarnings="${friendlyWarnings}" srcGenPath="${base.src.gen}" propertiesFile="${base.config}/Openbravo.properties" file="${base.src}/org/openbravo/base/gen/gen_entity.oaw" fork="true" maxmemory="${build.maxmemory}">
       <param name="ob.properties.location" value="${base.config}/Openbravo.properties" />
       <param name="base.src.gen" value="${base.src.gen}" />
+      <param name="friendlyWarnings" value="${friendlyWarnings}"/>
       <syspropertyset>
          <propertyref name="java.security.egd" />
       </syspropertyset>
--- a/src/org/openbravo/base/gen/GenerateEntitiesTask.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/base/gen/GenerateEntitiesTask.java	Thu Oct 21 18:38:18 2010 +0200
@@ -54,6 +54,14 @@
   private String providerConfigDirectory;
   private boolean debug;
 
+  public boolean getFriendlyWarnings() {
+    return OBPropertiesProvider.isFriendlyWarnings();
+  }
+
+  public void setFriendlyWarnings(boolean doFriendlyWarnings) {
+    OBPropertiesProvider.setFriendlyWarnings(doFriendlyWarnings);
+  }
+
   public String getPropertiesFile() {
     return propertiesFile;
   }
--- a/src/org/openbravo/base/gen/ModelProviderComponent.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/base/gen/ModelProviderComponent.java	Thu Oct 21 18:38:18 2010 +0200
@@ -53,6 +53,14 @@
     wc.set("model", ModelProvider.getInstance());
   }
 
+  public boolean getFriendlyWarnings() {
+    return OBPropertiesProvider.isFriendlyWarnings();
+  }
+
+  public void setFriendlyWarnings(boolean doFriendlyWarnings) {
+    OBPropertiesProvider.setFriendlyWarnings(doFriendlyWarnings);
+  }
+
   public void setContainer(CompositeComponent arg0) {
   }
 
--- a/src/org/openbravo/base/gen/gen_entity.oaw	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/base/gen/gen_entity.oaw	Thu Oct 21 18:38:18 2010 +0200
@@ -23,6 +23,7 @@
 	<!-- sets the list of Tables in the model slot -->
 	<component class="org.openbravo.base.gen.ModelProviderComponent">
 		<propFile value="${ob.properties.location}" />
+    <friendlyWarnings value="${friendlyWarnings}" />
 	</component>	
 	<component class="oaw.xpand2.Generator">
 		 <metaModel class="oaw.type.impl.java.JavaMetaModel"/>
--- a/src/org/openbravo/base/model/Column.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/base/model/Column.java	Thu Oct 21 18:38:18 2010 +0200
@@ -30,6 +30,7 @@
 import org.openbravo.base.model.domaintype.PrimitiveDomainType;
 import org.openbravo.base.model.domaintype.StringDomainType;
 import org.openbravo.base.model.domaintype.StringEnumerateDomainType;
+import org.openbravo.base.session.OBPropertiesProvider;
 
 /**
  * Used by the {@link ModelProvider ModelProvider}, maps the AD_Column table in the application
@@ -280,9 +281,10 @@
       setReferenceType(((ForeignKeyDomainType) getDomainType())
           .getForeignKeyColumn(getColumnName()));
     } catch (final Exception e) {
-      log.error("No referenced column found: error >> tableName: " + table.getTableName()
-          + " - columnName: " + getColumnName(), e);
-      e.printStackTrace();
+      if (!OBPropertiesProvider.isFriendlyWarnings()) {
+        log.error("No referenced column found: error >> tableName: " + table.getTableName()
+            + " - columnName: " + getColumnName(), e);
+      }
     }
   }
 
--- a/src/org/openbravo/base/model/ModelProvider.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/base/model/ModelProvider.java	Thu Oct 21 18:38:18 2010 +0200
@@ -38,6 +38,7 @@
 import org.openbravo.base.model.domaintype.StringDomainType;
 import org.openbravo.base.provider.OBProvider;
 import org.openbravo.base.provider.OBSingleton;
+import org.openbravo.base.session.OBPropertiesProvider;
 import org.openbravo.base.session.SessionFactoryController;
 import org.openbravo.base.session.UniqueConstraintColumn;
 import org.openbravo.base.util.Check;
@@ -383,10 +384,12 @@
           log.debug("Setting targetEntity and reference Property for " + thisProp);
           final Column thatColumn = c.getReferenceType();
           if (thatColumn == null) {
-            log
-                .error("Property "
-                    + thisProp
-                    + " is mapped incorrectly, there is no reference column for it, removing from the mapping");
+            if (!OBPropertiesProvider.isFriendlyWarnings()) {
+              log
+                  .error("Property "
+                      + thisProp
+                      + " is mapped incorrectly, there is no referenced column for it, removing from the mapping");
+            }
             thisProp.getEntity().getProperties().remove(thisProp);
             if (thisProp.getEntity().getIdProperties().remove(thisProp)) {
               Check.fail("Incorrect mapping for property " + thisProp
@@ -667,8 +670,15 @@
       getModel();
     // search case insensitive!
     final Table table = tablesByTableName.get(tableName.toLowerCase());
-    if (table == null)
-      Check.fail("Table: " + tableName + " not found in runtime model, is it maybe inactive?");
+    if (table == null) {
+      if (OBPropertiesProvider.isFriendlyWarnings()) {
+        // this error won't be logged...
+        throw new IllegalArgumentException("Table: " + tableName
+            + " not found in runtime model, is it maybe inactive?");
+      } else {
+        Check.fail("Table: " + tableName + " not found in runtime model, is it maybe inactive?");
+      }
+    }
     return table;
   }
 
--- a/src/org/openbravo/base/model/domaintype/BaseForeignKeyDomainType.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/base/model/domaintype/BaseForeignKeyDomainType.java	Thu Oct 21 18:38:18 2010 +0200
@@ -26,6 +26,7 @@
 import org.openbravo.base.model.ModelProvider;
 import org.openbravo.base.model.Property;
 import org.openbravo.base.model.Reference;
+import org.openbravo.base.session.OBPropertiesProvider;
 import org.openbravo.base.validation.ValidationException;
 
 /**
@@ -48,9 +49,16 @@
       return getModelProvider().getTable(getReferedTableName(columnName)).getPrimaryKeyColumns()
           .get(0);
     } catch (final Exception e) {
-      throw new OBException("Reference column for " + columnName
-          + " not found in runtime model [ref: " + getReference().getId()
-          + ", encountered exception " + e.getMessage(), e);
+      if (OBPropertiesProvider.isFriendlyWarnings()) {
+        // won't be logged
+        throw new IllegalArgumentException("Reference column for " + columnName
+            + " not found in runtime model [ref: " + getReference().getId()
+            + ", encountered exception " + e.getMessage(), e);
+      } else {
+        throw new OBException("Reference column for " + columnName
+            + " not found in runtime model [ref: " + getReference().getId()
+            + ", encountered exception " + e.getMessage(), e);
+      }
     }
   }
 
--- a/src/org/openbravo/base/secureApp/DefaultOptions_data.xsql	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/base/secureApp/DefaultOptions_data.xsql	Thu Oct 21 18:38:18 2010 +0200
@@ -151,7 +151,7 @@
    <SqlMethod name="getDefaultClient" type="preparedStatement" return="string">
       <SqlMethodComment></SqlMethodComment>
       <Sql><![CDATA[
-        SELECT CLIENTLIST AS DEFAULT_AD_CLIENT_ID
+        SELECT role.AD_CLIENT_ID AS DEFAULT_AD_CLIENT_ID
           FROM AD_ROLE role
             INNER JOIN AD_CLIENT client
               ON role.AD_CLIENT_ID = client.AD_CLIENT_ID
--- a/src/org/openbravo/base/secureApp/LoginUtils.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/base/secureApp/LoginUtils.java	Thu Oct 21 18:38:18 2010 +0200
@@ -11,6 +11,7 @@
  */
 package org.openbravo.base.secureApp;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.servlet.ServletException;
@@ -19,9 +20,12 @@
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.exception.OBSecurityException;
 import org.openbravo.dal.core.OBContext;
+import org.openbravo.dal.service.OBDal;
+import org.openbravo.dal.service.OBQuery;
 import org.openbravo.database.ConnectionProvider;
 import org.openbravo.erpCommon.businessUtility.Preferences;
 import org.openbravo.erpCommon.utility.Utility;
+import org.openbravo.model.ad.access.RoleOrganization;
 import org.openbravo.model.ad.domain.Preference;
 import org.openbravo.service.db.DalConnectionProvider;
 import org.openbravo.utils.FormatUtilities;
@@ -121,6 +125,52 @@
     return valid;
   }
 
+  public static List<RoleOrganization> loadRoleOrganization(String strRol) {
+
+    OBContext.setAdminMode();
+    try {
+      List parameters = new ArrayList();
+      parameters.add(strRol);
+      OBQuery query = OBDal.getInstance().createQuery(RoleOrganization.class,
+          "WHERE role.id = ? ORDER BY client.id, organization.id", parameters);
+      query.setFilterOnReadableClients(false);
+      query.setFilterOnReadableOrganization(false);
+      return query.list();
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+  }
+
+  public static String buildClientList(List<RoleOrganization> roleorglist) {
+      StringBuilder clientlist = new StringBuilder();
+      String currentclient = null;
+      for (RoleOrganization roleorg : roleorglist) {
+        if (currentclient == null || !currentclient.equals(roleorg.getClient().getId())) {
+          currentclient = roleorg.getClient().getId();
+          if (clientlist.length() > 0) {
+            clientlist.append(',');
+          }
+          clientlist.append('\'');
+          clientlist.append(roleorg.getClient().getId());
+          clientlist.append('\'');
+        }
+      }
+      return clientlist.toString();
+  }
+
+  public static String buildOrgList(List<RoleOrganization> roleorglist) {
+      StringBuilder orglist = new StringBuilder();
+      for (RoleOrganization roleorg : roleorglist) {
+        if (orglist.length() > 0) {
+          orglist.append(',');
+        }
+        orglist.append('\'');
+        orglist.append(roleorg.getOrganization().getId());
+        orglist.append('\'');
+      }
+      return orglist.toString();
+  }
+
   public static boolean fillSessionArguments(ConnectionProvider conn, VariablesSecureApp vars,
       String strUserAuth, String strLanguage, String strIsRTL, String strRol, String strCliente,
       String strOrg, String strAlmacen) throws ServletException {
@@ -174,9 +224,12 @@
         OBContext.setOBContext(currentContext);
         return false;
       }
+
+      List<RoleOrganization> datarolelist = loadRoleOrganization(strRol);
+
       vars.setSessionValue("#User_Level", data[0].userlevel);
-      vars.setSessionValue("#User_Client", data[0].clientlist);
-      vars.setSessionValue("#User_Org", data[0].orglist);
+      vars.setSessionValue("#User_Client", buildClientList(datarolelist));
+      vars.setSessionValue("#User_Org", buildOrgList(datarolelist));
       vars.setSessionValue("#Approval_C_Currency_ID", data[0].cCurrencyId);
       vars.setSessionValue("#Approval_Amt", data[0].amtapproval);
       vars.setSessionValue("#Client_Value", data[0].value);
--- a/src/org/openbravo/base/secureApp/Seguridad_data.xsql	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/base/secureApp/Seguridad_data.xsql	Thu Oct 21 18:38:18 2010 +0200
@@ -72,9 +72,12 @@
       <SqlMethodComment></SqlMethodComment>
       <Sql>
         SELECT COUNT(*) AS TOTAL
-        FROM AD_CLIENT A_C
-        WHERE A_C.AD_CLIENT_ID IN (SELECT CLIENTLIST FROM AD_ROLE WHERE AD_ROLE_ID = ?) 
-        AND A_C.AD_CLIENT_ID = ?
+        FROM AD_ROLE_ORGACCESS, AD_CLIENT
+        WHERE AD_ROLE_ORGACCESS.AD_CLIENT_ID = AD_CLIENT.AD_CLIENT_ID
+        AND AD_ROLE_ORGACCESS.AD_ROLE_ID = ?
+        AND AD_ROLE_ORGACCESS.AD_CLIENT_ID = ?
+        AND AD_ROLE_ORGACCESS.ISACTIVE = 'Y'
+        AND AD_CLIENT.ISACTIVE ='Y'
       </Sql>
         <Parameter name="rol"/>
         <Parameter name="client"/>
--- a/src/org/openbravo/base/session/OBPropertiesProvider.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/base/session/OBPropertiesProvider.java	Thu Oct 21 18:38:18 2010 +0200
@@ -44,6 +44,16 @@
 
   private static OBPropertiesProvider instance = new OBPropertiesProvider();
 
+  private static boolean friendlyWarnings = false;
+
+  public static boolean isFriendlyWarnings() {
+    return friendlyWarnings;
+  }
+
+  public static void setFriendlyWarnings(boolean doFriendlyWarnings) {
+    friendlyWarnings = doFriendlyWarnings;
+  }
+
   private Properties obProperties = null;
   private Document formatXML;
 
--- a/src/org/openbravo/dal/core/DalUtil.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/dal/core/DalUtil.java	Thu Oct 21 18:38:18 2010 +0200
@@ -31,6 +31,7 @@
 import org.hibernate.proxy.HibernateProxy;
 import org.openbravo.base.exception.OBException;
 import org.openbravo.base.model.Entity;
+import org.openbravo.base.model.ModelProvider;
 import org.openbravo.base.model.Property;
 import org.openbravo.base.provider.OBProvider;
 import org.openbravo.base.structure.BaseOBObject;
@@ -106,6 +107,25 @@
   }
 
   /**
+   * Finds a property using the db column name and table name.
+   * 
+   * @param tableName
+   *          the table name, is used to find the {@link Entity}
+   * @param dbColumnName
+   *          is used to find the {@link Property}
+   * @return a Property or null if no property found
+   */
+  public static Property getProperty(String tableName, String dbColumnName) {
+    final Entity entity = ModelProvider.getInstance().getEntityByTableName(tableName);
+    for (Property property : entity.getProperties()) {
+      if (property.getColumnName().equalsIgnoreCase(dbColumnName)) {
+        return property;
+      }
+    }
+    return null;
+  }
+
+  /**
    * Translates a so-called property path to a property. The passed entity is the starting entity.
    * For example the property: organization.name and entity: Product will result in the
    * Organization.name property to be returned.
--- a/src/org/openbravo/dal/service/OBQuery.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/dal/service/OBQuery.java	Thu Oct 21 18:38:18 2010 +0200
@@ -158,6 +158,28 @@
     return qryStr;
   }
 
+  public Query deleteQuery() {
+    final String qryStr = createQueryString();
+    String whereClause;
+    final int whereIndex = qryStr.toLowerCase().indexOf(WHERE);
+
+    if (whereIndex != -1) {
+      whereClause = qryStr.substring(whereIndex);
+    } else {
+      throw new OBException("Exception when creating delete query " + qryStr);
+    }
+
+    try {
+      final Query qry = getSession().createQuery(
+          "DELETE FROM " + getEntity().getName() + " " + whereClause);
+      setParameters(qry);
+      return qry;
+    } catch (final Exception e) {
+      throw new OBException("Exception when creating delete query " + "DELETE FROM "
+          + getEntity().getName() + " " + whereClause, e);
+    }
+  }
+
   /**
    * Creates a Hibernate Query object using the whereclause and extra filters (for readable
    * organizations etc.).
--- a/src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder.html	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder.html	Thu Oct 21 18:38:18 2010 +0200
@@ -307,9 +307,9 @@
                     </table>
                   </td>
                   <td class="TitleCell"><span class="LabelText">Organization</span></td>
-                  <td class="Combo_ContentCell" colspan="2"> <select name="organization" id="organization" class="Combo Combo_TwoCells_width">
-                  <option value=""></option><div id="sectionOrganizacion">
-                  <option value="es" id="fieldClaveOrganizacion">Organization1</option></td>
+                  <td class="Combo_ContentCell" colspan="2"> <select  name="inpOrg" id="inpOrg" class="Combo Combo_TwoCells_width">
+                      <option value=""> <div id="reportAD_ORGID"></div></option>
+                    </select></td>
                 </tr>
 
                 <tr>
--- a/src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder.java	Thu Oct 21 18:38:18 2010 +0200
@@ -32,13 +32,13 @@
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.dal.core.OBContext;
-import org.openbravo.erpCommon.ad_combos.OrganizationComboData;
 import org.openbravo.erpCommon.businessUtility.BpartnerMiscData;
 import org.openbravo.erpCommon.businessUtility.Preferences;
 import org.openbravo.erpCommon.businessUtility.Tax;
 import org.openbravo.erpCommon.businessUtility.WindowTabs;
 import org.openbravo.erpCommon.reference.ActionButtonData;
 import org.openbravo.erpCommon.reference.PInstanceProcessData;
+import org.openbravo.erpCommon.utility.ComboTableData;
 import org.openbravo.erpCommon.utility.DateTimeData;
 import org.openbravo.erpCommon.utility.LeftTabsBar;
 import org.openbravo.erpCommon.utility.NavigationBar;
@@ -67,7 +67,8 @@
 
     if (vars.commandIn("DEFAULT")) {
       String strCompleteAuto = vars.getStringParameter("inpShowNullComplete", "Y");
-      printPage(response, vars, "", "", "", "", "", strCompleteAuto);
+      String strOrganization = vars.getGlobalVariable("inpadOrgId", "ExpenseSOrder.adOrgId", "");
+      printPage(response, vars, "", "", "", "", strOrganization, strCompleteAuto);
     } else if (vars.commandIn("SAVE")) {
       String strBPartner = vars.getStringParameter("inpcBpartnerId");
       String strDatefrom = vars.getStringParameter("inpDateFrom");
@@ -536,8 +537,17 @@
     xmlDocument.setParameter("dateOrddisplayFormat", vars.getSessionValue("#AD_SqlDateFormat"));
     xmlDocument.setParameter("dateOrdsaveFormat", vars.getSessionValue("#AD_SqlDateFormat"));
     xmlDocument.setParameter("paramShowNullComplete", strCompleteAuto);
-    xmlDocument
-        .setData("structureOrganizacion", OrganizationComboData.select(this, vars.getRole()));
+    try{
+   	 ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_Org_ID", "",
+   	          "", Utility.getContext(this, vars, "#AccessibleOrgTree", "ExpenseSOrder"), Utility
+   	              .getContext(this, vars, "#User_Client", "ExpenseSOrder"), 0);
+   	      Utility.fillSQLParameters(this, vars, null, comboTableData, "ExpenseSOrder", strOrganization);
+   	      xmlDocument.setData("reportAD_ORGID", "liststructure", comboTableData.select(false));
+   	      comboTableData = null;
+
+   }catch (Exception ex) {
+   	 throw new ServletException(ex);
+	}
 
     // New interface parameters
     try {
--- a/src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder.xml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_actionButton/ExpenseSOrder.xml	Thu Oct 21 18:38:18 2010 +0200
@@ -49,9 +49,7 @@
 	<PARAMETER id="messageBoxIDTitle" name="messageTitle" default=""/>
 	<PARAMETER id="messageBoxIDMessage" name="messageMessage" default=""/>
 	<DISCARD id="discard"/>
-	<structure name="structureOrganizacion">
-		<FIELD id="fieldClaveOrganizacion" attribute="value" boolean="selected" withId="paramadOrgId">adOrgId</FIELD>
-		<FIELD id="fieldClaveOrganizacion">name</FIELD>
-		<SECTION id="sectionOrganizacion"/>
-	</structure>
+	<SUBREPORT id="reportAD_ORGID" name="reportAD_ORGID" report="org/openbravo/erpCommon/reference/List">
+      <ARGUMENT name="parameterListSelected" withId="paramAD_ORGID"/>
+    </SUBREPORT>
 </REPORT>
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Product.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Invoice_Product.java	Thu Oct 21 18:38:18 2010 +0200
@@ -57,7 +57,7 @@
       if (log4j.isDebugEnabled())
         log4j.debug("CHANGED: " + strChanged);
       String strUOM = vars.getStringParameter("inpmProductId_UOM");
-      String strPriceList = vars.getStringParameter("inpmProductId_PLIST");
+      String strPriceList = vars.getNumericParameter("inpmProductId_PLIST");
       String strPriceStd = vars.getNumericParameter("inpmProductId_PSTD");
       String strPriceLimit = vars.getStringParameter("inpmProductId_PLIM");
       String strCurrency = vars.getStringParameter("inpmProductId_CURR");
@@ -75,12 +75,14 @@
           .getOrganizationStructureProvider(vars.getClient());
       if (!strADOrgID.equals(strWarehouseOrg)) {
         Organization org = OBDal.getInstance().get(Organization.class, strADOrgID);
-        Organization warehouseOrg = OBDal.getInstance().get(Organization.class, strWarehouseOrg);
-        if (!osp.isInNaturalTree(org, warehouseOrg) && !osp.isInNaturalTree(warehouseOrg, org))
-          strWarehouseForOrg = SLOrderProductData.getWarehouseOfOrg(this, vars.getClient(),
-              strADOrgID);
-        if (!strWarehouseForOrg.equals(""))
-          strWharehouse = strWarehouseForOrg;
+        if (strWarehouseOrg != null) {
+          Organization warehouseOrg = OBDal.getInstance().get(Organization.class, strWarehouseOrg);
+          if (!osp.isInNaturalTree(org, warehouseOrg) && !osp.isInNaturalTree(warehouseOrg, org))
+            strWarehouseForOrg = SLOrderProductData.getWarehouseOfOrg(this, vars.getClient(),
+                strADOrgID);
+          if (!strWarehouseForOrg.equals(""))
+            strWharehouse = strWarehouseForOrg;
+        }
       }
       String strTabId = vars.getStringParameter("inpTabId");
 
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Requisition_BPartner.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Requisition_BPartner.java	Thu Oct 21 18:38:18 2010 +0200
@@ -60,19 +60,23 @@
       String strWindowId) throws IOException, ServletException {
     if (log4j.isDebugEnabled())
       log4j.debug("Output: dataSheet");
-
+    String strPriceList = "";
+    String strCurrency = "";
     if (strBPartner.equals(""))
       vars.removeSessionValue(strWindowId + "|C_BPartner_ID");
 
     XmlDocument xmlDocument = xmlEngine.readXmlTemplate(
         "org/openbravo/erpCommon/ad_callouts/CallOut").createXmlDocument();
     SLRequisitionBPartnerData[] data = SLRequisitionBPartnerData.select(this, strBPartner);
-
+    if (data.length != 0) {
+      strPriceList = data[0].poPricelistId;
+      strCurrency = data[0].cCurrencyId;
+    }
     StringBuffer resultado = new StringBuffer();
     resultado.append("var calloutName='SL_Requisition_BPartner';\n\n");
     resultado.append("var respuesta = new Array(");
-    resultado.append("new Array(\"inpmPricelistId\", \"" + data[0].poPricelistId + "\"),");
-    resultado.append("new Array(\"inpcCurrencyId\", \"" + data[0].cCurrencyId + "\")");
+    resultado.append("new Array(\"inpmPricelistId\", \"" + strPriceList + "\"),");
+    resultado.append("new Array(\"inpcCurrencyId\", \"" + strCurrency + "\")");
     resultado.append(");");
     xmlDocument.setParameter("array", resultado.toString());
     xmlDocument.setParameter("frameName", "appFrame");
--- a/src/org/openbravo/erpCommon/ad_forms/DocCash.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocCash.java	Thu Oct 21 18:38:18 2010 +0200
@@ -298,10 +298,9 @@
         // Charge DR
         // CashAsset CR
         log4jDocCash.debug("********** DocCash - factAcct - account - "
-            + line.getGlitemAccount(as, new BigDecimal(getAmount()), conn).C_ValidCombination_ID);
-        fact.createLine(line, line.getGlitemAccount(as, new BigDecimal(getAmount()), conn),
-            C_Currency_ID, amount.negate().toString(), "", Fact_Acct_Group_ID, nextSeqNo(SeqNo),
-            DocumentType, conn);
+            + line.getGlitemAccount(as, amount, conn).C_ValidCombination_ID);
+        fact.createLine(line, line.getGlitemAccount(as, amount, conn), C_Currency_ID, amount
+            .negate().toString(), "", Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn);
         assetAmt = assetAmt.subtract(amount.negate());
       } else if (CashType.equals(DocLine_Cash.CASHTYPE_DIFFERENCE)) {
         // amount is pos/neg
--- a/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocFINFinAccTransaction.java	Thu Oct 21 18:38:18 2010 +0200
@@ -358,9 +358,11 @@
               .getFinPayment().getAmount().toString() : "", Fact_Acct_Group_ID, nextSeqNo(SeqNo),
           DocumentType, conn);
     }
-    fact.createLine(null, getWithdrawalAccount(as, null, transaction.getAccount(), conn),
-        C_Currency_ID, transaction.getDepositAmount().toString(), transaction.getPaymentAmount()
-            .toString(), Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn);
+    fact.createLine(null,
+        getAccountUponDepositWithdrawal(conn, transaction.getFinPayment().getPaymentMethod(),
+            transaction.getAccount(), as, transaction.getFinPayment().isReceipt()), C_Currency_ID,
+        transaction.getDepositAmount().toString(), transaction.getPaymentAmount().toString(),
+        Fact_Acct_Group_ID, nextSeqNo(SeqNo), DocumentType, conn);
 
     SeqNo = "0";
     return fact;
--- a/src/org/openbravo/erpCommon/ad_forms/DocInvoice.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocInvoice.java	Thu Oct 21 18:38:18 2010 +0200
@@ -686,9 +686,24 @@
   /**
    * Get Document Confirmation
    * 
-   * not used
    */
   public boolean getDocumentConfirmation(ConnectionProvider conn, String strRecordId) {
+    DocInvoiceData[] data = null;
+    try {
+      data = DocInvoiceData.selectFinInvCount(conn, strRecordId);
+      if (data.length > 0) {
+        if (Integer.parseInt(data[0].fininvcount) == 0)
+          return true;
+        else if (Integer.parseInt(data[0].fininvcount) == Integer.parseInt(data[0].finacctcount))
+          return true;
+        else {
+          setStatus(STATUS_Error);
+          return false;
+        }
+      }
+    } catch (ServletException e) {
+      log4jDocInvoice.error("Exception in getDocumentConfirmation method: " + e);
+    }
     return true;
   }
 
--- a/src/org/openbravo/erpCommon/ad_forms/DocInvoice_data.xsql	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocInvoice_data.xsql	Thu Oct 21 18:38:18 2010 +0200
@@ -35,7 +35,8 @@
         '' AS GRANDTOTAL, '' AS M_PRICELIST_ID, '' AS ISTAXINCLUDED, '' AS C_CAMPAIGN_ID, '' AS C_PROJECT_ID, '' AS C_ACTIVITY_ID,
         '' AS ISPAID, '' AS CREATEFROM, '' AS GENERATETO, '' AS SENDEMAIL, '' AS AD_USER_ID, '' AS COPYFROM, '' AS ISSELFSERVICE,
         '' AS AD_ORGTRX_ID, '' AS USER1_ID, '' AS USER2_ID, '' as AMOUNT, '' AS STATUS, '' AS ISRECEIPT, '' AS ISMANUAL, '' AS WRITEOFFAMT,
-        '' AS C_DEBT_PAYMENT_ID, '' AS P_REVENUE_ACCT, '' AS P_EXPENSE_ACCT, '' as FIN_PAYMENT_SCHEDULE_ID, '' as FIN_PAYMENTMETHOD_ID, '' AS PREPAIDAMT
+        '' AS C_DEBT_PAYMENT_ID, '' AS P_REVENUE_ACCT, '' AS P_EXPENSE_ACCT, '' as FIN_PAYMENT_SCHEDULE_ID, '' as FIN_PAYMENTMETHOD_ID, '' AS PREPAIDAMT,
+        '' AS FININVCOUNT, '' AS FINACCTCOUNT
         FROM C_Tax t, C_InvoiceTax it
         WHERE t.C_Tax_ID=it.C_Tax_ID AND it.C_Invoice_ID=?
      ]]>
@@ -154,4 +155,20 @@
     <Parameter name="taxId"/>
     <Parameter name="invoiceId"/>
    </SqlMethod>
+   <SqlMethod name="selectFinInvCount" type="preparedStatement" return="multiple">
+    <SqlMethodComment></SqlMethodComment>
+    <Sql>
+      <![CDATA[
+        SELECT (SELECT COUNT(*) FROM C_INVOICELINE WHERE FINANCIAL_INVOICE_LINE='Y'
+        AND C_INVOICE_ID=?) AS FININVCOUNT, 
+        (SELECT COUNT(*) FROM C_INVOICELINE invln LEFT JOIN C_GLITEM_ACCT glact ON 
+        invln.ACCOUNT_ID = glact.C_GLITEM_ID WHERE invln.FINANCIAL_INVOICE_LINE='Y' AND 
+        invln.C_INVOICE_ID=? AND 
+        glact.GLITEM_DEBIT_ACCT IS NOT NULL AND 
+        glact.GLITEM_CREDIT_ACCT IS NOT NULL) AS FINACCTCOUNT FROM DUAL
+     ]]>
+     </Sql>
+     <Parameter name="invoiceId"/>
+     <Parameter name="invoiceId"/>
+   </SqlMethod>
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_forms/DocPayment.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/DocPayment.java	Thu Oct 21 18:38:18 2010 +0200
@@ -320,10 +320,32 @@
         // debt-payments
         if (line.WriteOffAmt != null && !line.WriteOffAmt.equals("")
             && !line.WriteOffAmt.equals("0")) {
-          fact.createLine(line, getAccount(AcctServer.ACCTTYPE_WriteOffDefault, as, conn),
-              C_Currency_ID, (line.isReceipt.equals("Y") ? line.WriteOffAmt : ""), (line.isReceipt
-                  .equals("Y") ? "" : line.WriteOffAmt), Fact_Acct_Group_ID, nextSeqNo(SeqNo),
-              DocumentType, conn);
+          String Account_ID = "";
+          AcctServerData[] acctData = AcctServerData.selectWriteOffAcct(conn, line.C_BPARTNER_ID,
+              as.getC_AcctSchema_ID());
+          if (acctData != null && acctData.length != 0) {
+            Account_ID = acctData[0].accountId;
+          } else {
+            acctData = AcctServerData.selectWriteOffDefault(conn, as.getC_AcctSchema_ID());
+            if (acctData != null && acctData.length != 0) {
+              Account_ID = acctData[0].accountId;
+            }
+          }
+          Account acct = null;
+          if (!Account_ID.equals("")) {
+            try {
+              acct = Account.getAccount(conn, Account_ID);
+            } catch (ServletException e) {
+              log4j.warn(e);
+              e.printStackTrace();
+            }
+          } else {
+            log4j.warn("AcctServer - getAccount - NO account Type=" + AcctServer.ACCTTYPE_WriteOff
+                + ", Record=" + Record_ID);
+          }
+          fact.createLine(line, acct, C_Currency_ID, (line.isReceipt.equals("Y") ? line.WriteOffAmt
+              : ""), (line.isReceipt.equals("Y") ? "" : line.WriteOffAmt), Fact_Acct_Group_ID,
+              nextSeqNo(SeqNo), DocumentType, conn);
         }
       }
 
--- a/src/org/openbravo/erpCommon/ad_forms/InstanceManagement.html	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/InstanceManagement.html	Thu Oct 21 18:38:18 2010 +0200
@@ -272,7 +272,7 @@
                   </td>
                   <td id="OPSExpired" colspan="5" class="TitleCell" style="text-align:left;">
                     <p class="Label_ReadOnly_Text"><span class="Label_ReadOnly_Text" id="subStatus"><span style="color:red;" id="subStatus_expired">Expired</span></span>.</p>
-                    <p class="Label_ReadOnly_Text"><span id="OPSExpirationTime">You need to renew the System’s Openbravo Professional Subscription. Users will not be able to login, until you do so.</span></p>
+                    <p class="Label_ReadOnly_Text"><span id="OPSExpirationTime">You need to renew the system’s Openbravo Professional/Basic Edition subscription. Users will not be able to login, until you do so.</span></p>
                   </td>
                 </tr>
                 
@@ -282,10 +282,10 @@
                   </td>
                   <td colspan="5" class="TitleCell" style="text-align:left;">
                     <p class="Label_ReadOnly_Text"><span class="Label_ReadOnly_Text" id="subStatus"><span style="color:red;" id="subStatus_inactive">Inactive</span></span>.</p>
-                    <p class="Label_ReadOnly_Text">You are now running Openbravo ERP Community. Openbravo provides this software as is, without any warranties of any kind.</p>
-                    <p class="Label_ReadOnly_Text">If you are looking for a professional supported system, you should upgrade to Openbravo ERP Professional.</p>
+                    <p class="Label_ReadOnly_Text">You are now running Openbravo Community. Openbravo provides this software as is, without any warranties of any kind.</p>
+                    <p class="Label_ReadOnly_Text">If you are looking for a professional supported system, you should upgrade to Openbravo Professional or Basic Edition.</p>
                     <p>&nbsp;</p>
-                    <p class="Label_ReadOnly_Text"><a class="LabelLink_noicon" href="http://www.openbravo.com/network" target="_blank">Learn more about Openbravo Professional Subscription options</a></p>
+                    <p class="Label_ReadOnly_Text"><a class="LabelLink_noicon" href="http://www.openbravo.com/network" target="_blank">Learn more about Openbravo Professional/Basic Edition subscription options</a></p>
                     <p>&nbsp;</p>
                     <p class="Label_ReadOnly_Text">Contact an&nbsp;<a class="LabelLink_noicon" href="http://www.openbravo.com/partners" target="_blank">Openbravo Business Partner</a>&nbsp; to purchase a subscription.</p>
                   </td>
@@ -329,7 +329,7 @@
                 <td/>
                   <td colspan="5" class="TitleCell" style="text-align:left;">
                     <span id="CEInstance" class="Label_ReadOnly_Text">
-                        <p class="Label_ReadOnly_Text">A System Key is required to activate an Openbravo Professional Subscription.</p>
+                        <p class="Label_ReadOnly_Text">A System Key is required to activate an Openbravo Professional or Basic Edition.</p>
                         <p class="Label_ReadOnly_Text">You will receive a System Key when you purchase a subscription.</p>
                         <p class="Label_ReadOnly_Text">If you are connected to the Internet, you can activate the system online.</p> 
                         <p class="Label_ReadOnly_Text">Otherwise, you need to provide a valid Activation File that can be downloaded from &nbsp;<a class="LabelLink_noicon" href="http://butler.openbravo.com/heartbeat-server/DownloadActivationKey.html" target="_blank">Openbravo Butler</a>.</p>
@@ -345,7 +345,7 @@
                         <p class="Label_ReadOnly_Text">Otherwise, you need to provide a new Activation File that can be downloaded from &nbsp;<a class="LabelLink_noicon" href="http://butler.openbravo.com/heartbeat-server/DownloadActivationKey.html" target="_blank">Openbravo Butler</a>.</p>
                      </span>
                      <span id="OPSExpired" class="Label_ReadOnly_Text" >
-                        <p class="Label_ReadOnly_Text">To reactivate an expired Professional Subscription, you need to refresh your Activation File.</p>
+                        <p class="Label_ReadOnly_Text">To reactivate an expired Professional or Basic Edition, you need to refresh your Activation File.</p>
                         <p class="Label_ReadOnly_Text">If you are connected to the Internet, you can do so online.</p>
                         <p class="Label_ReadOnly_Text">Otherwise, you need to provide a new Activation File that can be downloaded from &nbsp;<a class="LabelLink_noicon" href="http://butler.openbravo.com/heartbeat-server/DownloadActivationKey.html" target="_blank">Openbravo Butler</a>.</p>
                      </span>
@@ -422,8 +422,8 @@
                   <td/>
                   <td colspan="5" class="TitleCell" style="text-align:left;">
                     <span class="Label_ReadOnly_Text" >
-                    <p class="Label_ReadOnly_Text">You may convert back your Professional Edition to Community Edition by pressing the Deactivate button.</p> 
-                    <p class="Label_ReadOnly_Text">Please notice that all of installed commercial modules must be uninstalled or disabled first.</p>
+                    <p class="Label_ReadOnly_Text">You may revert back to the Community Edition from your Professional/Basic Edition  by pressing the Deactivate button.</p> 
+                    <p class="Label_ReadOnly_Text">Please notice that all installed commercial modules must be uninstalled or disabled first.</p>
                     </span>
                   </td>
                 </tr>
@@ -435,7 +435,7 @@
                   <td colspan="5" class="TitleCell" style="text-align:left;">
                     <span class="Label_ReadOnly_Text" >
                     <p class="Label_ReadOnly_Text">Alternatively, you may cancel your subscription by pressing the Cancel Subscription button.</p> 
-                    <p class="Label_ReadOnly_Text">Your system will remain a Professional Edition and you will continue to be able to use your currently installed commercial modules but you will no longer able to install new commercial modules or update existing ones.</p>
+                    <p class="Label_ReadOnly_Text">Your system will remain a Professional/Basic Edition and you will continue to be able to use your currently installed commercial modules but you will no longer able to install new commercial modules or update existing ones.</p>
                     </span>
                   </td>
                 </tr>
--- a/src/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateLocal.html	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateLocal.html	Thu Oct 21 18:38:18 2010 +0200
@@ -126,7 +126,7 @@
               <table>
                 <tr>
                   <td class="Popup_InfoBar_text">
-                    <p>Activate the instance with the Activation File you downloaded and the System Key you received upon purchasing of an Openbravo Professional Subscription.</p>
+                    <p>Activate the instance with the Activation File you downloaded and the System Key you received upon purchasing of an Openbravo Professional/Basic Edition.</p>
                     <p>Paste the System Key in the area below, declare what is the main purpose of the Instance you want to activate and upload the Activation File.</p>
                   </td>
                 </tr>
--- a/src/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateOnline.html	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/InstanceManagementActivateOnline.html	Thu Oct 21 18:38:18 2010 +0200
@@ -126,7 +126,7 @@
               <table>
                 <tr>
                   <td class="Popup_InfoBar_text">
-                    <p>Activate the instance online with the System Key you received upon purchasing of an Openbravo Professional Subscription.</p>
+                    <p>Activate the instance online with the System Key you received upon purchasing of an Openbravo Professional/Basic Edition.</p>
                     <p>Paste the System Key in the area below and declare what is the main purpose of the Instance you want to activate.</p>
                   </td>
                 </tr>
--- a/src/org/openbravo/erpCommon/ad_forms/InstanceManagementDeactivate.html	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/InstanceManagementDeactivate.html	Thu Oct 21 18:38:18 2010 +0200
@@ -115,12 +115,12 @@
               <table>
                 <tr>
                   <td class="Popup_InfoBar_text" id="discardDeactivate">
-                    This action will convert your Professional Edition to a Community Edition. 
+                    This action will convert your Professional/Basic Edition to a Community Edition. 
                     Do you want to continue?
                   </td>
                   <td class="Popup_InfoBar_text" id="discardCancel">
-                    This action will cancel your Professional Edition. 
-                    Your system will remain a Professional Edition and you will continue to be able to use your currently installed commercial modules but you will no longer able to install new commercial modules or update existing ones. 
+                    This action will cancel your Professional/Basic Edition. 
+                    Your system will remain a Professional/Basic Edition and you will continue to be able to use your currently installed commercial modules but you will no longer able to install new commercial modules or update existing ones. 
                     Do you want to continue?
                   </td>
                 </tr>
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement.java	Thu Oct 21 18:38:18 2010 +0200
@@ -499,7 +499,8 @@
       xmlDocument.setParameter("urlLink", getLink(url));
       xmlDocument.setParameter("url", url);
     }
-    xmlDocument.setParameter("license", module.getLicenseType());
+    xmlDocument.setParameter("license", Utility.getListValueName("License Type", module
+        .getLicenseType(), vars.getLanguage()));
 
     if (dependencies != null && dependencies.length > 0) {
       xmlDocument.setData("dependencies", formatDeps4Display(dependencies, vars, this));
@@ -1445,6 +1446,9 @@
     if (log4j.isDebugEnabled())
       log4j.debug("Output: ajaxreponse");
 
+    // clean module updates if there are any
+    cleanModulesUpdates();
+
     final HashMap<String, String> updates = ImportModule.scanForUpdates(this, vars);
     String up = "";
     for (final String node : updates.keySet())
@@ -1493,6 +1497,17 @@
               mod.setMaturityUpdate(null);
             }
             OBDal.getInstance().flush();
+            OBDal.getInstance().commitAndClose();
+
+            // clean module updates if there are any
+            boolean isCleaned = cleanModulesUpdates();
+            if (isCleaned) {
+              myMessage = new OBError();
+              myMessage.setType("Info");
+              myMessage.setMessage(Utility.messageBD(this, "ModuleUpdatesRemoved", vars
+                  .getLanguage()));
+            }
+
           } finally {
             OBInterceptor.setPreventUpdateInfoChange(false);
           }
@@ -1500,6 +1515,7 @@
           log4j.error("Module does not exists ID:" + moduleId);
         }
       } else if (vars.commandIn("SETTINGS_SAVE")) {
+
         // Save global maturity levels
         sysInfo.setMaturitySearch(vars.getStringParameter("inpSearchLevel"));
         sysInfo.setMaturityUpdate(vars.getStringParameter("inpScanLevel"));
@@ -1558,6 +1574,20 @@
               .getLanguage())
               + warnMsg);
         }
+
+        // clean module updates if there are any
+        boolean isCleaned = cleanModulesUpdates();
+        if (isCleaned) {
+          if (myMessage == null) {
+            myMessage = new OBError();
+            myMessage.setType("Info");
+            myMessage.setMessage(Utility
+                .messageBD(this, "ModuleUpdatesRemoved", vars.getLanguage()));
+          } else {
+            myMessage.setMessage(myMessage.getMessage() + "<br/>"
+                + Utility.messageBD(this, "ModuleUpdatesRemoved", vars.getLanguage()));
+          }
+        }
       }
 
       // Possible maturity levels are obtained from CR, obtain them once per session and store
@@ -1743,6 +1773,19 @@
   }
 
   /**
+   * Checks whether there are any updates available for the installed modules and cleans the update
+   * info if so.
+   */
+  private boolean cleanModulesUpdates() throws ServletException {
+    if (ModuleManagementData.selectUpdateable(this).length > 0) {
+      // cleaning modules updates
+      ModuleManagementData.cleanModulesUpdates(this);
+      return true;
+    }
+    return false;
+  }
+
+  /**
    * Obtains the combo used for enforcement, showing which is the default setting.
    */
   private FieldProvider[] getEnforcementCombo(org.openbravo.model.ad.module.ModuleDependency dep,
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagementInstalled.html	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagementInstalled.html	Thu Oct 21 18:38:18 2010 +0200
@@ -96,6 +96,18 @@
         if (XMLHttpRequestObj.responseText) {
           strText = XMLHttpRequestObj.responseText;
 
+          // revert all tree item icons to default state
+          var treeItems = document.getElementsByClassName('Tree_Row');
+          for (var i=1;i<treeItems.length;i++) {
+              var treeItemChildren = treeItems[i].childNodes;
+
+              for (var j=1;j<treeItemChildren.length;j++) {
+                  if(treeItemChildren[j].id == "icon"){
+                	  treeItemChildren[j].childNodes[1].setAttribute("class","");
+                  }
+              }
+          }
+          
           var elements = strText.split("|");
           document.getElementById('notifications').innerHTML=elements[0];
           for (var i=1;i<elements.length;i++) {
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement_ErrorCommercial.html	Thu Oct 21 18:38:18 2010 +0200
@@ -217,12 +217,12 @@
                   <br/>
                   <p>Minimum version of Core required:&nbsp;<span id="minCoreVersion">x</span>.</p>
                   <br/>
-                  <p>Automated click-thru update to this Core version is only available to Professional Edition subscribers.</p>
+                  <p>Automated click-thru update to this Core version is only available to Professional and Basic Edition subscribers.</p>
                   <br/>
                 </div>
               
                 <div id="OBPSInstance-Canceled" class="Label_ReadOnly_Text">
-                  <p>You canceled your Professional Edition subscription and you are no longer entitled to update or install commercial modules. You cannot update or install the following module(s) which are released under a commercial license:&nbsp;<FIELD_TMP id="converted"></FIELD_TMP><br /></p>
+                  <p>You canceled your Professional/Basic Edition subscription and you are no longer entitled to update or install commercial modules. You cannot update or install the following module(s) which are released under a commercial license:&nbsp;<FIELD_TMP id="converted"></FIELD_TMP><br /></p>
                   <ul style="padding: 0 25;" id="notAllowedModules">
                     <li id="moduleName">xxModule</li>
                   </ul>
@@ -235,9 +235,9 @@
                   <p>Please take the following steps and try again:</p>
                  
                   <ul style="padding: 0 25;">
-                    <li id="subscribeBAS">Subscribe to Basic Professional Edition</li>
-                    <li id="subscribeSTD">Subscribe to Standard Professional Edition</li>
-                    <li id="upgradeSTD">Upgrade your Basic Professional Edition subscription to Standard Professional Edition</li>
+                    <li id="subscribeBAS">Subscribe to Basic Edition</li>
+                    <li id="subscribeSTD">Subscribe to Professional Edition</li>
+                    <li id="upgradeSTD">Upgrade your Basic Edition subscription to Professional Edition</li>
                     <li id="acquireModules">Acquire a license for the following modules:
                       <ul style="padding: 0 25;" id="notAllowedModules">
                         <li id="moduleName">xxModule</li>
--- a/src/org/openbravo/erpCommon/ad_forms/ModuleManagement_data.xsql	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/ModuleManagement_data.xsql	Thu Oct 21 18:38:18 2010 +0200
@@ -101,5 +101,13 @@
       </Sql>
    </SqlMethod>
    
-  
+    <SqlMethod name="cleanModulesUpdates" type="preparedStatement" return="rowcount">
+      <SqlMethodComment></SqlMethodComment>
+      <Sql>
+        UPDATE  AD_MODULE 
+            SET update_available=null, 
+                update_ver_id=null      
+      </Sql>
+   </SqlMethod>
+   
 </SqlClass>
--- a/src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/RequisitionToOrder.java	Thu Oct 21 18:38:18 2010 +0200
@@ -31,6 +31,8 @@
 import org.openbravo.base.filter.IsIDFilter;
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
+import org.openbravo.dal.core.OBContext;
+import org.openbravo.erpCommon.businessUtility.Preferences;
 import org.openbravo.erpCommon.businessUtility.Tree;
 import org.openbravo.erpCommon.businessUtility.WindowTabs;
 import org.openbravo.erpCommon.businessUtility.WindowTabsData;
@@ -40,6 +42,8 @@
 import org.openbravo.erpCommon.utility.LeftTabsBar;
 import org.openbravo.erpCommon.utility.NavigationBar;
 import org.openbravo.erpCommon.utility.OBError;
+import org.openbravo.erpCommon.utility.PropertyException;
+import org.openbravo.erpCommon.utility.PropertyNotFoundException;
 import org.openbravo.erpCommon.utility.SequenceIdData;
 import org.openbravo.erpCommon.utility.ToolBar;
 import org.openbravo.erpCommon.utility.Utility;
@@ -468,7 +472,8 @@
             strOrderDate, strVendor, RequisitionToOrderData.cBPartnerLocationId(this, strVendor),
             RequisitionToOrderData.billto(this, strVendor).equals("") ? RequisitionToOrderData
                 .cBPartnerLocationId(this, strVendor) : RequisitionToOrderData.billto(this,
-                strVendor), cCurrencyId, data1[0].paymentrulepo, data1[0].poPaymenttermId,
+                strVendor), cCurrencyId, isAlternativeFinancialFlow() ? "P"
+                : data1[0].paymentrulepo, data1[0].poPaymenttermId,
             data1[0].invoicerule.equals("") ? "I" : data1[0].invoicerule, data1[0].deliveryrule
                 .equals("") ? "A" : data1[0].deliveryrule, "I",
             data1[0].deliveryviarule.equals("") ? "D" : data1[0].deliveryviarule, strWarehouse,
@@ -592,6 +597,26 @@
     return myMessage;
   }
 
+  /**
+   * Checks if the any module implements and alternative Financial Management preference. It should
+   * be the Advanced Payables and Receivables module.
+   * 
+   * @return true if any module implements and alternative Financial Management preference.
+   */
+  private boolean isAlternativeFinancialFlow() {
+    try {
+      try {
+        Preferences.getPreferenceValue("FinancialManagement", true, null, null, OBContext
+            .getOBContext().getUser(), null, null);
+      } catch (PropertyNotFoundException e) {
+        return false;
+      }
+    } catch (PropertyException e) {
+      return false;
+    }
+    return true;
+  }
+
   public String getServletInfo() {
     return "Servlet RequisitionToOrder.";
   } // end of getServletInfo() method
--- a/src/org/openbravo/erpCommon/ad_forms/Role.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/Role.java	Thu Oct 21 18:38:18 2010 +0200
@@ -217,10 +217,12 @@
     if (plaindataclient != null) {
 
       for (int i = 0; i < datarole.length; i++) {
-        StringTokenizer st = new StringTokenizer(datarole[i].clientlist, ",", false);
 
+        String clientlist = LoginUtils.buildClientList(LoginUtils.loadRoleOrganization(datarole[i].adRoleId));
+        StringTokenizer st = new StringTokenizer(clientlist, ",", false);
         while (st.hasMoreTokens()) {
           String token = st.nextToken().trim();
+          token = token.substring(1, token.length() -1); // remove quotes
           ClientData auxClient = new ClientData();
           auxClient.padre = datarole[i].adRoleId;
           auxClient.id = token;
--- a/src/org/openbravo/erpCommon/ad_forms/RoleCombo_data.xsql	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/RoleCombo_data.xsql	Thu Oct 21 18:38:18 2010 +0200
@@ -27,7 +27,7 @@
    <SqlMethod name="select" type="preparedStatement" return="multiple">
       <SqlMethodComment></SqlMethodComment>
       <Sql>
-        SELECT A_R.AD_ROLE_ID, A_R.NAME, A_R.AD_CLIENT_ID, A_R.CLIENTLIST 
+        SELECT A_R.AD_ROLE_ID, A_R.NAME, A_R.AD_CLIENT_ID 
         FROM AD_ROLE A_R, AD_USER_ROLES A_U_R 
         WHERE A_R.AD_ROLE_ID = A_U_R.AD_ROLE_ID 
         AND A_U_R.ISACTIVE = 'Y' 
@@ -40,7 +40,7 @@
    
     <SqlMethod name="selectSystem" type="preparedStatement" return="multiple">
       <Sql>
-        SELECT A_R.AD_ROLE_ID, A_R.NAME, A_R.AD_CLIENT_ID, A_R.CLIENTLIST 
+        SELECT A_R.AD_ROLE_ID, A_R.NAME, A_R.AD_CLIENT_ID 
         FROM AD_ROLE A_R, AD_USER_ROLES A_U_R 
         WHERE A_R.AD_ROLE_ID = A_U_R.AD_ROLE_ID 
         AND A_U_R.ISACTIVE = 'Y' 
--- a/src/org/openbravo/erpCommon/ad_forms/TranslationHandler.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_forms/TranslationHandler.java	Thu Oct 21 18:38:18 2010 +0200
@@ -62,6 +62,8 @@
   private String m_curColumnName = null;
   /** Current Value */
   private StringBuffer m_curValue = null;
+  /** Original Value */
+  private String m_oriValue = null;
   /** SQL */
   private StringBuffer m_sql = null;
 
@@ -104,7 +106,7 @@
       m_sql = new StringBuffer();
     } else if (qName.equals(TranslationManager.XML_VALUE_TAG)) {
       m_curColumnName = attributes.getValue(TranslationManager.XML_VALUE_ATTRIBUTE_COLUMN);
-
+      m_oriValue = attributes.getValue(TranslationManager.XML_VALUE_ATTRIBUTE_ORIGINAL);
     } else if (qName.equals(TranslationManager.XML_CONTRIB)) {
       m_AD_Language = attributes.getValue(TranslationManager.XML_ATTRIBUTE_LANGUAGE);
     } else
@@ -185,9 +187,17 @@
       else
         log4j.error("Update Rows=" + no + " (Should be 1) - " + m_sql.toString());
     } else if (qName.equals(TranslationManager.XML_VALUE_TAG)) {
-      if (m_sql.length() > 0)
-        m_sql.append(",");
-      m_sql.append(m_curColumnName).append("=").append(TO_STRING(m_curValue.toString()));
+      String value = "";
+      if (m_curValue != null && !m_curValue.toString().equals("")) {
+        value = TO_STRING(m_curValue.toString());
+      } else if (m_oriValue != null && !m_oriValue.toString().equals("")) {
+        value = TO_STRING(m_oriValue.toString());
+      }
+      if (!value.equals("")) {
+        if (m_sql.length() > 0)
+          m_sql.append(",");
+        m_sql.append(m_curColumnName).append("=").append(value);
+      }
     } else if (qName.equals(TranslationManager.XML_CONTRIB)) {
       if (log4j.isDebugEnabled())
         log4j.debug("Contibutors:" + TO_STRING(m_curValue.toString()));
--- a/src/org/openbravo/erpCommon/ad_process/ChangeOrderOrg.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_process/ChangeOrderOrg.java	Thu Oct 21 18:38:18 2010 +0200
@@ -31,7 +31,6 @@
 import org.openbravo.base.filter.IsIDFilter;
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
-import org.openbravo.erpCommon.ad_combos.OrganizationComboData;
 import org.openbravo.erpCommon.businessUtility.WindowTabs;
 import org.openbravo.erpCommon.utility.ComboTableData;
 import org.openbravo.erpCommon.utility.LeftTabsBar;
@@ -261,11 +260,28 @@
     xmlDocument.setParameter("shipperpath", strShipperpath);
     xmlDocument.setParameter("tax", strTax);
     xmlDocument.setParameter("bpartnerDes", ChangeOrderOrgData.selectBPartner(this, strBPartner));
+    try{
+   	 ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_Org_ID", "",
+   	          "", Utility.getContext(this, vars, "#AccessibleOrgTree", "ChangeOrderOrg"), Utility
+   	              .getContext(this, vars, "#User_Client", "ChangeOrderOrg"), 0);
+   	      Utility.fillSQLParameters(this, vars, null, comboTableData, "ChangeOrderOrg", strOrg);
+   	      xmlDocument.setData("reportAD_Org_ID", "liststructure", comboTableData.select(false));
+   	      comboTableData = null;
 
-    xmlDocument.setData("reportAD_Org_ID", "liststructure", OrganizationComboData.selectCombo(this,
-        vars.getRole()));
-    xmlDocument.setData("reportAD_Org_IDNew", "liststructure", OrganizationComboData.selectCombo(
-        this, vars.getRole()));
+   }catch (Exception ex) {
+   	 throw new ServletException(ex);
+	}
+   try{
+	   	 ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_Org_ID", "",
+	   	          "", Utility.getContext(this, vars, "#AccessibleOrgTree", "ChangeOrderOrg"), Utility
+	   	              .getContext(this, vars, "#User_Client", "ChangeOrderOrg"), 0);
+	   	      Utility.fillSQLParameters(this, vars, null, comboTableData, "ChangeOrderOrg", strOrg);
+	   	      xmlDocument.setData("reportAD_Org_IDNew", "liststructure", comboTableData.select(false));
+	   	      comboTableData = null;
+
+	   }catch (Exception ex) {
+	   	 throw new ServletException(ex);
+		}
 
     try {
       ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "C_Tax_ID", "",
--- a/src/org/openbravo/erpCommon/ad_process/ClientCombo_data.xsql	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_process/ClientCombo_data.xsql	Thu Oct 21 18:38:18 2010 +0200
@@ -27,9 +27,10 @@
    <SqlMethod name="select" type="preparedStatement" return="multiple">
       <SqlMethodComment></SqlMethodComment>
       <Sql>
-        SELECT A_C.AD_CLIENT_ID, A_C.NAME, '' AS ID 
+        SELECT A_C.AD_CLIENT_ID, A_C.NAME, '' AS ID
         FROM AD_CLIENT A_C
-        WHERE A_C.AD_CLIENT_ID IN (SELECT CLIENTLIST FROM AD_ROLE WHERE AD_ROLE_ID = ?)
+        WHERE A_C.ISACTIVE = 'Y'
+        AND EXISTS (SELECT 1 FROM AD_ROLE_ORGACCESS WHERE AD_ROLE_ORGACCESS.AD_CLIENT_ID = A_C.AD_CLIENT_ID AND AD_ROLE_ORGACCESS.AD_ROLE_ID = ? AND AD_ROLE_ORGACCESS.ISACTIVE = 'Y')
         ORDER BY A_C.NAME
       </Sql>
         <Parameter name="rol"/>
--- a/src/org/openbravo/erpCommon/ad_process/CreateAccountingReport.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_process/CreateAccountingReport.java	Thu Oct 21 18:38:18 2010 +0200
@@ -45,7 +45,6 @@
 
 public class CreateAccountingReport extends HttpSecureAppServlet {
   private static final long serialVersionUID = 1L;
-  private static String strTreeOrg = "";
 
   public void init(ServletConfig config) {
     super.init(config);
@@ -97,9 +96,9 @@
       pageErrorPopUp(response);
   }
 
-  private void printPage(HttpServletResponse response, VariablesSecureApp vars, String strcAcctSchemaId,
-      String strAccountingReportId, String strOrg, String strPeriod, String strYear,
-      String strProcessId) throws IOException, ServletException {
+  private void printPage(HttpServletResponse response, VariablesSecureApp vars,
+      String strcAcctSchemaId, String strAccountingReportId, String strOrg, String strPeriod,
+      String strYear, String strProcessId) throws IOException, ServletException {
     if (log4j.isDebugEnabled())
       log4j.debug("Output: process CreateAccountingReport");
 
@@ -245,17 +244,16 @@
         .getSqlDateFormat());
     strPeriodTo = CreateAccountingReportData.selectFormat(this, strPeriodTo, vars
         .getSqlDateFormat());
-    strTreeOrg = strOrg;
-    treeOrg(vars, strOrg);
+    StringBuilder strTreeOrg = new StringBuilder(strOrg);
+    treeOrg(vars, strOrg, strTreeOrg);
 
     Vector<Object> vectorArray = new Vector<Object>();
 
     childData(vars, vectorArray, strcAcctSchemaId, strAccountingReportId, strPeriodFrom,
-        strPeriodTo, strTreeOrg, level, "0", strPeriod);
+        strPeriodTo, strTreeOrg.toString(), level, "0", strPeriod);
 
     CreateAccountingReportData[] dataTree = convertVector(vectorArray);
     dataTree = filterData(dataTree);
-    strTreeOrg = "";
 
     xmlDocument.setParameter("title", dataTree[0].name);
     xmlDocument.setParameter("directory", "var baseDirectory = \"" + strReplaceWith + "/\";\n");
@@ -268,7 +266,8 @@
     out.close();
   }
 
-  private String arrayEntry(VariablesSecureApp vars, String strcAcctSchemaId) throws ServletException {
+  private String arrayEntry(VariablesSecureApp vars, String strcAcctSchemaId)
+      throws ServletException {
     String result = "";
     CreateAccountingReportData[] data = CreateAccountingReportData
         .selectAD_Accountingrpt_Element_ID(this, Utility.getContext(this, vars, "#User_Org",
@@ -306,20 +305,23 @@
     return result;
   }
 
-  private void treeOrg(VariablesSecureApp vars, String strOrg) throws ServletException {
+  private void treeOrg(VariablesSecureApp vars, String strOrg, StringBuilder treeOrg)
+      throws ServletException {
     CreateAccountingReportData[] dataOrg = CreateAccountingReportData.selectOrg(this, strOrg, vars
         .getClient());
     for (int i = 0; i < dataOrg.length; i++) {
-      strTreeOrg += "," + dataOrg[i].id;
+      treeOrg.append(",");
+      treeOrg.append(dataOrg[i].id);
       if (dataOrg[i].issummary.equals("Y"))
-        treeOrg(vars, dataOrg[i].id);
+        treeOrg(vars, dataOrg[i].id, treeOrg);
     }
     return;
   }
 
-  private void childData(VariablesSecureApp vars, Vector<Object> vectorArray, String strcAcctSchemaId,
-      String strAccountingReportId, String strPeriodFrom, String strPeriodTo, String strOrg,
-      int level, String strParent, String strPeriod) throws IOException, ServletException {
+  private void childData(VariablesSecureApp vars, Vector<Object> vectorArray,
+      String strcAcctSchemaId, String strAccountingReportId, String strPeriodFrom,
+      String strPeriodTo, String strOrg, int level, String strParent, String strPeriod)
+      throws IOException, ServletException {
     if (log4j.isDebugEnabled())
       log4j.debug("**********************strAccountingReportId: " + strAccountingReportId);
     if (log4j.isDebugEnabled())
@@ -378,7 +380,8 @@
     }
   }
 
-  private CreateAccountingReportData[] convertVector(Vector<Object> vectorArray) throws ServletException {
+  private CreateAccountingReportData[] convertVector(Vector<Object> vectorArray)
+      throws ServletException {
     CreateAccountingReportData[] data = new CreateAccountingReportData[vectorArray.size()];
     BigDecimal count = BigDecimal.ZERO;
     for (int i = 0; i < vectorArray.size(); i++) {
--- a/src/org/openbravo/erpCommon/ad_process/CreateTaxReport.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_process/CreateTaxReport.java	Thu Oct 21 18:38:18 2010 +0200
@@ -43,8 +43,6 @@
 
 public class CreateTaxReport extends HttpSecureAppServlet {
   private static final long serialVersionUID = 1L;
-  private static String strTreeOrg = "";
-  private static int rownum = 1;
 
   public void init(ServletConfig config) {
     super.init(config);
@@ -74,9 +72,9 @@
       pageErrorPopUp(response);
   }
 
-  private void printPage(HttpServletResponse response, VariablesSecureApp vars, String strTaxReportId,
-      String strDateFrom, String strDateTo, String strOrg, String strProcessId) throws IOException,
-      ServletException {
+  private void printPage(HttpServletResponse response, VariablesSecureApp vars,
+      String strTaxReportId, String strDateFrom, String strDateTo, String strOrg,
+      String strProcessId) throws IOException, ServletException {
     if (log4j.isDebugEnabled())
       log4j.debug("Output: process CreateTaxReport");
 
@@ -168,24 +166,24 @@
     out.close();
   }
 
-  private void printPagePopUp(HttpServletResponse response, VariablesSecureApp vars, String strTaxReportId,
-      String strDateFrom, String strDateTo, String strOrg) throws IOException, ServletException {
+  private void printPagePopUp(HttpServletResponse response, VariablesSecureApp vars,
+      String strTaxReportId, String strDateFrom, String strDateTo, String strOrg)
+      throws IOException, ServletException {
     if (log4j.isDebugEnabled())
       log4j.debug("Output: pop up CreateTaxReport");
     XmlDocument xmlDocument = xmlEngine.readXmlTemplate(
         "org/openbravo/erpCommon/ad_process/CreateTaxReportPopUp").createXmlDocument();
     int level = 0;
 
-    strTreeOrg = strOrg;
-    treeOrg(vars, strOrg);
+    StringBuilder strTreeOrg = new StringBuilder(strOrg);
+    treeOrg(vars, strOrg, strTreeOrg);
 
     Vector<Object> vectorArray = new Vector<Object>();
 
-    childData(vars, vectorArray, strTaxReportId, strDateFrom, strDateTo, strTreeOrg, level, "0",
-        rownum);
+    childData(vars, vectorArray, strTaxReportId, strDateFrom, strDateTo, strTreeOrg.toString(),
+        level, "0", 1);
 
     CreateTaxReportData[] dataTree = convertVector(vectorArray);
-    strTreeOrg = "";
     xmlDocument.setParameter("directory", "var baseDirectory = \"" + strReplaceWith + "/\";\n");
     xmlDocument.setParameter("language", "defaultLang=\"" + vars.getLanguage() + "\";");
     xmlDocument.setParameter("theme", vars.getTheme());
@@ -208,19 +206,21 @@
    * (i<data.length-1) result += ",\n"; } result += ");"; } return result; }
    */
 
-  private void treeOrg(VariablesSecureApp vars, String strOrg) throws ServletException {
+  private void treeOrg(VariablesSecureApp vars, String strOrg, StringBuilder treeOrg)
+      throws ServletException {
     CreateTaxReportData[] dataOrg = CreateTaxReportData.selectOrg(this, strOrg, vars.getClient());
     for (int i = 0; i < dataOrg.length; i++) {
-      strTreeOrg += "," + dataOrg[i].id;
+      treeOrg.append(",");
+      treeOrg.append(dataOrg[i].id);
       if (dataOrg[i].issummary.equals("Y"))
-        treeOrg(vars, dataOrg[i].id);
+        treeOrg(vars, dataOrg[i].id, treeOrg);
     }
     return;
   }
 
-  private void childData(VariablesSecureApp vars, Vector<Object> vectorArray, String strTaxReportId,
-      String strPeriodFrom, String strPeriodTo, String strOrg, int level, String strParent,
-      int rownum) throws IOException, ServletException {
+  private void childData(VariablesSecureApp vars, Vector<Object> vectorArray,
+      String strTaxReportId, String strPeriodFrom, String strPeriodTo, String strOrg, int level,
+      String strParent, int rownum) throws IOException, ServletException {
     if (log4j.isDebugEnabled())
       log4j.debug("**********************strTaxReportId: " + strTaxReportId);
     if (log4j.isDebugEnabled())
--- a/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/GeneralAccountingReportsPDF.fo	Thu Oct 21 18:38:18 2010 +0200
@@ -12,7 +12,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-2006 Openbravo SLU 
+ * All portions are Copyright (C) 2001-2010 Openbravo SLU 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -38,15 +38,15 @@
 					<fo:table-row>
 						<fo:table-cell>
 							<fo:block font-size="10pt" text-align="left" padding-top="2pt">
-								<fo:inline font-weight="bold">Enterprise:</fo:inline>
+								<fo:inline font-weight="bold">Client</fo:inline>:&#160;&#160;
 								<fo:inline id="fieldCompanyName">xx</fo:inline>&#160;&#160;<fo:inline id="fieldAgnoInitial"/>
-								<fo:inline font-weight="bold">Organization:</fo:inline>
+								<fo:inline font-weight="bold">Organization</fo:inline>:&#160;&#160;
 								<fo:inline id="fieldOrg">xx</fo:inline>
 							</fo:block>
 						</fo:table-cell>
 						<fo:table-cell>
 							<fo:block font-size="10pt" text-align="left" padding-top="2pt">
-								<fo:inline font-weight="bold">Date:</fo:inline>
+								<fo:inline font-weight="bold">Date</fo:inline>:&#160;&#160;
 								<fo:inline id="fieldDate">xx</fo:inline>
 							</fo:block>
 						</fo:table-cell>
@@ -54,16 +54,19 @@
 					<fo:table-row>
 						<fo:table-cell number-columns-spanned="2">
 							<fo:block font-size="10pt" text-align="left" padding-top="2pt">
-								<fo:inline font-weight="bold">Conditions:</fo:inline>
-								<fo:inline>Period:</fo:inline>
-								<fo:inline id="fieldPeriod">xx</fo:inline>&#160;&#160;&#160;&#160;<fo:inline>Period N-1:</fo:inline>
+								<fo:inline font-weight="bold">Conditions:</fo:inline>&#160;&#160;
+								<fo:inline>Period</fo:inline>:&#160;&#160;
+								<fo:inline id="fieldPeriod">xx</fo:inline>&#160;&#160;&#160;&#160;<fo:inline>Period</fo:inline>&#160;N-1:&#160;&#160;
 								<fo:inline id="fieldPeriodRef">xx</fo:inline>
 							</fo:block>
 						</fo:table-cell>
 					</fo:table-row>
 					<fo:table-row>
 						<fo:table-cell number-columns-spanned="2" border-bottom-style="solid" border-bottom-width="0.5pt">
-							<fo:block font-size="10pt" padding-bottom="4pt" text-align="left" padding-top="2pt" start-indent="2.4cm">Enterprise N-1:&#160;&#160;<fo:inline id="fieldCompanyName">Period</fo:inline>&#160;&#160;<fo:inline id="fieldAgnoRef">xx</fo:inline>
+							<fo:block font-size="10pt" padding-bottom="4pt" text-align="left" padding-top="2pt" start-indent="2.4cm">
+                                <fo:inline>Client</fo:inline>&#160;N-1:&#160;&#160;
+                                <fo:inline id="fieldCompanyName">Period</fo:inline>&#160;&#160;
+                                <fo:inline id="fieldAgnoRef">xx</fo:inline>
 							</fo:block>
 						</fo:table-cell>
 					</fo:table-row>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment.html	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportDebtPayment.html	Thu Oct 21 18:38:18 2010 +0200
@@ -597,10 +597,10 @@
                           <td class="DataGrid_Body_Cell" width="8%"> <A href="#" onclick="submitCommandFormParameter('DIRECT', document.frmMain.inpcInvoiceId, 'xx', false, document.frmMain, '../yy/Header_Relation.html', null, false, true);return false;" onmouseover="window.status='Invoice';return true;" onmouseout="window.status='';return true;" class="LabelLink_noicon" id="idfieldCInvoiceId"> 
                             <span id="fieldDocumentno">xx24/10/2004</span></A><span>&nbsp;&nbsp;&nbsp;</span></td>
                           <td class="DataGrid_Body_Cell" width="8%" id="fieldDateplanned">xx12/07/1923</td>
-                          <td class="DataGrid_Body_Cell" width="6%" id="fieldAmount">xx3456&nbsp;</td>
-                          <td class="DataGrid_Body_Cell" width="7%" id="fieldWriteoffamt">xx12345&nbsp;</td>
+                          <td class="DataGrid_Body_Cell_Amount" width="6%" id="fieldAmount">xx3456&nbsp;</td>
+                          <td class="DataGrid_Body_Cell_Amount" width="7%" id="fieldWriteoffamt">xx12345&nbsp;</td>
                           <td class="DataGrid_Body_Cell" width="5%" id="fieldCurrency">xxEUR</td>
-                          <td class="DataGrid_Body_Cell" width="6%" id="fieldOrigAmount">xx3456&nbsp;</td>
+                          <td class="DataGrid_Body_Cell_Amount" width="6%" id="fieldOrigAmount">xx3456&nbsp;</td>
                           <td class="DataGrid_Body_Cell" width="5%" id="fieldOrigCurrency">xxEUR</td>
                           <td class="DataGrid_Body_Cell" width="8%" id="fieldPaymentRule" >xxContado albarán</td>
                           <td class="DataGrid_Body_Cell" width="7%" id="fieldAccountStr">xx12/07/1923</td>
@@ -615,7 +615,7 @@
                       </div>
                       <tr class="DataGrid_Body_Row">
                         <th class="DataGrid_Header_Cell" colspan="2"><span class="Bold">Total amount</span></th>
-                        <th class="DataGrid_Header_Cell" colspan="2"><span class="Bold" id="fieldSumAmount">xx23455.56</span></th>
+                        <th class="DataGrid_Header_Cell_Amount" colspan="2"><span class="Bold" id="fieldSumAmount">xx23455.56</span></th>
                         <th class="DataGrid_Header_Cell" colspan="11">&nbsp;</th>
                       </tr>
                     </table>
@@ -656,10 +656,10 @@
                             <span id="fieldDocumentno3">xx24/10/2004</span></A><span>&nbsp;&nbsp;&nbsp;</span></td>
                             <td class="DataGrid_Body_Cell" width="6%" id="fieldBpartner3">xx12/07/1923</td>                           
                             <td class="DataGrid_Body_Cell" width="8%" id="fieldDateplanned3">xx12/07/1923</td>
-                            <td class="DataGrid_Body_Cell" width="6%" id="fieldAmount3">xx3456&nbsp;</td>
-                            <td class="DataGrid_Body_Cell" width="7%" id="fieldWriteoffamt3">xx12345&nbsp;</td>
+                            <td class="DataGrid_Body_Cell_Amount" width="6%" id="fieldAmount3">xx3456&nbsp;</td>
+                            <td class="DataGrid_Body_Cell_Amount" width="7%" id="fieldWriteoffamt3">xx12345&nbsp;</td>
                             <td class="DataGrid_Body_Cell" width="5%" id="fieldCurrency3">xxEUR</td>
-                            <td class="DataGrid_Body_Cell" width="6%" id="fieldOrigAmount3">xx3456&nbsp;</td>
+                            <td class="DataGrid_Body_Cell_Amount" width="6%" id="fieldOrigAmount3">xx3456&nbsp;</td>
                             <td class="DataGrid_Body_Cell" width="5%" id="fieldOrigCurrency3">xxEUR</td>
                             <td class="DataGrid_Body_Cell" width="10%" id="fieldPaymentRule3" >xxContado albarán</td>
                             <td class="DataGrid_Body_Cell" width="10%"> <A href="#" onclick="submitCommandFormParameter('DIRECT', document.frmMain.inpcDebtPaymentId, yy, false, document.frmMain, '../Settlement/CancelledPayments_Relation.html', null, false, true);return false;" onmouseover="window.status='Cancelled Settlement';return true;" onmouseout="window.status='';return true;" class="LabelLink_noicon" id="fieldCDebtPaymentId4"> 
@@ -673,7 +673,7 @@
                          </div>
                         <tr class="DataGrid_Body_Row">
                         <th class="DataGrid_Header_Cell" colspan="2"><span class="Bold">Total amount</span></th>
-                        <th class="DataGrid_Header_Cell" colspan="2"><span class="Bold" id="fieldSumAmount33">xx23455.56</span></th>
+                        <th class="DataGrid_Header_Cell_Amount" colspan="2"><span class="Bold" id="fieldSumAmount33">xx23455.56</span></th>
                         <th class="DataGrid_Header_Cell" colspan="8">&nbsp;</th>
                       </tr>
                      
@@ -721,10 +721,10 @@
                              <td class="DataGrid_Body_Cell" width="10%"> <A href="#" onclick="submitCommandFormParameter('DIRECT', document.frmMain.inpcInvoiceId, xx, false, document.frmMain, '../yy/Header_Relation.html', null, false, true);return false;" onmouseover="window.status='Invoice';return true;" onmouseout="window.status='';return true;" class="LabelLink_noicon" id="idfieldCInvoiceId4"> 
                             <span id="fieldDocumentno4">xx24/10/2004</span></A><span>&nbsp;&nbsp;&nbsp;</span></td>
                             <td class="DataGrid_Body_Cell" width="8%" id="fieldDateplanned4">xx12/07/1923</td>
-                            <td class="DataGrid_Body_Cell" width="6%" id="fieldAmount4">xx3456&nbsp;</td>
-                            <td class="DataGrid_Body_Cell" width="7%" id="fieldWriteoffamt4">xx12345&nbsp;</td>
+                            <td class="DataGrid_Body_Cell_Amount" width="6%" id="fieldAmount4">xx3456&nbsp;</td>
+                            <td class="DataGrid_Body_Cell_Amount" width="7%" id="fieldWriteoffamt4">xx12345&nbsp;</td>
                             <td class="DataGrid_Body_Cell" width="5%" id="fieldCurrency4">xxEUR</td>
-                            <td class="DataGrid_Body_Cell" width="6%" id="fieldOrigAmount4">xx3456&nbsp;</td>
+                            <td class="DataGrid_Body_Cell_Amount" width="6%" id="fieldOrigAmount4">xx3456&nbsp;</td>
                             <td class="DataGrid_Body_Cell" width="5%" id="fieldOrigCurrency4">xxEUR</td>
                             <td class="DataGrid_Body_Cell" width="10%" id="fieldPaymentRule4" >xxContado albarán</td>
                             <td class="DataGrid_Body_Cell" width="10%"> <A href="#" onclick="submitCommandFormParameter('DIRECT', document.frmMain.inpcDebtPaymentId, yy, false, document.frmMain, '../Settlement/CancelledPayments_Relation.html', null, false, true);return false;" onmouseover="window.status='Cancelled Settlement';return true;" onmouseout="window.status='';return true;" class="LabelLink_noicon" id="fieldCDebtPaymentId6"> 
@@ -738,7 +738,7 @@
                          </div>
                         <tr class="DataGrid_Body_Row">
                         <th class="DataGrid_Header_Cell" colspan="2"><span class="Bold">Total amount</span></th>
-                        <th class="DataGrid_Header_Cell" colspan="2"><span class="Bold" id="fieldSumAmount44">xx23455.56</span></th>
+                        <th class="DataGrid_Header_Cell_Amount" colspan="2"><span class="Bold" id="fieldSumAmount44">xx23455.56</span></th>
                         <th class="DataGrid_Header_Cell" colspan="8">&nbsp;</th>
                       </tr>
                      
@@ -777,10 +777,10 @@
                           <span id="fieldDocumentno2">xx24/10/2004</span></A><span>&nbsp;&nbsp;&nbsp;</span></td>
                         <td class="DataGrid_Body_Cell" width="6%" id="fieldBpartner2">xx12/07/1923</td>
                         <td class="DataGrid_Body_Cell" width="8%" id="fieldDateplanned2">xx12/07/1923</td>
-                        <td class="DataGrid_Body_Cell" width="6%" id="fieldAmount2">xx3456&nbsp;</td>
-                        <td class="DataGrid_Body_Cell" width="7%" id="fieldWriteoffamt2">xx12345&nbsp;</td>
+                        <td class="DataGrid_Body_Cell_Amount" width="6%" id="fieldAmount2">xx3456&nbsp;</td>
+                        <td class="DataGrid_Body_Cell_Amount" width="7%" id="fieldWriteoffamt2">xx12345&nbsp;</td>
                         <td class="DataGrid_Body_Cell" width="5%" id="fieldCurrency2">xxEUR</td>
-                        <td class="DataGrid_Body_Cell" width="6%" id="fieldOrigAmount2">xx3456&nbsp;</td>
+                        <td class="DataGrid_Body_Cell_Amount" width="6%" id="fieldOrigAmount2">xx3456&nbsp;</td>
                         <td class="DataGrid_Body_Cell" width="5%" id="fieldOrigCurrency2">xxEUR</td>
                         <td class="DataGrid_Body_Cell" width="10%" id="fieldPaymentRule2" >xxContado albarán</td>
                          <td class="DataGrid_Body_Cell" width="7%" id="fieldAccountStr2">xx12/07/1923</td>
@@ -795,7 +795,7 @@
                     </div>
                     <tr class="DataGrid_Body_Row"> 
                       <th class="DataGrid_Header_Cell" colspan="2"> <span class="Bold">Total amount</span></th>
-                      <th class="DataGrid_Header_Cell" colspan="2"> <span class="Bold" id="fieldSumAmount22">xx23455.56</span></th>
+                      <th class="DataGrid_Header_Cell_Amount" colspan="2"> <span class="Bold" id="fieldSumAmount22">xx23455.56</span></th>
                       <th class="DataGrid_Header_Cell" colspan="9">&nbsp;</th>
                     </tr>
                   </table>
--- a/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportInvoiceVendorDimensionalAnalysesJR.java	Thu Oct 21 18:38:18 2010 +0200
@@ -28,7 +28,6 @@
 import org.openbravo.base.filter.IsPositiveIntFilter;
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
-import org.openbravo.erpCommon.ad_combos.OrganizationComboData;
 import org.openbravo.erpCommon.businessUtility.Tree;
 import org.openbravo.erpCommon.businessUtility.TreeData;
 import org.openbravo.erpCommon.businessUtility.WindowTabs;
@@ -271,9 +270,17 @@
     } catch (Exception ex) {
       throw new ServletException(ex);
     }
+    try{
+   	 ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_Org_ID", "",
+   	          "", Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportInvoiceVendorDimensionalAnalysesJR"), Utility
+   	              .getContext(this, vars, "#User_Client", "ReportInvoiceVendorDimensionalAnalysesJR"), 0);
+   	      Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportInvoiceVendorDimensionalAnalysesJR", strOrg);
+   	      xmlDocument.setData("reportAD_ORGID", "liststructure", comboTableData.select(false));
+   	      comboTableData = null;
 
-    xmlDocument.setData("reportAD_ORGID", "liststructure", OrganizationComboData.selectCombo(this,
-        vars.getRole()));
+   }catch (Exception ex) {
+   	 throw new ServletException(ex);
+	}
     xmlDocument.setData("reportCBPartnerId_IN", "liststructure", SelectorUtilityData
         .selectBpartner(this, Utility.getContext(this, vars, "#AccessibleOrgTree", ""), Utility
             .getContext(this, vars, "#User_Client", ""), strcBpartnerId));
--- a/src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoiceJR.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportOrderNotInvoiceJR.java	Thu Oct 21 18:38:18 2010 +0200
@@ -28,7 +28,6 @@
 
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
-import org.openbravo.erpCommon.ad_combos.OrganizationComboData;
 import org.openbravo.erpCommon.businessUtility.WindowTabs;
 import org.openbravo.erpCommon.utility.ComboTableData;
 import org.openbravo.erpCommon.utility.DateTimeData;
@@ -163,9 +162,17 @@
     } catch (Exception ex) {
       throw new ServletException(ex);
     }
+    try{
+   	 ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_Org_ID", "",
+   	          "", Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportOrderNotInvoiceJR"), Utility
+   	              .getContext(this, vars, "#User_Client", "ReportOrderNotInvoiceJR"), 0);
+   	      Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportOrderNotInvoiceJR", strCOrgId);
+   	      xmlDocument.setData("reportAD_ORGID", "liststructure", comboTableData.select(false));
+   	      comboTableData = null;
 
-    xmlDocument.setData("reportAD_ORGID", "liststructure", OrganizationComboData.selectCombo(this,
-        vars.getRole()));
+   }catch (Exception ex) {
+   	 throw new ServletException(ex);
+	}
     response.setContentType("text/html; charset=UTF-8");
     PrintWriter out = response.getWriter();
     out.println(xmlDocument.print());
--- a/src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesJR.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportPurchaseDimensionalAnalysesJR.java	Thu Oct 21 18:38:18 2010 +0200
@@ -32,7 +32,6 @@
 import org.openbravo.base.filter.IsPositiveIntFilter;
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
-import org.openbravo.erpCommon.ad_combos.OrganizationComboData;
 import org.openbravo.erpCommon.businessUtility.Tree;
 import org.openbravo.erpCommon.businessUtility.TreeData;
 import org.openbravo.erpCommon.businessUtility.WindowTabs;
@@ -282,9 +281,17 @@
     } catch (Exception ex) {
       throw new ServletException(ex);
     }
+    try{
+    	 ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_Org_ID", "",
+    	          "", Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportPurchaseDimensionalAnalysesJR"), Utility
+    	              .getContext(this, vars, "#User_Client", "ReportPurchaseDimensionalAnalysesJR"), 0);
+    	      Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportPurchaseDimensionalAnalysesJR", strOrg);
+    	      xmlDocument.setData("reportAD_ORGID", "liststructure", comboTableData.select(false));
+    	      comboTableData = null;
 
-    xmlDocument.setData("reportAD_ORGID", "liststructure", OrganizationComboData.selectCombo(this,
-        vars.getRole()));
+    }catch (Exception ex) {
+    	 throw new ServletException(ex);
+	}
     xmlDocument.setData("reportCBPartnerId_IN", "liststructure", SelectorUtilityData
         .selectBpartner(this, Utility.getContext(this, vars, "#AccessibleOrgTree", ""), Utility
             .getContext(this, vars, "#User_Client", ""), strcBpartnerId));
--- a/src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalyses.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportRefundSalesDimensionalAnalyses.java	Thu Oct 21 18:38:18 2010 +0200
@@ -32,7 +32,6 @@
 import org.openbravo.base.filter.IsPositiveIntFilter;
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
-import org.openbravo.erpCommon.ad_combos.OrganizationComboData;
 import org.openbravo.erpCommon.businessUtility.Tree;
 import org.openbravo.erpCommon.businessUtility.TreeData;
 import org.openbravo.erpCommon.businessUtility.WindowTabs;
@@ -265,9 +264,17 @@
     } catch (Exception ex) {
       throw new ServletException(ex);
     }
+    try{
+   	 ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_Org_ID", "",
+   	          "", Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportRefundSalesDimensionalAnalyses"), Utility
+   	              .getContext(this, vars, "#User_Client", "ReportRefundSalesDimensionalAnalyses"), 0);
+   	      Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportRefundSalesDimensionalAnalyses", strOrg);
+   	      xmlDocument.setData("reportAD_ORGID", "liststructure", comboTableData.select(false));
+   	      comboTableData = null;
 
-    xmlDocument.setData("reportAD_ORGID", "liststructure", OrganizationComboData.selectCombo(this,
-        vars.getRole()));
+   }catch (Exception ex) {
+   	 throw new ServletException(ex);
+	}
     try {
       ComboTableData comboTableData = new ComboTableData(vars, this, "TABLE", "SalesRep_ID",
           "AD_User SalesRep", "", Utility.getContext(this, vars, "#AccessibleOrgTree",
--- a/src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportSalesDimensionalAnalyzeJR.java	Thu Oct 21 18:38:18 2010 +0200
@@ -32,7 +32,6 @@
 import org.openbravo.base.filter.IsPositiveIntFilter;
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
-import org.openbravo.erpCommon.ad_combos.OrganizationComboData;
 import org.openbravo.erpCommon.businessUtility.Tree;
 import org.openbravo.erpCommon.businessUtility.TreeData;
 import org.openbravo.erpCommon.businessUtility.WindowTabs;
@@ -316,9 +315,17 @@
     } catch (Exception ex) {
       throw new ServletException(ex);
     }
+    try{
+   	 ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_Org_ID", "",
+   	          "", Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportSalesDimensionalAnalyzeJR"), Utility
+   	              .getContext(this, vars, "#User_Client", "ReportSalesDimensionalAnalyzeJR"), 0);
+   	      Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportSalesDimensionalAnalyzeJR", strOrg);
+   	      xmlDocument.setData("reportAD_ORGID", "liststructure", comboTableData.select(false));
+   	      comboTableData = null;
 
-    xmlDocument.setData("reportAD_ORGID", "liststructure", OrganizationComboData.selectCombo(this,
-        vars.getRole()));
+   }catch (Exception ex) {
+   	 throw new ServletException(ex);
+	}
     xmlDocument.setData("reportCBPartnerId_IN", "liststructure", SelectorUtilityData
         .selectBpartner(this, Utility.getContext(this, vars, "#AccessibleOrgTree", ""), Utility
             .getContext(this, vars, "#User_Client", ""), strcBpartnerId));
--- a/src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJR.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportShipmentDimensionalAnalyzeJR.java	Thu Oct 21 18:38:18 2010 +0200
@@ -31,7 +31,6 @@
 import org.openbravo.base.filter.IsPositiveIntFilter;
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
-import org.openbravo.erpCommon.ad_combos.OrganizationComboData;
 import org.openbravo.erpCommon.businessUtility.Tree;
 import org.openbravo.erpCommon.businessUtility.TreeData;
 import org.openbravo.erpCommon.businessUtility.WindowTabs;
@@ -325,9 +324,17 @@
     } catch (Exception ex) {
       throw new ServletException(ex);
     }
+    try{
+   	 ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_Org_ID", "",
+   	          "", Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportShipmentDimensionalAnalyzeJR"), Utility
+   	              .getContext(this, vars, "#User_Client", "ReportShipmentDimensionalAnalyzeJR"), 0);
+   	      Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportShipmentDimensionalAnalyzeJR", strOrg);
+   	      xmlDocument.setData("reportAD_ORGID", "liststructure", comboTableData.select(false));
+   	      comboTableData = null;
 
-    xmlDocument.setData("reportAD_ORGID", "liststructure", OrganizationComboData.selectCombo(this,
-        vars.getRole()));
+   }catch (Exception ex) {
+   	 throw new ServletException(ex);
+	}
     xmlDocument.setData("reportCBPartnerId_IN", "liststructure", SelectorUtilityData
         .selectBpartner(this, Utility.getContext(this, vars, "#AccessibleOrgTree", ""), Utility
             .getContext(this, vars, "#User_Client", ""), strcBpartnerId));
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoice.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoice.java	Thu Oct 21 18:38:18 2010 +0200
@@ -27,10 +27,10 @@
 
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
-import org.openbravo.erpCommon.ad_combos.OrganizationComboData;
 import org.openbravo.erpCommon.businessUtility.Tree;
 import org.openbravo.erpCommon.businessUtility.TreeData;
 import org.openbravo.erpCommon.businessUtility.WindowTabs;
+import org.openbravo.erpCommon.utility.ComboTableData;
 import org.openbravo.erpCommon.utility.DateTimeData;
 import org.openbravo.erpCommon.utility.LeftTabsBar;
 import org.openbravo.erpCommon.utility.NavigationBar;
@@ -331,8 +331,17 @@
      * .setData("reportAD_ORGID","liststructure",AdOrgTreeComboData .select(this, strTreeNode,
      * vars.getOrg()));
      */
-    xmlDocument.setData("reportAD_ORGID", "liststructure", OrganizationComboData.selectCombo(this,
-        vars.getRole()));
+    try{
+   	 ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_Org_ID", "",
+   	          "", Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportTaxInvoice"), Utility
+   	              .getContext(this, vars, "#User_Client", "ReportTaxInvoice"), 0);
+   	      Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportTaxInvoice", strOrg);
+   	      xmlDocument.setData("reportAD_ORGID", "liststructure", comboTableData.select(false));
+   	      comboTableData = null;
+
+   }catch (Exception ex) {
+   	 throw new ServletException(ex);
+	}
 
     out.println(xmlDocument.print());
     out.close();
--- a/src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceJR.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/ad_reports/ReportTaxInvoiceJR.java	Thu Oct 21 18:38:18 2010 +0200
@@ -32,7 +32,6 @@
 
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
-import org.openbravo.erpCommon.ad_combos.OrganizationComboData;
 import org.openbravo.erpCommon.businessUtility.Tree;
 import org.openbravo.erpCommon.businessUtility.TreeData;
 import org.openbravo.erpCommon.businessUtility.WindowTabs;
@@ -281,8 +280,17 @@
      * .setData("reportAD_ORGID","liststructure",AdOrgTreeComboData .select(this, strTreeNode,
      * vars.getOrg()));
      */
-    xmlDocument.setData("reportAD_ORGID", "liststructure", OrganizationComboData.selectCombo(this,
-        vars.getRole()));
+    try{
+   	 ComboTableData comboTableData = new ComboTableData(vars, this, "TABLEDIR", "AD_Org_ID", "",
+   	          "", Utility.getContext(this, vars, "#AccessibleOrgTree", "ReportTaxInvoiceJR"), Utility
+   	              .getContext(this, vars, "#User_Client", "ReportTaxInvoiceJR"), 0);
+   	      Utility.fillSQLParameters(this, vars, null, comboTableData, "ReportTaxInvoiceJR", strOrg);
+   	      xmlDocument.setData("reportAD_ORGID", "liststructure", comboTableData.select(false));
+   	      comboTableData = null;
+
+   }catch (Exception ex) {
+   	 throw new ServletException(ex);
+	}
 
     out.println(xmlDocument.print());
     out.close();
--- a/src/org/openbravo/erpCommon/modules/VersionUtility.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/modules/VersionUtility.java	Thu Oct 21 18:38:18 2010 +0200
@@ -95,23 +95,24 @@
   }
 
   static private boolean checkVersion(String depParentMod, Dep dep, Mod mod, Vector<String> errors) {
+    String strModName = dep.modName != null ? dep.modName : "< @CR_NameNotAvailable@ >";
     if ("MINOR".equals(dep.enforcement)) {
       if (dep.maxVer == null || dep.maxVer.isEmpty()) {
         if (versionCompare(dep.minVer, mod.availableMaxVer, false) != 0) {
-          errors.add(depParentMod + " @CR_DependensOnModule@ \"" + dep.modName
+          errors.add(depParentMod + " @CR_DependensOnModule@ \"" + strModName
               + "\" @CR_InVersion@ \"" + dep.minVer + "\", @CR_MaxAvailableVersion@ \""
               + mod.availableMaxVer + "\". ");
           return false;
         }
       } else {
         if (versionCompare(dep.minVer, mod.availableMaxVer, false) == 1) {
-          errors.add(depParentMod + " @CR_DependensOnModule@ \"" + dep.modName
+          errors.add(depParentMod + " @CR_DependensOnModule@ \"" + strModName
               + "\" @CR_InVersion@ \"" + dep.minVer + "\", @CR_MaxAvailableVersion@ \""
               + mod.availableMaxVer + "\". ");
           return false;
         }
         if (versionCompare(mod.availableMinVer, dep.maxVer, false) == 1) {
-          errors.add(depParentMod + " @CR_DependensOnModule@ \"" + dep.modName
+          errors.add(depParentMod + " @CR_DependensOnModule@ \"" + strModName
               + "\" @CR_InVersion@ \"" + dep.maxVer + "\", @CR_MaxAvailableVersion@ \""
               + mod.availableMinVer + "\". ");
           return false;
@@ -119,7 +120,7 @@
       }
     } else if ("NONE".equals(dep.enforcement)) {
       if (versionCompare(dep.minVer, mod.availableMaxVer, false) == 1) {
-        errors.add(depParentMod + " @CR_DependensOnModule@ \"" + dep.modName
+        errors.add(depParentMod + " @CR_DependensOnModule@ \"" + strModName
             + "\" @CR_InVersion@ \"" + dep.minVer + "\", @CR_MaxAvailableVersion@ \""
             + mod.availableMaxVer + "\". ");
         return false;
@@ -127,7 +128,7 @@
     } else if ("MAJOR".equals(dep.enforcement)) {
       // installedVersion <= dep.fromVersion
       if (versionCompare(dep.minVer, mod.availableMaxVer, true) == 1) {
-        errors.add(depParentMod + " @CR_DependensOnModule@ \"" + dep.modName
+        errors.add(depParentMod + " @CR_DependensOnModule@ \"" + strModName
             + "\" @CR_InVersion@ \"" + dep.minVer + "\", @CR_MaxAvailableVersion@ \""
             + mod.availableMaxVer + "\". ");
         return false;
@@ -136,7 +137,7 @@
         // if lastVersion!=null, firstVersion >= installedVersion >= lastVersion
         if (versionCompare(dep.minVer, dep.maxVer, false) == 1
             && versionCompare(mod.availableMinVer, dep.maxVer, true) == 1) {
-          errors.add(depParentMod + " @CR_DependensOnModule@ \"" + dep.modName
+          errors.add(depParentMod + " @CR_DependensOnModule@ \"" + strModName
               + "\" @CR_InVersion@ \"" + dep.maxVer + "\", @CR_MaxAvailableVersion@ \""
               + mod.availableMinVer + "\". ");
           return false;
@@ -144,9 +145,9 @@
       } else {
         // if lastVerrsion==null, firtVersion same major version than installedVersion
         if (versionCompare(dep.minVer, mod.availableMaxVer, true) != 0) {
-          errors.add(depParentMod + " @CR_DependensOnModule@ \"" + dep.modName
-              + "\" @CR_InVersion@ \"" + dep.minVer + "\", @CR_MaxAvailableVersion@ \""
-              + mod.availableMaxVer + "\". ");
+          errors.add(depParentMod + " @CR_DependensOnModule@ \"" + strModName
+              + "\" @CR_InVersion@ \"" + dep.minVer + "\", @CR_ButOnlyVersion@ \""
+              + mod.availableMaxVer + "\" @CR_IsAvailable@. ");
           return false;
         }
       }
--- a/src/org/openbravo/erpCommon/security/Login.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/security/Login.java	Thu Oct 21 18:38:18 2010 +0200
@@ -29,6 +29,8 @@
 import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
+import org.openbravo.erpCommon.businessUtility.Preferences;
+import org.openbravo.erpCommon.utility.PropertyException;
 import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.model.ad.system.Client;
 import org.openbravo.xmlEngine.XmlDocument;
@@ -76,6 +78,26 @@
     } else if (vars.commandIn("LOGO")) {
       printPageLogo(response, vars);
     } else {
+      // Look for forced login URL property and redirect in case it is set and the login is accessed
+      // through a different URL
+      try {
+        String forcedLoginUrl = Preferences.getPreferenceValue("ForcedLoginURL", true, null, null,
+            null, null, null);
+        log4j.debug("Forced URL: " + forcedLoginUrl);
+        if (forcedLoginUrl != null && !forcedLoginUrl.isEmpty()
+            && !request.getRequestURL().toString().startsWith(forcedLoginUrl)) {
+          log4j.info("Redireting login from " + request.getRequestURL().toString()
+              + " to forced login URL " + forcedLoginUrl);
+          response.sendRedirect(forcedLoginUrl);
+          return;
+        }
+      } catch (PropertyException e) {
+        // Ignore and continue with the standard login. PropertyException is raised in case property
+        // is not defined (standard case) or in case of conflict.
+        log4j.debug("Exception getting ForcedLoginURL", e);
+      }
+
+      // Standard login
       String textDirection = vars.getSessionValue("#TextDirection", "LTR");
       printPageFrameIdentificacion(response, "Login_Welcome.html?Command=WELCOME",
           "Login_F1.html?Command=LOGIN", textDirection);
--- a/src/org/openbravo/erpCommon/utility/DynamicJS.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/utility/DynamicJS.java	Thu Oct 21 18:38:18 2010 +0200
@@ -119,11 +119,11 @@
     String globals = "";
 
     globals += "var decSeparator_global = '"
-        + vars.getSessionValue("#DECIMALSEPARATOR|EUROEDITION") + "';\n";
+        + vars.getSessionValue("#DECIMALSEPARATOR|QTYEDITION") + "';\n";
     globals += "var groupSeparator_global = '"
-        + vars.getSessionValue("#GROUPSEPARATOR|EUROEDITION") + "';\n";
+        + vars.getSessionValue("#GROUPSEPARATOR|QTYEDITION") + "';\n";
     globals += "var groupInterval_global = '3';\n";
-    globals += "var maskNumeric_default = '" + vars.getSessionValue("#FORMATOUTPUT|EUROEDITION")
+    globals += "var maskNumeric_default = '" + vars.getSessionValue("#FORMATOUTPUT|QTYEDITION")
         + "';\n";
 
     out.print(globals);
@@ -144,11 +144,11 @@
     }
     out.println("]};");
     out.print("F.getFormat=function(name)");
-    out.print("{if(typeof name==='undefined'||name==='')");
-    out.print("{return'qtyEdition';}");
+    out.print("{if(!name)");
+    out.print("{return F.getFormat('qtyEdition');}");
     out.print("for(var i=0;i<this.formats.length;i++)");
     out.print("{if(this.formats[i].name===name)");
-    out.println("{return this.formats[i].output;}}return'qtyEdtion';}");
+    out.println("{return this.formats[i].output;}} return F.getFormat('qtyEdtion');};");
 
     out.close();
   }
--- a/src/org/openbravo/erpCommon/utility/OBError.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpCommon/utility/OBError.java	Thu Oct 21 18:38:18 2010 +0200
@@ -18,6 +18,9 @@
  */
 package org.openbravo.erpCommon.utility;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class OBError {
   private String type = "";
   private String title = "";
@@ -75,4 +78,12 @@
   public boolean isConnectionAvailable() {
     return this.connectionAvailable;
   }
+
+  public Map<String, String> toMap() {
+    Map<String, String> o = new HashMap<String, String>();
+    o.put("title", title);
+    o.put("message", message);
+    o.put("type", type);
+    return o;
+  }
 }
--- a/src/org/openbravo/erpReports/C_OrderJR.jrxml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpReports/C_OrderJR.jrxml	Thu Oct 21 18:38:18 2010 +0200
@@ -156,9 +156,9 @@
 C_ORDER.DESCRIPTION, C_ORDER.DATEORDERED, C_ORDER.DOCUMENTNO AS ALBARAN, 
 C_BPARTNER.NAME2 || ' (' || C_BPARTNER.NAME || ')' AS COMPLETE_NAME, AD_CLIENT.DESCRIPTION AS ENTITY, 
 C_LOCATION_DESCRIPTION(AD_ORGINFO.C_LOCATION_ID) AS LOCATION,  AD_ORG.ad_org_id AS ORGANIZATIONID, C_ORDER.docstatus AS STATUS,
-(TO_CHAR(AD_USER.NAME) || CASE WHEN AD_USER.NAME IS null THEN '' ELSE CHR(13) END || TO_CHAR(C_BPARTNER.TAXID) || CASE WHEN C_BPARTNER.TAXID IS null THEN '' ELSE CHR(13) END ||
-TO_CHAR(ADDRESS1) || CASE WHEN ADDRESS1 IS null THEN '' ELSE CHR(13) END || TO_CHAR(POSTAL) || CASE WHEN POSTAL IS null THEN '' ELSE CHR(13) END ||
-TO_CHAR(C_BPARTNER_LOCATION.PHONE) ||  CASE WHEN C_BPARTNER_LOCATION.PHONE IS null THEN '' ELSE CHR(13) END || TO_CHAR(C_BPARTNER_LOCATION.FAX) ||
+(COALESCE(TO_CHAR(AD_USER.NAME), '') || CASE WHEN AD_USER.NAME IS null THEN '' ELSE CHR(13) END || COALESCE(TO_CHAR(C_BPARTNER.TAXID), '') || CASE WHEN C_BPARTNER.TAXID IS null THEN '' ELSE CHR(13) END ||
+COALESCE(TO_CHAR(ADDRESS1), '') || CASE WHEN ADDRESS1 IS null THEN '' ELSE CHR(13) END || COALESCE(TO_CHAR(POSTAL), '') || CASE WHEN POSTAL IS null THEN '' ELSE CHR(13) END ||
+COALESCE(TO_CHAR(C_BPARTNER_LOCATION.PHONE), '') || CASE WHEN C_BPARTNER_LOCATION.PHONE IS null THEN '' ELSE CHR(13) END || COALESCE(TO_CHAR(C_BPARTNER_LOCATION.FAX), '') ||
 CASE WHEN C_BPARTNER_LOCATION.FAX IS null THEN '' ELSE CHR(13) END) AS BP_DATA, AD_ORGINFO.TAXID AS ORG_TAXID, SHOWLOGO, SHOWCOMPANYDATA, HEADERMARGIN,
 AD_ORG.NAME AS ORG_NAME, DELIVERYRULE.NAME AS DELIVERYTERM, PAYMENTTERM.TERM AS PAYMENTTERM
 FROM C_BPARTNER_LOCATION left join C_LOCATION L on C_BPARTNER_LOCATION.C_LOCATION_ID = L.C_LOCATION_ID
--- a/src/org/openbravo/erpReports/RptC_Invoice.jrxml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpReports/RptC_Invoice.jrxml	Thu Oct 21 18:38:18 2010 +0200
@@ -211,10 +211,10 @@
 C_INVOICE.DATEINVOICED, C_INVOICE.DOCUMENTNO, C_BPARTNER.VALUE AS CODE_BPARTNER, 
 AD_CLIENT.DESCRIPTION AS ENTITY, C_Location_Description(AD_ORGINFO.C_LOCATION_ID) AS LOCATION, C_CURRENCY.ISO_CODE AS CURRENCY_CODE,C_CURRENCY.CURSYMBOL AS SYMBOL,
 C_PAYMENTTERM.NAME AS PAYTERM, AD_ORGINFO.ad_org_id AS ORGANIZATIONID, C_INVOICE.docstatus AS STATUS, AD_ORG.NAME AS ORG_NAME, AD_ORGINFO.TAXID AS ORG_TAXID,
-C_BPARTNER.TAXID AS BP_TAXID, (TO_CHAR(AD_USER.NAME) || CASE WHEN AD_USER.NAME IS null THEN '' ELSE CHR(13) END || TO_CHAR(C_BPARTNER.TAXID) ||
-CASE WHEN C_BPARTNER.TAXID IS null THEN '' ELSE CHR(13) END || TO_CHAR(ADDRESS1) || CASE WHEN ADDRESS1 IS null THEN '' ELSE CHR(13) END || TO_CHAR(POSTAL) ||
-CASE WHEN POSTAL IS null THEN '' ELSE CHR(13) END || TO_CHAR(C_BPARTNER_LOCATION.PHONE) ||  CASE WHEN C_BPARTNER_LOCATION.PHONE IS null THEN '' ELSE CHR(13) END ||
-TO_CHAR(C_BPARTNER_LOCATION.FAX) || CASE WHEN C_BPARTNER_LOCATION.FAX IS null THEN '' ELSE CHR(13) END) AS BP_DATA, SHOWLOGO, SHOWCOMPANYDATA, HEADERMARGIN
+C_BPARTNER.TAXID AS BP_TAXID, (COALESCE(TO_CHAR(AD_USER.NAME), '') || CASE WHEN AD_USER.NAME IS null THEN '' ELSE CHR(13) END || COALESCE(TO_CHAR(C_BPARTNER.TAXID), '') || CASE WHEN C_BPARTNER.TAXID IS null THEN '' ELSE CHR(13) END ||
+COALESCE(TO_CHAR(ADDRESS1), '') || CASE WHEN ADDRESS1 IS null THEN '' ELSE CHR(13) END || COALESCE(TO_CHAR(POSTAL), '') || CASE WHEN POSTAL IS null THEN '' ELSE CHR(13) END ||
+COALESCE(TO_CHAR(C_BPARTNER_LOCATION.PHONE), '') || CASE WHEN C_BPARTNER_LOCATION.PHONE IS null THEN '' ELSE CHR(13) END || COALESCE(TO_CHAR(C_BPARTNER_LOCATION.FAX), '') ||
+CASE WHEN C_BPARTNER_LOCATION.FAX IS null THEN '' ELSE CHR(13) END) AS BP_DATA, SHOWLOGO, SHOWCOMPANYDATA, HEADERMARGIN
 FROM C_INVOICE LEFT JOIN C_BPARTNER ON C_INVOICE.C_BPARTNER_ID = C_BPARTNER.C_BPARTNER_ID
 	 LEFT JOIN AD_USER ON C_INVOICE.AD_USER_ID = AD_USER.AD_USER_ID
 	 LEFT JOIN C_BPARTNER_LOCATION ON C_INVOICE.C_BPARTNER_LOCATION_ID = C_BPARTNER_LOCATION.C_BPARTNER_LOCATION_ID
--- a/src/org/openbravo/erpReports/RptC_OrderPO.jrxml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpReports/RptC_OrderPO.jrxml	Thu Oct 21 18:38:18 2010 +0200
@@ -210,9 +210,10 @@
 DELIVERYRULE.NAME AS DELIVERYTERM, C_CURRENCY.ISO_CODE, PAYMENTTERM.TERM AS PAYMENTTERM, (SELECT o.AD_ORG_ID FROM AD_ORG o JOIN AD_OrgType t USING (AD_ORGTYPE_ID)
 WHERE AD_ISORGINCLUDED(C_ORDER.ad_org_id, o.ad_org_id, C_ORDER.ad_client_id)<>-1
 AND (t.IsLegalEntity='Y' OR t.IsAcctLegalEntity='Y')) AS ORGANIZATIONID, C_ORDER.docstatus AS STATUS,
-(TO_CHAR(AD_USER.NAME) || CASE WHEN AD_USER.NAME IS null THEN '' ELSE CHR(13) END || TO_CHAR(C_BPARTNER.TAXID) || CASE WHEN C_BPARTNER.TAXID IS null THEN '' ELSE CHR(13) END ||
-TO_CHAR(ADDRESS1) || CASE WHEN ADDRESS1 IS null THEN '' ELSE CHR(13) END || TO_CHAR(POSTAL) || CASE WHEN POSTAL IS null THEN '' ELSE CHR(13) END || TO_CHAR(C_BPARTNER_LOCATION.PHONE) ||
-CASE WHEN C_BPARTNER_LOCATION.PHONE IS null THEN '' ELSE CHR(13) END || TO_CHAR(C_BPARTNER_LOCATION.FAX) || CASE WHEN C_BPARTNER_LOCATION.FAX IS null THEN '' ELSE CHR(13) END) AS BP_DATA,
+(COALESCE(TO_CHAR(AD_USER.NAME), '') || CASE WHEN AD_USER.NAME IS null THEN '' ELSE CHR(13) END || COALESCE(TO_CHAR(C_BPARTNER.TAXID), '') || CASE WHEN C_BPARTNER.TAXID IS null THEN '' ELSE CHR(13) END ||
+COALESCE(TO_CHAR(ADDRESS1), '') || CASE WHEN ADDRESS1 IS null THEN '' ELSE CHR(13) END || COALESCE(TO_CHAR(POSTAL), '') || CASE WHEN POSTAL IS null THEN '' ELSE CHR(13) END ||
+COALESCE(TO_CHAR(C_BPARTNER_LOCATION.PHONE), '') || CASE WHEN C_BPARTNER_LOCATION.PHONE IS null THEN '' ELSE CHR(13) END || COALESCE(TO_CHAR(C_BPARTNER_LOCATION.FAX), '') ||
+CASE WHEN C_BPARTNER_LOCATION.FAX IS null THEN '' ELSE CHR(13) END) AS BP_DATA,
 AD_ORGINFO.TAXID AS ORG_TAXID, SHOWLOGO, SHOWCOMPANYDATA, HEADERMARGIN, AD_ORG.NAME AS ORG_NAME
 FROM   C_ORDER left join C_BPARTNER_LOCATION on C_ORDER.BILLTO_ID = C_BPARTNER_LOCATION.C_BPARTNER_ID
 	       left join AD_USER on C_ORDER.AD_USER_ID = AD_USER.AD_USER_ID
--- a/src/org/openbravo/erpReports/RptM_InOut.jrxml	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/erpReports/RptM_InOut.jrxml	Thu Oct 21 18:38:18 2010 +0200
@@ -186,10 +186,10 @@
 C_REGION.NAME AS REGION, M_INOUT.DOCUMENTNO, M_INOUT.MOVEMENTDATE, C_BPARTNER.VALUE AS PARTNER_VALUE, C_BPARTNER.TAXID, 
 MAX(C_ORDER.POREFERENCE) AS POREFERENCE, AD_CLIENT.DESCRIPTION AS ENTITY, C_LOCATION_DESCRIPTION(AD_ORGINFO.C_LOCATION_ID) AS ENTITY_LOCATION,
 C_ORDER.DATEPROMISED, AD_ORGINFO.AD_ORG_ID AS ORGANIZATIONID, M_INOUT.docstatus AS STATUS, C_BPARTNER.NAME AS BP_NAME, AD_ORG.NAME AS ORG_NAME,
-AD_ORGINFO.TAXID AS ORG_TAXID, C_Location_Description(AD_ORGINFO.C_LOCATION_ID) AS LOCATION, (TO_CHAR(AD_USER.NAME) || CASE WHEN AD_USER.NAME IS null THEN '' ELSE CHR(13) END ||
-TO_CHAR(C_BPARTNER.TAXID) || CASE WHEN C_BPARTNER.TAXID IS null THEN '' ELSE CHR(13) END || TO_CHAR(ADDRESS1) || CASE WHEN ADDRESS1 IS null THEN '' ELSE CHR(13) END || TO_CHAR(POSTAL) ||
-CASE WHEN POSTAL IS null THEN '' ELSE CHR(13) END || TO_CHAR(C_BPARTNER_LOCATION.PHONE) || CASE WHEN C_BPARTNER_LOCATION.PHONE IS null THEN '' ELSE CHR(13) END ||
-TO_CHAR(C_BPARTNER_LOCATION.FAX) || CASE WHEN C_BPARTNER_LOCATION.FAX IS null THEN '' ELSE CHR(13) END) AS BP_DATA,
+AD_ORGINFO.TAXID AS ORG_TAXID, C_Location_Description(AD_ORGINFO.C_LOCATION_ID) AS LOCATION, (COALESCE(TO_CHAR(AD_USER.NAME), '') || CASE WHEN AD_USER.NAME IS null THEN '' ELSE CHR(13) END || COALESCE(TO_CHAR(C_BPARTNER.TAXID), '') || CASE WHEN C_BPARTNER.TAXID IS null THEN '' ELSE CHR(13) END ||
+COALESCE(TO_CHAR(ADDRESS1), '') || CASE WHEN ADDRESS1 IS null THEN '' ELSE CHR(13) END || COALESCE(TO_CHAR(POSTAL), '') || CASE WHEN POSTAL IS null THEN '' ELSE CHR(13) END ||
+COALESCE(TO_CHAR(C_BPARTNER_LOCATION.PHONE), '') || CASE WHEN C_BPARTNER_LOCATION.PHONE IS null THEN '' ELSE CHR(13) END || COALESCE(TO_CHAR(C_BPARTNER_LOCATION.FAX), '') ||
+CASE WHEN C_BPARTNER_LOCATION.FAX IS null THEN '' ELSE CHR(13) END) AS BP_DATA,
 SHOWLOGO, SHOWCOMPANYDATA, HEADERMARGIN
 FROM C_BPARTNER_LOCATION right join M_INOUT on M_INOUT.C_BPARTNER_LOCATION_ID = C_BPARTNER_LOCATION.C_BPARTNER_LOCATION_ID
 			 left join C_LOCATION on C_BPARTNER_LOCATION.C_LOCATION_ID = C_LOCATION.C_LOCATION_ID
--- a/src/org/openbravo/service/rest/DalWebService.java	Thu Oct 21 18:34:57 2010 +0200
+++ b/src/org/openbravo/service/rest/DalWebService.java	Thu Oct 21 18:38:18 2010 +0200
@@ -276,6 +276,7 @@
       final BaseOBObject result = OBDal.getInstance().get(entityName, id);
       final String resIdentifier = result.getIdentifier();
       OBDal.getInstance().remove(result);
+      OBDal.getInstance().commitAndClose();
 
       final String resultXml = WebServiceUtil.getInstance().createResultXMLWithLogWarning(
           "Action performed successfully", "Removed business object " + resIdentifier, null);
@@ -290,6 +291,42 @@
       return;
     }
 
+    if (segments.length == 1) {
+      final String entityName = segments[0];
+
+      try {
+        ModelProvider.getInstance().getEntity(entityName);
+      } catch (final CheckException ce) {
+        throw new ResourceNotFoundException("Resource " + entityName + " not found", ce);
+      }
+
+      final String where = request.getParameter(PARAMETER_WHERE);
+      String whereOrderByClause = "";
+      if (where != null) {
+        whereOrderByClause += where;
+      }
+
+      try {
+        final OBQuery<BaseOBObject> obq = OBDal.getInstance().createQuery(entityName,
+            whereOrderByClause);
+
+        Object o = obq.deleteQuery().executeUpdate();
+
+        OBDal.getInstance().commitAndClose();
+
+        final String resultXml = WebServiceUtil.getInstance().createResultXMLWithLogWarning(
+            "Action performed successfully", "Removed business objects " + o, null);
+        response.setContentType("text/xml;charset=UTF-8");
+        final Writer w = response.getWriter();
+        w.write(resultXml);
+        w.close();
+      } catch (final Exception e) {
+        throw new OBException(e);
+      }
+
+      return;
+    }
+
     // use the content of the request
     doChangeAction(path, request, response, ChangeAction.DELETE);
   }
@@ -313,6 +350,9 @@
       HttpServletResponse response, ChangeAction changeAction) {
     response.setContentType("text/xml;charset=UTF-8");
     final String resultXml = doChangeActionXML(path, request, response, changeAction);
+
+    OBDal.getInstance().commitAndClose();
+
     try {
       final Writer w = response.getWriter();
       w.write(resultXml);