diff --git a/db/ddlutils/model/AD_ATTRIBUTE.xml b/db/ddlutils/model/AD_ATTRIBUTE.xml
index 5e11b0a3a0..c7716b61d1 100644
--- a/db/ddlutils/model/AD_ATTRIBUTE.xml
+++ b/db/ddlutils/model/AD_ATTRIBUTE.xml
@@ -33,12 +33,12 @@
       <column name="ISHEADING" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISFIELDONLY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="SEQNO" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
-      <foreign-key foreignTable="AD_REFERENCE" name="ADREFERENCE_ADATTRIBUTE">
-        <reference local="AD_REFERENCE_ID" foreign="AD_REFERENCE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_REFERENCE" name="ADREFERENCEVALUE_ADATTRIBUTE">
         <reference local="AD_REFERENCE_VALUE_ID" foreign="AD_REFERENCE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_REFERENCE" name="ADREFERENCE_ADATTRIBUTE">
+        <reference local="AD_REFERENCE_ID" foreign="AD_REFERENCE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_TABLE" name="ADTABLE_ADATTRIBUTE">
         <reference local="AD_TABLE_ID" foreign="AD_TABLE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_CLIENT.xml b/db/ddlutils/model/AD_CLIENT.xml
index bdc2944ce1..721881c3de 100644
--- a/db/ddlutils/model/AD_CLIENT.xml
+++ b/db/ddlutils/model/AD_CLIENT.xml
@@ -30,6 +30,9 @@
       <column name="DOCUMENTDIR" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ISPOSTIMMEDIATE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISCOSTIMMEDIATE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
+      <column name="STOREATTACHMENTSONFILESYSTEM" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
+      <column name="WINDOWSATTACHMENTPATH" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
+      <column name="UNIXATTACHMENTPATH" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <unique name="AD_CLIENT_NAME">
         <unique-column name="NAME"/>
       </unique>
diff --git a/db/ddlutils/model/AD_CLIENTINFO.xml b/db/ddlutils/model/AD_CLIENTINFO.xml
index 8462489967..1e6e8e92a0 100644
--- a/db/ddlutils/model/AD_CLIENTINFO.xml
+++ b/db/ddlutils/model/AD_CLIENTINFO.xml
@@ -30,12 +30,6 @@
       <foreign-key foreignTable="AD_CLIENT" name="ADCLIENT_ADCLIENTINFO">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_TREE" name="ADTREEMENU_ADCLIENTINFO">
-        <reference local="AD_TREE_MENU_ID" foreign="AD_TREE_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="AD_TREE" name="ADTREESALESREG_ADCLIENTINFO">
-        <reference local="AD_TREE_SALESREGION_ID" foreign="AD_TREE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_TREE" name="ADTREEPROJECT_ADCLIENTINFO">
         <reference local="AD_TREE_PROJECT_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
@@ -45,6 +39,12 @@
       <foreign-key foreignTable="AD_TREE" name="ADTREEORG_ADCLIENTINFO">
         <reference local="AD_TREE_ORG_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_TREE" name="ADTREEMENU_ADCLIENTINFO">
+        <reference local="AD_TREE_MENU_ID" foreign="AD_TREE_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_TREE" name="ADTREESALESREG_ADCLIENTINFO">
+        <reference local="AD_TREE_SALESREGION_ID" foreign="AD_TREE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_TREE" name="ADTREEBPARTNER_ADCLIENTINFO">
         <reference local="AD_TREE_BPARTNER_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
@@ -54,9 +54,6 @@
       <foreign-key foreignTable="C_CALENDAR" name="CCALENDAR_ADCLIENTINFO">
         <reference local="C_CALENDAR_ID" foreign="C_CALENDAR_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_UOM" name="C_UOM_WEIGHT_AD_CLIENTINFO">
-        <reference local="C_UOM_WEIGHT_ID" foreign="C_UOM_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_UOM" name="C_UOM_VOLUME_AD_CLIENTINFO">
         <reference local="C_UOM_VOLUME_ID" foreign="C_UOM_ID"/>
       </foreign-key>
@@ -66,6 +63,9 @@
       <foreign-key foreignTable="C_UOM" name="C_UOM_LENGTH_AD_CLIENTINFO">
         <reference local="C_UOM_LENGTH_ID" foreign="C_UOM_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_UOM" name="C_UOM_WEIGHT_AD_CLIENTINFO">
+        <reference local="C_UOM_WEIGHT_ID" foreign="C_UOM_ID"/>
+      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/AD_COLUMN.xml b/db/ddlutils/model/AD_COLUMN.xml
index 857d45f247..49b62a7405 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">
         <reference local="AD_PROCESS_ID" foreign="AD_PROCESS_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_REFERENCE" name="AD_REFERENCE_COLUMNVALUE">
-        <reference local="AD_REFERENCE_VALUE_ID" foreign="AD_REFERENCE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_REFERENCE" name="AD_REFERENCE_COLUMNDATATYPE">
         <reference local="AD_REFERENCE_ID" foreign="AD_REFERENCE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_REFERENCE" name="AD_REFERENCE_COLUMNVALUE">
+        <reference local="AD_REFERENCE_VALUE_ID" foreign="AD_REFERENCE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_TABLE" name="AD_TABLE_COLUMN">
         <reference local="AD_TABLE_ID" foreign="AD_TABLE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_ORGINFO.xml b/db/ddlutils/model/AD_ORGINFO.xml
index c6b3ff1f12..81b4e9907a 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="ADORG_ADORGINFO">
-        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORGPARENT_ADORGINFO">
         <reference local="PARENT_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="ADORG_ADORGINFO">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_ORGTYPE" name="ADORGTYPE_ADORGINFO">
         <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 7ca61ad9e8..fd9d97540a 100644
--- a/db/ddlutils/model/AD_PRINTFORM.xml
+++ b/db/ddlutils/model/AD_PRINTFORM.xml
@@ -25,12 +25,6 @@
       <foreign-key foreignTable="AD_CLIENT" name="ADCLIENT_ADPRINTFORM">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_PRINTFORMAT" name="ADPRINTFORMAT_FORMINVOICE">
-        <reference local="INVOICE_PRINTFORMAT_ID" foreign="AD_PRINTFORMAT_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="AD_PRINTFORMAT" name="ADPRINTFORMAT_FORMSHIPMENT">
-        <reference local="SHIPMENT_PRINTFORMAT_ID" foreign="AD_PRINTFORMAT_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_PRINTFORMAT" name="ADPRINTFORMAT_FORMREMITTANCE">
         <reference local="REMITTANCE_PRINTFORMAT_ID" foreign="AD_PRINTFORMAT_ID"/>
       </foreign-key>
@@ -40,11 +34,11 @@
       <foreign-key foreignTable="AD_PRINTFORMAT" name="ADPRINTFORMAT_FORMORDER">
         <reference local="ORDER_PRINTFORMAT_ID" foreign="AD_PRINTFORMAT_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="R_MAILTEXT" name="RMAILTEXT_INVOICEADPRINTFORM">
-        <reference local="INVOICE_MAILTEXT_ID" foreign="R_MAILTEXT_ID"/>
+      <foreign-key foreignTable="AD_PRINTFORMAT" name="ADPRINTFORMAT_FORMINVOICE">
+        <reference local="INVOICE_PRINTFORMAT_ID" foreign="AD_PRINTFORMAT_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="R_MAILTEXT" name="RMAILTEXT_SHIPADPRINTFORM">
-        <reference local="SHIPMENT_MAILTEXT_ID" foreign="R_MAILTEXT_ID"/>
+      <foreign-key foreignTable="AD_PRINTFORMAT" name="ADPRINTFORMAT_FORMSHIPMENT">
+        <reference local="SHIPMENT_PRINTFORMAT_ID" foreign="AD_PRINTFORMAT_ID"/>
       </foreign-key>
       <foreign-key foreignTable="R_MAILTEXT" name="RMAILTEXT_REMITADPRINTFORM">
         <reference local="REMITTANCE_MAILTEXT_ID" foreign="R_MAILTEXT_ID"/>
@@ -55,6 +49,12 @@
       <foreign-key foreignTable="R_MAILTEXT" name="RMAILTEXT_ORDERADPRINTFORM">
         <reference local="ORDER_MAILTEXT_ID" foreign="R_MAILTEXT_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="R_MAILTEXT" name="RMAILTEXT_INVOICEADPRINTFORM">
+        <reference local="INVOICE_MAILTEXT_ID" foreign="R_MAILTEXT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="R_MAILTEXT" name="RMAILTEXT_SHIPADPRINTFORM">
+        <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_PRINTFORMAT.xml b/db/ddlutils/model/AD_PRINTFORMAT.xml
index 46e90b87c4..304e11cee9 100644
--- a/db/ddlutils/model/AD_PRINTFORMAT.xml
+++ b/db/ddlutils/model/AD_PRINTFORMAT.xml
@@ -26,6 +26,7 @@
       <column name="AD_PRINTTABLEFORMAT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PRINTERNAME" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="ISDEFAULT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
+      <column name="JASPERPROCESS_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_PRINTCOLOR" name="ADPRINTCOLOR_ADPRINTFORMAT">
         <reference local="AD_PRINTCOLOR_ID" foreign="AD_PRINTCOLOR_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_PRINTGRAPH.xml b/db/ddlutils/model/AD_PRINTGRAPH.xml
index 73b4a74bcb..97a172a647 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">
         <reference local="DATA1_PRINTFORMATITEM_ID" foreign="AD_PRINTFORMATITEM_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_PRINTFORMATITEM" name="ADPRINTFORMATITEM_GRAPHDESCR">
-        <reference local="DESCRIPTION_PRINTFORMATITEM_ID" foreign="AD_PRINTFORMATITEM_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="AD_PRINTFORMATITEM" name="ADPRINTFORMATITEM_GRAPHDATA3">
-        <reference local="DATA3_PRINTFORMATITEM_ID" foreign="AD_PRINTFORMATITEM_ID"/>
+      <foreign-key foreignTable="AD_PRINTFORMATITEM" name="ADPRINTFORMATITEM_GRAPHDATA2">
+        <reference local="DATA2_PRINTFORMATITEM_ID" foreign="AD_PRINTFORMATITEM_ID"/>
       </foreign-key>
       <foreign-key foreignTable="AD_PRINTFORMATITEM" name="ADPRINTFORMATITEM_GRAPHDATA4">
         <reference local="DATA4_PRINTFORMATITEM_ID" foreign="AD_PRINTFORMATITEM_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_PRINTFORMATITEM" name="ADPRINTFORMATITEM_GRAPHDESCR">
+        <reference local="DESCRIPTION_PRINTFORMATITEM_ID" foreign="AD_PRINTFORMATITEM_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_PRINTFORMATITEM" name="ADPRINTFORMATITEM_GRAPHDATA">
         <reference local="DATA_PRINTFORMATITEM_ID" foreign="AD_PRINTFORMATITEM_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_PRINTFORMATITEM" name="ADPRINTFORMATITEM_GRAPHDATA2">
-        <reference local="DATA2_PRINTFORMATITEM_ID" foreign="AD_PRINTFORMATITEM_ID"/>
+      <foreign-key foreignTable="AD_PRINTFORMATITEM" name="ADPRINTFORMATITEM_GRAPHDATA3">
+        <reference local="DATA3_PRINTFORMATITEM_ID" foreign="AD_PRINTFORMATITEM_ID"/>
       </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
diff --git a/db/ddlutils/model/AD_ROLE.xml b/db/ddlutils/model/AD_ROLE.xml
index e728dd34e5..7f45357bbe 100644
--- a/db/ddlutils/model/AD_ROLE.xml
+++ b/db/ddlutils/model/AD_ROLE.xml
@@ -33,6 +33,17 @@
       <column name="CONFIRMQUERYRECORDS" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <column name="MAXQUERYRECORDS" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <column name="CONNECTIONPROFILE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
+      <column name="ALLOW_INFO_ACCOUNT" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
+      <column name="ALLOW_INFO_ASSET" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
+      <column name="ALLOW_INFO_BPARTNER" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
+      <column name="ALLOW_INFO_CASHJOURNAL" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
+      <column name="ALLOW_INFO_INOUT" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
+      <column name="ALLOW_INFO_INVOICE" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
+      <column name="ALLOW_INFO_ORDER" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
+      <column name="ALLOW_INFO_PAYMENT" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
+      <column name="ALLOW_INFO_PRODUCT" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
+      <column name="ALLOW_INFO_RESOURCE" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
+      <column name="ALLOW_INFO_SCHEDULE" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="AD_ROLECLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_TAB.xml b/db/ddlutils/model/AD_TAB.xml
index 337ef7d8aa..4fa2f6b987 100644
--- a/db/ddlutils/model/AD_TAB.xml
+++ b/db/ddlutils/model/AD_TAB.xml
@@ -42,12 +42,12 @@
       <foreign-key foreignTable="AD_CLIENT" name="TABCLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_COLUMN" name="ADCOLUMN_ADTABSORTORDER">
-        <reference local="AD_COLUMNSORTORDER_ID" foreign="AD_COLUMN_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_COLUMN" name="ADCOLUMN_ADTABSORTYESNO">
         <reference local="AD_COLUMNSORTYESNO_ID" foreign="AD_COLUMN_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_COLUMN" name="ADCOLUMN_ADTABSORTORDER">
+        <reference local="AD_COLUMNSORTORDER_ID" foreign="AD_COLUMN_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_COLUMN" name="AD_COLUMN_AD_TAB">
         <reference local="AD_COLUMN_ID" foreign="AD_COLUMN_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_TABLE.xml b/db/ddlutils/model/AD_TABLE.xml
index e06fc350c7..6658493588 100644
--- a/db/ddlutils/model/AD_TABLE.xml
+++ b/db/ddlutils/model/AD_TABLE.xml
@@ -27,6 +27,7 @@
       <column name="ISCHANGELOG" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="REPLICATIONTYPE" primaryKey="false" required="true" type="CHAR" size="1" default="L" autoIncrement="false"/>
       <column name="PO_WINDOW_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="COPYCOLUMNSFROMTABLE" primaryKey="false" required="false" type="VARCHAR" size="1" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="TABLECLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -36,12 +37,12 @@
       <foreign-key foreignTable="AD_VAL_RULE" name="AD_VALRULE_TABLE">
         <reference local="AD_VAL_RULE_ID" foreign="AD_VAL_RULE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_WINDOW" name="AD_WINDOW_TABLE">
-        <reference local="AD_WINDOW_ID" foreign="AD_WINDOW_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_WINDOW" name="ADWINDOWPO_ADTABLE">
         <reference local="PO_WINDOW_ID" foreign="AD_WINDOW_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_WINDOW" name="AD_WINDOW_TABLE">
+        <reference local="AD_WINDOW_ID" foreign="AD_WINDOW_ID"/>
+      </foreign-key>
       <unique name="AD_TABLE_NAME">
         <unique-column name="TABLENAME"/>
       </unique>
diff --git a/db/ddlutils/model/AD_USER.xml b/db/ddlutils/model/AD_USER.xml
index c3a666c7e4..0dbfd7f81d 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">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_ORG" name="AD_USER_ORG">
-        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORGTRX_ADUSER">
         <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="AD_USER_ORG">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_USER" name="ADUSER_SUPERVISOR">
         <reference local="SUPERVISOR_ID" foreign="AD_USER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_WF_NODENEXT.xml b/db/ddlutils/model/AD_WF_NODENEXT.xml
index e8d1172c67..f1f1b554a4 100644
--- a/db/ddlutils/model/AD_WF_NODENEXT.xml
+++ b/db/ddlutils/model/AD_WF_NODENEXT.xml
@@ -23,12 +23,12 @@
       <foreign-key foreignTable="AD_ORG" name="WF_NODENEXTORG">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_WF_NODE" name="ADWFNODE_ADWFNODENEXT">
-        <reference local="AD_WF_NODE_ID" foreign="AD_WF_NODE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_WF_NODE" name="ADWFNODENEXT_ADWFNODENEXT">
         <reference local="AD_WF_NEXT_ID" foreign="AD_WF_NODE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_WF_NODE" name="ADWFNODE_ADWFNODENEXT">
+        <reference local="AD_WF_NODE_ID" foreign="AD_WF_NODE_ID"/>
+      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/CM_CHATENTRY.xml b/db/ddlutils/model/CM_CHATENTRY.xml
index e970b0deca..c529081183 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">
         <reference local="CM_CHAT_ID" foreign="CM_CHAT_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="CM_CHATENTRY" name="CMCHATENTRY_GRANDPARENT">
-        <reference local="CM_CHATENTRYGRANDPARENT_ID" foreign="CM_CHATENTRY_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="CM_CHATENTRY" name="CMENTRTY_CMENTRYPARENT">
         <reference local="CM_CHATENTRYPARENT_ID" foreign="CM_CHATENTRY_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="CM_CHATENTRY" name="CMCHATENTRY_GRANDPARENT">
+        <reference local="CM_CHATENTRYGRANDPARENT_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 5afc1ba5cb..92e9e5487a 100644
--- a/db/ddlutils/model/C_ACCTSCHEMA_DEFAULT.xml
+++ b/db/ddlutils/model/C_ACCTSCHEMA_DEFAULT.xml
@@ -74,9 +74,6 @@
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_DEFAULT">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PTDISCOUNTREC_CSCHEMADEFAUL">
-        <reference local="P_TRADEDISCOUNTREC_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_REALIZEDGAIN_CSCHEMADEFAULT">
         <reference local="REALIZEDGAIN_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
@@ -245,6 +242,9 @@
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PTDISCOUNTGRANT_CSCHEMADEFA">
         <reference local="P_TRADEDISCOUNTGRANT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PTDISCOUNTREC_CSCHEMADEFAUL">
+        <reference local="P_TRADEDISCOUNTREC_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/C_BANKACCOUNT_ACCT.xml b/db/ddlutils/model/C_BANKACCOUNT_ACCT.xml
index d2ab839d06..07dde2849b 100644
--- a/db/ddlutils/model/C_BANKACCOUNT_ACCT.xml
+++ b/db/ddlutils/model/C_BANKACCOUNT_ACCT.xml
@@ -35,11 +35,8 @@
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_BINTRANSIT_CBANKACCOUNT">
         <reference local="B_INTRANSIT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_BASSET_CBANKACCOUNT">
-        <reference local="B_ASSET_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_BREVALUATIONGAIN_CBANKACCOU">
-        <reference local="B_REVALUATIONGAIN_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_BPAYMENTSELECT_CBANKACCOUNT">
+        <reference local="B_PAYMENTSELECT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_BREVALUATIONLOSS_CBANKACCOU">
         <reference local="B_REVALUATIONLOSS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
@@ -56,14 +53,17 @@
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_BUNIDENTIFIED_CBANKACCOUNT">
         <reference local="B_UNIDENTIFIED_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_BASSET_CBANKACCOUNT">
+        <reference local="B_ASSET_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_BINTERESTEXP_CBANKACCOUNT">
         <reference local="B_INTERESTEXP_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_BEXPENSE_CBANKACCOUNT">
         <reference local="B_EXPENSE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_BPAYMENTSELECT_CBANKACCOUNT">
-        <reference local="B_PAYMENTSELECT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_BREVALUATIONGAIN_CBANKACCOU">
+        <reference local="B_REVALUATIONGAIN_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
diff --git a/db/ddlutils/model/C_BPARTNER.xml b/db/ddlutils/model/C_BPARTNER.xml
index 3ca883dfea..7324162179 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">
         <reference local="AD_LANGUAGE" foreign="AD_LANGUAGE"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_ORG" name="ADORG_CBPARTNERORG">
-        <reference local="AD_ORGBP_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORG_CBPARTNER">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="ADORG_CBPARTNERORG">
+        <reference local="AD_ORGBP_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_PRINTFORMAT" name="ADPRINTFORMATINV_CBPARTNER">
         <reference local="INVOICE_PRINTFORMAT_ID" foreign="AD_PRINTFORMAT_ID"/>
       </foreign-key>
@@ -100,12 +100,12 @@
       <foreign-key foreignTable="C_INVOICESCHEDULE" name="CINVOICESCHEDULE_CBPARTNER">
         <reference local="C_INVOICESCHEDULE_ID" foreign="C_INVOICESCHEDULE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_PAYMENTTERM" name="CPAYMENTTERM_CBPARTNER">
-        <reference local="C_PAYMENTTERM_ID" foreign="C_PAYMENTTERM_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_PAYMENTTERM" name="CPOPAYMENTTERM_CBPARTNER">
         <reference local="PO_PAYMENTTERM_ID" foreign="C_PAYMENTTERM_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_PAYMENTTERM" name="CPAYMENTTERM_CBPARTNER">
+        <reference local="C_PAYMENTTERM_ID" foreign="C_PAYMENTTERM_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="M_DISCOUNTSCHEMA" name="MDISCOUNTS_CBPARTNER">
         <reference local="M_DISCOUNTSCHEMA_ID" foreign="M_DISCOUNTSCHEMA_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_CASH.xml b/db/ddlutils/model/C_CASH.xml
index 6a157c5bb6..feab5a841b 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">
         <reference local="C_CASHBOOK_ID" foreign="C_CASHBOOK_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_CCASH">
-        <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER2_CCASH">
         <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_CCASH">
+        <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_PROJECT" name="CPROJECT_CCASH">
         <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 f2a3dbc2d6..4f2886dde6 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">
         <reference local="CB_DIFFERENCES_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_CBEXPENSE_CCASHBOOK">
-        <reference local="CB_EXPENSE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_CBRECEIPT_CCASHBOOK">
         <reference local="CB_RECEIPT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_CBCASHTRANSFER_CCASHBOOK">
+        <reference local="CB_CASHTRANSFER_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_CBASSET_CCASHBOOK">
         <reference local="CB_ASSET_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_CBCASHTRANSFER_CCASHBOOK">
-        <reference local="CB_CASHTRANSFER_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_CBEXPENSE_CCASHBOOK">
+        <reference local="CB_EXPENSE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
diff --git a/db/ddlutils/model/C_CURRENCY_ACCT.xml b/db/ddlutils/model/C_CURRENCY_ACCT.xml
index 17e3cfdc2c..3ec94b1224 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">
         <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_UNREALIZEDGAIN_CCURRENCY">
-        <reference local="UNREALIZEDGAIN_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_UNREALIZEDLOSS_CCURRENCY">
+        <reference local="UNREALIZEDLOSS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_REALIZEDLOSS_CCURRENCY">
         <reference local="REALIZEDLOSS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_UNREALIZEDLOSS_CCURRENCY">
-        <reference local="UNREALIZEDLOSS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_REALIZEDGAIN_CCURRENCY">
         <reference local="REALIZEDGAIN_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_UNREALIZEDGAIN_CCURRENCY">
+        <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_INTERORG_ACCT.xml b/db/ddlutils/model/C_INTERORG_ACCT.xml
index 4eef3d95f7..147a313a87 100644
--- a/db/ddlutils/model/C_INTERORG_ACCT.xml
+++ b/db/ddlutils/model/C_INTERORG_ACCT.xml
@@ -13,21 +13,21 @@
       <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="INTERCOMPANYDUETO_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="INTERCOMPANYDUEFROM_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <foreign-key foreignTable="AD_ORG" name="ADORG_CINTERORGACCT">
-        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORGTO_CINTERORGACCT">
         <reference local="AD_ORGTO_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="ADORG_CINTERORGACCT">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_CINTERORGACCT">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_INTERCOMPANYDUETO_CINTERORG">
-        <reference local="INTERCOMPANYDUETO_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_INTERCOMPANYDUEFROM_CINTERO">
         <reference local="INTERCOMPANYDUEFROM_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_INTERCOMPANYDUETO_CINTERORG">
+        <reference local="INTERCOMPANYDUETO_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 0cd37e91b3..589931b711 100644
--- a/db/ddlutils/model/C_INVOICE.xml
+++ b/db/ddlutils/model/C_INVOICE.xml
@@ -62,12 +62,12 @@
       <column name="REF_INVOICE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISINDISPUTE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="INVOICECOLLECTIONTYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_CINVOICE">
-        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORG_CINVOICE">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_CINVOICE">
+        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_USER" name="ADUSER_CINVOICE">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
@@ -104,12 +104,12 @@
       <foreign-key foreignTable="C_DOCTYPE" name="CDOCTYPETARGET_CINVOICE">
         <reference local="C_DOCTYPETARGET_ID" foreign="C_DOCTYPE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_CINVOICE">
-        <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER2_CINVOICE">
         <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_CINVOICE">
+        <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_INVOICE" name="CINVOICE_REF">
         <reference local="REF_INVOICE_ID" foreign="C_INVOICE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_INVOICEBATCHLINE.xml b/db/ddlutils/model/C_INVOICEBATCHLINE.xml
index 216a8f5721..7e02ed6095 100644
--- a/db/ddlutils/model/C_INVOICEBATCHLINE.xml
+++ b/db/ddlutils/model/C_INVOICEBATCHLINE.xml
@@ -36,12 +36,12 @@
       <column name="C_INVOICE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_INVOICELINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_CINVOICEBATCHLINE">
-        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORG_CINVOICEBATCHLINE">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_CINVOICEBATCHLINE">
+        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_USER" name="ADUSER_CINVOICEBATCHLINE">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
@@ -60,12 +60,12 @@
       <foreign-key foreignTable="C_DOCTYPE" name="CDOCTYPE_CINVOICEBATCHLINE">
         <reference local="C_DOCTYPE_ID" foreign="C_DOCTYPE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEU1_CINVOICEBLINE">
-        <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEU2_CINVOICEBLINE">
         <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEU1_CINVOICEBLINE">
+        <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_INVOICE" name="CINVOICE_CINVOICEBATCHLINE">
         <reference local="C_INVOICE_ID" foreign="C_INVOICE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_ORDER.xml b/db/ddlutils/model/C_ORDER.xml
index cb61e92f59..b224714430 100644
--- a/db/ddlutils/model/C_ORDER.xml
+++ b/db/ddlutils/model/C_ORDER.xml
@@ -81,33 +81,33 @@
       <foreign-key foreignTable="AD_ORG" name="ADORGTRX_CORDER">
         <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_USER" name="ADUSER_CORDER">
-        <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_USER" name="ADUSERBILL_CORDER">
         <reference local="BILL_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_USER" name="ADUSER_CORDER">
+        <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_USER" name="ADUSER_SR_CORDER">
         <reference local="SALESREP_ID" foreign="AD_USER_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_ACTIVITY" name="CACTIVITY_CORDER">
         <reference local="C_ACTIVITY_ID" foreign="C_ACTIVITY_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_BPARTNER" name="CBPARTNERPAY_CORDER">
-        <reference local="PAY_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_BPARTNER" name="CBPARTNERBILL_CORDER">
         <reference local="BILL_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_BPARTNER" name="CBPARTNERPAY_CORDER">
+        <reference local="PAY_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_BPARTNER" name="CBPARTNER_CORDER">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_BPARTNER_LOCATION" name="CBPARTNERLOCATION_CORDER">
-        <reference local="C_BPARTNER_LOCATION_ID" foreign="C_BPARTNER_LOCATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_BPARTNER_LOCATION" name="CBPLOCATIONPAY_CORDER">
         <reference local="PAY_LOCATION_ID" foreign="C_BPARTNER_LOCATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_BPARTNER_LOCATION" name="CBPARTNERLOCATION_CORDER">
+        <reference local="C_BPARTNER_LOCATION_ID" foreign="C_BPARTNER_LOCATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_BPARTNER_LOCATION" name="CBPLOCATIONBILL_CORDER">
         <reference local="BILL_LOCATION_ID" foreign="C_BPARTNER_LOCATION_ID"/>
       </foreign-key>
@@ -132,12 +132,12 @@
       <foreign-key foreignTable="C_DOCTYPE" name="CDOCTYPETARGET_CORDER">
         <reference local="C_DOCTYPETARGET_ID" foreign="C_DOCTYPE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENRVALUEUSER2_CORDER">
-        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_CORDER">
         <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENRVALUEUSER2_CORDER">
+        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ORDER" name="CORDER_REF">
         <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 560ec5352c..4156f15f00 100644
--- a/db/ddlutils/model/C_ORDERLINE.xml
+++ b/db/ddlutils/model/C_ORDERLINE.xml
@@ -55,12 +55,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="ADORGTRX_CORDERLINE">
-        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORG_CORDERLINE">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_CORDERLINE">
+        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ACTIVITY" name="CACTIVITY_CORDERLINE">
         <reference local="C_ACTIVITY_ID" foreign="C_ACTIVITY_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_PAYMENT.xml b/db/ddlutils/model/C_PAYMENT.xml
index 9c31be2f1a..db9b8f7e97 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="ADORG_CPAYMENT">
-        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORGTRX_CPAYMENT">
         <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="ADORG_CPAYMENT">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ACTIVITY" name="CACTIVITY_CPAYMENT">
         <reference local="C_ACTIVITY_ID" foreign="C_ACTIVITY_ID"/>
       </foreign-key>
@@ -137,15 +137,6 @@
       <index name="C_PAYMENT_BPARTNER">
         <index-column name="C_BPARTNER_ID"/>
       </index>
-      <check>
-        <rule><![CDATA[IsAllocated in ('Y','N')]]></rule>
-      </check>
-      <check>
-        <rule><![CDATA[IsOnline in ('Y','N')]]></rule>
-      </check>
-      <check>
-        <rule><![CDATA[Processed in ('Y','N')]]></rule>
-      </check>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
@@ -158,5 +149,14 @@
       <check>
         <rule><![CDATA[IsReconciled in ('Y','N')]]></rule>
       </check>
+      <check>
+        <rule><![CDATA[IsAllocated in ('Y','N')]]></rule>
+      </check>
+      <check>
+        <rule><![CDATA[IsOnline in ('Y','N')]]></rule>
+      </check>
+      <check>
+        <rule><![CDATA[Processed in ('Y','N')]]></rule>
+      </check>
     </table>
   </database>
diff --git a/db/ddlutils/model/C_PROJECTLINE.xml b/db/ddlutils/model/C_PROJECTLINE.xml
index 05779e811e..ee38bb9778 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="CORDERPO_CPROJECTLINE">
-        <reference local="C_ORDERPO_ID" foreign="C_ORDER_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ORDER" name="CORDER_CPROJECTLINE">
         <reference local="C_ORDER_ID" foreign="C_ORDER_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ORDER" name="CORDERPO_CPROJECTLINE">
+        <reference local="C_ORDERPO_ID" foreign="C_ORDER_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_PROJECT" name="CPROJECT_CPROJECTLINE">
         <reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_REVENUERECOGNITION_PLAN.xml b/db/ddlutils/model/C_REVENUERECOGNITION_PLAN.xml
index a77606505b..f5f5704778 100644
--- a/db/ddlutils/model/C_REVENUERECOGNITION_PLAN.xml
+++ b/db/ddlutils/model/C_REVENUERECOGNITION_PLAN.xml
@@ -30,12 +30,12 @@
       <foreign-key foreignTable="C_REVENUERECOGNITION" name="CREVENUERECOGNITION_PLAN">
         <reference local="C_REVENUERECOGNITION_ID" foreign="C_REVENUERECOGNITION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PREVENUE_CREVENUERECOGNITIO">
-        <reference local="P_REVENUE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_UNEARNEDREVENUE_CREVENUEREC">
         <reference local="UNEARNEDREVENUE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PREVENUE_CREVENUERECOGNITIO">
+        <reference local="P_REVENUE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/C_VALIDCOMBINATION.xml b/db/ddlutils/model/C_VALIDCOMBINATION.xml
index 8eb6413976..0bf5ae09a4 100644
--- a/db/ddlutils/model/C_VALIDCOMBINATION.xml
+++ b/db/ddlutils/model/C_VALIDCOMBINATION.xml
@@ -33,12 +33,12 @@
       <foreign-key foreignTable="AD_CLIENT" name="ADCLIENT_VC">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_VC">
-        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORG_VC">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_VC">
+        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_CVALIDCOMBINATION">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
@@ -60,12 +60,12 @@
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_VC">
         <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_LOCATION" name="MLOCATIONFROM_VC">
-        <reference local="C_LOCFROM_ID" foreign="C_LOCATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_LOCATION" name="MLOCATIONTO_VC">
         <reference local="C_LOCTO_ID" foreign="C_LOCATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_LOCATION" name="MLOCATIONFROM_VC">
+        <reference local="C_LOCFROM_ID" foreign="C_LOCATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_PROJECT" name="CPROJECT_VC">
         <reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
       </foreign-key>
@@ -75,10 +75,6 @@
       <foreign-key foreignTable="M_PRODUCT" name="MPRODUCT_VC">
         <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"/>
@@ -98,6 +94,10 @@
         <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 a733d115ed..c402ba30b3 100644
--- a/db/ddlutils/model/FACT_ACCT.xml
+++ b/db/ddlutils/model/FACT_ACCT.xml
@@ -78,15 +78,15 @@
       <foreign-key foreignTable="C_CURRENCY" name="C_CURRENCY_FACT_ACCT">
         <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_FACTACCT">
-        <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUE_FACTACCT">
         <reference local="ACCOUNT_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER2_FACTACCT">
         <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_FACTACCT">
+        <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_LOCATION" name="C_LOCATIONFROM_FACT_ACCT">
         <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">
         <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 b529e0ac8b..f01812714f 100644
--- a/db/ddlutils/model/FACT_ACCT_BALANCE.xml
+++ b/db/ddlutils/model/FACT_ACCT_BALANCE.xml
@@ -57,12 +57,12 @@
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEU1_FACTACCTBAL">
         <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEU2_FACTACCTBAL">
-        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEACCT_FACTACCTBAL">
         <reference local="ACCOUNT_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEU2_FACTACCTBAL">
+        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_LOCATION" name="CLOCTO_FACTACCTBAL">
         <reference local="C_LOCTO_ID" foreign="C_LOCATION_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/GL_DISTRIBUTION.xml b/db/ddlutils/model/GL_DISTRIBUTION.xml
index 4f21578e5e..0a54534020 100644
--- a/db/ddlutils/model/GL_DISTRIBUTION.xml
+++ b/db/ddlutils/model/GL_DISTRIBUTION.xml
@@ -69,14 +69,14 @@
       <foreign-key foreignTable="C_DOCTYPE" name="CDOCTYPE_GLDISTRIBUTION">
         <reference local="C_DOCTYPE_ID" foreign="C_DOCTYPE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CEVALUEACCT_GLDIST">
-        <reference local="ACCOUNT_ID" foreign="C_ELEMENTVALUE_ID"/>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CEVALUEUSER2_GLDIST">
+        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CEVALUEUSER1_GLDIST">
         <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CEVALUEUSER2_GLDIST">
-        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CEVALUEACCT_GLDIST">
+        <reference local="ACCOUNT_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_LOCATION" name="CLOCTO_GLDIST">
         <reference local="C_LOCTO_ID" foreign="C_LOCATION_ID"/>
diff --git a/db/ddlutils/model/I_ELEMENTVALUE.xml b/db/ddlutils/model/I_ELEMENTVALUE.xml
index c5db92ed00..a069d9a99f 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">
         <reference local="C_ELEMENT_ID" foreign="C_ELEMENT_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CEVALUEPARENT_IELEMENTVALUE">
-        <reference local="PARENTELEMENTVALUE_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUE_IELEMENTVALUE">
         <reference local="C_ELEMENTVALUE_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CEVALUEPARENT_IELEMENTVALUE">
+        <reference local="PARENTELEMENTVALUE_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 b10c026a75..c9f59417fe 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="ADORG_IGLJOURNAL">
-        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      <foreign-key foreignTable="AD_ORG" name="ADORGDOC_IGLJOURNAL">
+        <reference local="AD_ORGDOC_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORGTRX_IGLJOURNAL">
         <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_ORG" name="ADORGDOC_IGLJOURNAL">
-        <reference local="AD_ORGDOC_ID" foreign="AD_ORG_ID"/>
+      <foreign-key foreignTable="AD_ORG" name="ADORG_IGLJOURNAL">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_IGLJOURNAL">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
@@ -98,15 +98,15 @@
       <foreign-key foreignTable="C_DOCTYPE" name="CDOCTYPE_IGLJOURNAL">
         <reference local="C_DOCTYPE_ID" foreign="C_DOCTYPE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELVALUEUSER2_IGLJOURNAL">
+        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CEVALUEUSER1_IGLJOURNAL">
         <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELVALUEACCOUNT_IGLJOURNAL">
         <reference local="ACCOUNT_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELVALUEUSER2_IGLJOURNAL">
-        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_LOCATION" name="CLOCFROM_IGLJOURNAL">
         <reference local="C_LOCFROM_ID" foreign="C_LOCATION_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/I_INVOICE.xml b/db/ddlutils/model/I_INVOICE.xml
index 2db9e3e629..6b21ef5d51 100644
--- a/db/ddlutils/model/I_INVOICE.xml
+++ b/db/ddlutils/model/I_INVOICE.xml
@@ -59,12 +59,12 @@
       <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="ADORG_IINVOICE">
-        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORGTRX_IINVOICE">
         <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="ADORG_IINVOICE">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_USER" name="ADUSERSALESREP_IINVOICE">
         <reference local="SALESREP_ID" foreign="AD_USER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/I_ORDER.xml b/db/ddlutils/model/I_ORDER.xml
index cf7e7e1109..2506b06dc1 100644
--- a/db/ddlutils/model/I_ORDER.xml
+++ b/db/ddlutils/model/I_ORDER.xml
@@ -64,30 +64,30 @@
       <column name="PRICEACTUAL" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="FREIGHTAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <foreign-key foreignTable="AD_ORG" name="ADORG_IORDER">
-        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORGTRX_IORDER">
         <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_USER" name="ADUSER_IORDER">
-        <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
+      <foreign-key foreignTable="AD_ORG" name="ADORG_IORDER">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
       <foreign-key foreignTable="AD_USER" name="ADUSERSALESREP_IORDER">
         <reference local="SALESREP_ID" foreign="AD_USER_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_USER" name="ADUSER_IORDER">
+        <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ACTIVITY" name="CACTIVITY_IORDER">
         <reference local="C_ACTIVITY_ID" foreign="C_ACTIVITY_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_BPARTNER" name="CBPARTNER_IORDER">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_BPARTNER_LOCATION" name="CBPARTNERLOCBILLTO_IORDER">
-        <reference local="BILLTO_ID" foreign="C_BPARTNER_LOCATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_BPARTNER_LOCATION" name="CBOLOCATION_IORDER">
         <reference local="C_BPARTNER_LOCATION_ID" foreign="C_BPARTNER_LOCATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_BPARTNER_LOCATION" name="CBPARTNERLOCBILLTO_IORDER">
+        <reference local="BILLTO_ID" foreign="C_BPARTNER_LOCATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_CAMPAIGN" name="CCAMPAIGN_IORDER">
         <reference local="C_CAMPAIGN_ID" foreign="C_CAMPAIGN_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_ATTRIBUTESETEXCLUDE.xml b/db/ddlutils/model/M_ATTRIBUTESETEXCLUDE.xml
index d9420e28ae..81329954fc 100644
--- a/db/ddlutils/model/M_ATTRIBUTESETEXCLUDE.xml
+++ b/db/ddlutils/model/M_ATTRIBUTESETEXCLUDE.xml
@@ -20,10 +20,10 @@
         <reference local="M_ATTRIBUTESET_ID" foreign="M_ATTRIBUTESET_ID"/>
       </foreign-key>
       <check>
-        <rule><![CDATA[IsSOTrx in ('Y','N')]]></rule>
+        <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
       <check>
-        <rule><![CDATA[IsActive in ('Y','N')]]></rule>
+        <rule><![CDATA[IsSOTrx in ('Y','N')]]></rule>
       </check>
     </table>
   </database>
diff --git a/db/ddlutils/model/M_FREIGHT.xml b/db/ddlutils/model/M_FREIGHT.xml
index 6ca0efb0b1..925ea5833c 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="CCOUNTRYTO_MFREIGHT">
-        <reference local="TO_COUNTRY_ID" foreign="C_COUNTRY_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_COUNTRY" name="CCOUNTRY_MFREIGHT">
         <reference local="C_COUNTRY_ID" foreign="C_COUNTRY_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_COUNTRY" name="CCOUNTRYTO_MFREIGHT">
+        <reference local="TO_COUNTRY_ID" foreign="C_COUNTRY_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_CURRENCY" name="CCURRENCY_MFREIGHT">
         <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 4e308ce92d..bf10f0b054 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">
         <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_USER" name="ADUSER_SR_MINOUT">
-        <reference local="SALESREP_ID" foreign="AD_USER_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_USER" name="ADUSER_MINOUT">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_USER" name="ADUSER_SR_MINOUT">
+        <reference local="SALESREP_ID" foreign="AD_USER_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ACTIVITY" name="CACTIVITY_MINOUT">
         <reference local="C_ACTIVITY_ID" foreign="C_ACTIVITY_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_INOUTLINE.xml b/db/ddlutils/model/M_INOUTLINE.xml
index 11ad2b9ec3..4e3fb253e9 100644
--- a/db/ddlutils/model/M_INOUTLINE.xml
+++ b/db/ddlutils/model/M_INOUTLINE.xml
@@ -37,12 +37,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="ADORGTRX_MINOUTLINE">
-        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORG_MINOUTLINE">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_MINOUTLINE">
+        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ACTIVITY" name="CACTIVITY_MINOUTLINE">
         <reference local="C_ACTIVITY_ID" foreign="C_ACTIVITY_ID"/>
       </foreign-key>
@@ -52,12 +52,12 @@
       <foreign-key foreignTable="C_CHARGE" name="CCHARGE_MINOUTLINE">
         <reference local="C_CHARGE_ID" foreign="C_CHARGE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENRVALUEUSER2_MINOUTLINE">
-        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENRVALUEUSER1_MINOUTLINE">
         <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENRVALUEUSER2_MINOUTLINE">
+        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ORDERLINE" name="CORDERLINE_MINOUT">
         <reference local="C_ORDERLINE_ID" foreign="C_ORDERLINE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_MOVEMENT.xml b/db/ddlutils/model/M_MOVEMENT.xml
index f35700e546..51a354e805 100644
--- a/db/ddlutils/model/M_MOVEMENT.xml
+++ b/db/ddlutils/model/M_MOVEMENT.xml
@@ -29,12 +29,12 @@
       <column name="C_DOCTYPE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISAPPROVED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="APPROVALAMT" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
-      <foreign-key foreignTable="AD_ORG" name="ADORG_MMOVEMENT">
-        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORGTRX_MMOVEMENT">
         <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="ADORG_MMOVEMENT">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ACTIVITY" name="CACTIVITY_MMOVEMENT">
         <reference local="C_ACTIVITY_ID" foreign="C_ACTIVITY_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_PRODUCT.xml b/db/ddlutils/model/M_PRODUCT.xml
index 662489baf8..a6b213f5f3 100644
--- a/db/ddlutils/model/M_PRODUCT.xml
+++ b/db/ddlutils/model/M_PRODUCT.xml
@@ -101,6 +101,9 @@
       <foreign-key foreignTable="S_RESOURCE" name="SRESOURCE_MPRODUCT">
         <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>
@@ -117,9 +120,6 @@
       <unique name="M_PRODUCT_RESOURCE">
         <unique-column name="S_RESOURCE_ID"/>
       </unique>
-      <unique name="M_PRODUCT_EXPENSETYPE">
-        <unique-column name="S_EXPENSETYPE_ID"/>
-      </unique>
       <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 75a296a85e..80af43d484 100644
--- a/db/ddlutils/model/M_PRODUCTION.xml
+++ b/db/ddlutils/model/M_PRODUCTION.xml
@@ -23,12 +23,12 @@
       <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <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"/>
-      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_MPRODUCTION">
-        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORG_MPRODUCTION">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_MPRODUCTION">
+        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ACTIVITY" name="CACTIVITY_MPRODUCTION">
         <reference local="C_ACTIVITY_ID" foreign="C_ACTIVITY_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_PRODUCT_ACCT.xml b/db/ddlutils/model/M_PRODUCT_ACCT.xml
index d96290f592..dd3b645e28 100644
--- a/db/ddlutils/model/M_PRODUCT_ACCT.xml
+++ b/db/ddlutils/model/M_PRODUCT_ACCT.xml
@@ -24,18 +24,15 @@
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_MPRODUCTACCT">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PCOGS_MPRODUCT">
+        <reference local="P_COGS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PEXPENSE_MPRODUCT">
         <reference local="P_EXPENSE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PASSET_MPRODUCT">
         <reference local="P_ASSET_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PCOGS_MPRODUCT">
-        <reference local="P_COGS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PTDISCOUNTREC_MPRODUCT">
-        <reference local="P_TRADEDISCOUNTREC_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PINVOICEPV_MPRODUCT">
         <reference local="P_INVOICEPRICEVARIANCE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
@@ -48,6 +45,9 @@
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PTDISCOUNTGRANT_MPRODUCT">
         <reference local="P_TRADEDISCOUNTGRANT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PTDISCOUNTREC_MPRODUCT">
+        <reference local="P_TRADEDISCOUNTREC_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="M_PRODUCT" name="M_PRODUCT_M_PRODUCT_ACCT">
         <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_PRODUCT_CATEGORY_ACCT.xml b/db/ddlutils/model/M_PRODUCT_CATEGORY_ACCT.xml
index 03dd942f35..77efea3639 100644
--- a/db/ddlutils/model/M_PRODUCT_CATEGORY_ACCT.xml
+++ b/db/ddlutils/model/M_PRODUCT_CATEGORY_ACCT.xml
@@ -27,21 +27,18 @@
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_MPRODCATACCT">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PINVOICEPV_MPRODUCTCATEGORY">
+        <reference local="P_INVOICEPRICEVARIANCE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PCOGS_MPRODUCTCATEGORY">
+        <reference local="P_COGS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PEXPENSE_MPRODUCTCATEGORY">
         <reference local="P_EXPENSE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PASSET_MPRODUCTCATEGORY">
         <reference local="P_ASSET_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PCOGS_MPRODUCTCATEGORY">
-        <reference local="P_COGS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PTDISCOUNTREC_MPRODUCTCATEG">
-        <reference local="P_TRADEDISCOUNTREC_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PINVOICEPV_MPRODUCTCATEGORY">
-        <reference local="P_INVOICEPRICEVARIANCE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PPURCHASEPV_MPRODUCTCATEGOR">
         <reference local="P_PURCHASEPRICEVARIANCE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
@@ -51,6 +48,9 @@
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PTDISCOUNTGRANT_MPRODUCTCAT">
         <reference local="P_TRADEDISCOUNTGRANT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PTDISCOUNTREC_MPRODUCTCATEG">
+        <reference local="P_TRADEDISCOUNTREC_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="M_PRODUCT_CATEGORY" name="MPRODCAT_MPRODCATACCT">
         <reference local="M_PRODUCT_CATEGORY_ID" foreign="M_PRODUCT_CATEGORY_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_TRANSACTIONALLOCATION.xml b/db/ddlutils/model/M_TRANSACTIONALLOCATION.xml
index bf0fc16dfa..3c4151816f 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">
         <reference local="M_ATTRIBUTESETINSTANCE_ID" foreign="M_ATTRIBUTESETINSTANCE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="M_INOUTLINE" name="MINOUTLINEOUT_MTRXALLOC">
-        <reference local="OUT_M_INOUTLINE_ID" foreign="M_INOUTLINE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="M_INOUTLINE" name="MINOUTLINE_MTRXALLOC">
         <reference local="M_INOUTLINE_ID" foreign="M_INOUTLINE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="M_INVENTORYLINE" name="MINVENTORYLINEOUT_MTRXALLOC">
-        <reference local="OUT_M_INVENTORYLINE_ID" foreign="M_INVENTORYLINE_ID"/>
+      <foreign-key foreignTable="M_INOUTLINE" name="MINOUTLINEOUT_MTRXALLOC">
+        <reference local="OUT_M_INOUTLINE_ID" foreign="M_INOUTLINE_ID"/>
       </foreign-key>
       <foreign-key foreignTable="M_INVENTORYLINE" name="MINVENTORYLINE_MTRXALLOC">
         <reference local="M_INVENTORYLINE_ID" foreign="M_INVENTORYLINE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="M_INVENTORYLINE" name="MINVENTORYLINEOUT_MTRXALLOC">
+        <reference local="OUT_M_INVENTORYLINE_ID" foreign="M_INVENTORYLINE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="M_PRODUCT" name="MPRODUCT_MTRXALLOC">
         <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
       </foreign-key>
@@ -47,12 +47,12 @@
       <foreign-key foreignTable="M_PRODUCTIONLINE" name="MPRODUCTIONLINE_MTRXALLOC">
         <reference local="M_PRODUCTIONLINE_ID" foreign="M_PRODUCTIONLINE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="M_TRANSACTION" name="MTRANSACTIONOUT_MTRXALLOC">
-        <reference local="OUT_M_TRANSACTION_ID" foreign="M_TRANSACTION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="M_TRANSACTION" name="MTTRANSACTION_MTRXALLOC">
         <reference local="M_TRANSACTION_ID" foreign="M_TRANSACTION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="M_TRANSACTION" name="MTRANSACTIONOUT_MTRXALLOC">
+        <reference local="OUT_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_GOALRESTRICTION.xml b/db/ddlutils/model/PA_GOALRESTRICTION.xml
index c269076aa5..f3902707e8 100644
--- a/db/ddlutils/model/PA_GOALRESTRICTION.xml
+++ b/db/ddlutils/model/PA_GOALRESTRICTION.xml
@@ -18,12 +18,12 @@
       <column name="ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_BP_GROUP_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="M_PRODUCT_CATEGORY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <foreign-key foreignTable="AD_ORG" name="ADORG2_PAGOALRESTRICTION">
-        <reference local="ORG_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORG_PAGOALRESTRICTION">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="ADORG2_PAGOALRESTRICTION">
+        <reference local="ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_BPARTNER" name="CBPARTNER_PAGOALRESTRICTION">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/PA_RATIOELEMENT.xml b/db/ddlutils/model/PA_RATIOELEMENT.xml
index 31aa8f3bfd..d6cbf285c0 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">
         <reference local="PA_MEASURECALC_ID" foreign="PA_MEASURECALC_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="PA_RATIO" name="PARATIOUSED_PARATIOELEMENT">
-        <reference local="PA_RATIOUSED_ID" foreign="PA_RATIO_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="PA_RATIO" name="PARATIO_PARATIOELEMENT">
         <reference local="PA_RATIO_ID" foreign="PA_RATIO_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="PA_RATIO" name="PARATIOUSED_PARATIOELEMENT">
+        <reference local="PA_RATIOUSED_ID" foreign="PA_RATIO_ID"/>
+      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/R_REQUEST.xml b/db/ddlutils/model/R_REQUEST.xml
index db97dbfe64..97ed9fdaff 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">
         <reference local="AD_TABLE_ID" foreign="AD_TABLE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_USER" name="ADUSER_RREQUEST">
-        <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_USER" name="ADUSERSR_RREQUEST">
         <reference local="SALESREP_ID" foreign="AD_USER_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_USER" name="ADUSER_RREQUEST">
+        <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="A_ASSET" name="AASSET_RREQUEST">
         <reference local="A_ASSET_ID" foreign="A_ASSET_ID"/>
       </foreign-key>
@@ -90,12 +90,12 @@
       <foreign-key foreignTable="C_CAMPAIGN" name="CCAMPAIGN_RREQUEST">
         <reference local="C_CAMPAIGN_ID" foreign="C_CAMPAIGN_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_INVOICE" name="CINVOICEREQUEST_RREQUEST">
-        <reference local="C_INVOICEREQUEST_ID" foreign="C_INVOICE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_INVOICE" name="RINVOICE_RREQUEST">
         <reference local="C_INVOICE_ID" foreign="C_INVOICE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_INVOICE" name="CINVOICEREQUEST_RREQUEST">
+        <reference local="C_INVOICEREQUEST_ID" foreign="C_INVOICE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ORDER" name="CORDER_RREQUEST">
         <reference local="C_ORDER_ID" foreign="C_ORDER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/R_REQUESTACTION.xml b/db/ddlutils/model/R_REQUESTACTION.xml
index 1a264daf9b..e8777b20c1 100644
--- a/db/ddlutils/model/R_REQUESTACTION.xml
+++ b/db/ddlutils/model/R_REQUESTACTION.xml
@@ -50,12 +50,12 @@
       <foreign-key foreignTable="AD_ROLE" name="ADROLE_RREQUESTACTION">
         <reference local="AD_ROLE_ID" foreign="AD_ROLE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_USER" name="ADUSER_RREQUESTACTION">
-        <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_USER" name="ADUSERSR_RREQUESTACTION">
         <reference local="SALESREP_ID" foreign="AD_USER_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_USER" name="ADUSER_RREQUESTACTION">
+        <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="A_ASSET" name="AASSET_RREQUESTACTION">
         <reference local="A_ASSET_ID" foreign="A_ASSET_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/TIRE_STORAGE.xml b/db/ddlutils/model/TIRE_STORAGE.xml
deleted file mode 100644
index c603c9fead..0000000000
--- a/db/ddlutils/model/TIRE_STORAGE.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
-  <database name="default" defaultIdMethod="none">
-    <table name="TIRE_STORAGE">
-      <column name="TIRE_STORAGE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="REGISTRATION" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
-      <column name="VEHICLE" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
-      <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="TIRETYPE" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
-      <column name="TIRETYPE_B" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
-      <column name="TIRESIZE" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
-      <column name="TIRESIZE_B" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
-      <column name="TIREQUALITY" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
-      <column name="TIREQUALITY_B" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
-      <column name="RIM" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
-      <column name="RIM_B" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
-      <column name="DATERECEIVED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="ISSTORED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="M_LOCATOR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="REMARK" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="ISRETURNED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="DATERETURNED" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <foreign-key foreignTable="AD_USER" name="ADUSER_TIRESTORAGE">
-        <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_BPARTNER" name="CBPARTNER_TIRESTORAGE">
-        <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="M_LOCATOR" name="MLOCATOR_TIRESTORAGE">
-        <reference local="M_LOCATOR_ID" foreign="M_LOCATOR_ID"/>
-      </foreign-key>
-      <check>
-        <rule><![CDATA[IsActive in ('Y','N')]]></rule>
-      </check>
-      <check>
-        <rule><![CDATA[IsStored in ('Y','N')]]></rule>
-      </check>
-      <check>
-        <rule><![CDATA[IsReturned in ('Y','N')]]></rule>
-      </check>
-      <check>
-        <rule><![CDATA[IsActive in ('Y','N')]]></rule>
-      </check>
-      <check>
-        <rule><![CDATA[IsStored in ('Y','N')]]></rule>
-      </check>
-      <check>
-        <rule><![CDATA[IsReturned in ('Y','N')]]></rule>
-      </check>
-    </table>
-  </database>
diff --git a/db/ddlutils/model/T_REPLENISH.xml b/db/ddlutils/model/T_REPLENISH.xml
index 59ae2f5ea8..d68340543b 100644
--- a/db/ddlutils/model/T_REPLENISH.xml
+++ b/db/ddlutils/model/T_REPLENISH.xml
@@ -29,11 +29,11 @@
       <foreign-key foreignTable="M_PRODUCT" name="MPRODUCT_TREPLENISH">
         <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="M_WAREHOUSE" name="MWAREHOUSE_TREPLENISH">
-        <reference local="M_WAREHOUSE_ID" foreign="M_WAREHOUSE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="M_WAREHOUSE" name="MWAREHOUSESOURCE_TREPLENISH">
         <reference local="M_WAREHOUSESOURCE_ID" foreign="M_WAREHOUSE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="M_WAREHOUSE" name="MWAREHOUSE_TREPLENISH">
+        <reference local="M_WAREHOUSE_ID" foreign="M_WAREHOUSE_ID"/>
+      </foreign-key>
     </table>
   </database>