From 2a3d601df9a44c20ac6c66207b663551fcda2bbd Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Mon, 2 Apr 2007 10:15:26 +0000
Subject: [PATCH] * updated for 316

---
 db/ddlutils/model/AD_CLIENTINFO.xml           |  6 +-
 db/ddlutils/model/AD_COLUMN.xml               |  6 +-
 db/ddlutils/model/AD_FIELDGROUP_TRL.xml       |  4 +-
 db/ddlutils/model/AD_ORGINFO.xml              |  6 +-
 db/ddlutils/model/AD_PRINTFORM.xml            | 20 ++--
 db/ddlutils/model/AD_PRINTGRAPH.xml           | 14 +--
 db/ddlutils/model/AD_PROCESS_PARA.xml         |  6 +-
 db/ddlutils/model/AD_REF_TABLE.xml            |  6 +-
 db/ddlutils/model/AD_TAB.xml                  |  6 +-
 db/ddlutils/model/AD_USER.xml                 |  6 +-
 db/ddlutils/model/AD_WF_NODE.xml              |  6 +-
 db/ddlutils/model/CM_CHATENTRY.xml            |  6 +-
 db/ddlutils/model/C_ACCTSCHEMA_DEFAULT.xml    | 96 +++++++++----------
 db/ddlutils/model/C_BPARTNER.xml              |  6 +-
 db/ddlutils/model/C_BPARTNER_LOCATION.xml     |  6 +-
 db/ddlutils/model/C_BP_CUSTOMER_ACCT.xml      |  6 +-
 db/ddlutils/model/C_BP_EMPLOYEE_ACCT.xml      |  6 +-
 db/ddlutils/model/C_BP_GROUP_ACCT.xml         | 32 +++----
 db/ddlutils/model/C_CASH.xml                  |  6 +-
 db/ddlutils/model/C_CASHBOOK_ACCT.xml         | 10 +-
 db/ddlutils/model/C_CHARGE_ACCT.xml           |  6 +-
 db/ddlutils/model/C_CONVERSION_RATE.xml       |  6 +-
 db/ddlutils/model/C_CURRENCY_ACCT.xml         | 10 +-
 db/ddlutils/model/C_INVOICE.xml               | 16 ++--
 db/ddlutils/model/C_INVOICELINE.xml           |  6 +-
 db/ddlutils/model/C_ORDER.xml                 | 26 ++---
 db/ddlutils/model/C_ORDERLINE.xml             |  6 +-
 db/ddlutils/model/C_PAYMENT.xml               |  6 +-
 db/ddlutils/model/C_PROJECT.xml               |  6 +-
 db/ddlutils/model/C_PROJECTLINE.xml           |  6 +-
 db/ddlutils/model/C_PROJECT_ACCT.xml          |  6 +-
 db/ddlutils/model/C_RFQ.xml                   |  6 +-
 db/ddlutils/model/C_TAX.xml                   | 10 +-
 db/ddlutils/model/C_VALIDCOMBINATION.xml      | 18 ++--
 db/ddlutils/model/FACT_ACCT.xml               | 18 ++--
 db/ddlutils/model/FACT_ACCT_BALANCE.xml       |  6 +-
 db/ddlutils/model/GL_DISTRIBUTIONLINE.xml     | 12 +--
 db/ddlutils/model/I_ELEMENTVALUE.xml          |  6 +-
 db/ddlutils/model/I_GLJOURNAL.xml             | 20 ++--
 db/ddlutils/model/I_INVOICE.xml               | 10 +-
 db/ddlutils/model/I_ORDER.xml                 |  6 +-
 db/ddlutils/model/M_BOMPRODUCT.xml            |  4 +-
 db/ddlutils/model/M_FREIGHT.xml               |  6 +-
 db/ddlutils/model/M_INOUT.xml                 | 18 ++--
 db/ddlutils/model/M_MOVEMENT.xml              |  6 +-
 db/ddlutils/model/M_MOVEMENTLINE.xml          |  6 +-
 db/ddlutils/model/M_PRODUCT.xml               | 12 +--
 db/ddlutils/model/M_PRODUCTION.xml            |  6 +-
 db/ddlutils/model/M_PRODUCT_ACCT.xml          | 12 +--
 db/ddlutils/model/M_SUBSTITUTE.xml            |  6 +-
 db/ddlutils/model/M_TRANSACTIONALLOCATION.xml | 16 ++--
 db/ddlutils/model/PA_RATIOELEMENT.xml         |  6 +-
 db/ddlutils/model/PA_REPORTLINE.xml           |  6 +-
 db/ddlutils/model/R_REQUEST.xml               | 12 +--
 db/ddlutils/model/S_RESOURCETYPE.xml          | 24 ++---
 db/ddlutils/model/W_STORE.xml                 | 18 ++--
 56 files changed, 315 insertions(+), 315 deletions(-)

diff --git a/db/ddlutils/model/AD_CLIENTINFO.xml b/db/ddlutils/model/AD_CLIENTINFO.xml
index 90d1ae3fc4..7ea985a6c2 100644
--- a/db/ddlutils/model/AD_CLIENTINFO.xml
+++ b/db/ddlutils/model/AD_CLIENTINFO.xml
@@ -33,6 +33,9 @@
       <foreign-key foreignTable="AD_TREE" name="ADTREEPROJECT_ADCLIENTINFO" onDelete="none">
         <reference local="AD_TREE_PROJECT_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_TREE" name="ADTREESALESREG_ADCLIENTINFO" onDelete="none">
+        <reference local="AD_TREE_SALESREGION_ID" foreign="AD_TREE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_TREE" name="ADTREEPRODUCT_ADCLIENTINFO" onDelete="none">
         <reference local="AD_TREE_PRODUCT_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
@@ -42,9 +45,6 @@
       <foreign-key foreignTable="AD_TREE" name="ADTREEMENU_ADCLIENTINFO" onDelete="none">
         <reference local="AD_TREE_MENU_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_TREE" name="ADTREESALESREG_ADCLIENTINFO" onDelete="none">
-        <reference local="AD_TREE_SALESREGION_ID" foreign="AD_TREE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_TREE" name="ADTREEBPARTNER_ADCLIENTINFO" onDelete="none">
         <reference local="AD_TREE_BPARTNER_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_COLUMN.xml b/db/ddlutils/model/AD_COLUMN.xml
index 61c9db1976..5be1f8ac60 100644
--- a/db/ddlutils/model/AD_COLUMN.xml
+++ b/db/ddlutils/model/AD_COLUMN.xml
@@ -53,12 +53,12 @@
       <foreign-key foreignTable="AD_PROCESS" name="ADPROCESS_ADCOLUMN" onDelete="setnull">
         <reference local="AD_PROCESS_ID" foreign="AD_PROCESS_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_REFERENCE" name="AD_REFERENCE_COLUMNDATATYPE" onDelete="none">
-        <reference local="AD_REFERENCE_ID" foreign="AD_REFERENCE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_REFERENCE" name="AD_REFERENCE_COLUMNVALUE" onDelete="none">
         <reference local="AD_REFERENCE_VALUE_ID" foreign="AD_REFERENCE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_REFERENCE" name="AD_REFERENCE_COLUMNDATATYPE" onDelete="none">
+        <reference local="AD_REFERENCE_ID" foreign="AD_REFERENCE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_TABLE" name="AD_TABLE_COLUMN" onDelete="cascade">
         <reference local="AD_TABLE_ID" foreign="AD_TABLE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_FIELDGROUP_TRL.xml b/db/ddlutils/model/AD_FIELDGROUP_TRL.xml
index 886cee31f7..f342d163e5 100644
--- a/db/ddlutils/model/AD_FIELDGROUP_TRL.xml
+++ b/db/ddlutils/model/AD_FIELDGROUP_TRL.xml
@@ -20,10 +20,10 @@
         <reference local="AD_LANGUAGE" foreign="AD_LANGUAGE"/>
       </foreign-key>
       <check>
-        <rule><![CDATA[IsActive in ('Y','N')]]></rule>
+        <rule><![CDATA[IsTranslated in ('Y','N')]]></rule>
       </check>
       <check>
-        <rule><![CDATA[IsTranslated in ('Y','N')]]></rule>
+        <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
     </table>
   </database>
diff --git a/db/ddlutils/model/AD_ORGINFO.xml b/db/ddlutils/model/AD_ORGINFO.xml
index c54022f170..7903098c02 100644
--- a/db/ddlutils/model/AD_ORGINFO.xml
+++ b/db/ddlutils/model/AD_ORGINFO.xml
@@ -17,12 +17,12 @@
       <column name="PARENT_ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_ORGTYPE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="M_WAREHOUSE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <foreign-key foreignTable="AD_ORG" name="ADORGPARENT_ADORGINFO" onDelete="setnull">
-        <reference local="PARENT_ORG_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORG_ADORGINFO" onDelete="cascade">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="ADORGPARENT_ADORGINFO" onDelete="setnull">
+        <reference local="PARENT_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_ORGTYPE" name="ADORGTYPE_ADORGINFO" onDelete="none">
         <reference local="AD_ORGTYPE_ID" foreign="AD_ORGTYPE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_PRINTFORM.xml b/db/ddlutils/model/AD_PRINTFORM.xml
index 080c1bc9e6..a95102514b 100644
--- a/db/ddlutils/model/AD_PRINTFORM.xml
+++ b/db/ddlutils/model/AD_PRINTFORM.xml
@@ -25,6 +25,12 @@
       <foreign-key foreignTable="AD_CLIENT" name="ADCLIENT_ADPRINTFORM" onDelete="none">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_PRINTFORMAT" name="ADPRINTFORMAT_FORMINVOICE" onDelete="none">
+        <reference local="INVOICE_PRINTFORMAT_ID" foreign="AD_PRINTFORMAT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_PRINTFORMAT" name="ADPRINTFORMAT_FORMSHIPMENT" onDelete="none">
+        <reference local="SHIPMENT_PRINTFORMAT_ID" foreign="AD_PRINTFORMAT_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_PRINTFORMAT" name="ADPRINTFORMAT_FORMREMITTANCE" onDelete="none">
         <reference local="REMITTANCE_PRINTFORMAT_ID" foreign="AD_PRINTFORMAT_ID"/>
       </foreign-key>
@@ -34,11 +40,11 @@
       <foreign-key foreignTable="AD_PRINTFORMAT" name="ADPRINTFORMAT_FORMORDER" onDelete="none">
         <reference local="ORDER_PRINTFORMAT_ID" foreign="AD_PRINTFORMAT_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_PRINTFORMAT" name="ADPRINTFORMAT_FORMINVOICE" onDelete="none">
-        <reference local="INVOICE_PRINTFORMAT_ID" foreign="AD_PRINTFORMAT_ID"/>
+      <foreign-key foreignTable="R_MAILTEXT" name="RMAILTEXT_INVOICEADPRINTFORM" onDelete="none">
+        <reference local="INVOICE_MAILTEXT_ID" foreign="R_MAILTEXT_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_PRINTFORMAT" name="ADPRINTFORMAT_FORMSHIPMENT" onDelete="none">
-        <reference local="SHIPMENT_PRINTFORMAT_ID" foreign="AD_PRINTFORMAT_ID"/>
+      <foreign-key foreignTable="R_MAILTEXT" name="RMAILTEXT_SHIPADPRINTFORM" onDelete="none">
+        <reference local="SHIPMENT_MAILTEXT_ID" foreign="R_MAILTEXT_ID"/>
       </foreign-key>
       <foreign-key foreignTable="R_MAILTEXT" name="RMAILTEXT_REMITADPRINTFORM" onDelete="none">
         <reference local="REMITTANCE_MAILTEXT_ID" foreign="R_MAILTEXT_ID"/>
@@ -49,12 +55,6 @@
       <foreign-key foreignTable="R_MAILTEXT" name="RMAILTEXT_ORDERADPRINTFORM" onDelete="none">
         <reference local="ORDER_MAILTEXT_ID" foreign="R_MAILTEXT_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="R_MAILTEXT" name="RMAILTEXT_INVOICEADPRINTFORM" onDelete="none">
-        <reference local="INVOICE_MAILTEXT_ID" foreign="R_MAILTEXT_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="R_MAILTEXT" name="RMAILTEXT_SHIPADPRINTFORM" onDelete="none">
-        <reference local="SHIPMENT_MAILTEXT_ID" foreign="R_MAILTEXT_ID"/>
-      </foreign-key>
       <unique name="AD_PRINTFORM_CLIENT">
         <unique-column name="AD_CLIENT_ID"/>
         <unique-column name="AD_ORG_ID"/>
diff --git a/db/ddlutils/model/AD_PRINTGRAPH.xml b/db/ddlutils/model/AD_PRINTGRAPH.xml
index ac3aef9712..3e7ccaaf4a 100644
--- a/db/ddlutils/model/AD_PRINTGRAPH.xml
+++ b/db/ddlutils/model/AD_PRINTGRAPH.xml
@@ -26,20 +26,20 @@
       <foreign-key foreignTable="AD_PRINTFORMATITEM" name="ADPRINTFORMATITEM_GRAPHDATA1" onDelete="none">
         <reference local="DATA1_PRINTFORMATITEM_ID" foreign="AD_PRINTFORMATITEM_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_PRINTFORMATITEM" name="ADPRINTFORMATITEM_GRAPHDATA2" onDelete="none">
-        <reference local="DATA2_PRINTFORMATITEM_ID" foreign="AD_PRINTFORMATITEM_ID"/>
+      <foreign-key foreignTable="AD_PRINTFORMATITEM" name="ADPRINTFORMATITEM_GRAPHDESCR" onDelete="none">
+        <reference local="DESCRIPTION_PRINTFORMATITEM_ID" foreign="AD_PRINTFORMATITEM_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_PRINTFORMATITEM" name="ADPRINTFORMATITEM_GRAPHDATA3" onDelete="none">
+        <reference local="DATA3_PRINTFORMATITEM_ID" foreign="AD_PRINTFORMATITEM_ID"/>
       </foreign-key>
       <foreign-key foreignTable="AD_PRINTFORMATITEM" name="ADPRINTFORMATITEM_GRAPHDATA4" onDelete="none">
         <reference local="DATA4_PRINTFORMATITEM_ID" foreign="AD_PRINTFORMATITEM_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_PRINTFORMATITEM" name="ADPRINTFORMATITEM_GRAPHDESCR" onDelete="none">
-        <reference local="DESCRIPTION_PRINTFORMATITEM_ID" foreign="AD_PRINTFORMATITEM_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_PRINTFORMATITEM" name="ADPRINTFORMATITEM_GRAPHDATA" onDelete="none">
         <reference local="DATA_PRINTFORMATITEM_ID" foreign="AD_PRINTFORMATITEM_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_PRINTFORMATITEM" name="ADPRINTFORMATITEM_GRAPHDATA3" onDelete="none">
-        <reference local="DATA3_PRINTFORMATITEM_ID" foreign="AD_PRINTFORMATITEM_ID"/>
+      <foreign-key foreignTable="AD_PRINTFORMATITEM" name="ADPRINTFORMATITEM_GRAPHDATA2" onDelete="none">
+        <reference local="DATA2_PRINTFORMATITEM_ID" foreign="AD_PRINTFORMATITEM_ID"/>
       </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
diff --git a/db/ddlutils/model/AD_PROCESS_PARA.xml b/db/ddlutils/model/AD_PROCESS_PARA.xml
index 97fdf4858d..b3bdceca02 100644
--- a/db/ddlutils/model/AD_PROCESS_PARA.xml
+++ b/db/ddlutils/model/AD_PROCESS_PARA.xml
@@ -36,12 +36,12 @@
       <foreign-key foreignTable="AD_PROCESS" name="ADPROCESS_ADPROCESSPARA" onDelete="cascade">
         <reference local="AD_PROCESS_ID" foreign="AD_PROCESS_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_REFERENCE" name="ADREFERENCE_ADPROCESSPARA" onDelete="none">
-        <reference local="AD_REFERENCE_ID" foreign="AD_REFERENCE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_REFERENCE" name="ADREFERENCEVALUE_ADPROCPARA" onDelete="none">
         <reference local="AD_REFERENCE_VALUE_ID" foreign="AD_REFERENCE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_REFERENCE" name="ADREFERENCE_ADPROCESSPARA" onDelete="none">
+        <reference local="AD_REFERENCE_ID" foreign="AD_REFERENCE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_VAL_RULE" name="ADVALRULE_AD_PROCESSPARA" onDelete="none">
         <reference local="AD_VAL_RULE_ID" foreign="AD_VAL_RULE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_REF_TABLE.xml b/db/ddlutils/model/AD_REF_TABLE.xml
index efcf7852d6..e1e827b610 100644
--- a/db/ddlutils/model/AD_REF_TABLE.xml
+++ b/db/ddlutils/model/AD_REF_TABLE.xml
@@ -20,12 +20,12 @@
       <foreign-key foreignTable="AD_CLIENT" name="REF_TABLECLIENT" onDelete="none">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_COLUMN" name="AD_COLUMN_REFTABLE_DISPLAY" onDelete="none">
-        <reference local="AD_DISPLAY" foreign="AD_COLUMN_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_COLUMN" name="AD_COLUMN_REFTABLE_ID" onDelete="none">
         <reference local="AD_KEY" foreign="AD_COLUMN_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_COLUMN" name="AD_COLUMN_REFTABLE_DISPLAY" onDelete="none">
+        <reference local="AD_DISPLAY" foreign="AD_COLUMN_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="REF_TABLEORG" onDelete="none">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_TAB.xml b/db/ddlutils/model/AD_TAB.xml
index 9473737b7d..e99a154231 100644
--- a/db/ddlutils/model/AD_TAB.xml
+++ b/db/ddlutils/model/AD_TAB.xml
@@ -45,12 +45,12 @@
       <foreign-key foreignTable="AD_COLUMN" name="ADCOLUMN_ADTABSORTYESNO" onDelete="none">
         <reference local="AD_COLUMNSORTYESNO_ID" foreign="AD_COLUMN_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_COLUMN" name="ADCOLUMN_ADTABSORTORDER" onDelete="none">
-        <reference local="AD_COLUMNSORTORDER_ID" foreign="AD_COLUMN_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_COLUMN" name="AD_COLUMN_AD_TAB" onDelete="none">
         <reference local="AD_COLUMN_ID" foreign="AD_COLUMN_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_COLUMN" name="ADCOLUMN_ADTABSORTORDER" onDelete="none">
+        <reference local="AD_COLUMNSORTORDER_ID" foreign="AD_COLUMN_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_IMAGE" name="ADIMAGE_ADTAB" onDelete="none">
         <reference local="AD_IMAGE_ID" foreign="AD_IMAGE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_USER.xml b/db/ddlutils/model/AD_USER.xml
index 3b92aaf539..ec46993f39 100644
--- a/db/ddlutils/model/AD_USER.xml
+++ b/db/ddlutils/model/AD_USER.xml
@@ -41,12 +41,12 @@
       <foreign-key foreignTable="AD_CLIENT" name="AD_USER_CLIENT" onDelete="none">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_ADUSER" onDelete="none">
-        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="AD_USER_ORG" onDelete="none">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_ADUSER" onDelete="none">
+        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_USER" name="ADUSER_SUPERVISOR" onDelete="none">
         <reference local="SUPERVISOR_ID" foreign="AD_USER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_WF_NODE.xml b/db/ddlutils/model/AD_WF_NODE.xml
index 152856a830..9f8aec27b0 100644
--- a/db/ddlutils/model/AD_WF_NODE.xml
+++ b/db/ddlutils/model/AD_WF_NODE.xml
@@ -76,12 +76,12 @@
       <foreign-key foreignTable="AD_WINDOW" name="ADWINDOW_ADWFNODE" onDelete="none">
         <reference local="AD_WINDOW_ID" foreign="AD_WINDOW_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_WORKFLOW" name="ADWORKFLOW_ADWFNODESUBFLOW" onDelete="none">
-        <reference local="WORKFLOW_ID" foreign="AD_WORKFLOW_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_WORKFLOW" name="ADWORKFLOW_ADWFNODE" onDelete="cascade">
         <reference local="AD_WORKFLOW_ID" foreign="AD_WORKFLOW_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_WORKFLOW" name="ADWORKFLOW_ADWFNODESUBFLOW" onDelete="none">
+        <reference local="WORKFLOW_ID" foreign="AD_WORKFLOW_ID"/>
+      </foreign-key>
       <index name="AD_WF_NODE_WORKFLOW">
         <index-column name="AD_WORKFLOW_ID"/>
       </index>
diff --git a/db/ddlutils/model/CM_CHATENTRY.xml b/db/ddlutils/model/CM_CHATENTRY.xml
index a587c3c046..fce3ceb0f2 100644
--- a/db/ddlutils/model/CM_CHATENTRY.xml
+++ b/db/ddlutils/model/CM_CHATENTRY.xml
@@ -25,12 +25,12 @@
       <foreign-key foreignTable="CM_CHAT" name="CMCHAT_CHCHATENTRY" onDelete="cascade">
         <reference local="CM_CHAT_ID" foreign="CM_CHAT_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="CM_CHATENTRY" name="CMENTRTY_CMENTRYPARENT" onDelete="none">
-        <reference local="CM_CHATENTRYPARENT_ID" foreign="CM_CHATENTRY_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="CM_CHATENTRY" name="CMCHATENTRY_GRANDPARENT" onDelete="none">
         <reference local="CM_CHATENTRYGRANDPARENT_ID" foreign="CM_CHATENTRY_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="CM_CHATENTRY" name="CMENTRTY_CMENTRYPARENT" onDelete="none">
+        <reference local="CM_CHATENTRYPARENT_ID" foreign="CM_CHATENTRY_ID"/>
+      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/C_ACCTSCHEMA_DEFAULT.xml b/db/ddlutils/model/C_ACCTSCHEMA_DEFAULT.xml
index 5fd9e80142..92f69fa4c4 100644
--- a/db/ddlutils/model/C_ACCTSCHEMA_DEFAULT.xml
+++ b/db/ddlutils/model/C_ACCTSCHEMA_DEFAULT.xml
@@ -74,54 +74,6 @@
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_DEFAULT" onDelete="cascade">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_REALIZEDGAIN_CSCHEMADEFAULT" onDelete="none">
-        <reference local="REALIZEDGAIN_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_REALIZEDLOSS_CSCHEMADEFAULT" onDelete="none">
-        <reference local="REALIZEDLOSS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_TCREDIT_CSCHEMADEFAULT" onDelete="none">
-        <reference local="T_CREDIT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_TDUE_CSCHEMADEFAULT" onDelete="none">
-        <reference local="T_DUE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_TEXPENSE_CSCHEMADEFAULT" onDelete="none">
-        <reference local="T_EXPENSE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_TLIABILITY_CSCHEMADEFAULT" onDelete="none">
-        <reference local="T_LIABILITY_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_TREC_CSCHEMADEFAULT" onDelete="none">
-        <reference local="T_RECEIVABLES_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_UNEARNEDREVENUE_CSCHEMADEFA" onDelete="none">
-        <reference local="UNEARNEDREVENUE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_UNREALIZEDGAIN_CSCHEMADEFAU" onDelete="none">
-        <reference local="UNREALIZEDGAIN_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_UNREALIZEDLOSS_CSCHEMADEFAU" onDelete="none">
-        <reference local="UNREALIZEDLOSS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_VLIABILITYSERVICES_CSCHEMAD" onDelete="none">
-        <reference local="V_LIABILITY_SERVICES_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_VLIABILITY_CSCHEMADEFAULT" onDelete="none">
-        <reference local="V_LIABILITY_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_VPREPAYMENT_CSCHEMADEFAULT" onDelete="none">
-        <reference local="V_PREPAYMENT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_WDIFFERENCES_CSCHEMADEFAULT" onDelete="none">
-        <reference local="W_DIFFERENCES_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_WINVACTUALADJUST_CSCHEMADEF" onDelete="none">
-        <reference local="W_INVACTUALADJUST_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_WINVENTORY_CSCHEMADEFAULT" onDelete="none">
-        <reference local="W_INVENTORY_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_WITHHOLDING_CSCHEMADEFAULT" onDelete="none">
         <reference local="WITHHOLDING_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
@@ -245,6 +197,54 @@
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PTDISCOUNTREC_CSCHEMADEFAUL" onDelete="none">
         <reference local="P_TRADEDISCOUNTREC_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_REALIZEDGAIN_CSCHEMADEFAULT" onDelete="none">
+        <reference local="REALIZEDGAIN_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_REALIZEDLOSS_CSCHEMADEFAULT" onDelete="none">
+        <reference local="REALIZEDLOSS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_TCREDIT_CSCHEMADEFAULT" onDelete="none">
+        <reference local="T_CREDIT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_TDUE_CSCHEMADEFAULT" onDelete="none">
+        <reference local="T_DUE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_TEXPENSE_CSCHEMADEFAULT" onDelete="none">
+        <reference local="T_EXPENSE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_TLIABILITY_CSCHEMADEFAULT" onDelete="none">
+        <reference local="T_LIABILITY_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_TREC_CSCHEMADEFAULT" onDelete="none">
+        <reference local="T_RECEIVABLES_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_UNEARNEDREVENUE_CSCHEMADEFA" onDelete="none">
+        <reference local="UNEARNEDREVENUE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_UNREALIZEDGAIN_CSCHEMADEFAU" onDelete="none">
+        <reference local="UNREALIZEDGAIN_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_UNREALIZEDLOSS_CSCHEMADEFAU" onDelete="none">
+        <reference local="UNREALIZEDLOSS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_VLIABILITYSERVICES_CSCHEMAD" onDelete="none">
+        <reference local="V_LIABILITY_SERVICES_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_VLIABILITY_CSCHEMADEFAULT" onDelete="none">
+        <reference local="V_LIABILITY_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_VPREPAYMENT_CSCHEMADEFAULT" onDelete="none">
+        <reference local="V_PREPAYMENT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_WDIFFERENCES_CSCHEMADEFAULT" onDelete="none">
+        <reference local="W_DIFFERENCES_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_WINVACTUALADJUST_CSCHEMADEF" onDelete="none">
+        <reference local="W_INVACTUALADJUST_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_WINVENTORY_CSCHEMADEFAULT" onDelete="none">
+        <reference local="W_INVENTORY_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/C_BPARTNER.xml b/db/ddlutils/model/C_BPARTNER.xml
index 3c14c58163..d674b3de90 100644
--- a/db/ddlutils/model/C_BPARTNER.xml
+++ b/db/ddlutils/model/C_BPARTNER.xml
@@ -73,12 +73,12 @@
       <foreign-key foreignTable="AD_LANGUAGE" name="AD_LANGUAGE_C_BUSPARTNER" onDelete="none">
         <reference local="AD_LANGUAGE" foreign="AD_LANGUAGE"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_ORG" name="ADORG_CBPARTNER" onDelete="none">
-        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORG_CBPARTNERORG" onDelete="none">
         <reference local="AD_ORGBP_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="ADORG_CBPARTNER" onDelete="none">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_PRINTFORMAT" name="ADPRINTFORMATINV_CBPARTNER" onDelete="none">
         <reference local="INVOICE_PRINTFORMAT_ID" foreign="AD_PRINTFORMAT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_BPARTNER_LOCATION.xml b/db/ddlutils/model/C_BPARTNER_LOCATION.xml
index c42fbd504d..cb10568dbe 100644
--- a/db/ddlutils/model/C_BPARTNER_LOCATION.xml
+++ b/db/ddlutils/model/C_BPARTNER_LOCATION.xml
@@ -37,12 +37,12 @@
       <foreign-key foreignTable="C_SALESREGION" name="CSALESREGION_BPARTNERLOCATION" onDelete="setnull">
         <reference local="C_SALESREGION_ID" foreign="C_SALESREGION_ID"/>
       </foreign-key>
-      <index name="C_BPLOCATION_BPARTNER">
-        <index-column name="C_BPARTNER_ID"/>
-      </index>
       <index name="C_BPLOCATION_UPDATED">
         <index-column name="UPDATED"/>
       </index>
+      <index name="C_BPLOCATION_BPARTNER">
+        <index-column name="C_BPARTNER_ID"/>
+      </index>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/C_BP_CUSTOMER_ACCT.xml b/db/ddlutils/model/C_BP_CUSTOMER_ACCT.xml
index 9dd594ee72..e0d6fb037a 100644
--- a/db/ddlutils/model/C_BP_CUSTOMER_ACCT.xml
+++ b/db/ddlutils/model/C_BP_CUSTOMER_ACCT.xml
@@ -20,12 +20,12 @@
       <foreign-key foreignTable="C_BPARTNER" name="CBUSPARTNER_CBPCUSTOMER_ACCT" onDelete="cascade">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_CPREPAYMENT_CBPCUSTOMER" onDelete="none">
-        <reference local="C_PREPAYMENT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_CRECEIVABLE_CBPCUSTOMER" onDelete="none">
         <reference local="C_RECEIVABLE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_CPREPAYMENT_CBPCUSTOMER" onDelete="none">
+        <reference local="C_PREPAYMENT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/C_BP_EMPLOYEE_ACCT.xml b/db/ddlutils/model/C_BP_EMPLOYEE_ACCT.xml
index 060094f520..d218fd767f 100644
--- a/db/ddlutils/model/C_BP_EMPLOYEE_ACCT.xml
+++ b/db/ddlutils/model/C_BP_EMPLOYEE_ACCT.xml
@@ -19,12 +19,12 @@
       <foreign-key foreignTable="C_BPARTNER" name="CBUSPARTNER_C_BPEMPLOYEEACCT" onDelete="cascade">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_EEXPENSE_CBPEMPLOYEE" onDelete="none">
-        <reference local="E_EXPENSE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_EPREPAYMENT_CBPEMPLOYEE" onDelete="none">
         <reference local="E_PREPAYMENT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_EEXPENSE_CBPEMPLOYEE" onDelete="none">
+        <reference local="E_EXPENSE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/C_BP_GROUP_ACCT.xml b/db/ddlutils/model/C_BP_GROUP_ACCT.xml
index 5dd0dd311f..601011c879 100644
--- a/db/ddlutils/model/C_BP_GROUP_ACCT.xml
+++ b/db/ddlutils/model/C_BP_GROUP_ACCT.xml
@@ -31,14 +31,26 @@
       <foreign-key foreignTable="C_BP_GROUP" name="CBPGROUP_CBPGROUPACCT" onDelete="none">
         <reference local="C_BP_GROUP_ID" foreign="C_BP_GROUP_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_VPREPAYMENT_CBPGROUP" onDelete="none">
+        <reference local="V_PREPAYMENT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_WRITEOFF_CBPGROUP" onDelete="none">
+        <reference local="WRITEOFF_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_UNEARNEDREVENUE_CBPGROUP" onDelete="none">
+        <reference local="UNEARNEDREVENUE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_CRECEIVABLE_CBPGROUP" onDelete="none">
+        <reference local="C_RECEIVABLE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_NOTINVOICEDRECEIPTS_CBPGROU" onDelete="none">
         <reference local="NOTINVOICEDRECEIPTS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_NOTINVOICEDREC_CBPGROUP" onDelete="none">
         <reference local="NOTINVOICEDRECEIVABLES_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_WRITEOFF_CBPGROUP" onDelete="none">
-        <reference local="WRITEOFF_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_NOTINVOICEDREVENUE_CBPGROUP" onDelete="none">
+        <reference local="NOTINVOICEDREVENUE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PAYDISCOUNTEXP_CBPGROUP" onDelete="none">
         <reference local="PAYDISCOUNT_EXP_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
@@ -46,27 +58,15 @@
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PAYDISCOUNTREV_CBPGROUP" onDelete="none">
         <reference local="PAYDISCOUNT_REV_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_UNEARNEDREVENUE_CBPGROUP" onDelete="none">
-        <reference local="UNEARNEDREVENUE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_VLIABILITY_CBPGROUP" onDelete="none">
+        <reference local="V_LIABILITY_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_VLIABILITYSERVICES_CBPGROUP" onDelete="none">
         <reference local="V_LIABILITY_SERVICES_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_VLIABILITY_CBPGROUP" onDelete="none">
-        <reference local="V_LIABILITY_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_VPREPAYMENT_CBPGROUP" onDelete="none">
-        <reference local="V_PREPAYMENT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_CRECEIVABLE_CBPGROUP" onDelete="none">
-        <reference local="C_RECEIVABLE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_CPREPAYMENT_CBPGROUP" onDelete="none">
         <reference local="C_PREPAYMENT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_NOTINVOICEDREVENUE_CBPGROUP" onDelete="none">
-        <reference local="NOTINVOICEDREVENUE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/C_CASH.xml b/db/ddlutils/model/C_CASH.xml
index 02f38909d6..2842988840 100644
--- a/db/ddlutils/model/C_CASH.xml
+++ b/db/ddlutils/model/C_CASH.xml
@@ -45,12 +45,12 @@
       <foreign-key foreignTable="C_CASHBOOK" name="CCASHBOOK_CCASH" onDelete="none">
         <reference local="C_CASHBOOK_ID" foreign="C_CASHBOOK_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER2_CCASH" onDelete="none">
-        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_CCASH" onDelete="none">
         <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER2_CCASH" onDelete="none">
+        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_PROJECT" name="CPROJECT_CCASH" onDelete="none">
         <reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_CASHBOOK_ACCT.xml b/db/ddlutils/model/C_CASHBOOK_ACCT.xml
index 19ad2e7ea4..3e9a84d791 100644
--- a/db/ddlutils/model/C_CASHBOOK_ACCT.xml
+++ b/db/ddlutils/model/C_CASHBOOK_ACCT.xml
@@ -25,17 +25,17 @@
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_CBDIFFERENCES_CCASHBOOK" onDelete="none">
         <reference local="CB_DIFFERENCES_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_CBEXPENSE_CCASHBOOK" onDelete="none">
+        <reference local="CB_EXPENSE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_CBRECEIPT_CCASHBOOK" onDelete="none">
         <reference local="CB_RECEIPT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_CBCASHTRANSFER_CCASHBOOK" onDelete="none">
-        <reference local="CB_CASHTRANSFER_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_CBASSET_CCASHBOOK" onDelete="none">
         <reference local="CB_ASSET_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_CBEXPENSE_CCASHBOOK" onDelete="none">
-        <reference local="CB_EXPENSE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_CBCASHTRANSFER_CCASHBOOK" onDelete="none">
+        <reference local="CB_CASHTRANSFER_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
diff --git a/db/ddlutils/model/C_CHARGE_ACCT.xml b/db/ddlutils/model/C_CHARGE_ACCT.xml
index 88c2d1f039..f030637504 100644
--- a/db/ddlutils/model/C_CHARGE_ACCT.xml
+++ b/db/ddlutils/model/C_CHARGE_ACCT.xml
@@ -19,12 +19,12 @@
       <foreign-key foreignTable="C_CHARGE" name="CCHRAGE_CCHARGEACCT" onDelete="none">
         <reference local="C_CHARGE_ID" foreign="C_CHARGE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_CHEXPENSE_CCHARGE" onDelete="none">
-        <reference local="CH_EXPENSE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_CHREVENUE_CCHARGE" onDelete="none">
         <reference local="CH_REVENUE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_CHEXPENSE_CCHARGE" onDelete="none">
+        <reference local="CH_EXPENSE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/C_CONVERSION_RATE.xml b/db/ddlutils/model/C_CONVERSION_RATE.xml
index c14a340e99..ce694edc91 100644
--- a/db/ddlutils/model/C_CONVERSION_RATE.xml
+++ b/db/ddlutils/model/C_CONVERSION_RATE.xml
@@ -26,12 +26,12 @@
       <foreign-key foreignTable="C_CONVERSIONTYPE" name="CCONVERSIONTYPE_CCONVRATE" onDelete="none">
         <reference local="C_CONVERSIONTYPE_ID" foreign="C_CONVERSIONTYPE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_CURRENCY" name="C_CURRENCYCONVRATETO" onDelete="none">
-        <reference local="C_CURRENCY_ID_TO" foreign="C_CURRENCY_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_CURRENCY" name="CCURRENCY_CCONVERSIONRATE" onDelete="none">
         <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_CURRENCY" name="C_CURRENCYCONVRATETO" onDelete="none">
+        <reference local="C_CURRENCY_ID_TO" foreign="C_CURRENCY_ID"/>
+      </foreign-key>
       <index name="C_CONVERSIONRATE_ONCE">
         <index-column name="AD_CLIENT_ID"/>
         <index-column name="AD_ORG_ID"/>
diff --git a/db/ddlutils/model/C_CURRENCY_ACCT.xml b/db/ddlutils/model/C_CURRENCY_ACCT.xml
index 7582677668..d64a806142 100644
--- a/db/ddlutils/model/C_CURRENCY_ACCT.xml
+++ b/db/ddlutils/model/C_CURRENCY_ACCT.xml
@@ -21,18 +21,18 @@
       <foreign-key foreignTable="C_CURRENCY" name="CCURRENCY_CCURRENCYACCT" onDelete="none">
         <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_UNREALIZEDLOSS_CCURRENCY" onDelete="none">
-        <reference local="UNREALIZEDLOSS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_UNREALIZEDGAIN_CCURRENCY" onDelete="none">
+        <reference local="UNREALIZEDGAIN_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_REALIZEDLOSS_CCURRENCY" onDelete="none">
         <reference local="REALIZEDLOSS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_UNREALIZEDLOSS_CCURRENCY" onDelete="none">
+        <reference local="UNREALIZEDLOSS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_REALIZEDGAIN_CCURRENCY" onDelete="none">
         <reference local="REALIZEDGAIN_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_UNREALIZEDGAIN_CCURRENCY" onDelete="none">
-        <reference local="UNREALIZEDGAIN_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/C_INVOICE.xml b/db/ddlutils/model/C_INVOICE.xml
index e4af2a0db9..93a7f73773 100644
--- a/db/ddlutils/model/C_INVOICE.xml
+++ b/db/ddlutils/model/C_INVOICE.xml
@@ -68,12 +68,12 @@
       <foreign-key foreignTable="AD_ORG" name="ADORGTRX_CINVOICE" onDelete="none">
         <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_USER" name="ADUSER_CINVOICE" onDelete="none">
-        <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_USER" name="ADUSER_SR_CINVOICE" onDelete="none">
         <reference local="SALESREP_ID" foreign="AD_USER_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_USER" name="ADUSER_CINVOICE" onDelete="none">
+        <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ACTIVITY" name="CACTIVITY_CINVOICE" onDelete="none">
         <reference local="C_ACTIVITY_ID" foreign="C_ACTIVITY_ID"/>
       </foreign-key>
@@ -98,18 +98,18 @@
       <foreign-key foreignTable="C_CURRENCY" name="CCURRENCY_CINVOICE" onDelete="none">
         <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_DOCTYPE" name="CDOCTYPE_CINVOICE" onDelete="none">
-        <reference local="C_DOCTYPE_ID" foreign="C_DOCTYPE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_DOCTYPE" name="CDOCTYPETARGET_CINVOICE" onDelete="none">
         <reference local="C_DOCTYPETARGET_ID" foreign="C_DOCTYPE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER2_CINVOICE" onDelete="none">
-        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
+      <foreign-key foreignTable="C_DOCTYPE" name="CDOCTYPE_CINVOICE" onDelete="none">
+        <reference local="C_DOCTYPE_ID" foreign="C_DOCTYPE_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_CINVOICE" onDelete="none">
         <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER2_CINVOICE" onDelete="none">
+        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_INVOICE" name="CINVOICE_REF" onDelete="none">
         <reference local="REF_INVOICE_ID" foreign="C_INVOICE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_INVOICELINE.xml b/db/ddlutils/model/C_INVOICELINE.xml
index d5e599d579..1ca54fd9ec 100644
--- a/db/ddlutils/model/C_INVOICELINE.xml
+++ b/db/ddlutils/model/C_INVOICELINE.xml
@@ -45,12 +45,12 @@
       <column name="USER1_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="USER2_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <foreign-key foreignTable="AD_ORG" name="ADORG_CINVOICELINE" onDelete="none">
-        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORGTRX_CINVOICELINE" onDelete="none">
         <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="ADORG_CINVOICELINE" onDelete="none">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="A_ASSET" name="AASSET_CINVOICELINE" onDelete="none">
         <reference local="A_ASSET_ID" foreign="A_ASSET_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_ORDER.xml b/db/ddlutils/model/C_ORDER.xml
index 50a01a5d17..ff25618299 100644
--- a/db/ddlutils/model/C_ORDER.xml
+++ b/db/ddlutils/model/C_ORDER.xml
@@ -75,11 +75,14 @@
       <column name="ISDROPSHIP" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="VOLUME" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="WEIGHT" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_CORDER" onDelete="none">
+        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORG_CORDER" onDelete="none">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_CORDER" onDelete="none">
-        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
+      <foreign-key foreignTable="AD_USER" name="ADUSER_SR_CORDER" onDelete="none">
+        <reference local="SALESREP_ID" foreign="AD_USER_ID"/>
       </foreign-key>
       <foreign-key foreignTable="AD_USER" name="ADUSERBILL_CORDER" onDelete="none">
         <reference local="BILL_USER_ID" foreign="AD_USER_ID"/>
@@ -87,21 +90,18 @@
       <foreign-key foreignTable="AD_USER" name="ADUSER_CORDER" onDelete="none">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_USER" name="ADUSER_SR_CORDER" onDelete="none">
-        <reference local="SALESREP_ID" foreign="AD_USER_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ACTIVITY" name="CACTIVITY_CORDER" onDelete="none">
         <reference local="C_ACTIVITY_ID" foreign="C_ACTIVITY_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_BPARTNER" name="CBPARTNERBILL_CORDER" onDelete="none">
-        <reference local="BILL_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_BPARTNER" name="CBPARTNERPAY_CORDER" onDelete="none">
         <reference local="PAY_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_BPARTNER" name="CBPARTNER_CORDER" onDelete="none">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_BPARTNER" name="CBPARTNERBILL_CORDER" onDelete="none">
+        <reference local="BILL_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_BPARTNER_LOCATION" name="CBPLOCATIONPAY_CORDER" onDelete="none">
         <reference local="PAY_LOCATION_ID" foreign="C_BPARTNER_LOCATION_ID"/>
       </foreign-key>
@@ -126,18 +126,18 @@
       <foreign-key foreignTable="C_CURRENCY" name="CCURRENCY_CORDER" onDelete="none">
         <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_DOCTYPE" name="C_DOCTYPE_CORDER" onDelete="none">
-        <reference local="C_DOCTYPE_ID" foreign="C_DOCTYPE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_DOCTYPE" name="CDOCTYPETARGET_CORDER" onDelete="none">
         <reference local="C_DOCTYPETARGET_ID" foreign="C_DOCTYPE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_CORDER" onDelete="none">
-        <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
+      <foreign-key foreignTable="C_DOCTYPE" name="C_DOCTYPE_CORDER" onDelete="none">
+        <reference local="C_DOCTYPE_ID" foreign="C_DOCTYPE_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENRVALUEUSER2_CORDER" onDelete="none">
         <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_CORDER" onDelete="none">
+        <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ORDER" name="CORDER_REF" onDelete="none">
         <reference local="REF_ORDER_ID" foreign="C_ORDER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_ORDERLINE.xml b/db/ddlutils/model/C_ORDERLINE.xml
index c2a60f31fb..6888fb219f 100644
--- a/db/ddlutils/model/C_ORDERLINE.xml
+++ b/db/ddlutils/model/C_ORDERLINE.xml
@@ -79,12 +79,12 @@
       <foreign-key foreignTable="C_CURRENCY" name="CCURRENCY_CORDERLINE" onDelete="none">
         <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENRVALUEUSER1_CORDERLINE" onDelete="none">
-        <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENRVALUEUSER2_CORDERLINE" onDelete="none">
         <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENRVALUEUSER1_CORDERLINE" onDelete="none">
+        <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ORDER" name="CORDER_CORDERLINE" onDelete="cascade">
         <reference local="C_ORDER_ID" foreign="C_ORDER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_PAYMENT.xml b/db/ddlutils/model/C_PAYMENT.xml
index 869ceae498..cf14b06bb6 100644
--- a/db/ddlutils/model/C_PAYMENT.xml
+++ b/db/ddlutils/model/C_PAYMENT.xml
@@ -86,12 +86,12 @@
       <column name="C_ORDER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISPREPAYMENT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="REF_PAYMENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_CPAYMENT" onDelete="none">
-        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORG_CPAYMENT" onDelete="none">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_CPAYMENT" onDelete="none">
+        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ACTIVITY" name="CACTIVITY_CPAYMENT" onDelete="none">
         <reference local="C_ACTIVITY_ID" foreign="C_ACTIVITY_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_PROJECT.xml b/db/ddlutils/model/C_PROJECT.xml
index 1bb3b005cf..4b49e1bff0 100644
--- a/db/ddlutils/model/C_PROJECT.xml
+++ b/db/ddlutils/model/C_PROJECT.xml
@@ -53,12 +53,12 @@
       <foreign-key foreignTable="AD_ORG" name="ADORG_CPROJECT" onDelete="none">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_USER" name="ADUSER_CPROJECT" onDelete="setnull">
-        <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_USER" name="ADUSER_SR_CPROJECT" onDelete="none">
         <reference local="SALESREP_ID" foreign="AD_USER_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_USER" name="ADUSER_CPROJECT" onDelete="setnull">
+        <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_BPARTNER" name="CBPARTNER_CPROJECT" onDelete="none">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_PROJECTLINE.xml b/db/ddlutils/model/C_PROJECTLINE.xml
index bb8e636791..7344403221 100644
--- a/db/ddlutils/model/C_PROJECTLINE.xml
+++ b/db/ddlutils/model/C_PROJECTLINE.xml
@@ -31,12 +31,12 @@
       <column name="DOPRICING" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="C_PROJECTPHASE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_PROJECTTASK_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <foreign-key foreignTable="C_ORDER" name="CORDER_CPROJECTLINE" onDelete="none">
-        <reference local="C_ORDER_ID" foreign="C_ORDER_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ORDER" name="CORDERPO_CPROJECTLINE" onDelete="none">
         <reference local="C_ORDERPO_ID" foreign="C_ORDER_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ORDER" name="CORDER_CPROJECTLINE" onDelete="none">
+        <reference local="C_ORDER_ID" foreign="C_ORDER_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_PROJECT" name="CPROJECT_CPROJECTLINE" onDelete="cascade">
         <reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_PROJECT_ACCT.xml b/db/ddlutils/model/C_PROJECT_ACCT.xml
index 2505873559..aace20e92a 100644
--- a/db/ddlutils/model/C_PROJECT_ACCT.xml
+++ b/db/ddlutils/model/C_PROJECT_ACCT.xml
@@ -19,12 +19,12 @@
       <foreign-key foreignTable="C_PROJECT" name="C_PROJECT_PROJECTACCT" onDelete="cascade">
         <reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PJASSET_CPROJECT" onDelete="none">
-        <reference local="PJ_ASSET_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PJWIP_CPROJECT" onDelete="none">
         <reference local="PJ_WIP_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PJASSET_CPROJECT" onDelete="none">
+        <reference local="PJ_ASSET_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/C_RFQ.xml b/db/ddlutils/model/C_RFQ.xml
index 1fb46a47b4..d3688ae130 100644
--- a/db/ddlutils/model/C_RFQ.xml
+++ b/db/ddlutils/model/C_RFQ.xml
@@ -39,12 +39,12 @@
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="DOCUMENTNO" primaryKey="false" required="true" type="VARCHAR" size="30" default="." autoIncrement="false"/>
-      <foreign-key foreignTable="AD_USER" name="ADUSERSALESREP_CRFQ" onDelete="none">
-        <reference local="SALESREP_ID" foreign="AD_USER_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_USER" name="ADUSER_CRFQ" onDelete="none">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_USER" name="ADUSERSALESREP_CRFQ" onDelete="none">
+        <reference local="SALESREP_ID" foreign="AD_USER_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_BPARTNER" name="CBPARTNER_CRFQ" onDelete="none">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_TAX.xml b/db/ddlutils/model/C_TAX.xml
index 2990a7feba..4bd5238f4a 100644
--- a/db/ddlutils/model/C_TAX.xml
+++ b/db/ddlutils/model/C_TAX.xml
@@ -28,18 +28,18 @@
       <column name="ISTAXEXEMPT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="SOPOTYPE" primaryKey="false" required="true" type="CHAR" size="1" default="B" autoIncrement="false"/>
       <column name="ISSALESTAX" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <foreign-key foreignTable="C_COUNTRY" name="C_COUNTRY_C_TAX" onDelete="none">
-        <reference local="C_COUNTRY_ID" foreign="C_COUNTRY_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_COUNTRY" name="C_COUNTRYTO_C_TAX" onDelete="none">
         <reference local="TO_COUNTRY_ID" foreign="C_COUNTRY_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_REGION" name="C_REGIONTO_C_TAX" onDelete="none">
-        <reference local="TO_REGION_ID" foreign="C_REGION_ID"/>
+      <foreign-key foreignTable="C_COUNTRY" name="C_COUNTRY_C_TAX" onDelete="none">
+        <reference local="C_COUNTRY_ID" foreign="C_COUNTRY_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_REGION" name="C_REGION_C_TAX" onDelete="none">
         <reference local="C_REGION_ID" foreign="C_REGION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_REGION" name="C_REGIONTO_C_TAX" onDelete="none">
+        <reference local="TO_REGION_ID" foreign="C_REGION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_TAX" name="CTAX_PARENT" onDelete="none">
         <reference local="PARENT_TAX_ID" foreign="C_TAX_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_VALIDCOMBINATION.xml b/db/ddlutils/model/C_VALIDCOMBINATION.xml
index 22a722af27..1c8b9cccf9 100644
--- a/db/ddlutils/model/C_VALIDCOMBINATION.xml
+++ b/db/ddlutils/model/C_VALIDCOMBINATION.xml
@@ -51,21 +51,21 @@
       <foreign-key foreignTable="C_CAMPAIGN" name="SOCAMPAIGN_VC" onDelete="none">
         <reference local="C_CAMPAIGN_ID" foreign="C_CAMPAIGN_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER2_VC" onDelete="none">
-        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEACCOUNT_VC" onDelete="cascade">
         <reference local="ACCOUNT_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_VC" onDelete="none">
         <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_LOCATION" name="MLOCATIONTO_VC" onDelete="none">
-        <reference local="C_LOCTO_ID" foreign="C_LOCATION_ID"/>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER2_VC" onDelete="none">
+        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_LOCATION" name="MLOCATIONFROM_VC" onDelete="none">
         <reference local="C_LOCFROM_ID" foreign="C_LOCATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_LOCATION" name="MLOCATIONTO_VC" onDelete="none">
+        <reference local="C_LOCTO_ID" foreign="C_LOCATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_PROJECT" name="CPROJECT_VC" onDelete="none">
         <reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
       </foreign-key>
@@ -75,6 +75,10 @@
       <foreign-key foreignTable="M_PRODUCT" name="MPRODUCT_VC" onDelete="none">
         <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
       </foreign-key>
+      <index name="C_VALIDCOMBINATION_ALIAS">
+        <index-column name="AD_CLIENT_ID"/>
+        <index-column name="ALIAS"/>
+      </index>
       <unique name="C_VALIDCOMBINATION_ALT">
         <unique-column name="C_ACCTSCHEMA_ID"/>
         <unique-column name="AD_ORG_ID"/>
@@ -94,10 +98,6 @@
         <unique-column name="USERELEMENT1_ID"/>
         <unique-column name="USERELEMENT2_ID"/>
       </unique>
-      <index name="C_VALIDCOMBINATION_ALIAS">
-        <index-column name="AD_CLIENT_ID"/>
-        <index-column name="ALIAS"/>
-      </index>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/FACT_ACCT.xml b/db/ddlutils/model/FACT_ACCT.xml
index 43ecdb6fd7..f58e771ab1 100644
--- a/db/ddlutils/model/FACT_ACCT.xml
+++ b/db/ddlutils/model/FACT_ACCT.xml
@@ -51,12 +51,12 @@
       <foreign-key foreignTable="AD_CLIENT" name="AC_CLIENT_FACT_ACCT" onDelete="none">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_ORG" name="AD_ORGTRX_FACT_ACCT" onDelete="none">
-        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="AD_ORG_FACT_ACCT" onDelete="none">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="AD_ORGTRX_FACT_ACCT" onDelete="none">
+        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_TABLE" name="ADTABLE_FACTACCT" onDelete="none">
         <reference local="AD_TABLE_ID" foreign="AD_TABLE_ID"/>
       </foreign-key>
@@ -81,12 +81,12 @@
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUE_FACTACCT" onDelete="none">
         <reference local="ACCOUNT_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER2_FACTACCT" onDelete="none">
-        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_FACTACCT" onDelete="none">
         <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER2_FACTACCT" onDelete="none">
+        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_LOCATION" name="C_LOCATIONFROM_FACT_ACCT" onDelete="none">
         <reference local="C_LOCFROM_ID" foreign="C_LOCATION_ID"/>
       </foreign-key>
@@ -126,15 +126,15 @@
       <foreign-key foreignTable="M_PRODUCT" name="M_PRODUCT_FACT_ACCT" onDelete="none">
         <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
       </foreign-key>
-      <index name="FACT_ACCT_DATEACCT">
-        <index-column name="DATEACCT"/>
-      </index>
       <index name="FACT_ACCT_ACCOUNT">
         <index-column name="AD_CLIENT_ID"/>
         <index-column name="AD_ORG_ID"/>
         <index-column name="C_ACCTSCHEMA_ID"/>
         <index-column name="ACCOUNT_ID"/>
       </index>
+      <index name="FACT_ACCT_DATEACCT">
+        <index-column name="DATEACCT"/>
+      </index>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/FACT_ACCT_BALANCE.xml b/db/ddlutils/model/FACT_ACCT_BALANCE.xml
index 8afc2a03e0..710b9dda60 100644
--- a/db/ddlutils/model/FACT_ACCT_BALANCE.xml
+++ b/db/ddlutils/model/FACT_ACCT_BALANCE.xml
@@ -54,15 +54,15 @@
       <foreign-key foreignTable="C_CAMPAIGN" name="CCAMPAIGN_FACTACCTBAL" onDelete="none">
         <reference local="C_CAMPAIGN_ID" foreign="C_CAMPAIGN_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEU2_FACTACCTBAL" onDelete="none">
+        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEU1_FACTACCTBAL" onDelete="none">
         <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEACCT_FACTACCTBAL" onDelete="none">
         <reference local="ACCOUNT_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEU2_FACTACCTBAL" onDelete="none">
-        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_LOCATION" name="CLOCTO_FACTACCTBAL" onDelete="none">
         <reference local="C_LOCTO_ID" foreign="C_LOCATION_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/GL_DISTRIBUTIONLINE.xml b/db/ddlutils/model/GL_DISTRIBUTIONLINE.xml
index e4048e7ae0..f9ce48915c 100644
--- a/db/ddlutils/model/GL_DISTRIBUTIONLINE.xml
+++ b/db/ddlutils/model/GL_DISTRIBUTIONLINE.xml
@@ -58,21 +58,21 @@
       <foreign-key foreignTable="C_CAMPAIGN" name="CCAMPAIGN_GLDISTLINE" onDelete="none">
         <reference local="C_CAMPAIGN_ID" foreign="C_CAMPAIGN_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CEVALUEUSER1_GLDISTLINE" onDelete="none">
-        <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CEVALUEUSER2_GLDISTLINE" onDelete="none">
         <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CEVALUEUSER1_GLDISTLINE" onDelete="none">
+        <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CEVALUEACCT_GLDISTLINE" onDelete="none">
         <reference local="ACCOUNT_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_LOCATION" name="CLOCTO_GLDISTLINE" onDelete="none">
-        <reference local="C_LOCTO_ID" foreign="C_LOCATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_LOCATION" name="CLOCFROM_GLDISTLINE" onDelete="none">
         <reference local="C_LOCFROM_ID" foreign="C_LOCATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_LOCATION" name="CLOCTO_GLDISTLINE" onDelete="none">
+        <reference local="C_LOCTO_ID" foreign="C_LOCATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_PROJECT" name="CPROJECT_GLDISTLINE" onDelete="none">
         <reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/I_ELEMENTVALUE.xml b/db/ddlutils/model/I_ELEMENTVALUE.xml
index 356b3d8a06..ec0c5225ba 100644
--- a/db/ddlutils/model/I_ELEMENTVALUE.xml
+++ b/db/ddlutils/model/I_ELEMENTVALUE.xml
@@ -38,12 +38,12 @@
       <foreign-key foreignTable="C_ELEMENT" name="CELEMENT_IELEMENTVALUE" onDelete="setnull">
         <reference local="C_ELEMENT_ID" foreign="C_ELEMENT_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUE_IELEMENTVALUE" onDelete="setnull">
-        <reference local="C_ELEMENTVALUE_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CEVALUEPARENT_IELEMENTVALUE" onDelete="setnull">
         <reference local="PARENTELEMENTVALUE_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUE_IELEMENTVALUE" onDelete="setnull">
+        <reference local="C_ELEMENTVALUE_ID" foreign="C_ELEMENTVALUE_ID"/>
+      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/I_GLJOURNAL.xml b/db/ddlutils/model/I_GLJOURNAL.xml
index a83c6b82d3..00e772bbb7 100644
--- a/db/ddlutils/model/I_GLJOURNAL.xml
+++ b/db/ddlutils/model/I_GLJOURNAL.xml
@@ -68,14 +68,14 @@
       <column name="USER2_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISCREATENEWBATCH" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="ISCREATENEWJOURNAL" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <foreign-key foreignTable="AD_ORG" name="ADORGDOC_IGLJOURNAL" onDelete="setnull">
-        <reference local="AD_ORGDOC_ID" foreign="AD_ORG_ID"/>
+      <foreign-key foreignTable="AD_ORG" name="ADORG_IGLJOURNAL" onDelete="setnull">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORGTRX_IGLJOURNAL" onDelete="setnull">
         <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_ORG" name="ADORG_IGLJOURNAL" onDelete="setnull">
-        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      <foreign-key foreignTable="AD_ORG" name="ADORGDOC_IGLJOURNAL" onDelete="setnull">
+        <reference local="AD_ORGDOC_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_IGLJOURNAL" onDelete="setnull">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
@@ -98,21 +98,21 @@
       <foreign-key foreignTable="C_DOCTYPE" name="CDOCTYPE_IGLJOURNAL" onDelete="setnull">
         <reference local="C_DOCTYPE_ID" foreign="C_DOCTYPE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELVALUEUSER2_IGLJOURNAL" onDelete="setnull">
-        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CEVALUEUSER1_IGLJOURNAL" onDelete="setnull">
         <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELVALUEUSER2_IGLJOURNAL" onDelete="setnull">
+        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELVALUEACCOUNT_IGLJOURNAL" onDelete="setnull">
         <reference local="ACCOUNT_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_LOCATION" name="CLOCFROM_IGLJOURNAL" onDelete="setnull">
-        <reference local="C_LOCFROM_ID" foreign="C_LOCATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_LOCATION" name="CLOCTO_IGLJOURNAL" onDelete="setnull">
         <reference local="C_LOCTO_ID" foreign="C_LOCATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_LOCATION" name="CLOCFROM_IGLJOURNAL" onDelete="setnull">
+        <reference local="C_LOCFROM_ID" foreign="C_LOCATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_PERIOD" name="CPERIOD_IGLJOURNAL" onDelete="setnull">
         <reference local="C_PERIOD_ID" foreign="C_PERIOD_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/I_INVOICE.xml b/db/ddlutils/model/I_INVOICE.xml
index 36468b981a..e443cf0c0f 100644
--- a/db/ddlutils/model/I_INVOICE.xml
+++ b/db/ddlutils/model/I_INVOICE.xml
@@ -59,18 +59,18 @@
       <column name="LINEDESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="QTYORDERED" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="PRICEACTUAL" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
-      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_IINVOICE" onDelete="setnull">
-        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORG_IINVOICE" onDelete="setnull">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_USER" name="ADUSERSALESREP_IINVOICE" onDelete="setnull">
-        <reference local="SALESREP_ID" foreign="AD_USER_ID"/>
+      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_IINVOICE" onDelete="setnull">
+        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
       <foreign-key foreignTable="AD_USER" name="ADUSER_IINVOICE" onDelete="setnull">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_USER" name="ADUSERSALESREP_IINVOICE" onDelete="setnull">
+        <reference local="SALESREP_ID" foreign="AD_USER_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ACTIVITY" name="CACTIVITY_IINVOICE" onDelete="setnull">
         <reference local="C_ACTIVITY_ID" foreign="C_ACTIVITY_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/I_ORDER.xml b/db/ddlutils/model/I_ORDER.xml
index 538b321b21..1a62a3b8e7 100644
--- a/db/ddlutils/model/I_ORDER.xml
+++ b/db/ddlutils/model/I_ORDER.xml
@@ -70,12 +70,12 @@
       <foreign-key foreignTable="AD_ORG" name="ADORG_IORDER" onDelete="setnull">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_USER" name="ADUSERSALESREP_IORDER" onDelete="setnull">
-        <reference local="SALESREP_ID" foreign="AD_USER_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_USER" name="ADUSER_IORDER" onDelete="setnull">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_USER" name="ADUSERSALESREP_IORDER" onDelete="setnull">
+        <reference local="SALESREP_ID" foreign="AD_USER_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ACTIVITY" name="CACTIVITY_IORDER" onDelete="setnull">
         <reference local="C_ACTIVITY_ID" foreign="C_ACTIVITY_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_BOMPRODUCT.xml b/db/ddlutils/model/M_BOMPRODUCT.xml
index 0a13b68e86..d038010c2f 100644
--- a/db/ddlutils/model/M_BOMPRODUCT.xml
+++ b/db/ddlutils/model/M_BOMPRODUCT.xml
@@ -43,10 +43,10 @@
         <reference local="M_PRODUCTOPERATION_ID" foreign="M_PRODUCTOPERATION_ID"/>
       </foreign-key>
       <check>
-        <rule><![CDATA[IsActive in ('Y','N')]]></rule>
+        <rule><![CDATA[IsPhantom in ('Y','N')]]></rule>
       </check>
       <check>
-        <rule><![CDATA[IsPhantom in ('Y','N')]]></rule>
+        <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
     </table>
   </database>
diff --git a/db/ddlutils/model/M_FREIGHT.xml b/db/ddlutils/model/M_FREIGHT.xml
index 57a71861ed..eb28ea111c 100644
--- a/db/ddlutils/model/M_FREIGHT.xml
+++ b/db/ddlutils/model/M_FREIGHT.xml
@@ -19,12 +19,12 @@
       <column name="TO_REGION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="FREIGHTAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
-      <foreign-key foreignTable="C_COUNTRY" name="CCOUNTRY_MFREIGHT" onDelete="none">
-        <reference local="C_COUNTRY_ID" foreign="C_COUNTRY_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_COUNTRY" name="CCOUNTRYTO_MFREIGHT" onDelete="none">
         <reference local="TO_COUNTRY_ID" foreign="C_COUNTRY_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_COUNTRY" name="CCOUNTRY_MFREIGHT" onDelete="none">
+        <reference local="C_COUNTRY_ID" foreign="C_COUNTRY_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_CURRENCY" name="CCURRENCY_MFREIGHT" onDelete="none">
         <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_INOUT.xml b/db/ddlutils/model/M_INOUT.xml
index 2822c710ba..a9fbbf80fa 100644
--- a/db/ddlutils/model/M_INOUT.xml
+++ b/db/ddlutils/model/M_INOUT.xml
@@ -69,12 +69,12 @@
       <foreign-key foreignTable="AD_ORG" name="ADORGTRX_MINOUT" onDelete="none">
         <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_USER" name="ADUSER_MINOUT" onDelete="none">
-        <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_USER" name="ADUSER_SR_MINOUT" onDelete="none">
         <reference local="SALESREP_ID" foreign="AD_USER_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_USER" name="ADUSER_MINOUT" onDelete="none">
+        <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ACTIVITY" name="CACTIVITY_MINOUT" onDelete="none">
         <reference local="C_ACTIVITY_ID" foreign="C_ACTIVITY_ID"/>
       </foreign-key>
@@ -93,12 +93,12 @@
       <foreign-key foreignTable="C_DOCTYPE" name="CDOCTYPE_MINOUT" onDelete="none">
         <reference local="C_DOCTYPE_ID" foreign="C_DOCTYPE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_MINOUT" onDelete="none">
-        <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER2_MINOUT" onDelete="none">
         <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_MINOUT" onDelete="none">
+        <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ORDER" name="CORDER_MINOUT" onDelete="none">
         <reference local="C_ORDER_ID" foreign="C_ORDER_ID"/>
       </foreign-key>
@@ -114,15 +114,15 @@
       <foreign-key foreignTable="M_WAREHOUSE" name="MWAREHOUSE_MINOUT" onDelete="none">
         <reference local="M_WAREHOUSE_ID" foreign="M_WAREHOUSE_ID"/>
       </foreign-key>
+      <index name="M_INOUT_DOCUMENTNO">
+        <index-column name="DOCUMENTNO"/>
+      </index>
       <index name="M_INOUT_ORDER">
         <index-column name="C_ORDER_ID"/>
       </index>
       <index name="M_INOUT_BPARTNER">
         <index-column name="C_BPARTNER_ID"/>
       </index>
-      <index name="M_INOUT_DOCUMENTNO">
-        <index-column name="DOCUMENTNO"/>
-      </index>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/M_MOVEMENT.xml b/db/ddlutils/model/M_MOVEMENT.xml
index 2a05f56cf2..3f0c1480fa 100644
--- a/db/ddlutils/model/M_MOVEMENT.xml
+++ b/db/ddlutils/model/M_MOVEMENT.xml
@@ -41,12 +41,12 @@
       <foreign-key foreignTable="C_CAMPAIGN" name="CCAMPAIGN_MMOVEMENT" onDelete="none">
         <reference local="C_CAMPAIGN_ID" foreign="C_CAMPAIGN_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER2_MMOVE" onDelete="none">
-        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_MMOVE" onDelete="none">
         <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER2_MMOVE" onDelete="none">
+        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_PROJECT" name="CPROJECT_MMOVEMENT" onDelete="none">
         <reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_MOVEMENTLINE.xml b/db/ddlutils/model/M_MOVEMENTLINE.xml
index bcfbeb4bf5..6cf9608634 100644
--- a/db/ddlutils/model/M_MOVEMENTLINE.xml
+++ b/db/ddlutils/model/M_MOVEMENTLINE.xml
@@ -26,12 +26,12 @@
       <foreign-key foreignTable="M_ATTRIBUTESETINSTANCE" name="MATTRSETINST_MMOVEMENTLINE" onDelete="none">
         <reference local="M_ATTRIBUTESETINSTANCE_ID" foreign="M_ATTRIBUTESETINSTANCE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="M_LOCATOR" name="MLOCATORTO_MMOVEMENTLINE" onDelete="none">
-        <reference local="M_LOCATOR_ID" foreign="M_LOCATOR_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="M_LOCATOR" name="MLOCATOR_MOVEMENTLINE" onDelete="none">
         <reference local="M_LOCATORTO_ID" foreign="M_LOCATOR_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="M_LOCATOR" name="MLOCATORTO_MMOVEMENTLINE" onDelete="none">
+        <reference local="M_LOCATOR_ID" foreign="M_LOCATOR_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="M_MOVEMENT" name="MMOVEMENT_MMOVEMENTLINE" onDelete="cascade">
         <reference local="M_MOVEMENT_ID" foreign="M_MOVEMENT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_PRODUCT.xml b/db/ddlutils/model/M_PRODUCT.xml
index 82880d592a..a446b8a4ed 100644
--- a/db/ddlutils/model/M_PRODUCT.xml
+++ b/db/ddlutils/model/M_PRODUCT.xml
@@ -101,12 +101,6 @@
       <foreign-key foreignTable="S_RESOURCE" name="SRESOURCE_MPRODUCT" onDelete="none">
         <reference local="S_RESOURCE_ID" foreign="S_RESOURCE_ID"/>
       </foreign-key>
-      <unique name="M_PRODUCT_EXPENSETYPE">
-        <unique-column name="S_EXPENSETYPE_ID"/>
-      </unique>
-      <index name="M_PRODUCT_UPC">
-        <index-column name="UPC"/>
-      </index>
       <unique name="M_PRODUCT_VALUE">
         <unique-column name="AD_CLIENT_ID"/>
         <unique-column name="VALUE"/>
@@ -120,6 +114,12 @@
       <unique name="M_PRODUCT_RESOURCE">
         <unique-column name="S_RESOURCE_ID"/>
       </unique>
+      <unique name="M_PRODUCT_EXPENSETYPE">
+        <unique-column name="S_EXPENSETYPE_ID"/>
+      </unique>
+      <index name="M_PRODUCT_UPC">
+        <index-column name="UPC"/>
+      </index>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/M_PRODUCTION.xml b/db/ddlutils/model/M_PRODUCTION.xml
index 7310a80091..98b7a4eabc 100644
--- a/db/ddlutils/model/M_PRODUCTION.xml
+++ b/db/ddlutils/model/M_PRODUCTION.xml
@@ -35,12 +35,12 @@
       <foreign-key foreignTable="C_CAMPAIGN" name="CCAMPAIGN_MPRODUCTION" onDelete="none">
         <reference local="C_CAMPAIGN_ID" foreign="C_CAMPAIGN_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER2_MPROD" onDelete="none">
-        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_MPROD" onDelete="none">
         <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER2_MPROD" onDelete="none">
+        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_PROJECT" name="CPROJECT_MPRODUCTION" onDelete="none">
         <reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_PRODUCT_ACCT.xml b/db/ddlutils/model/M_PRODUCT_ACCT.xml
index 54f3760614..e33f717ad6 100644
--- a/db/ddlutils/model/M_PRODUCT_ACCT.xml
+++ b/db/ddlutils/model/M_PRODUCT_ACCT.xml
@@ -24,15 +24,18 @@
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_MPRODUCTACCT" onDelete="cascade">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PCOGS_MPRODUCT" onDelete="none">
-        <reference local="P_COGS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PEXPENSE_MPRODUCT" onDelete="none">
         <reference local="P_EXPENSE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PASSET_MPRODUCT" onDelete="none">
         <reference local="P_ASSET_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PCOGS_MPRODUCT" onDelete="none">
+        <reference local="P_COGS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PTDISCOUNTREC_MPRODUCT" onDelete="none">
+        <reference local="P_TRADEDISCOUNTREC_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PINVOICEPV_MPRODUCT" onDelete="none">
         <reference local="P_INVOICEPRICEVARIANCE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
@@ -45,9 +48,6 @@
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PTDISCOUNTGRANT_MPRODUCT" onDelete="none">
         <reference local="P_TRADEDISCOUNTGRANT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PTDISCOUNTREC_MPRODUCT" onDelete="none">
-        <reference local="P_TRADEDISCOUNTREC_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="M_PRODUCT" name="M_PRODUCT_M_PRODUCT_ACCT" onDelete="cascade">
         <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_SUBSTITUTE.xml b/db/ddlutils/model/M_SUBSTITUTE.xml
index 7f4a07a741..e25e599a61 100644
--- a/db/ddlutils/model/M_SUBSTITUTE.xml
+++ b/db/ddlutils/model/M_SUBSTITUTE.xml
@@ -19,12 +19,12 @@
       <foreign-key foreignTable="AD_ORG" name="M_SUBSTITUTE_ORG" onDelete="none">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="M_PRODUCT" name="MPRODUCT_SUBSTITUTESUB" onDelete="cascade">
-        <reference local="SUBSTITUTE_ID" foreign="M_PRODUCT_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="M_PRODUCT" name="MPRODUCT_SUBSTITUTE" onDelete="cascade">
         <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="M_PRODUCT" name="MPRODUCT_SUBSTITUTESUB" onDelete="cascade">
+        <reference local="SUBSTITUTE_ID" foreign="M_PRODUCT_ID"/>
+      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/M_TRANSACTIONALLOCATION.xml b/db/ddlutils/model/M_TRANSACTIONALLOCATION.xml
index 3bdac93bcd..9ac8435667 100644
--- a/db/ddlutils/model/M_TRANSACTIONALLOCATION.xml
+++ b/db/ddlutils/model/M_TRANSACTIONALLOCATION.xml
@@ -26,18 +26,18 @@
       <foreign-key foreignTable="M_ATTRIBUTESETINSTANCE" name="MATTRIBUTESETINST_MTRXALLOC" onDelete="none">
         <reference local="M_ATTRIBUTESETINSTANCE_ID" foreign="M_ATTRIBUTESETINSTANCE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="M_INOUTLINE" name="MINOUTLINE_MTRXALLOC" onDelete="none">
-        <reference local="M_INOUTLINE_ID" foreign="M_INOUTLINE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="M_INOUTLINE" name="MINOUTLINEOUT_MTRXALLOC" onDelete="none">
         <reference local="OUT_M_INOUTLINE_ID" foreign="M_INOUTLINE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="M_INVENTORYLINE" name="MINVENTORYLINE_MTRXALLOC" onDelete="none">
-        <reference local="M_INVENTORYLINE_ID" foreign="M_INVENTORYLINE_ID"/>
+      <foreign-key foreignTable="M_INOUTLINE" name="MINOUTLINE_MTRXALLOC" onDelete="none">
+        <reference local="M_INOUTLINE_ID" foreign="M_INOUTLINE_ID"/>
       </foreign-key>
       <foreign-key foreignTable="M_INVENTORYLINE" name="MINVENTORYLINEOUT_MTRXALLOC" onDelete="none">
         <reference local="OUT_M_INVENTORYLINE_ID" foreign="M_INVENTORYLINE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="M_INVENTORYLINE" name="MINVENTORYLINE_MTRXALLOC" onDelete="none">
+        <reference local="M_INVENTORYLINE_ID" foreign="M_INVENTORYLINE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="M_PRODUCT" name="MPRODUCT_MTRXALLOC" onDelete="none">
         <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
       </foreign-key>
@@ -47,12 +47,12 @@
       <foreign-key foreignTable="M_PRODUCTIONLINE" name="MPRODUCTIONLINE_MTRXALLOC" onDelete="none">
         <reference local="M_PRODUCTIONLINE_ID" foreign="M_PRODUCTIONLINE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="M_TRANSACTION" name="MTTRANSACTION_MTRXALLOC" onDelete="cascade">
-        <reference local="M_TRANSACTION_ID" foreign="M_TRANSACTION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="M_TRANSACTION" name="MTRANSACTIONOUT_MTRXALLOC" onDelete="none">
         <reference local="OUT_M_TRANSACTION_ID" foreign="M_TRANSACTION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="M_TRANSACTION" name="MTTRANSACTION_MTRXALLOC" onDelete="cascade">
+        <reference local="M_TRANSACTION_ID" foreign="M_TRANSACTION_ID"/>
+      </foreign-key>
       <index name="M_TRANSACTIONALLOCATION_PRD">
         <index-column name="M_PRODUCT_ID"/>
         <index-column name="M_ATTRIBUTESETINSTANCE_ID"/>
diff --git a/db/ddlutils/model/PA_RATIOELEMENT.xml b/db/ddlutils/model/PA_RATIOELEMENT.xml
index 455b602f61..a4c9b7b973 100644
--- a/db/ddlutils/model/PA_RATIOELEMENT.xml
+++ b/db/ddlutils/model/PA_RATIOELEMENT.xml
@@ -27,12 +27,12 @@
       <foreign-key foreignTable="PA_MEASURECALC" name="PAMEASURECALC_PARATIOELEMENT" onDelete="none">
         <reference local="PA_MEASURECALC_ID" foreign="PA_MEASURECALC_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="PA_RATIO" name="PARATIO_PARATIOELEMENT" onDelete="none">
-        <reference local="PA_RATIO_ID" foreign="PA_RATIO_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="PA_RATIO" name="PARATIOUSED_PARATIOELEMENT" onDelete="none">
         <reference local="PA_RATIOUSED_ID" foreign="PA_RATIO_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="PA_RATIO" name="PARATIO_PARATIOELEMENT" onDelete="none">
+        <reference local="PA_RATIO_ID" foreign="PA_RATIO_ID"/>
+      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/PA_REPORTLINE.xml b/db/ddlutils/model/PA_REPORTLINE.xml
index 41efd8af5b..08a28c2d06 100644
--- a/db/ddlutils/model/PA_REPORTLINE.xml
+++ b/db/ddlutils/model/PA_REPORTLINE.xml
@@ -27,12 +27,12 @@
       <foreign-key foreignTable="GL_BUDGET" name="GLBUDGET_PAREPORTLINE" onDelete="none">
         <reference local="GL_BUDGET_ID" foreign="GL_BUDGET_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="PA_REPORTLINE" name="PAREPORTLINE_OPER2" onDelete="setnull">
-        <reference local="OPER_2_ID" foreign="PA_REPORTLINE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="PA_REPORTLINE" name="PAREPORTLINE_OPER1" onDelete="setnull">
         <reference local="OPER_1_ID" foreign="PA_REPORTLINE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="PA_REPORTLINE" name="PAREPORTLINE_OPER2" onDelete="setnull">
+        <reference local="OPER_2_ID" foreign="PA_REPORTLINE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="PA_REPORTLINE" name="PAREPORTLINE_PARENT" onDelete="setnull">
         <reference local="PARENT_ID" foreign="PA_REPORTLINE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/R_REQUEST.xml b/db/ddlutils/model/R_REQUEST.xml
index 250df1462e..9dd48dda91 100644
--- a/db/ddlutils/model/R_REQUEST.xml
+++ b/db/ddlutils/model/R_REQUEST.xml
@@ -72,12 +72,12 @@
       <foreign-key foreignTable="AD_TABLE" name="ADTABLE_RREQUEST" onDelete="none">
         <reference local="AD_TABLE_ID" foreign="AD_TABLE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_USER" name="ADUSERSR_RREQUEST" onDelete="none">
-        <reference local="SALESREP_ID" foreign="AD_USER_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_USER" name="ADUSER_RREQUEST" onDelete="none">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_USER" name="ADUSERSR_RREQUEST" onDelete="none">
+        <reference local="SALESREP_ID" foreign="AD_USER_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="A_ASSET" name="AASSET_RREQUEST" onDelete="none">
         <reference local="A_ASSET_ID" foreign="A_ASSET_ID"/>
       </foreign-key>
@@ -90,12 +90,12 @@
       <foreign-key foreignTable="C_CAMPAIGN" name="CCAMPAIGN_RREQUEST" onDelete="none">
         <reference local="C_CAMPAIGN_ID" foreign="C_CAMPAIGN_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_INVOICE" name="RINVOICE_RREQUEST" onDelete="none">
-        <reference local="C_INVOICE_ID" foreign="C_INVOICE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_INVOICE" name="CINVOICEREQUEST_RREQUEST" onDelete="none">
         <reference local="C_INVOICEREQUEST_ID" foreign="C_INVOICE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_INVOICE" name="RINVOICE_RREQUEST" onDelete="none">
+        <reference local="C_INVOICE_ID" foreign="C_INVOICE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ORDER" name="CORDER_RREQUEST" onDelete="none">
         <reference local="C_ORDER_ID" foreign="C_ORDER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/S_RESOURCETYPE.xml b/db/ddlutils/model/S_RESOURCETYPE.xml
index 31b0a0740d..c316e363ee 100644
--- a/db/ddlutils/model/S_RESOURCETYPE.xml
+++ b/db/ddlutils/model/S_RESOURCETYPE.xml
@@ -39,6 +39,18 @@
       <foreign-key foreignTable="M_PRODUCT_CATEGORY" name="MPRODCATEGORY_SRESOURCETYPE" onDelete="none">
         <reference local="M_PRODUCT_CATEGORY_ID" foreign="M_PRODUCT_CATEGORY_ID"/>
       </foreign-key>
+      <check>
+        <rule><![CDATA[OnWednesday in ('Y','N')]]></rule>
+      </check>
+      <check>
+        <rule><![CDATA[OnThursday in ('Y','N')]]></rule>
+      </check>
+      <check>
+        <rule><![CDATA[OnFriday in ('Y','N')]]></rule>
+      </check>
+      <check>
+        <rule><![CDATA[OnSaturday in ('Y','N')]]></rule>
+      </check>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
@@ -63,17 +75,5 @@
       <check>
         <rule><![CDATA[OnTuesday in ('Y','N')]]></rule>
       </check>
-      <check>
-        <rule><![CDATA[OnWednesday in ('Y','N')]]></rule>
-      </check>
-      <check>
-        <rule><![CDATA[OnThursday in ('Y','N')]]></rule>
-      </check>
-      <check>
-        <rule><![CDATA[OnFriday in ('Y','N')]]></rule>
-      </check>
-      <check>
-        <rule><![CDATA[OnSaturday in ('Y','N')]]></rule>
-      </check>
     </table>
   </database>
diff --git a/db/ddlutils/model/W_STORE.xml b/db/ddlutils/model/W_STORE.xml
index f8562b1a35..0cf2f6f2b7 100644
--- a/db/ddlutils/model/W_STORE.xml
+++ b/db/ddlutils/model/W_STORE.xml
@@ -50,6 +50,15 @@
       <unique name="W_STORE_WEBCONTEXT">
         <unique-column name="WEBCONTEXT"/>
       </unique>
+      <check>
+        <rule><![CDATA[IsMenuInterests in ('Y','N')]]></rule>
+      </check>
+      <check>
+        <rule><![CDATA[IsMenuRegistrations in ('Y','N')]]></rule>
+      </check>
+      <check>
+        <rule><![CDATA[IsMenuContact in ('Y','N')]]></rule>
+      </check>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
@@ -74,14 +83,5 @@
       <check>
         <rule><![CDATA[IsMenuRequests in ('Y','N')]]></rule>
       </check>
-      <check>
-        <rule><![CDATA[IsMenuInterests in ('Y','N')]]></rule>
-      </check>
-      <check>
-        <rule><![CDATA[IsMenuRegistrations in ('Y','N')]]></rule>
-      </check>
-      <check>
-        <rule><![CDATA[IsMenuContact in ('Y','N')]]></rule>
-      </check>
     </table>
   </database>