From 5ac09ec9d20f9a71eec9026ccef66621ea3754c9 Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Thu, 1 Feb 2007 16:50:31 +0000
Subject: [PATCH] * [ 1649484 ] Error in PostgreSQL seed Number is map AS
 Numeric(22)

---
 db/ddlutils/model/AD_ATTRIBUTE.xml            |  6 +-
 db/ddlutils/model/AD_ATTRIBUTE_VALUE.xml      |  2 +-
 db/ddlutils/model/AD_CLIENTINFO.xml           | 12 ++--
 db/ddlutils/model/AD_COLOR.xml                |  2 +-
 db/ddlutils/model/AD_COLUMN.xml               | 32 +++++-----
 db/ddlutils/model/AD_FIELDGROUP.xml           |  3 +
 db/ddlutils/model/AD_FIND.xml                 |  2 +-
 db/ddlutils/model/AD_NOTE.xml                 |  3 +
 db/ddlutils/model/AD_ORGINFO.xml              |  6 +-
 db/ddlutils/model/AD_PACKAGE_EXP_COMMON.xml   |  2 +-
 db/ddlutils/model/AD_PACKAGE_EXP_DETAIL.xml   |  6 +-
 db/ddlutils/model/AD_PINSTANCE_LOG.xml        |  2 +-
 db/ddlutils/model/AD_PINSTANCE_PARA.xml       |  4 +-
 db/ddlutils/model/AD_PRINTFORM.xml            | 16 ++---
 db/ddlutils/model/AD_PRINTGRAPH.xml           | 18 +++---
 db/ddlutils/model/AD_PRINTPAPER.xml           |  4 +-
 db/ddlutils/model/AD_PRINTTABLEFORMAT.xml     |  4 +-
 db/ddlutils/model/AD_PROCESS.xml              |  3 +-
 db/ddlutils/model/AD_PROCESS_PARA.xml         | 10 +--
 db/ddlutils/model/AD_REPLICATION.xml          |  4 +-
 db/ddlutils/model/AD_ROLE.xml                 |  2 +-
 db/ddlutils/model/AD_SYSTEM.xml               |  4 +-
 db/ddlutils/model/AD_TABLE.xml                |  6 +-
 db/ddlutils/model/AD_USERDEF_FIELD.xml        | 12 ++--
 db/ddlutils/model/AD_WF_ACTIVITY.xml          |  8 +--
 db/ddlutils/model/AD_WF_EVENTAUDIT.xml        |  2 +-
 db/ddlutils/model/AD_WF_NODE.xml              | 10 +--
 db/ddlutils/model/AD_WORKFLOW.xml             |  2 +-
 db/ddlutils/model/A_ASSET.xml                 |  6 +-
 db/ddlutils/model/A_ASSET_ADDITION.xml        |  2 +-
 db/ddlutils/model/A_ASSET_CHANGE.xml          |  4 +-
 db/ddlutils/model/A_ASSET_CHANGE_AMT.xml      |  8 +--
 db/ddlutils/model/A_ASSET_RETIREMENT.xml      |  4 +-
 db/ddlutils/model/A_ASSET_USE.xml             |  2 +-
 db/ddlutils/model/B_BUYERFUNDS.xml            |  4 +-
 db/ddlutils/model/B_SELLERFUNDS.xml           |  4 +-
 db/ddlutils/model/CM_WEBACCESSLOG.xml         |  2 +-
 db/ddlutils/model/C_ACCTSCHEMA.xml            |  4 +-
 db/ddlutils/model/C_ACCTSCHEMA_DEFAULT.xml    | 18 +++---
 db/ddlutils/model/C_ACCTSCHEMA_ELEMENT.xml    |  6 +-
 db/ddlutils/model/C_ACCTSCHEMA_GL.xml         | 24 +++----
 db/ddlutils/model/C_ALLOCATIONHDR.xml         |  2 +-
 db/ddlutils/model/C_ALLOCATIONLINE.xml        |  8 +--
 db/ddlutils/model/C_BANKACCOUNT.xml           |  4 +-
 db/ddlutils/model/C_BANKACCOUNT_ACCT.xml      | 36 +++++------
 db/ddlutils/model/C_BANKSTATEMENT.xml         |  6 +-
 db/ddlutils/model/C_BANKSTATEMENTLINE.xml     | 10 +--
 db/ddlutils/model/C_BPARTNER.xml              | 30 ++++-----
 db/ddlutils/model/C_BPARTNER_PRODUCT.xml      |  2 +-
 db/ddlutils/model/C_BP_GROUP.xml              |  4 +-
 db/ddlutils/model/C_BP_GROUP_ACCT.xml         | 36 +++++------
 db/ddlutils/model/C_BP_VENDOR_ACCT.xml        |  6 +-
 db/ddlutils/model/C_CAMPAIGN.xml              |  2 +-
 db/ddlutils/model/C_CASH.xml                  | 12 ++--
 db/ddlutils/model/C_CASHBOOK_ACCT.xml         | 12 ++--
 db/ddlutils/model/C_CASHLINE.xml              |  6 +-
 db/ddlutils/model/C_CHANNEL.xml               |  3 +
 db/ddlutils/model/C_CHARGE.xml                |  2 +-
 db/ddlutils/model/C_COMMISSIONAMT.xml         |  6 +-
 db/ddlutils/model/C_COMMISSIONDETAIL.xml      |  6 +-
 db/ddlutils/model/C_COMMISSIONLINE.xml        |  8 +--
 db/ddlutils/model/C_COMMISSIONRUN.xml         |  2 +-
 db/ddlutils/model/C_CONVERSION_RATE.xml       | 10 +--
 db/ddlutils/model/C_CURRENCY.xml              |  2 +-
 db/ddlutils/model/C_CYCLESTEP.xml             |  2 +-
 db/ddlutils/model/C_DOCTYPE.xml               |  6 +-
 db/ddlutils/model/C_DUNNINGLEVEL.xml          |  4 +-
 db/ddlutils/model/C_DUNNINGRUNENTRY.xml       |  4 +-
 db/ddlutils/model/C_DUNNINGRUNLINE.xml        | 12 ++--
 db/ddlutils/model/C_INTERORG_ACCT.xml         |  6 +-
 db/ddlutils/model/C_INVOICE.xml               | 15 +++--
 db/ddlutils/model/C_INVOICEBATCH.xml          |  4 +-
 db/ddlutils/model/C_INVOICEBATCHLINE.xml      | 10 +--
 db/ddlutils/model/C_INVOICELINE.xml           | 32 +++++-----
 db/ddlutils/model/C_INVOICEPAYSCHEDULE.xml    |  4 +-
 db/ddlutils/model/C_INVOICESCHEDULE.xml       |  2 +-
 db/ddlutils/model/C_INVOICETAX.xml            |  4 +-
 db/ddlutils/model/C_LANDEDCOSTALLOCATION.xml  |  6 +-
 db/ddlutils/model/C_ORDER.xml                 | 46 ++++++-------
 db/ddlutils/model/C_ORDERLINE.xml             | 36 +++++------
 db/ddlutils/model/C_ORDERTAX.xml              |  4 +-
 db/ddlutils/model/C_PAYMENT.xml               | 42 ++++++------
 db/ddlutils/model/C_PAYMENTALLOCATE.xml       | 10 +--
 db/ddlutils/model/C_PAYMENTPROCESSOR.xml      |  9 ++-
 db/ddlutils/model/C_PAYMENTTERM.xml           |  4 +-
 db/ddlutils/model/C_PAYSCHEDULE.xml           |  4 +-
 db/ddlutils/model/C_PAYSELECTION.xml          |  2 +-
 db/ddlutils/model/C_PAYSELECTIONCHECK.xml     |  6 +-
 db/ddlutils/model/C_PAYSELECTIONLINE.xml      |  8 +--
 db/ddlutils/model/C_PHASE.xml                 |  2 +-
 db/ddlutils/model/C_POSKEY.xml                |  2 +-
 db/ddlutils/model/C_PROJECT.xml               | 22 +++----
 db/ddlutils/model/C_PROJECTISSUE.xml          |  2 +-
 db/ddlutils/model/C_PROJECTISSUEMA.xml        |  2 +-
 db/ddlutils/model/C_PROJECTLINE.xml           | 16 ++---
 db/ddlutils/model/C_PROJECTPHASE.xml          |  8 +--
 db/ddlutils/model/C_PROJECTTASK.xml           |  6 +-
 db/ddlutils/model/C_REMUNERATION.xml          |  8 +--
 db/ddlutils/model/C_REVENUERECOGNITION.xml    |  3 +
 .../model/C_REVENUERECOGNITION_PLAN.xml       |  4 +-
 .../model/C_REVENUERECOGNITION_RUN.xml        |  2 +-
 db/ddlutils/model/C_RFQ.xml                   |  2 +-
 db/ddlutils/model/C_RFQLINEQTY.xml            | 10 +--
 db/ddlutils/model/C_RFQRESPONSE.xml           |  2 +-
 db/ddlutils/model/C_RFQRESPONSELINEQTY.xml    |  4 +-
 db/ddlutils/model/C_SERVICELEVEL.xml          |  4 +-
 db/ddlutils/model/C_SERVICELEVELLINE.xml      |  2 +-
 db/ddlutils/model/C_TASK.xml                  |  2 +-
 db/ddlutils/model/C_TAX.xml                   |  5 +-
 db/ddlutils/model/C_TAXDECLARATIONLINE.xml    |  4 +-
 db/ddlutils/model/C_TAX_ACCT.xml              | 12 ++--
 db/ddlutils/model/C_UOM_CONVERSION.xml        | 10 +--
 db/ddlutils/model/C_USERREMUNERATION.xml      |  8 +--
 db/ddlutils/model/C_VALIDCOMBINATION.xml      |  8 +--
 db/ddlutils/model/C_WITHHOLDING.xml           | 12 ++--
 db/ddlutils/model/FACT_ACCT.xml               | 20 +++---
 db/ddlutils/model/FACT_ACCT_BALANCE.xml       | 18 +++---
 db/ddlutils/model/GL_DISTRIBUTION.xml         | 64 +++++++++----------
 db/ddlutils/model/GL_DISTRIBUTIONLINE.xml     | 16 ++---
 db/ddlutils/model/GL_FUND.xml                 |  2 +-
 db/ddlutils/model/GL_JOURNAL.xml              |  8 +--
 db/ddlutils/model/GL_JOURNALBATCH.xml         |  6 +-
 db/ddlutils/model/GL_JOURNALLINE.xml          | 15 +++--
 db/ddlutils/model/I_BANKSTATEMENT.xml         | 10 +--
 db/ddlutils/model/I_CONVERSION_RATE.xml       |  4 +-
 db/ddlutils/model/I_ELEMENTVALUE.xml          |  6 +-
 db/ddlutils/model/I_GLJOURNAL.xml             | 30 ++++-----
 db/ddlutils/model/I_INOUTLINECONFIRM.xml      |  6 +-
 db/ddlutils/model/I_INVENTORY.xml             |  4 +-
 db/ddlutils/model/I_INVOICE.xml               | 12 ++--
 db/ddlutils/model/I_ORDER.xml                 | 18 +++---
 db/ddlutils/model/I_PAYMENT.xml               | 12 ++--
 db/ddlutils/model/I_PRODUCT.xml               | 20 +++---
 db/ddlutils/model/M_ATTRIBUTEINSTANCE.xml     |  2 +-
 db/ddlutils/model/M_ATTRIBUTESETEXCLUDE.xml   |  4 +-
 db/ddlutils/model/M_BOMPRODUCT.xml            |  2 +-
 db/ddlutils/model/M_COST.xml                  | 10 +--
 db/ddlutils/model/M_COSTDETAIL.xml            |  8 +--
 db/ddlutils/model/M_COSTQUEUE.xml             |  4 +-
 db/ddlutils/model/M_DEMANDLINE.xml            |  4 +-
 db/ddlutils/model/M_DISCOUNTSCHEMA.xml        |  2 +-
 db/ddlutils/model/M_DISCOUNTSCHEMABREAK.xml   |  4 +-
 db/ddlutils/model/M_DISCOUNTSCHEMALINE.xml    | 30 ++++-----
 db/ddlutils/model/M_DISTRIBUTIONLIST.xml      |  2 +-
 db/ddlutils/model/M_DISTRIBUTIONLISTLINE.xml  |  4 +-
 db/ddlutils/model/M_DISTRIBUTIONRUNLINE.xml   |  4 +-
 db/ddlutils/model/M_EDI.xml                   | 10 +--
 db/ddlutils/model/M_FORECASTLINE.xml          |  4 +-
 db/ddlutils/model/M_FREIGHT.xml               |  8 +--
 db/ddlutils/model/M_INOUT.xml                 | 18 +++---
 db/ddlutils/model/M_INOUTCONFIRM.xml          |  2 +-
 db/ddlutils/model/M_INOUTLINE.xml             | 24 +++----
 db/ddlutils/model/M_INOUTLINECONFIRM.xml      |  8 +--
 db/ddlutils/model/M_INOUTLINEMA.xml           |  2 +-
 db/ddlutils/model/M_INVENTORY.xml             |  8 +--
 db/ddlutils/model/M_INVENTORYLINE.xml         |  6 +-
 db/ddlutils/model/M_INVENTORYLINEMA.xml       |  2 +-
 db/ddlutils/model/M_MATCHINV.xml              |  2 +-
 db/ddlutils/model/M_MATCHPO.xml               |  4 +-
 db/ddlutils/model/M_MOVEMENT.xml              | 14 ++--
 db/ddlutils/model/M_MOVEMENTCONFIRM.xml       |  2 +-
 db/ddlutils/model/M_MOVEMENTLINE.xml          |  8 +--
 db/ddlutils/model/M_MOVEMENTLINECONFIRM.xml   |  8 +--
 db/ddlutils/model/M_MOVEMENTLINEMA.xml        |  2 +-
 db/ddlutils/model/M_OPERATIONRESOURCE.xml     |  6 +-
 db/ddlutils/model/M_PACKAGELINE.xml           |  2 +-
 db/ddlutils/model/M_PRODUCT.xml               | 10 +--
 db/ddlutils/model/M_PRODUCTION.xml            |  6 +-
 db/ddlutils/model/M_PRODUCTIONLINE.xml        |  5 +-
 db/ddlutils/model/M_PRODUCTIONLINEMA.xml      |  2 +-
 db/ddlutils/model/M_PRODUCTIONPLAN.xml        |  2 +-
 db/ddlutils/model/M_PRODUCTOPERATION.xml      |  6 +-
 db/ddlutils/model/M_PRODUCTPRICE.xml          |  6 +-
 db/ddlutils/model/M_PRODUCT_ACCT.xml          | 10 +--
 db/ddlutils/model/M_PRODUCT_BOM.xml           |  2 +-
 db/ddlutils/model/M_PRODUCT_CATEGORY.xml      |  2 +-
 db/ddlutils/model/M_PRODUCT_CATEGORY_ACCT.xml | 10 +--
 db/ddlutils/model/M_PRODUCT_COSTING.xml       | 28 ++++----
 db/ddlutils/model/M_PRODUCT_PO.xml            | 18 +++---
 db/ddlutils/model/M_REPLENISH.xml             |  4 +-
 db/ddlutils/model/M_REQUISITION.xml           |  2 +-
 db/ddlutils/model/M_REQUISITIONLINE.xml       |  8 +--
 db/ddlutils/model/M_RMA.xml                   |  2 +-
 db/ddlutils/model/M_RMALINE.xml               |  2 +-
 db/ddlutils/model/M_STORAGE.xml               |  6 +-
 db/ddlutils/model/M_TRANSACTION.xml           |  2 +-
 db/ddlutils/model/M_TRANSACTIONALLOCATION.xml |  2 +-
 db/ddlutils/model/M_WAREHOUSE_ACCT.xml        | 10 +--
 db/ddlutils/model/PA_ACHIEVEMENT.xml          |  2 +-
 db/ddlutils/model/PA_BENCHMARKDATA.xml        |  2 +-
 db/ddlutils/model/PA_GOAL.xml                 |  8 +--
 db/ddlutils/model/PA_MEASURE.xml              |  2 +-
 db/ddlutils/model/PA_RATIOELEMENT.xml         |  8 +--
 db/ddlutils/model/PA_REPORTCOLUMN.xml         |  6 +-
 db/ddlutils/model/PA_SLA_GOAL.xml             |  4 +-
 db/ddlutils/model/PA_SLA_MEASURE.xml          |  2 +-
 db/ddlutils/model/R_REQUEST.xml               | 20 +++---
 db/ddlutils/model/R_REQUESTACTION.xml         |  6 +-
 db/ddlutils/model/R_REQUESTUPDATE.xml         |  4 +-
 db/ddlutils/model/S_RESOURCE.xml              |  2 +-
 db/ddlutils/model/S_RESOURCEASSIGNMENT.xml    |  2 +-
 db/ddlutils/model/S_RESOURCETYPE.xml          |  2 +-
 db/ddlutils/model/S_TIMEEXPENSE.xml           |  2 +-
 db/ddlutils/model/S_TIMEEXPENSELINE.xml       | 16 ++---
 db/ddlutils/model/TEST.xml                    |  6 +-
 db/ddlutils/model/T_AGING.xml                 | 44 ++++++-------
 db/ddlutils/model/T_DISTRIBUTIONRUNDETAIL.xml |  6 +-
 db/ddlutils/model/T_INVENTORYVALUE.xml        | 26 ++++----
 db/ddlutils/model/T_INVOICEGL.xml             | 18 +++---
 db/ddlutils/model/T_REPLENISH.xml             | 16 ++---
 db/ddlutils/model/T_REPORT.xml                | 44 ++++++-------
 db/ddlutils/model/T_REPORTSTATEMENT.xml       |  8 +--
 db/ddlutils/model/T_SELECTION2.xml            |  2 +-
 db/ddlutils/model/T_TRANSACTION.xml           |  2 +-
 db/ddlutils/model/T_TRIALBALANCE.xml          | 14 ++--
 db/ddlutils/model/W_BASKETLINE.xml            |  4 +-
 db/ddlutils/model/W_STORE.xml                 |  6 +-
 217 files changed, 941 insertions(+), 913 deletions(-)

diff --git a/db/ddlutils/model/AD_ATTRIBUTE.xml b/db/ddlutils/model/AD_ATTRIBUTE.xml
index c7716b61d1..5e11b0a3a0 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="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_REFERENCE" name="ADREFERENCEVALUE_ADATTRIBUTE">
+        <reference local="AD_REFERENCE_VALUE_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_ATTRIBUTE_VALUE.xml b/db/ddlutils/model/AD_ATTRIBUTE_VALUE.xml
index 1369290b4c..e34cf46f76 100644
--- a/db/ddlutils/model/AD_ATTRIBUTE_VALUE.xml
+++ b/db/ddlutils/model/AD_ATTRIBUTE_VALUE.xml
@@ -4,7 +4,7 @@
     <table name="AD_ATTRIBUTE_VALUE">
       <column name="AD_ATTRIBUTE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="RECORD_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="V_NUMBER" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="V_NUMBER" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="V_DATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="V_STRING" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <foreign-key foreignTable="AD_ATTRIBUTE" name="ADATTRIBUTE_ADATTRIBUTEVALUE">
diff --git a/db/ddlutils/model/AD_CLIENTINFO.xml b/db/ddlutils/model/AD_CLIENTINFO.xml
index 82b774513f..8462489967 100644
--- a/db/ddlutils/model/AD_CLIENTINFO.xml
+++ b/db/ddlutils/model/AD_CLIENTINFO.xml
@@ -30,9 +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="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>
@@ -45,6 +42,9 @@
       <foreign-key foreignTable="AD_TREE" name="ADTREEPRODUCT_ADCLIENTINFO">
         <reference local="AD_TREE_PRODUCT_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
+      <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="ADTREEBPARTNER_ADCLIENTINFO">
         <reference local="AD_TREE_BPARTNER_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
@@ -54,6 +54,9 @@
       <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>
@@ -63,9 +66,6 @@
       <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_COLOR.xml b/db/ddlutils/model/AD_COLOR.xml
index 1405c77a4b..731bae765e 100644
--- a/db/ddlutils/model/AD_COLOR.xml
+++ b/db/ddlutils/model/AD_COLOR.xml
@@ -18,7 +18,7 @@
       <column name="BLUE" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ALPHA" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="AD_IMAGE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="IMAGEALPHA" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="IMAGEALPHA" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="RED_1" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="GREEN_1" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="BLUE_1" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_COLUMN.xml b/db/ddlutils/model/AD_COLUMN.xml
index 8f856ce735..857d45f247 100644
--- a/db/ddlutils/model/AD_COLUMN.xml
+++ b/db/ddlutils/model/AD_COLUMN.xml
@@ -13,7 +13,7 @@
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="VERSION" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="VERSION" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="ENTITYTYPE" primaryKey="false" required="true" type="VARCHAR" size="4" default="D" autoIncrement="false"/>
       <column name="COLUMNNAME" primaryKey="false" required="true" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
@@ -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_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_REFERENCE" name="AD_REFERENCE_COLUMNDATATYPE">
+        <reference local="AD_REFERENCE_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>
@@ -69,6 +69,18 @@
         <unique-column name="AD_TABLE_ID"/>
         <unique-column name="COLUMNNAME"/>
       </unique>
+      <check>
+        <rule><![CDATA[IsActive in ('Y','N')]]></rule>
+      </check>
+      <check>
+        <rule><![CDATA[IsKey in ('Y','N')]]></rule>
+      </check>
+      <check>
+        <rule><![CDATA[IsParent in ('Y','N')]]></rule>
+      </check>
+      <check>
+        <rule><![CDATA[IsMandatory in ('Y','N')]]></rule>
+      </check>
       <check>
         <rule><![CDATA[IsUpdateable in ('Y','N')]]></rule>
       </check>
@@ -87,17 +99,5 @@
       <check>
         <rule><![CDATA[IsSyncDatabase in ('Y','N')]]></rule>
       </check>
-      <check>
-        <rule><![CDATA[IsActive in ('Y','N')]]></rule>
-      </check>
-      <check>
-        <rule><![CDATA[IsKey in ('Y','N')]]></rule>
-      </check>
-      <check>
-        <rule><![CDATA[IsParent in ('Y','N')]]></rule>
-      </check>
-      <check>
-        <rule><![CDATA[IsMandatory in ('Y','N')]]></rule>
-      </check>
     </table>
   </database>
diff --git a/db/ddlutils/model/AD_FIELDGROUP.xml b/db/ddlutils/model/AD_FIELDGROUP.xml
index cb39009362..2763a92162 100644
--- a/db/ddlutils/model/AD_FIELDGROUP.xml
+++ b/db/ddlutils/model/AD_FIELDGROUP.xml
@@ -12,6 +12,9 @@
       <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="ENTITYTYPE" primaryKey="false" required="true" type="VARCHAR" size="4" default="D" autoIncrement="false"/>
+      <unique name="AD_FIELDGROUP_KEY">
+        <unique-column name="AD_FIELDGROUP_ID"/>
+      </unique>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/AD_FIND.xml b/db/ddlutils/model/AD_FIND.xml
index ee98025df3..21257caadd 100644
--- a/db/ddlutils/model/AD_FIND.xml
+++ b/db/ddlutils/model/AD_FIND.xml
@@ -3,7 +3,7 @@
   <database name="default" defaultIdMethod="none">
     <table name="AD_FIND">
       <column name="AD_FIND_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="FIND_ID" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="FIND_ID" primaryKey="false" required="true" type="DECIMAL" 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"/>
diff --git a/db/ddlutils/model/AD_NOTE.xml b/db/ddlutils/model/AD_NOTE.xml
index 5d5fcad2a9..56c3738e7e 100644
--- a/db/ddlutils/model/AD_NOTE.xml
+++ b/db/ddlutils/model/AD_NOTE.xml
@@ -32,6 +32,9 @@
       <foreign-key foreignTable="AD_WF_ACTIVITY" name="ADWFACTIVITY_ADNOTE">
         <reference local="AD_WF_ACTIVITY_ID" foreign="AD_WF_ACTIVITY_ID"/>
       </foreign-key>
+      <unique name="AD_NOTE_KEY">
+        <unique-column name="AD_NOTE_ID"/>
+      </unique>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/AD_ORGINFO.xml b/db/ddlutils/model/AD_ORGINFO.xml
index 81b4e9907a..c6b3ff1f12 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">
-        <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_ORG" name="ADORGPARENT_ADORGINFO">
+        <reference local="PARENT_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_PACKAGE_EXP_COMMON.xml b/db/ddlutils/model/AD_PACKAGE_EXP_COMMON.xml
index 4ef1270937..215a60fb41 100644
--- a/db/ddlutils/model/AD_PACKAGE_EXP_COMMON.xml
+++ b/db/ddlutils/model/AD_PACKAGE_EXP_COMMON.xml
@@ -19,7 +19,7 @@
       <column name="PROCESSED" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="NAME2" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="LINE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="FILE_DIRECTORY" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="FILENAME" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="DESTINATION_DIRECTORY" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_PACKAGE_EXP_DETAIL.xml b/db/ddlutils/model/AD_PACKAGE_EXP_DETAIL.xml
index 04ae7de294..22609df96f 100644
--- a/db/ddlutils/model/AD_PACKAGE_EXP_DETAIL.xml
+++ b/db/ddlutils/model/AD_PACKAGE_EXP_DETAIL.xml
@@ -7,9 +7,9 @@
       <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="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="DECIMAL" 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="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="AD_FORM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_IMPFORMAT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_MENU_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
@@ -30,7 +30,7 @@
       <column name="PROCESSING" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="NAME2" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="LINE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="AD_WORKBENCH_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_TABLE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_REPORTVIEW_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_PINSTANCE_LOG.xml b/db/ddlutils/model/AD_PINSTANCE_LOG.xml
index 6540a3a972..57f1f68d4d 100644
--- a/db/ddlutils/model/AD_PINSTANCE_LOG.xml
+++ b/db/ddlutils/model/AD_PINSTANCE_LOG.xml
@@ -6,7 +6,7 @@
       <column name="LOG_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="P_DATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
       <column name="P_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="P_NUMBER" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="P_NUMBER" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="P_MSG" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <foreign-key foreignTable="AD_PINSTANCE" name="ADPINSTANCE_PILOG">
         <reference local="AD_PINSTANCE_ID" foreign="AD_PINSTANCE_ID"/>
diff --git a/db/ddlutils/model/AD_PINSTANCE_PARA.xml b/db/ddlutils/model/AD_PINSTANCE_PARA.xml
index a2afb66727..9f3f78482e 100644
--- a/db/ddlutils/model/AD_PINSTANCE_PARA.xml
+++ b/db/ddlutils/model/AD_PINSTANCE_PARA.xml
@@ -7,8 +7,8 @@
       <column name="PARAMETERNAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="P_STRING" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="P_STRING_TO" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="P_NUMBER" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="P_NUMBER_TO" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="P_NUMBER" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="P_NUMBER_TO" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="P_DATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="P_DATE_TO" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="INFO" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_PRINTFORM.xml b/db/ddlutils/model/AD_PRINTFORM.xml
index e7a09926d2..7ca61ad9e8 100644
--- a/db/ddlutils/model/AD_PRINTFORM.xml
+++ b/db/ddlutils/model/AD_PRINTFORM.xml
@@ -25,20 +25,23 @@
       <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_FORMORDER">
-        <reference local="ORDER_PRINTFORMAT_ID" foreign="AD_PRINTFORMAT_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>
       <foreign-key foreignTable="AD_PRINTFORMAT" name="ADPRINTFORMAT_FORMPROJECT">
         <reference local="PROJECT_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 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>
       <foreign-key foreignTable="R_MAILTEXT" name="RMAILTEXT_SHIPADPRINTFORM">
         <reference local="SHIPMENT_MAILTEXT_ID" foreign="R_MAILTEXT_ID"/>
@@ -52,9 +55,6 @@
       <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>
       <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 f5a9619217..73b4a74bcb 100644
--- a/db/ddlutils/model/AD_PRINTGRAPH.xml
+++ b/db/ddlutils/model/AD_PRINTGRAPH.xml
@@ -23,24 +23,24 @@
       <foreign-key foreignTable="AD_PRINTFORMAT" name="ADPRINTFORMAT_ADPRINTGRAPH">
         <reference local="AD_PRINTFORMAT_ID" foreign="AD_PRINTFORMAT_ID"/>
       </foreign-key>
-      <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_GRAPHDATA3">
-        <reference local="DATA3_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_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>
       <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_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>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/AD_PRINTPAPER.xml b/db/ddlutils/model/AD_PRINTPAPER.xml
index 0c20644d07..2911d59f37 100644
--- a/db/ddlutils/model/AD_PRINTPAPER.xml
+++ b/db/ddlutils/model/AD_PRINTPAPER.xml
@@ -20,8 +20,8 @@
       <column name="MARGINRIGHT" primaryKey="false" required="true" type="DECIMAL" size="10" default="36" autoIncrement="false"/>
       <column name="MARGINBOTTOM" primaryKey="false" required="true" type="DECIMAL" size="10" default="36" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="SIZEX" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="SIZEY" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="SIZEX" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="SIZEY" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="DIMENSIONUNITS" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <unique name="AD_PRINTPAPER_NAME">
         <unique-column name="AD_CLIENT_ID"/>
diff --git a/db/ddlutils/model/AD_PRINTTABLEFORMAT.xml b/db/ddlutils/model/AD_PRINTTABLEFORMAT.xml
index 83c6827b48..b8bef881aa 100644
--- a/db/ddlutils/model/AD_PRINTTABLEFORMAT.xml
+++ b/db/ddlutils/model/AD_PRINTTABLEFORMAT.xml
@@ -33,8 +33,8 @@
       <column name="FOOTERCENTER" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="FOOTERRIGHT" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="IMAGEISATTACHED" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="HDRSTROKE" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="LINESTROKE" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="HDRSTROKE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="LINESTROKE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="HDRSTROKETYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="LINESTROKETYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="ISPAINTHEADERLINES" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_PROCESS.xml b/db/ddlutils/model/AD_PROCESS.xml
index 2b83ea6eb7..f890dd9bb2 100644
--- a/db/ddlutils/model/AD_PROCESS.xml
+++ b/db/ddlutils/model/AD_PROCESS.xml
@@ -22,13 +22,14 @@
       <column name="AD_REPORTVIEW_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="CLASSNAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="STATISTIC_COUNT" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
-      <column name="STATISTIC_SECONDS" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="STATISTIC_SECONDS" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="AD_PRINTFORMAT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="WORKFLOWVALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="AD_WORKFLOW_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISBETAFUNCTIONALITY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISSERVERPROCESS" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="SHOWHELP" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
+      <column name="JASPERREPORT" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <foreign-key foreignTable="AD_PRINTFORMAT" name="ADPRINTFORMAT_ADPROCESS">
         <reference local="AD_PRINTFORMAT_ID" foreign="AD_PRINTFORMAT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_PROCESS_PARA.xml b/db/ddlutils/model/AD_PROCESS_PARA.xml
index f05ac5bd35..595cd63b90 100644
--- a/db/ddlutils/model/AD_PROCESS_PARA.xml
+++ b/db/ddlutils/model/AD_PROCESS_PARA.xml
@@ -23,8 +23,8 @@
       <column name="FIELDLENGTH" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ISMANDATORY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISRANGE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="DEFAULTVALUE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="DEFAULTVALUE2" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
+      <column name="DEFAULTVALUE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
+      <column name="DEFAULTVALUE2" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="VFORMAT" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="VALUEMIN" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="VALUEMAX" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
@@ -36,12 +36,12 @@
       <foreign-key foreignTable="AD_PROCESS" name="ADPROCESS_ADPROCESSPARA">
         <reference local="AD_PROCESS_ID" foreign="AD_PROCESS_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_REFERENCE" name="ADREFERENCEVALUE_ADPROCPARA">
-        <reference local="AD_REFERENCE_VALUE_ID" foreign="AD_REFERENCE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_REFERENCE" name="ADREFERENCE_ADPROCESSPARA">
         <reference local="AD_REFERENCE_ID" foreign="AD_REFERENCE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_REFERENCE" name="ADREFERENCEVALUE_ADPROCPARA">
+        <reference local="AD_REFERENCE_VALUE_ID" foreign="AD_REFERENCE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_VAL_RULE" name="ADVALRULE_AD_PROCESSPARA">
         <reference local="AD_VAL_RULE_ID" foreign="AD_VAL_RULE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_REPLICATION.xml b/db/ddlutils/model/AD_REPLICATION.xml
index d8ccfee947..f05b0c06f0 100644
--- a/db/ddlutils/model/AD_REPLICATION.xml
+++ b/db/ddlutils/model/AD_REPLICATION.xml
@@ -18,8 +18,8 @@
       <column name="AD_REPLICATIONSTRATEGY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISRMIOVERHTTP" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="IDRANGESTART" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="IDRANGEEND" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="IDRANGESTART" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="IDRANGEEND" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="REMOTE_CLIENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="REMOTE_ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PREFIX" primaryKey="false" required="false" type="VARCHAR" size="10" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_ROLE.xml b/db/ddlutils/model/AD_ROLE.xml
index c66dc63f66..e728dd34e5 100644
--- a/db/ddlutils/model/AD_ROLE.xml
+++ b/db/ddlutils/model/AD_ROLE.xml
@@ -14,7 +14,7 @@
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="USERLEVEL" primaryKey="false" required="true" type="CHAR" size="3" default="  O" autoIncrement="false"/>
       <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="AMTAPPROVAL" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="AMTAPPROVAL" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="AD_TREE_MENU_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISMANUAL" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISSHOWACCT" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_SYSTEM.xml b/db/ddlutils/model/AD_SYSTEM.xml
index db662ee169..9ae4067b36 100644
--- a/db/ddlutils/model/AD_SYSTEM.xml
+++ b/db/ddlutils/model/AD_SYSTEM.xml
@@ -18,8 +18,8 @@
       <column name="SUPPORTUNITS" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="PASSWORD" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="REPLICATIONTYPE" primaryKey="false" required="true" type="CHAR" size="1" default="L" autoIncrement="false"/>
-      <column name="IDRANGESTART" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="IDRANGEEND" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="IDRANGESTART" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="IDRANGEEND" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="LDAPHOST" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="CUSTOMPREFIX" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ISJUSTMIGRATED" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_TABLE.xml b/db/ddlutils/model/AD_TABLE.xml
index a1d5e4f5ee..e06fc350c7 100644
--- a/db/ddlutils/model/AD_TABLE.xml
+++ b/db/ddlutils/model/AD_TABLE.xml
@@ -36,12 +36,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="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>
+      <foreign-key foreignTable="AD_WINDOW" name="ADWINDOWPO_ADTABLE">
+        <reference local="PO_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_USERDEF_FIELD.xml b/db/ddlutils/model/AD_USERDEF_FIELD.xml
index cb822587cb..d8618e7f40 100644
--- a/db/ddlutils/model/AD_USERDEF_FIELD.xml
+++ b/db/ddlutils/model/AD_USERDEF_FIELD.xml
@@ -30,6 +30,12 @@
       <foreign-key foreignTable="AD_USERDEF_TAB" name="ADUSERDEFTAB_ADUSERDEFFIELD">
         <reference local="AD_USERDEF_TAB_ID" foreign="AD_USERDEF_TAB_ID"/>
       </foreign-key>
+      <check>
+        <rule><![CDATA[IsActive in ('Y','N')]]></rule>
+      </check>
+      <check>
+        <rule><![CDATA[IsDisplayed in ('Y','N')]]></rule>
+      </check>
       <check>
         <rule><![CDATA[IsReadOnly in ('Y','N')]]></rule>
       </check>
@@ -39,11 +45,5 @@
       <check>
         <rule><![CDATA[IsUpdateable in ('Y','N')]]></rule>
       </check>
-      <check>
-        <rule><![CDATA[IsActive in ('Y','N')]]></rule>
-      </check>
-      <check>
-        <rule><![CDATA[IsDisplayed in ('Y','N')]]></rule>
-      </check>
     </table>
   </database>
diff --git a/db/ddlutils/model/AD_WF_ACTIVITY.xml b/db/ddlutils/model/AD_WF_ACTIVITY.xml
index 82feb90955..0c20b253d5 100644
--- a/db/ddlutils/model/AD_WF_ACTIVITY.xml
+++ b/db/ddlutils/model/AD_WF_ACTIVITY.xml
@@ -41,10 +41,6 @@
       <foreign-key foreignTable="AD_WF_RESPONSIBLE" name="ADWFRESPONSIBLE_ADWFACTIVITY">
         <reference local="AD_WF_RESPONSIBLE_ID" foreign="AD_WF_RESPONSIBLE_ID"/>
       </foreign-key>
-      <index name="AD_WF_ACTIVITY_STATUS">
-        <index-column name="PROCESSED"/>
-        <index-column name="WFSTATE"/>
-      </index>
       <index name="AD_WF_ACTIVITY_WHO">
         <index-column name="AD_WF_RESPONSIBLE_ID"/>
         <index-column name="AD_USER_ID"/>
@@ -53,6 +49,10 @@
         <index-column name="AD_WF_PROCESS_ID"/>
         <index-column name="AD_WF_NODE_ID"/>
       </index>
+      <index name="AD_WF_ACTIVITY_STATUS">
+        <index-column name="PROCESSED"/>
+        <index-column name="WFSTATE"/>
+      </index>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/AD_WF_EVENTAUDIT.xml b/db/ddlutils/model/AD_WF_EVENTAUDIT.xml
index 8c3e7a1058..567905c8d4 100644
--- a/db/ddlutils/model/AD_WF_EVENTAUDIT.xml
+++ b/db/ddlutils/model/AD_WF_EVENTAUDIT.xml
@@ -18,7 +18,7 @@
       <column name="RECORD_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_WF_RESPONSIBLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="ELAPSEDTIMEMS" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="ELAPSEDTIMEMS" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="ATTRIBUTENAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="OLDVALUE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="NEWVALUE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_WF_NODE.xml b/db/ddlutils/model/AD_WF_NODE.xml
index 23f4b603b1..d7a41f9bd1 100644
--- a/db/ddlutils/model/AD_WF_NODE.xml
+++ b/db/ddlutils/model/AD_WF_NODE.xml
@@ -31,7 +31,7 @@
       <column name="LIMIT" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <column name="PRIORITY" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="DURATION" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
-      <column name="COST" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="COST" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="WORKINGTIME" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="WAITINGTIME" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <column name="AD_WF_RESPONSIBLE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
@@ -45,7 +45,7 @@
       <column name="DOCACTION" primaryKey="false" required="false" type="CHAR" size="2" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="DYNPRIORITYUNIT" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="DYNPRIORITYCHANGE" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="DYNPRIORITYCHANGE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="EMAILRECIPIENT" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="EMAIL" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="R_MAILTEXT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
@@ -76,12 +76,12 @@
       <foreign-key foreignTable="AD_WINDOW" name="ADWINDOW_ADWFNODE">
         <reference local="AD_WINDOW_ID" foreign="AD_WINDOW_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_WORKFLOW" name="ADWORKFLOW_ADWFNODE">
-        <reference local="AD_WORKFLOW_ID" foreign="AD_WORKFLOW_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_WORKFLOW" name="ADWORKFLOW_ADWFNODESUBFLOW">
         <reference local="WORKFLOW_ID" foreign="AD_WORKFLOW_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_WORKFLOW" name="ADWORKFLOW_ADWFNODE">
+        <reference local="AD_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/AD_WORKFLOW.xml b/db/ddlutils/model/AD_WORKFLOW.xml
index d97bf2bf01..4a03ed45ef 100644
--- a/db/ddlutils/model/AD_WORKFLOW.xml
+++ b/db/ddlutils/model/AD_WORKFLOW.xml
@@ -24,7 +24,7 @@
       <column name="PRIORITY" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="LIMIT" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="DURATION" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
-      <column name="COST" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="COST" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="WORKINGTIME" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <column name="WAITINGTIME" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <column name="AD_WF_RESPONSIBLE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
diff --git a/db/ddlutils/model/A_ASSET.xml b/db/ddlutils/model/A_ASSET.xml
index fae69e4778..ee36618379 100644
--- a/db/ddlutils/model/A_ASSET.xml
+++ b/db/ddlutils/model/A_ASSET.xml
@@ -25,8 +25,8 @@
       <column name="ASSETDEPRECIATIONDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="USELIFEYEARS" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="USELIFEMONTHS" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
-      <column name="LIFEUSEUNITS" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="USEUNITS" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="LIFEUSEUNITS" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="USEUNITS" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="ISDISPOSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ASSETDISPOSALDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="ISINPOSESSION" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
@@ -40,7 +40,7 @@
       <column name="ISFULLYDEPRECIATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="ID" size="10" default="0" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_BPARTNERSR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="M_INOUTLINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
diff --git a/db/ddlutils/model/A_ASSET_ADDITION.xml b/db/ddlutils/model/A_ASSET_ADDITION.xml
index b15aeeb3e0..0374557f47 100644
--- a/db/ddlutils/model/A_ASSET_ADDITION.xml
+++ b/db/ddlutils/model/A_ASSET_ADDITION.xml
@@ -11,7 +11,7 @@
       <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="A_ASSET_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="ASSETVALUEAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="ASSETVALUEAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_INVOICELINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="A_ASSET" name="AASSET_AASSETADDITION">
         <reference local="A_ASSET_ID" foreign="A_ASSET_ID"/>
diff --git a/db/ddlutils/model/A_ASSET_CHANGE.xml b/db/ddlutils/model/A_ASSET_CHANGE.xml
index dd447d4a2d..c65799f6f6 100644
--- a/db/ddlutils/model/A_ASSET_CHANGE.xml
+++ b/db/ddlutils/model/A_ASSET_CHANGE.xml
@@ -13,10 +13,10 @@
       <column name="A_ASSET_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="CHANGETYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="CHANGEDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="CHANGEAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="CHANGEAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="USELIFEYEARS" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="USELIFEMONTHS" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
-      <column name="LIFEUSEUNITS" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="LIFEUSEUNITS" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="ASSETDEPRECIATIONDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="A_ASSET_RETIREMENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="A_ASSET_ADDITION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
diff --git a/db/ddlutils/model/A_ASSET_CHANGE_AMT.xml b/db/ddlutils/model/A_ASSET_CHANGE_AMT.xml
index dae271679f..c94221f81f 100644
--- a/db/ddlutils/model/A_ASSET_CHANGE_AMT.xml
+++ b/db/ddlutils/model/A_ASSET_CHANGE_AMT.xml
@@ -11,10 +11,10 @@
       <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="ASSETVALUEAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="ASSETMARKETVALUEAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="ASSETBOOKVALUEAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="ASSETACCUMDEPRECIATIONAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="ASSETVALUEAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="ASSETMARKETVALUEAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="ASSETBOOKVALUEAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="ASSETACCUMDEPRECIATIONAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="A_ASSET_CHANGE" name="AASSETCHANGE_AASSETCHANGEAMT">
         <reference local="A_ASSET_CHANGE_ID" foreign="A_ASSET_CHANGE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/A_ASSET_RETIREMENT.xml b/db/ddlutils/model/A_ASSET_RETIREMENT.xml
index cc5c6346c6..8a6c7f081b 100644
--- a/db/ddlutils/model/A_ASSET_RETIREMENT.xml
+++ b/db/ddlutils/model/A_ASSET_RETIREMENT.xml
@@ -11,8 +11,8 @@
       <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="A_ASSET_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="ASSETVALUEAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="ASSETMARKETVALUEAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="ASSETVALUEAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="ASSETMARKETVALUEAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_INVOICELINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="A_ASSET" name="AASSET_AASSETRETIREMENT">
         <reference local="A_ASSET_ID" foreign="A_ASSET_ID"/>
diff --git a/db/ddlutils/model/A_ASSET_USE.xml b/db/ddlutils/model/A_ASSET_USE.xml
index 557e8f1097..5aeec931e1 100644
--- a/db/ddlutils/model/A_ASSET_USE.xml
+++ b/db/ddlutils/model/A_ASSET_USE.xml
@@ -12,7 +12,7 @@
       <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="A_ASSET_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="USEDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="USEUNITS" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="USEUNITS" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <foreign-key foreignTable="A_ASSET" name="AASSET_AASSETUSE">
         <reference local="A_ASSET_ID" foreign="A_ASSET_ID"/>
diff --git a/db/ddlutils/model/B_BUYERFUNDS.xml b/db/ddlutils/model/B_BUYERFUNDS.xml
index 99ba2ad5fa..defb2498f2 100644
--- a/db/ddlutils/model/B_BUYERFUNDS.xml
+++ b/db/ddlutils/model/B_BUYERFUNDS.xml
@@ -13,8 +13,8 @@
       <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_ORDER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_PAYMENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="COMMITTEDAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="NONCOMMITTEDAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="COMMITTEDAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="NONCOMMITTEDAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="B_BUYER" name="BBUYER_BBUYERFUNDS">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/B_SELLERFUNDS.xml b/db/ddlutils/model/B_SELLERFUNDS.xml
index bc54e9b61f..dd6867a6a4 100644
--- a/db/ddlutils/model/B_SELLERFUNDS.xml
+++ b/db/ddlutils/model/B_SELLERFUNDS.xml
@@ -13,8 +13,8 @@
       <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_ORDER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_PAYMENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="COMMITTEDAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="NONCOMMITTEDAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="COMMITTEDAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="NONCOMMITTEDAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="B_SELLER" name="BSELLER_BSELLERFUNDS">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/CM_WEBACCESSLOG.xml b/db/ddlutils/model/CM_WEBACCESSLOG.xml
index 3369f1b893..51a7bac2f2 100644
--- a/db/ddlutils/model/CM_WEBACCESSLOG.xml
+++ b/db/ddlutils/model/CM_WEBACCESSLOG.xml
@@ -25,7 +25,7 @@
       <column name="HYPHEN" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="PROTOCOL" primaryKey="false" required="true" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="STATUSCODE" primaryKey="false" required="false" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
-      <column name="FILESIZE" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="FILESIZE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="CM_MEDIA_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_CMWEBACCESSLOG">
diff --git a/db/ddlutils/model/C_ACCTSCHEMA.xml b/db/ddlutils/model/C_ACCTSCHEMA.xml
index 225ffb8299..ef843cd8f0 100644
--- a/db/ddlutils/model/C_ACCTSCHEMA.xml
+++ b/db/ddlutils/model/C_ACCTSCHEMA.xml
@@ -29,8 +29,8 @@
       <column name="COSTINGLEVEL" primaryKey="false" required="true" type="CHAR" size="1" default="C" autoIncrement="false"/>
       <column name="ISADJUSTCOGS" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="AD_ORGONLY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="ISPOSTSERVICES" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="ISEXPLICITCOSTADJUSTMENT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
+      <column name="ISPOSTSERVICES" primaryKey="false" required="true" type="CHAR" size="1" default="(&apos;N&apos;)" autoIncrement="false"/>
+      <column name="ISEXPLICITCOSTADJUSTMENT" primaryKey="false" required="true" type="CHAR" size="1" default="(&apos;N&apos;)" autoIncrement="false"/>
       <column name="COMMITMENTTYPE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="TAXCORRECTIONTYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_ACCTSCHEMA_DEFAULT.xml b/db/ddlutils/model/C_ACCTSCHEMA_DEFAULT.xml
index eb7f2a8627..5afc1ba5cb 100644
--- a/db/ddlutils/model/C_ACCTSCHEMA_DEFAULT.xml
+++ b/db/ddlutils/model/C_ACCTSCHEMA_DEFAULT.xml
@@ -74,6 +74,15 @@
       <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>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_REALIZEDLOSS_CSCHEMADEFAULT">
+        <reference local="REALIZEDLOSS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_TCREDIT_CSCHEMADEFAULT">
         <reference local="T_CREDIT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
@@ -236,15 +245,6 @@
       <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>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_REALIZEDGAIN_CSCHEMADEFAULT">
-        <reference local="REALIZEDGAIN_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_REALIZEDLOSS_CSCHEMADEFAULT">
-        <reference local="REALIZEDLOSS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/C_ACCTSCHEMA_ELEMENT.xml b/db/ddlutils/model/C_ACCTSCHEMA_ELEMENT.xml
index 510e60b528..a300cab9fd 100644
--- a/db/ddlutils/model/C_ACCTSCHEMA_ELEMENT.xml
+++ b/db/ddlutils/model/C_ACCTSCHEMA_ELEMENT.xml
@@ -30,12 +30,12 @@
       <foreign-key foreignTable="AD_CLIENT" name="ADCLIENT_CASCHEMAELEMENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_ORG" name="ADORGID_C_ASCHEMAELEMENT">
-        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORG_CASCHEMAELEMENT">
         <reference local="ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="ADORGID_C_ASCHEMAELEMENT">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_CASCHEMAELEMENT">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_ACCTSCHEMA_GL.xml b/db/ddlutils/model/C_ACCTSCHEMA_GL.xml
index 08baf50e10..24579925ad 100644
--- a/db/ddlutils/model/C_ACCTSCHEMA_GL.xml
+++ b/db/ddlutils/model/C_ACCTSCHEMA_GL.xml
@@ -25,8 +25,14 @@
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_CACCTSCHEMAGL">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_INTERCOMPANYDUETO_CSCHEMAGL">
-        <reference local="INTERCOMPANYDUETO_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_INCOMESUMMARY_CSCHEMAGL">
+        <reference local="INCOMESUMMARY_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_INTERCOMPANYDUEFROM_CSCHEMA">
+        <reference local="INTERCOMPANYDUEFROM_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_SUSPENSEERROR_CSCHEMAGL">
+        <reference local="SUSPENSEERROR_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PPVOFFSET_CSCHEMAGL">
         <reference local="PPVOFFSET_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
@@ -34,20 +40,14 @@
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_RETAINEDEARNING_CSCHEMAGL">
         <reference local="RETAINEDEARNING_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_SUSPENSEERROR_CSCHEMAGL">
-        <reference local="SUSPENSEERROR_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_SUSPENSEBALANCING_CSCHEMAGL">
+        <reference local="SUSPENSEBALANCING_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_CURRENCYBALANCING_CSCHEMAGL">
         <reference local="CURRENCYBALANCING_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_INCOMESUMMARY_CSCHEMAGL">
-        <reference local="INCOMESUMMARY_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_INTERCOMPANYDUEFROM_CSCHEMA">
-        <reference local="INTERCOMPANYDUEFROM_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_SUSPENSEBALANCING_CSCHEMAGL">
-        <reference local="SUSPENSEBALANCING_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_INTERCOMPANYDUETO_CSCHEMAGL">
+        <reference local="INTERCOMPANYDUETO_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
diff --git a/db/ddlutils/model/C_ALLOCATIONHDR.xml b/db/ddlutils/model/C_ALLOCATIONHDR.xml
index ea88e4d9bc..9d5f7711df 100644
--- a/db/ddlutils/model/C_ALLOCATIONHDR.xml
+++ b/db/ddlutils/model/C_ALLOCATIONHDR.xml
@@ -15,7 +15,7 @@
       <column name="DATETRX" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATEACCT" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="APPROVALAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="APPROVALAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="ISMANUAL" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="DOCSTATUS" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
       <column name="DOCACTION" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_ALLOCATIONLINE.xml b/db/ddlutils/model/C_ALLOCATIONLINE.xml
index 145f3efe9d..39d159115b 100644
--- a/db/ddlutils/model/C_ALLOCATIONLINE.xml
+++ b/db/ddlutils/model/C_ALLOCATIONLINE.xml
@@ -18,11 +18,11 @@
       <column name="C_ORDER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_PAYMENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_CASHLINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="AMOUNT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="DISCOUNTAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="WRITEOFFAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="AMOUNT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="DISCOUNTAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="WRITEOFFAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="POSTED" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="OVERUNDERAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="OVERUNDERAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_ALLOCATIONHDR_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_ALLOCATIONHDR" name="CALLOCATION_CALLOCATIONLINE">
         <reference local="C_ALLOCATIONHDR_ID" foreign="C_ALLOCATIONHDR_ID"/>
diff --git a/db/ddlutils/model/C_BANKACCOUNT.xml b/db/ddlutils/model/C_BANKACCOUNT.xml
index cade1dd6f3..42ab2b26b5 100644
--- a/db/ddlutils/model/C_BANKACCOUNT.xml
+++ b/db/ddlutils/model/C_BANKACCOUNT.xml
@@ -14,8 +14,8 @@
       <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="BANKACCOUNTTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="ACCOUNTNO" primaryKey="false" required="true" type="VARCHAR" size="20" autoIncrement="false"/>
-      <column name="CURRENTBALANCE" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="CREDITLIMIT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="CURRENTBALANCE" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="CREDITLIMIT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="ISDEFAULT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="IBAN" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_BANKACCOUNT_ACCT.xml b/db/ddlutils/model/C_BANKACCOUNT_ACCT.xml
index ec237d75ab..d2ab839d06 100644
--- a/db/ddlutils/model/C_BANKACCOUNT_ACCT.xml
+++ b/db/ddlutils/model/C_BANKACCOUNT_ACCT.xml
@@ -29,42 +29,42 @@
       <foreign-key foreignTable="C_BANKACCOUNT" name="CBANKACCOUNT_CBANKACCTACCT">
         <reference local="C_BANKACCOUNT_ID" foreign="C_BANKACCOUNT_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_BINTERESTREV_CBANKACCOUNT">
+        <reference local="B_INTERESTREV_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <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>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_BREVALUATIONLOSS_CBANKACCOU">
         <reference local="B_REVALUATIONLOSS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_BSETTLEMENTLOSS_CBANKACCOUN">
-        <reference local="B_SETTLEMENTLOSS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_BSETTLEMENTGAIN_CBANKACCOUN">
         <reference local="B_SETTLEMENTGAIN_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_BSETTLEMENTLOSS_CBANKACCOUN">
+        <reference local="B_SETTLEMENTLOSS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_BUNALLOCATEDCASH_CBANKACCOU">
+        <reference local="B_UNALLOCATEDCASH_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <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_BINTRANSIT_CBANKACCOUNT">
-        <reference local="B_INTRANSIT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_BINTERESTREV_CBANKACCOUNT">
-        <reference local="B_INTERESTREV_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>
       <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_BUNALLOCATEDCASH_CBANKACCOU">
-        <reference local="B_UNALLOCATEDCASH_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/C_BANKSTATEMENT.xml b/db/ddlutils/model/C_BANKSTATEMENT.xml
index 647494f869..49a6316d28 100644
--- a/db/ddlutils/model/C_BANKSTATEMENT.xml
+++ b/db/ddlutils/model/C_BANKSTATEMENT.xml
@@ -15,9 +15,9 @@
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="ISMANUAL" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="STATEMENTDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="BEGINNINGBALANCE" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="ENDINGBALANCE" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="STATEMENTDIFFERENCE" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="BEGINNINGBALANCE" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="ENDINGBALANCE" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="STATEMENTDIFFERENCE" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="CREATEFROM" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <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"/>
diff --git a/db/ddlutils/model/C_BANKSTATEMENTLINE.xml b/db/ddlutils/model/C_BANKSTATEMENTLINE.xml
index c5b68e9424..dad3378b6e 100644
--- a/db/ddlutils/model/C_BANKSTATEMENTLINE.xml
+++ b/db/ddlutils/model/C_BANKSTATEMENTLINE.xml
@@ -18,11 +18,11 @@
       <column name="VALUTADATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATEACCT" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="TRXAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="STMTAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="TRXAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="STMTAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_CHARGE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="CHARGEAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="INTERESTAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="CHARGEAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="INTERESTAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="MEMO" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="REFERENCENO" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="ISMANUAL" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
@@ -37,7 +37,7 @@
       <column name="EFTVALUTADATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="EFTREFERENCE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="EFTCURRENCY" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
-      <column name="EFTAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="EFTAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="EFTCHECKNO" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="MATCHSTATEMENT" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_BPARTNER.xml b/db/ddlutils/model/C_BPARTNER.xml
index ecf3c558c7..3ca883dfea 100644
--- a/db/ddlutils/model/C_BPARTNER.xml
+++ b/db/ddlutils/model/C_BPARTNER.xml
@@ -34,13 +34,13 @@
       <column name="NUMBEREMPLOYEES" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="NAICS" primaryKey="false" required="false" type="CHAR" size="6" autoIncrement="false"/>
       <column name="FIRSTSALE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="ACQUSITIONCOST" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="POTENTIALLIFETIMEVALUE" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="ACTUALLIFETIMEVALUE" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="ACQUSITIONCOST" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="POTENTIALLIFETIMEVALUE" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="ACTUALLIFETIMEVALUE" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="SHAREOFCUSTOMER" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="PAYMENTRULE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="SO_CREDITLIMIT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="SO_CREDITUSED" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="SO_CREDITLIMIT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="SO_CREDITUSED" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_PAYMENTTERM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="M_PRICELIST_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="M_DISCOUNTSCHEMA_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
@@ -65,20 +65,20 @@
       <column name="SOCREDITSTATUS" primaryKey="false" required="false" type="CHAR" size="1" default="O" autoIncrement="false"/>
       <column name="SHELFLIFEMINPCT" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="AD_ORGBP_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="FLATDISCOUNT" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="TOTALOPENBALANCE" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="FLATDISCOUNT" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="TOTALOPENBALANCE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="ADCLIENT_CBPARTNER">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
       <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_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_ORG" name="ADORG_CBPARTNER">
+        <reference local="AD_ORG_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,18 +100,18 @@
       <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="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="MDISCOUNTSPO_CBPARTNER">
-        <reference local="PO_DISCOUNTSCHEMA_ID" foreign="M_DISCOUNTSCHEMA_ID"/>
+      <foreign-key foreignTable="C_PAYMENTTERM" name="CPOPAYMENTTERM_CBPARTNER">
+        <reference local="PO_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>
+      <foreign-key foreignTable="M_DISCOUNTSCHEMA" name="MDISCOUNTSPO_CBPARTNER">
+        <reference local="PO_DISCOUNTSCHEMA_ID" foreign="M_DISCOUNTSCHEMA_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="M_PRICELIST" name="MPRICELISTPO_CBUSPARTNER">
         <reference local="PO_PRICELIST_ID" foreign="M_PRICELIST_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_BPARTNER_PRODUCT.xml b/db/ddlutils/model/C_BPARTNER_PRODUCT.xml
index 6040056f80..35a70d08e5 100644
--- a/db/ddlutils/model/C_BPARTNER_PRODUCT.xml
+++ b/db/ddlutils/model/C_BPARTNER_PRODUCT.xml
@@ -14,7 +14,7 @@
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="SHELFLIFEMINPCT" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="SHELFLIFEMINDAYS" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
-      <column name="QUALITYRATING" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="QUALITYRATING" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="VENDORPRODUCTNO" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="VENDORCATEGORY" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="MANUFACTURER" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_BP_GROUP.xml b/db/ddlutils/model/C_BP_GROUP.xml
index 77473e7150..dfa6614943 100644
--- a/db/ddlutils/model/C_BP_GROUP.xml
+++ b/db/ddlutils/model/C_BP_GROUP.xml
@@ -21,8 +21,8 @@
       <column name="PO_PRICELIST_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="M_DISCOUNTSCHEMA_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PO_DISCOUNTSCHEMA_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="CREDITWATCHPERCENT" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="PRICEMATCHTOLERANCE" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="CREDITWATCHPERCENT" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="PRICEMATCHTOLERANCE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="C_DUNNING_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="M_DISCOUNTSCHEMA" name="MDISCOUNTSCHEMAPO_CBPGROUP">
         <reference local="PO_DISCOUNTSCHEMA_ID" foreign="M_DISCOUNTSCHEMA_ID"/>
diff --git a/db/ddlutils/model/C_BP_GROUP_ACCT.xml b/db/ddlutils/model/C_BP_GROUP_ACCT.xml
index 6bea7a05e1..c2b49076fe 100644
--- a/db/ddlutils/model/C_BP_GROUP_ACCT.xml
+++ b/db/ddlutils/model/C_BP_GROUP_ACCT.xml
@@ -31,42 +31,42 @@
       <foreign-key foreignTable="C_BP_GROUP" name="CBPGROUP_CBPGROUPACCT">
         <reference local="C_BP_GROUP_ID" foreign="C_BP_GROUP_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_NOTINVOICEDRECEIPTS_CBPGROU">
+        <reference local="NOTINVOICEDRECEIPTS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_NOTINVOICEDREC_CBPGROUP">
+        <reference local="NOTINVOICEDRECEIVABLES_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_WRITEOFF_CBPGROUP">
+        <reference local="WRITEOFF_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PAYDISCOUNTEXP_CBPGROUP">
+        <reference local="PAYDISCOUNT_EXP_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PAYDISCOUNTREV_CBPGROUP">
         <reference local="PAYDISCOUNT_REV_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_VLIABILITYSERVICES_CBPGROUP">
-        <reference local="V_LIABILITY_SERVICES_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_UNEARNEDREVENUE_CBPGROUP">
         <reference local="UNEARNEDREVENUE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_VLIABILITYSERVICES_CBPGROUP">
+        <reference local="V_LIABILITY_SERVICES_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_VLIABILITY_CBPGROUP">
+        <reference local="V_LIABILITY_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_VPREPAYMENT_CBPGROUP">
         <reference local="V_PREPAYMENT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_WRITEOFF_CBPGROUP">
-        <reference local="WRITEOFF_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_CRECEIVABLE_CBPGROUP">
         <reference local="C_RECEIVABLE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_CPREPAYMENT_CBPGROUP">
         <reference local="C_PREPAYMENT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_NOTINVOICEDREC_CBPGROUP">
-        <reference local="NOTINVOICEDRECEIVABLES_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_NOTINVOICEDRECEIPTS_CBPGROU">
-        <reference local="NOTINVOICEDRECEIPTS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PAYDISCOUNTEXP_CBPGROUP">
-        <reference local="PAYDISCOUNT_EXP_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_NOTINVOICEDREVENUE_CBPGROUP">
         <reference local="NOTINVOICEDREVENUE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_VLIABILITY_CBPGROUP">
-        <reference local="V_LIABILITY_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/C_BP_VENDOR_ACCT.xml b/db/ddlutils/model/C_BP_VENDOR_ACCT.xml
index cbc94bfd20..7d56685d4e 100644
--- a/db/ddlutils/model/C_BP_VENDOR_ACCT.xml
+++ b/db/ddlutils/model/C_BP_VENDOR_ACCT.xml
@@ -20,12 +20,12 @@
       <foreign-key foreignTable="C_BPARTNER" name="C_BUSPARTNER_C_BP_VENDOR_ACCT">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_VPREPAYMENT_CBPVENDOR">
-        <reference local="V_PREPAYMENT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_VLIABILITY_CBPVENDOR">
         <reference local="V_LIABILITY_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_VPREPAYMENT_CBPVENDOR">
+        <reference local="V_PREPAYMENT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_VLIABILITYSERVICES_CBPVENDO">
         <reference local="V_LIABILITY_SERVICES_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_CAMPAIGN.xml b/db/ddlutils/model/C_CAMPAIGN.xml
index d6db4309b8..60675448b6 100644
--- a/db/ddlutils/model/C_CAMPAIGN.xml
+++ b/db/ddlutils/model/C_CAMPAIGN.xml
@@ -16,7 +16,7 @@
       <column name="C_CHANNEL_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="STARTDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="ENDDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="COSTS" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="COSTS" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="ISSUMMARY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="C_CHANNEL" name="CCHANNEL_CCAMPAIGN">
         <reference local="C_CHANNEL_ID" foreign="C_CHANNEL_ID"/>
diff --git a/db/ddlutils/model/C_CASH.xml b/db/ddlutils/model/C_CASH.xml
index b7143c60c5..6a157c5bb6 100644
--- a/db/ddlutils/model/C_CASH.xml
+++ b/db/ddlutils/model/C_CASH.xml
@@ -15,9 +15,9 @@
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="STATEMENTDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATEACCT" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="BEGINNINGBALANCE" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="ENDINGBALANCE" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="STATEMENTDIFFERENCE" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="BEGINNINGBALANCE" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="ENDINGBALANCE" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="STATEMENTDIFFERENCE" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <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="POSTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
@@ -30,12 +30,12 @@
       <column name="ISAPPROVED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="DOCSTATUS" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
       <column name="DOCACTION" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
-      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_CCASH">
-        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORG_CCASH">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_CCASH">
+        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ACTIVITY" name="CACTIVITY_CCASH">
         <reference local="C_ACTIVITY_ID" foreign="C_ACTIVITY_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_CASHBOOK_ACCT.xml b/db/ddlutils/model/C_CASHBOOK_ACCT.xml
index cc5987207b..f2a3dbc2d6 100644
--- a/db/ddlutils/model/C_CASHBOOK_ACCT.xml
+++ b/db/ddlutils/model/C_CASHBOOK_ACCT.xml
@@ -22,21 +22,21 @@
       <foreign-key foreignTable="C_CASHBOOK" name="CCASHBOOK_CCASHBOOKACCT">
         <reference local="C_CASHBOOK_ID" foreign="C_CASHBOOK_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_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>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/C_CASHLINE.xml b/db/ddlutils/model/C_CASHLINE.xml
index 80ae094f57..cd1fb19f07 100644
--- a/db/ddlutils/model/C_CASHLINE.xml
+++ b/db/ddlutils/model/C_CASHLINE.xml
@@ -18,9 +18,9 @@
       <column name="C_CHARGE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_INVOICE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="AMOUNT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="DISCOUNTAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="WRITEOFFAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="AMOUNT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="DISCOUNTAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="WRITEOFFAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="ISGENERATED" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="C_BANKACCOUNT" name="CBANKACCT_CCASHLINE">
diff --git a/db/ddlutils/model/C_CHANNEL.xml b/db/ddlutils/model/C_CHANNEL.xml
index fd078dd51b..ab9d6b8da6 100644
--- a/db/ddlutils/model/C_CHANNEL.xml
+++ b/db/ddlutils/model/C_CHANNEL.xml
@@ -17,6 +17,9 @@
         <unique-column name="AD_CLIENT_ID"/>
         <unique-column name="NAME"/>
       </unique>
+      <unique name="C_CHANNEL_KEY">
+        <unique-column name="C_CHANNEL_ID"/>
+      </unique>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/C_CHARGE.xml b/db/ddlutils/model/C_CHARGE.xml
index d73abcda23..43350ea79c 100644
--- a/db/ddlutils/model/C_CHARGE.xml
+++ b/db/ddlutils/model/C_CHARGE.xml
@@ -12,7 +12,7 @@
       <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="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="CHARGEAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="CHARGEAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="ISSAMETAX" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISSAMECURRENCY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="C_TAXCATEGORY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_COMMISSIONAMT.xml b/db/ddlutils/model/C_COMMISSIONAMT.xml
index a951f9a828..bc4cff55e5 100644
--- a/db/ddlutils/model/C_COMMISSIONAMT.xml
+++ b/db/ddlutils/model/C_COMMISSIONAMT.xml
@@ -12,9 +12,9 @@
       <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_COMMISSIONRUN_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_COMMISSIONLINE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="CONVERTEDAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="ACTUALQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="COMMISSIONAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="CONVERTEDAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="ACTUALQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="COMMISSIONAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="C_COMMISSIONLINE" name="CCOMLINE_CCOMAMT">
         <reference local="C_COMMISSIONLINE_ID" foreign="C_COMMISSIONLINE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_COMMISSIONDETAIL.xml b/db/ddlutils/model/C_COMMISSIONDETAIL.xml
index c47867cb98..480aab021c 100644
--- a/db/ddlutils/model/C_COMMISSIONDETAIL.xml
+++ b/db/ddlutils/model/C_COMMISSIONDETAIL.xml
@@ -16,9 +16,9 @@
       <column name="C_INVOICELINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="INFO" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="ACTUALAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="CONVERTEDAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="ACTUALQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="ACTUALAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="CONVERTEDAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="ACTUALQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="C_COMMISSIONAMT" name="CCOMMISSIONAMT_CCOMDETAIL">
         <reference local="C_COMMISSIONAMT_ID" foreign="C_COMMISSIONAMT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_COMMISSIONLINE.xml b/db/ddlutils/model/C_COMMISSIONLINE.xml
index 452889d393..54461972da 100644
--- a/db/ddlutils/model/C_COMMISSIONLINE.xml
+++ b/db/ddlutils/model/C_COMMISSIONLINE.xml
@@ -13,10 +13,10 @@
       <column name="C_COMMISSION_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="LINE" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="AMTSUBTRACT" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="AMTMULTIPLIER" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="QTYSUBTRACT" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="QTYMULTIPLIER" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="AMTSUBTRACT" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
+      <column name="AMTMULTIPLIER" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
+      <column name="QTYSUBTRACT" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
+      <column name="QTYMULTIPLIER" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="ISPOSITIVEONLY" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="COMMISSIONORDERS" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_COMMISSIONRUN.xml b/db/ddlutils/model/C_COMMISSIONRUN.xml
index 9d8529fd0f..35a46c7e09 100644
--- a/db/ddlutils/model/C_COMMISSIONRUN.xml
+++ b/db/ddlutils/model/C_COMMISSIONRUN.xml
@@ -14,7 +14,7 @@
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="C_COMMISSION_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="STARTDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="GRANDTOTAL" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="GRANDTOTAL" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <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"/>
       <foreign-key foreignTable="C_COMMISSION" name="CCOMMISSION_CCOMMISSIONRUN">
diff --git a/db/ddlutils/model/C_CONVERSION_RATE.xml b/db/ddlutils/model/C_CONVERSION_RATE.xml
index 2b1787c10b..bca4fa0b56 100644
--- a/db/ddlutils/model/C_CONVERSION_RATE.xml
+++ b/db/ddlutils/model/C_CONVERSION_RATE.xml
@@ -14,8 +14,8 @@
       <column name="C_CURRENCY_ID_TO" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="VALIDFROM" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="VALIDTO" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="MULTIPLYRATE" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="DIVIDERATE" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="MULTIPLYRATE" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="DIVIDERATE" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_CONVERSIONTYPE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="C_CONVERSION_RATECLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
@@ -26,12 +26,12 @@
       <foreign-key foreignTable="C_CONVERSIONTYPE" name="CCONVERSIONTYPE_CCONVRATE">
         <reference local="C_CONVERSIONTYPE_ID" foreign="C_CONVERSIONTYPE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_CURRENCY" name="CCURRENCY_CCONVERSIONRATE">
-        <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_CURRENCY" name="C_CURRENCYCONVRATETO">
         <reference local="C_CURRENCY_ID_TO" foreign="C_CURRENCY_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_CURRENCY" name="CCURRENCY_CCONVERSIONRATE">
+        <reference local="C_CURRENCY_ID" 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.xml b/db/ddlutils/model/C_CURRENCY.xml
index 6558021829..d106a09080 100644
--- a/db/ddlutils/model/C_CURRENCY.xml
+++ b/db/ddlutils/model/C_CURRENCY.xml
@@ -18,7 +18,7 @@
       <column name="ISEURO" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISEMUMEMBER" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="EMUENTRYDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="EMURATE" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="EMURATE" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="C_CURRENCYCLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_CYCLESTEP.xml b/db/ddlutils/model/C_CYCLESTEP.xml
index 5899c7b141..68adab6e8d 100644
--- a/db/ddlutils/model/C_CYCLESTEP.xml
+++ b/db/ddlutils/model/C_CYCLESTEP.xml
@@ -12,7 +12,7 @@
       <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_CYCLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="SEQNO" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
-      <column name="RELATIVEWEIGHT" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="RELATIVEWEIGHT" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <foreign-key foreignTable="C_CYCLE" name="CCYCLE_CCYCLESTEP">
         <reference local="C_CYCLE_ID" foreign="C_CYCLE_ID"/>
diff --git a/db/ddlutils/model/C_DOCTYPE.xml b/db/ddlutils/model/C_DOCTYPE.xml
index 14d00a8747..a23a554f14 100644
--- a/db/ddlutils/model/C_DOCTYPE.xml
+++ b/db/ddlutils/model/C_DOCTYPE.xml
@@ -42,15 +42,15 @@
       <foreign-key foreignTable="AD_SEQUENCE" name="AD_SEQUENCE_DOCTYPEDOC">
         <reference local="DOCNOSEQUENCE_ID" foreign="AD_SEQUENCE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_DOCTYPE" name="CDOCTYPE_INVOICE">
-        <reference local="C_DOCTYPEINVOICE_ID" foreign="C_DOCTYPE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_DOCTYPE" name="CDOCTYPE_PROFORMA">
         <reference local="C_DOCTYPEPROFORMA_ID" foreign="C_DOCTYPE_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_DOCTYPE" name="CDOCTYPE_SHIPMENT">
         <reference local="C_DOCTYPESHIPMENT_ID" foreign="C_DOCTYPE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_DOCTYPE" name="CDOCTYPE_INVOICE">
+        <reference local="C_DOCTYPEINVOICE_ID" foreign="C_DOCTYPE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="GL_CATEGORY" name="GLCATEGORY_CDOCTYPE">
         <reference local="GL_CATEGORY_ID" foreign="GL_CATEGORY_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_DUNNINGLEVEL.xml b/db/ddlutils/model/C_DUNNINGLEVEL.xml
index 44b7d89a84..5a9d0800a3 100644
--- a/db/ddlutils/model/C_DUNNINGLEVEL.xml
+++ b/db/ddlutils/model/C_DUNNINGLEVEL.xml
@@ -16,9 +16,9 @@
       <column name="DAYSBETWEENDUNNING" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="NOTE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="CHARGEINTEREST" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="INTERESTPERCENT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="INTERESTPERCENT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="CHARGEFEE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="FEEAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="FEEAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DUNNING_PRINTFORMAT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" default="x" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_DUNNINGRUNENTRY.xml b/db/ddlutils/model/C_DUNNINGRUNENTRY.xml
index 27568f9d0a..ba0b62ed83 100644
--- a/db/ddlutils/model/C_DUNNINGRUNENTRY.xml
+++ b/db/ddlutils/model/C_DUNNINGRUNENTRY.xml
@@ -16,8 +16,8 @@
       <column name="C_DUNNINGRUN_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="SALESREP_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="AMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="AMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="NOTE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="C_BPARTNER" name="CBPARTNER_CDUNNINGRUNENTRY">
diff --git a/db/ddlutils/model/C_DUNNINGRUNLINE.xml b/db/ddlutils/model/C_DUNNINGRUNLINE.xml
index eddbf7505a..8cb986b6bf 100644
--- a/db/ddlutils/model/C_DUNNINGRUNLINE.xml
+++ b/db/ddlutils/model/C_DUNNINGRUNLINE.xml
@@ -13,16 +13,16 @@
       <column name="C_DUNNINGRUNENTRY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_INVOICE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_PAYMENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="AMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="CONVERTEDAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="AMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="CONVERTEDAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DAYSDUE" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <column name="TIMESDUNNED" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
-      <column name="INTERESTAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="FEEAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="TOTALAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="INTERESTAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="FEEAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="TOTALAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISINDISPUTE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="OPENAMT" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="OPENAMT" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <foreign-key foreignTable="C_DUNNINGRUNENTRY" name="CDUNNINGRUNENTRY_LINE">
         <reference local="C_DUNNINGRUNENTRY_ID" foreign="C_DUNNINGRUNENTRY_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_INTERORG_ACCT.xml b/db/ddlutils/model/C_INTERORG_ACCT.xml
index cd5c4f80bc..4eef3d95f7 100644
--- a/db/ddlutils/model/C_INTERORG_ACCT.xml
+++ b/db/ddlutils/model/C_INTERORG_ACCT.xml
@@ -13,12 +13,12 @@
       <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="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="AD_ORG" name="ADORGTO_CINTERORGACCT">
+        <reference local="AD_ORGTO_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>
diff --git a/db/ddlutils/model/C_INVOICE.xml b/db/ddlutils/model/C_INVOICE.xml
index 56a3ad4c08..0cd37e91b3 100644
--- a/db/ddlutils/model/C_INVOICE.xml
+++ b/db/ddlutils/model/C_INVOICE.xml
@@ -37,9 +37,9 @@
       <column name="PAYMENTRULE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="C_PAYMENTTERM_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_CHARGE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="CHARGEAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="TOTALLINES" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="GRANDTOTAL" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="CHARGEAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="TOTALLINES" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="GRANDTOTAL" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="M_PRICELIST_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISTAXINCLUDED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
@@ -98,12 +98,12 @@
       <foreign-key foreignTable="C_CURRENCY" name="CCURRENCY_CINVOICE">
         <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_DOCTYPE" name="CDOCTYPETARGET_CINVOICE">
-        <reference local="C_DOCTYPETARGET_ID" foreign="C_DOCTYPE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_DOCTYPE" name="CDOCTYPE_CINVOICE">
         <reference local="C_DOCTYPE_ID" foreign="C_DOCTYPE_ID"/>
       </foreign-key>
+      <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>
@@ -134,6 +134,9 @@
       <index name="C_INVOICE_BPARTNER">
         <index-column name="C_BPARTNER_ID"/>
       </index>
+      <unique name="C_INVOICE_KEY">
+        <unique-column name="C_INVOICE_ID"/>
+      </unique>
       <unique name="C_INVOICE_DOCUMENTNO">
         <unique-column name="DOCUMENTNO"/>
         <unique-column name="C_DOCTYPE_ID"/>
diff --git a/db/ddlutils/model/C_INVOICEBATCH.xml b/db/ddlutils/model/C_INVOICEBATCH.xml
index 6c36ace508..e3b54585b5 100644
--- a/db/ddlutils/model/C_INVOICEBATCH.xml
+++ b/db/ddlutils/model/C_INVOICEBATCH.xml
@@ -17,8 +17,8 @@
       <column name="SALESREP_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_CONVERSIONTYPE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="CONTROLAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="DOCUMENTAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="CONTROLAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="DOCUMENTAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <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"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_CINVOICEBATCH">
diff --git a/db/ddlutils/model/C_INVOICEBATCHLINE.xml b/db/ddlutils/model/C_INVOICEBATCHLINE.xml
index 579f39a365..216a8f5721 100644
--- a/db/ddlutils/model/C_INVOICEBATCHLINE.xml
+++ b/db/ddlutils/model/C_INVOICEBATCHLINE.xml
@@ -20,13 +20,13 @@
       <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_CHARGE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="QTYENTERED" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PRICEENTERED" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTYENTERED" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PRICEENTERED" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="ISTAXINCLUDED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="LINENETAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="LINENETAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_TAX_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="TAXAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="LINETOTALAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="TAXAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="LINETOTALAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_ACTIVITY_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"/>
diff --git a/db/ddlutils/model/C_INVOICELINE.xml b/db/ddlutils/model/C_INVOICELINE.xml
index c53045fa74..f65f5ce613 100644
--- a/db/ddlutils/model/C_INVOICELINE.xml
+++ b/db/ddlutils/model/C_INVOICELINE.xml
@@ -16,41 +16,41 @@
       <column name="LINE" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="QTYINVOICED" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PRICELIST" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PRICEACTUAL" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PRICELIMIT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="LINENETAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTYINVOICED" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PRICELIST" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PRICEACTUAL" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PRICELIMIT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="LINENETAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_CHARGE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_UOM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_TAX_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="S_RESOURCEASSIGNMENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="A_ASSET_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="TAXAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="TAXAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="ID" size="10" default="0" autoIncrement="false"/>
       <column name="ISDESCRIPTION" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISPRINTED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="LINETOTALAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="LINETOTALAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="REF_INVOICELINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="QTYENTERED" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="PRICEENTERED" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="QTYENTERED" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
+      <column name="PRICEENTERED" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" size="10" 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"/>
       <column name="RRSTARTDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="RRAMT" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="RRAMT" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <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"/>
       <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_CINVOICELINE">
-        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORG_CINVOICELINE">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_CINVOICELINE">
+        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="A_ASSET" name="AASSET_CINVOICELINE">
         <reference local="A_ASSET_ID" foreign="A_ASSET_ID"/>
       </foreign-key>
@@ -63,12 +63,12 @@
       <foreign-key foreignTable="C_CHARGE" name="CCHARGE_CINVOICELINE">
         <reference local="C_CHARGE_ID" foreign="C_CHARGE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENRVALUEUSER2_CINVLINE">
-        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENRVALUEUSER1_CINVLINE">
         <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENRVALUEUSER2_CINVLINE">
+        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_INVOICE" name="CINVOICE_CINVOICELINE">
         <reference local="C_INVOICE_ID" foreign="C_INVOICE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_INVOICEPAYSCHEDULE.xml b/db/ddlutils/model/C_INVOICEPAYSCHEDULE.xml
index 94177ad28d..fa4c5843f2 100644
--- a/db/ddlutils/model/C_INVOICEPAYSCHEDULE.xml
+++ b/db/ddlutils/model/C_INVOICEPAYSCHEDULE.xml
@@ -13,9 +13,9 @@
       <column name="C_INVOICE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_PAYSCHEDULE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DUEDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="DUEAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="DUEAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DISCOUNTDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="DISCOUNTAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="DISCOUNTAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="ISVALID" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <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"/>
diff --git a/db/ddlutils/model/C_INVOICESCHEDULE.xml b/db/ddlutils/model/C_INVOICESCHEDULE.xml
index 3a1fbeb351..bce6828604 100644
--- a/db/ddlutils/model/C_INVOICESCHEDULE.xml
+++ b/db/ddlutils/model/C_INVOICESCHEDULE.xml
@@ -13,7 +13,7 @@
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="ISAMOUNT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="AMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="AMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="INVOICEFREQUENCY" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="INVOICEWEEKDAY" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="INVOICEWEEKDAYCUTOFF" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_INVOICETAX.xml b/db/ddlutils/model/C_INVOICETAX.xml
index 78c1408d7c..b8e892cc7b 100644
--- a/db/ddlutils/model/C_INVOICETAX.xml
+++ b/db/ddlutils/model/C_INVOICETAX.xml
@@ -11,8 +11,8 @@
       <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="TAXBASEAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="TAXAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="TAXBASEAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="TAXAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISTAXINCLUDED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="C_INVOICE" name="CINVOICE_CINVOICETAX">
diff --git a/db/ddlutils/model/C_LANDEDCOSTALLOCATION.xml b/db/ddlutils/model/C_LANDEDCOSTALLOCATION.xml
index d2802511b2..b37f92d3f8 100644
--- a/db/ddlutils/model/C_LANDEDCOSTALLOCATION.xml
+++ b/db/ddlutils/model/C_LANDEDCOSTALLOCATION.xml
@@ -13,9 +13,9 @@
       <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="M_COSTELEMENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="AMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="BASE" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="AMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="BASE" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="C_INVOICELINE" name="CINVOICELINE_CLANDEDCOSTALLOC">
         <reference local="C_INVOICELINE_ID" foreign="C_INVOICELINE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_ORDER.xml b/db/ddlutils/model/C_ORDER.xml
index 9ac3e318f6..cb61e92f59 100644
--- a/db/ddlutils/model/C_ORDER.xml
+++ b/db/ddlutils/model/C_ORDER.xml
@@ -41,14 +41,14 @@
       <column name="INVOICERULE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="DELIVERYRULE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="FREIGHTCOSTRULE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="FREIGHTAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="FREIGHTAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DELIVERYVIARULE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="M_SHIPPER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_CHARGE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="CHARGEAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="CHARGEAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="PRIORITYRULE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="TOTALLINES" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="GRANDTOTAL" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="TOTALLINES" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="GRANDTOTAL" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="M_WAREHOUSE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_PRICELIST_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISTAXINCLUDED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
@@ -73,44 +73,44 @@
       <column name="PAY_LOCATION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="REF_ORDER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISDROPSHIP" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="VOLUME" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="WEIGHT" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_CORDER">
-        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
+      <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="ADORG_CORDER">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <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="ADUSER_SR_CORDER">
-        <reference local="SALESREP_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_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="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="CBPARTNERBILL_CORDER">
+        <reference local="BILL_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="CBPLOCATIONBILL_CORDER">
-        <reference local="BILL_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="CBPLOCATIONBILL_CORDER">
+        <reference local="BILL_LOCATION_ID" foreign="C_BPARTNER_LOCATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_CAMPAIGN" name="CCAMPAIGN_CORDER">
         <reference local="C_CAMPAIGN_ID" foreign="C_CAMPAIGN_ID"/>
       </foreign-key>
@@ -126,18 +126,18 @@
       <foreign-key foreignTable="C_CURRENCY" name="CCURRENCY_CORDER">
         <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_DOCTYPE" name="CDOCTYPETARGET_CORDER">
-        <reference local="C_DOCTYPETARGET_ID" foreign="C_DOCTYPE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_DOCTYPE" name="C_DOCTYPE_CORDER">
         <reference local="C_DOCTYPE_ID" foreign="C_DOCTYPE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_CORDER">
-        <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
+      <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_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 857230fdf3..560ec5352c 100644
--- a/db/ddlutils/model/C_ORDERLINE.xml
+++ b/db/ddlutils/model/C_ORDERLINE.xml
@@ -22,18 +22,18 @@
       <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="M_WAREHOUSE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_UOM_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="QTYORDERED" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="QTYRESERVED" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="QTYDELIVERED" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="QTYINVOICED" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTYORDERED" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="QTYRESERVED" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="QTYDELIVERED" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="QTYINVOICED" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="M_SHIPPER_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="PRICELIST" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PRICEACTUAL" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PRICELIMIT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="LINENETAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="DISCOUNT" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="FREIGHTAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="PRICELIST" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PRICEACTUAL" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PRICELIMIT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="LINENETAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="DISCOUNT" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="FREIGHTAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_CHARGE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_TAX_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="S_RESOURCEASSIGNMENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
@@ -41,15 +41,15 @@
       <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="ID" size="10" default="0" autoIncrement="false"/>
       <column name="ISDESCRIPTION" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="QTYENTERED" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="PRICEENTERED" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="QTYENTERED" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
+      <column name="PRICEENTERED" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="PRICECOST" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="QTYLOSTSALES" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="PRICECOST" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="QTYLOSTSALES" primaryKey="false" required="true" type="DECIMAL" default="0" 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"/>
       <column name="RRSTARTDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="RRAMT" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="RRAMT" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <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"/>
@@ -79,12 +79,12 @@
       <foreign-key foreignTable="C_CURRENCY" name="CCURRENCY_CORDERLINE">
         <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENRVALUEUSER2_CORDERLINE">
-        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENRVALUEUSER1_CORDERLINE">
         <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENRVALUEUSER2_CORDERLINE">
+        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ORDER" name="CORDER_CORDERLINE">
         <reference local="C_ORDER_ID" foreign="C_ORDER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_ORDERTAX.xml b/db/ddlutils/model/C_ORDERTAX.xml
index 5b494729bb..a8bef12cc6 100644
--- a/db/ddlutils/model/C_ORDERTAX.xml
+++ b/db/ddlutils/model/C_ORDERTAX.xml
@@ -11,8 +11,8 @@
       <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="TAXBASEAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="TAXAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="TAXBASEAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="TAXAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISTAXINCLUDED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="C_ORDER" name="CORDER_CORDERTAX">
diff --git a/db/ddlutils/model/C_PAYMENT.xml b/db/ddlutils/model/C_PAYMENT.xml
index 1819728965..9c31be2f1a 100644
--- a/db/ddlutils/model/C_PAYMENT.xml
+++ b/db/ddlutils/model/C_PAYMENT.xml
@@ -42,10 +42,10 @@
       <column name="ORIG_TRXID" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="PONUM" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="PAYAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="DISCOUNTAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="WRITEOFFAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="TAXAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="PAYAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="DISCOUNTAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="WRITEOFFAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="TAXAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="ISAPPROVED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="R_PNREF" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="R_RESULT" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
@@ -64,11 +64,11 @@
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="POSTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISOVERUNDERPAYMENT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="OVERUNDERAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="OVERUNDERAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="A_COUNTRY" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSELFSERVICE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="CHARGEAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="CHARGEAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_CHARGE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISDELAYEDCAPTURE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="R_AUTHCODE_DC" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
@@ -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">
-        <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="AD_ORG" name="ADORGTRX_CPAYMENT">
+        <reference local="AD_ORGTRX_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>
@@ -119,12 +119,12 @@
       <foreign-key foreignTable="C_DOCTYPE" name="CDOCTYPE_CPAYMENT">
         <reference local="C_DOCTYPE_ID" foreign="C_DOCTYPE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER2_CPAYMENT">
-        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_CPAYMENT">
         <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER2_CPAYMENT">
+        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_PAYMENTBATCH" name="CPAYMENTBATCH_CPAYMENT">
         <reference local="C_PAYMENTBATCH_ID" foreign="C_PAYMENTBATCH_ID"/>
       </foreign-key>
@@ -137,6 +137,15 @@
       <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>
@@ -149,14 +158,5 @@
       <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_PAYMENTALLOCATE.xml b/db/ddlutils/model/C_PAYMENTALLOCATE.xml
index dbfec6b0b0..8678ddd2cd 100644
--- a/db/ddlutils/model/C_PAYMENTALLOCATE.xml
+++ b/db/ddlutils/model/C_PAYMENTALLOCATE.xml
@@ -12,11 +12,11 @@
       <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_PAYMENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_INVOICE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="AMOUNT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="DISCOUNTAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="WRITEOFFAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="OVERUNDERAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="INVOICEAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="AMOUNT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="DISCOUNTAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="WRITEOFFAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="OVERUNDERAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="INVOICEAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_ALLOCATIONLINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_ALLOCATIONLINE" name="CPAYMTALLOCATE_CALLOCATIONLINE">
         <reference local="C_ALLOCATIONLINE_ID" foreign="C_ALLOCATIONLINE_ID"/>
diff --git a/db/ddlutils/model/C_PAYMENTPROCESSOR.xml b/db/ddlutils/model/C_PAYMENTPROCESSOR.xml
index ba71ff4c84..192b292615 100644
--- a/db/ddlutils/model/C_PAYMENTPROCESSOR.xml
+++ b/db/ddlutils/model/C_PAYMENTPROCESSOR.xml
@@ -33,11 +33,11 @@
       <column name="ACCEPTATM" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="REQUIREVV" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="COSTPERTRX" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="COMMISSION" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="COSTPERTRX" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="COMMISSION" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="PARTNERID" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="VENDORID" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="MINIMUMAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="MINIMUMAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="ACCEPTDIRECTDEBIT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ACCEPTDIRECTDEPOSIT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="AD_SEQUENCE" name="ADSEQUENCE_CPAYMENTPROCESSOR">
@@ -49,6 +49,9 @@
       <foreign-key foreignTable="C_CURRENCY" name="CCURRENCY_CPAYMENTPROCESSOR">
         <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
       </foreign-key>
+      <unique name="C_PAYMENTPROCESSOR_KEY">
+        <unique-column name="C_PAYMENTPROCESSOR_ID"/>
+      </unique>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/C_PAYMENTTERM.xml b/db/ddlutils/model/C_PAYMENTTERM.xml
index 73aa372f7c..94bcd2d93f 100644
--- a/db/ddlutils/model/C_PAYMENTTERM.xml
+++ b/db/ddlutils/model/C_PAYMENTTERM.xml
@@ -21,9 +21,9 @@
       <column name="FIXMONTHDAY" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="FIXMONTHOFFSET" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="DISCOUNTDAYS" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
-      <column name="DISCOUNT" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="DISCOUNT" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="DISCOUNTDAYS2" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
-      <column name="DISCOUNT2" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="DISCOUNT2" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="ISNEXTBUSINESSDAY" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISDEFAULT" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_PAYSCHEDULE.xml b/db/ddlutils/model/C_PAYSCHEDULE.xml
index 3518595586..fcaeeeac5f 100644
--- a/db/ddlutils/model/C_PAYSCHEDULE.xml
+++ b/db/ddlutils/model/C_PAYSCHEDULE.xml
@@ -11,11 +11,11 @@
       <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="C_PAYMENTTERM_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="PERCENTAGE" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="PERCENTAGE" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="NETDAYS" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="NETDAY" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="DISCOUNTDAYS" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
-      <column name="DISCOUNT" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="DISCOUNT" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="ISVALID" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="GRACEDAYS" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_PAYMENTTERM" name="CPAYMENTTERM_CPAYSCHEDULE">
diff --git a/db/ddlutils/model/C_PAYSELECTION.xml b/db/ddlutils/model/C_PAYSELECTION.xml
index a0057aca22..4c758b3a23 100644
--- a/db/ddlutils/model/C_PAYSELECTION.xml
+++ b/db/ddlutils/model/C_PAYSELECTION.xml
@@ -15,7 +15,7 @@
       <column name="C_BANKACCOUNT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="PAYDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="ISAPPROVED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="TOTALAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="TOTALAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="CREATEFROM" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <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"/>
diff --git a/db/ddlutils/model/C_PAYSELECTIONCHECK.xml b/db/ddlutils/model/C_PAYSELECTIONCHECK.xml
index cf18a65659..697c6cfb50 100644
--- a/db/ddlutils/model/C_PAYSELECTIONCHECK.xml
+++ b/db/ddlutils/model/C_PAYSELECTIONCHECK.xml
@@ -12,14 +12,14 @@
       <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_PAYSELECTION_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="PAYAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="PAYAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_PAYMENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DOCUMENTNO" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="ISPRINTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="PAYMENTRULE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="DISCOUNTAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="DISCOUNTAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="ISRECEIPT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="C_BP_BANKACCOUNT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_BPARTNER" name="CBPARTNER_CPAYSELECTIONCHECK">
diff --git a/db/ddlutils/model/C_PAYSELECTIONLINE.xml b/db/ddlutils/model/C_PAYSELECTIONLINE.xml
index cf3e50391b..fe09900a5b 100644
--- a/db/ddlutils/model/C_PAYSELECTIONLINE.xml
+++ b/db/ddlutils/model/C_PAYSELECTIONLINE.xml
@@ -16,12 +16,12 @@
       <column name="PAYMENTRULE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="ISMANUAL" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="C_INVOICE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="PAYAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="DIFFERENCEAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="PAYAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="DIFFERENCEAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_PAYSELECTIONCHECK_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="DISCOUNTAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="OPENAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="DISCOUNTAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="OPENAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="ISSOTRX" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="C_INVOICE" name="CINVOICE_CPAYSELECTLINE">
         <reference local="C_INVOICE_ID" foreign="C_INVOICE_ID"/>
diff --git a/db/ddlutils/model/C_PHASE.xml b/db/ddlutils/model/C_PHASE.xml
index 2de1d88d74..e26551d8fb 100644
--- a/db/ddlutils/model/C_PHASE.xml
+++ b/db/ddlutils/model/C_PHASE.xml
@@ -14,7 +14,7 @@
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="C_PROJECTTYPE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="STANDARDQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="STANDARDQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_PHASE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_PROJECTTYPE" name="CPROJECTTYPE_CPHASE">
diff --git a/db/ddlutils/model/C_POSKEY.xml b/db/ddlutils/model/C_POSKEY.xml
index c269f3c224..ab6fe15fc0 100644
--- a/db/ddlutils/model/C_POSKEY.xml
+++ b/db/ddlutils/model/C_POSKEY.xml
@@ -15,7 +15,7 @@
       <column name="C_POSKEYLAYOUT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="SEQNO" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="AD_PRINTCOLOR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_POSKEYLAYOUT" name="CPOSKEYLAYOUT_C_POSKEY">
         <reference local="C_POSKEYLAYOUT_ID" foreign="C_POSKEYLAYOUT_ID"/>
diff --git a/db/ddlutils/model/C_PROJECT.xml b/db/ddlutils/model/C_PROJECT.xml
index e3d62044de..b8ad76c309 100644
--- a/db/ddlutils/model/C_PROJECT.xml
+++ b/db/ddlutils/model/C_PROJECT.xml
@@ -24,10 +24,10 @@
       <column name="M_PRICELIST_VERSION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISCOMMITMENT" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="PLANNEDAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PLANNEDQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PLANNEDMARGINAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="COMMITTEDAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="PLANNEDAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PLANNEDQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PLANNEDMARGINAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="COMMITTEDAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DATECONTRACT" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATEFINISH" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="GENERATETO" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
@@ -35,10 +35,10 @@
       <column name="SALESREP_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="COPYFROM" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="C_PROJECTTYPE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="COMMITTEDQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="INVOICEDAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="INVOICEDQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PROJECTBALANCEAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="COMMITTEDQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="INVOICEDAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="INVOICEDQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PROJECTBALANCEAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_PHASE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISCOMMITCEILING" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="M_WAREHOUSE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
@@ -53,12 +53,12 @@
       <foreign-key foreignTable="AD_ORG" name="ADORG_CPROJECT">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_USER" name="ADUSER_SR_CPROJECT">
-        <reference local="SALESREP_ID" foreign="AD_USER_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_USER" name="ADUSER_CPROJECT">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_USER" name="ADUSER_SR_CPROJECT">
+        <reference local="SALESREP_ID" foreign="AD_USER_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_BPARTNER" name="CBPARTNER_CPROJECT">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_PROJECTISSUE.xml b/db/ddlutils/model/C_PROJECTISSUE.xml
index 3dfbe29aad..7982855928 100644
--- a/db/ddlutils/model/C_PROJECTISSUE.xml
+++ b/db/ddlutils/model/C_PROJECTISSUE.xml
@@ -15,7 +15,7 @@
       <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="ID" size="10" default="0" autoIncrement="false"/>
       <column name="M_LOCATOR_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="MOVEMENTQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="MOVEMENTQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="POSTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_PROJECTISSUEMA.xml b/db/ddlutils/model/C_PROJECTISSUEMA.xml
index 71d7e84a42..014a6b03dd 100644
--- a/db/ddlutils/model/C_PROJECTISSUEMA.xml
+++ b/db/ddlutils/model/C_PROJECTISSUEMA.xml
@@ -11,7 +11,7 @@
       <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="MOVEMENTQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="MOVEMENTQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="C_PROJECTISSUE" name="CPROJECTISSUE_CPROJECTISSUEMA">
         <reference local="C_PROJECTISSUE_ID" foreign="C_PROJECTISSUE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_PROJECTLINE.xml b/db/ddlutils/model/C_PROJECTLINE.xml
index 3f59666e96..05779e811e 100644
--- a/db/ddlutils/model/C_PROJECTLINE.xml
+++ b/db/ddlutils/model/C_PROJECTLINE.xml
@@ -13,16 +13,16 @@
       <column name="C_PROJECT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="LINE" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="PLANNEDQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PLANNEDPRICE" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PLANNEDAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PLANNEDMARGINAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="COMMITTEDAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="PLANNEDQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PLANNEDPRICE" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PLANNEDAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PLANNEDMARGINAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="COMMITTEDAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="M_PRODUCT_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"/>
-      <column name="INVOICEDAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="INVOICEDQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="COMMITTEDQTY" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="INVOICEDAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="INVOICEDQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="COMMITTEDQTY" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_PROJECTISSUE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_ORDER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_ORDERPO_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_PROJECTPHASE.xml b/db/ddlutils/model/C_PROJECTPHASE.xml
index 560a6d06eb..c80c85a681 100644
--- a/db/ddlutils/model/C_PROJECTPHASE.xml
+++ b/db/ddlutils/model/C_PROJECTPHASE.xml
@@ -15,19 +15,19 @@
       <column name="ENDDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="ISCOMPLETE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="PRICEACTUAL" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="PRICEACTUAL" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="GENERATEORDER" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="C_ORDER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_PHASE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_PROJECTPHASE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="SEQNO" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
-      <column name="COMMITTEDAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="COMMITTEDAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="ISCOMMITCEILING" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="PROJINVOICERULE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="PLANNEDAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="PLANNEDAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="C_ORDER" name="CORDER_CPROJECTPHASE">
         <reference local="C_ORDER_ID" foreign="C_ORDER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_PROJECTTASK.xml b/db/ddlutils/model/C_PROJECTTASK.xml
index a1a429f71c..9445bb3e4c 100644
--- a/db/ddlutils/model/C_PROJECTTASK.xml
+++ b/db/ddlutils/model/C_PROJECTTASK.xml
@@ -17,10 +17,10 @@
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_PROJECTPHASE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="PROJINVOICERULE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="PLANNEDAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="COMMITTEDAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="PLANNEDAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="COMMITTEDAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="C_PROJECTPHASE" name="CPROJECTPHASE_CPROJECTTASK">
         <reference local="C_PROJECTPHASE_ID" foreign="C_PROJECTPHASE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_REMUNERATION.xml b/db/ddlutils/model/C_REMUNERATION.xml
index 75294c5259..4dc38b2cbc 100644
--- a/db/ddlutils/model/C_REMUNERATION.xml
+++ b/db/ddlutils/model/C_REMUNERATION.xml
@@ -15,10 +15,10 @@
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="REMUNERATIONTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="STANDARDHOURS" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
-      <column name="GROSSRAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="GROSSRCOST" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="OVERTIMEAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="OVERTIMECOST" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="GROSSRAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="GROSSRCOST" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="OVERTIMEAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="OVERTIMECOST" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/C_REVENUERECOGNITION.xml b/db/ddlutils/model/C_REVENUERECOGNITION.xml
index cab98e374e..838c14dd71 100644
--- a/db/ddlutils/model/C_REVENUERECOGNITION.xml
+++ b/db/ddlutils/model/C_REVENUERECOGNITION.xml
@@ -15,6 +15,9 @@
       <column name="ISTIMEBASED" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="RECOGNITIONFREQUENCY" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="NOMONTHS" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
+      <unique name="C_REVENUERECOGNITION_KEY">
+        <unique-column name="C_REVENUERECOGNITION_ID"/>
+      </unique>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/C_REVENUERECOGNITION_PLAN.xml b/db/ddlutils/model/C_REVENUERECOGNITION_PLAN.xml
index 99d77576cc..a77606505b 100644
--- a/db/ddlutils/model/C_REVENUERECOGNITION_PLAN.xml
+++ b/db/ddlutils/model/C_REVENUERECOGNITION_PLAN.xml
@@ -16,8 +16,8 @@
       <column name="UNEARNEDREVENUE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="P_REVENUE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="TOTALAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="RECOGNIZEDAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="TOTALAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="RECOGNIZEDAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_CREVRECPLAN">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_REVENUERECOGNITION_RUN.xml b/db/ddlutils/model/C_REVENUERECOGNITION_RUN.xml
index 4d2b81000e..51d1efb73c 100644
--- a/db/ddlutils/model/C_REVENUERECOGNITION_RUN.xml
+++ b/db/ddlutils/model/C_REVENUERECOGNITION_RUN.xml
@@ -12,7 +12,7 @@
       <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_REVENUERECOGNITION_PLAN_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="GL_JOURNAL_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="RECOGNIZEDAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="RECOGNIZEDAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="C_REVENUERECOGNITION_PLAN" name="CREVRECPLAN_CREFRECRUN">
         <reference local="C_REVENUERECOGNITION_PLAN_ID" foreign="C_REVENUERECOGNITION_PLAN_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_RFQ.xml b/db/ddlutils/model/C_RFQ.xml
index 3cd06253e7..7c6fe62bb2 100644
--- a/db/ddlutils/model/C_RFQ.xml
+++ b/db/ddlutils/model/C_RFQ.xml
@@ -29,7 +29,7 @@
       <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="SALESREP_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="MARGIN" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="MARGIN" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="CREATESO" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="CREATEPO" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="PUBLISHRFQ" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_RFQLINEQTY.xml b/db/ddlutils/model/C_RFQLINEQTY.xml
index 4ed53fdc72..d0644a5026 100644
--- a/db/ddlutils/model/C_RFQLINEQTY.xml
+++ b/db/ddlutils/model/C_RFQLINEQTY.xml
@@ -12,13 +12,13 @@
       <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_RFQLINE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_UOM_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="MARGIN" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="MARGIN" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="ISPURCHASEQTY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="BESTRESPONSEAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="BESTRESPONSEAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="ISOFFERQTY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="OFFERAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="BENCHMARKPRICE" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="OFFERAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="BENCHMARKPRICE" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="ISRFQQTY" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <foreign-key foreignTable="C_RFQLINE" name="CRFQLINE_CRFQLINEQTY">
         <reference local="C_RFQLINE_ID" foreign="C_RFQLINE_ID"/>
diff --git a/db/ddlutils/model/C_RFQRESPONSE.xml b/db/ddlutils/model/C_RFQRESPONSE.xml
index 0529e2ab2e..f6882b1ed1 100644
--- a/db/ddlutils/model/C_RFQRESPONSE.xml
+++ b/db/ddlutils/model/C_RFQRESPONSE.xml
@@ -23,7 +23,7 @@
       <column name="DATEWORKSTART" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DELIVERYDAYS" primaryKey="false" required="false" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <column name="DATEWORKCOMPLETE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="PRICE" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="PRICE" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="ISSELFSERVICE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISCOMPLETE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISSELECTEDWINNER" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_RFQRESPONSELINEQTY.xml b/db/ddlutils/model/C_RFQRESPONSELINEQTY.xml
index dbe2eaccf3..f24fe16a7e 100644
--- a/db/ddlutils/model/C_RFQRESPONSELINEQTY.xml
+++ b/db/ddlutils/model/C_RFQRESPONSELINEQTY.xml
@@ -12,8 +12,8 @@
       <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_RFQRESPONSELINE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_RFQLINEQTY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="PRICE" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="DISCOUNT" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="PRICE" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="DISCOUNT" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="RANKING" primaryKey="false" required="false" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="C_RFQLINEQTY" name="CRFQLINEQTY_CRFQRESPLINEQTY">
         <reference local="C_RFQLINEQTY_ID" foreign="C_RFQLINEQTY_ID"/>
diff --git a/db/ddlutils/model/C_SERVICELEVEL.xml b/db/ddlutils/model/C_SERVICELEVEL.xml
index ef87257338..a6ecbec01b 100644
--- a/db/ddlutils/model/C_SERVICELEVEL.xml
+++ b/db/ddlutils/model/C_SERVICELEVEL.xml
@@ -12,8 +12,8 @@
       <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="SERVICELEVELPROVIDED" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="SERVICELEVELINVOICED" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="SERVICELEVELPROVIDED" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
+      <column name="SERVICELEVELINVOICED" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="C_REVENUERECOGNITION_PLAN_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_SERVICELEVELLINE.xml b/db/ddlutils/model/C_SERVICELEVELLINE.xml
index cde0ee61df..70f195e253 100644
--- a/db/ddlutils/model/C_SERVICELEVELLINE.xml
+++ b/db/ddlutils/model/C_SERVICELEVELLINE.xml
@@ -12,7 +12,7 @@
       <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_SERVICELEVEL_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="SERVICELEVELPROVIDED" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="SERVICELEVELPROVIDED" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="SERVICEDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="C_SERVICELEVEL" name="CSERVICELEVEL_LINE">
diff --git a/db/ddlutils/model/C_TASK.xml b/db/ddlutils/model/C_TASK.xml
index 5fc2c1cbd7..56d040b859 100644
--- a/db/ddlutils/model/C_TASK.xml
+++ b/db/ddlutils/model/C_TASK.xml
@@ -16,7 +16,7 @@
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="C_PHASE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="STANDARDQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="STANDARDQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="C_PHASE" name="CPHASE_CTASK">
         <reference local="C_PHASE_ID" foreign="C_PHASE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_TAX.xml b/db/ddlutils/model/C_TAX.xml
index 530691e9c0..eec2bd5deb 100644
--- a/db/ddlutils/model/C_TAX.xml
+++ b/db/ddlutils/model/C_TAX.xml
@@ -17,7 +17,7 @@
       <column name="VALIDFROM" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="ISSUMMARY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="REQUIRESTAXCERTIFICATE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="RATE" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="RATE" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="PARENT_TAX_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_COUNTRY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_REGION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
@@ -46,6 +46,9 @@
       <foreign-key foreignTable="C_TAXCATEGORY" name="CTAXCATEGORY_CTAX">
         <reference local="C_TAXCATEGORY_ID" foreign="C_TAXCATEGORY_ID"/>
       </foreign-key>
+      <unique name="C_TAX_KEY">
+        <unique-column name="C_TAX_ID"/>
+      </unique>
       <unique name="C_TAX_NAME">
         <unique-column name="AD_CLIENT_ID"/>
         <unique-column name="NAME"/>
diff --git a/db/ddlutils/model/C_TAXDECLARATIONLINE.xml b/db/ddlutils/model/C_TAXDECLARATIONLINE.xml
index 6b42aefc1f..a372496dde 100644
--- a/db/ddlutils/model/C_TAXDECLARATIONLINE.xml
+++ b/db/ddlutils/model/C_TAXDECLARATIONLINE.xml
@@ -20,8 +20,8 @@
       <column name="C_INVOICELINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_ALLOCATIONLINE_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="TAXBASEAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="TAXAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="TAXBASEAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="TAXAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DATEACCT" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <foreign-key foreignTable="C_ALLOCATIONLINE" name="CALLOCATIONLINE_CTAXDECLLINE">
         <reference local="C_ALLOCATIONLINE_ID" foreign="C_ALLOCATIONLINE_ID"/>
diff --git a/db/ddlutils/model/C_TAX_ACCT.xml b/db/ddlutils/model/C_TAX_ACCT.xml
index 6214644b6d..eddac11a56 100644
--- a/db/ddlutils/model/C_TAX_ACCT.xml
+++ b/db/ddlutils/model/C_TAX_ACCT.xml
@@ -22,21 +22,21 @@
       <foreign-key foreignTable="C_TAX" name="CTAX_CTAXACCT">
         <reference local="C_TAX_ID" foreign="C_TAX_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_TLIABILITY_CTAX">
-        <reference local="T_LIABILITY_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_TEXPENSE_CTAX">
         <reference local="T_EXPENSE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_TLIABILITY_CTAX">
+        <reference local="T_LIABILITY_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_TREC_CTAX">
         <reference local="T_RECEIVABLES_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_TDUE_CTAX">
-        <reference local="T_DUE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_TCREDIT_CTAX">
         <reference local="T_CREDIT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_TDUE_CTAX">
+        <reference local="T_DUE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/C_UOM_CONVERSION.xml b/db/ddlutils/model/C_UOM_CONVERSION.xml
index ce2fec930a..3f987ed2e7 100644
--- a/db/ddlutils/model/C_UOM_CONVERSION.xml
+++ b/db/ddlutils/model/C_UOM_CONVERSION.xml
@@ -12,8 +12,8 @@
       <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_UOM_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_UOM_TO_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="MULTIPLYRATE" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="DIVIDERATE" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="MULTIPLYRATE" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="DIVIDERATE" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="C_UOM_CONVERSIONCLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
@@ -21,12 +21,12 @@
       <foreign-key foreignTable="AD_ORG" name="C_UOM_CONVERSIONORG">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_UOM" name="CUOM_CUOMCONVERSION">
-        <reference local="C_UOM_ID" foreign="C_UOM_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_UOM" name="C_UOMCONVERSIONTO">
         <reference local="C_UOM_TO_ID" foreign="C_UOM_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_UOM" name="CUOM_CUOMCONVERSION">
+        <reference local="C_UOM_ID" foreign="C_UOM_ID"/>
+      </foreign-key>
       <unique name="C_UOM_CONVERSION_PRODUCT">
         <unique-column name="C_UOM_ID"/>
         <unique-column name="C_UOM_TO_ID"/>
diff --git a/db/ddlutils/model/C_USERREMUNERATION.xml b/db/ddlutils/model/C_USERREMUNERATION.xml
index 640e317bac..b36ea6446e 100644
--- a/db/ddlutils/model/C_USERREMUNERATION.xml
+++ b/db/ddlutils/model/C_USERREMUNERATION.xml
@@ -14,10 +14,10 @@
       <column name="C_REMUNERATION_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="VALIDFROM" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="VALIDTO" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="GROSSRAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="GROSSRCOST" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="OVERTIMEAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="OVERTIMECOST" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="GROSSRAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="GROSSRCOST" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="OVERTIMEAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="OVERTIMECOST" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_CUSERREMUNERATION">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
diff --git a/db/ddlutils/model/C_VALIDCOMBINATION.xml b/db/ddlutils/model/C_VALIDCOMBINATION.xml
index bd6753292d..8eb6413976 100644
--- a/db/ddlutils/model/C_VALIDCOMBINATION.xml
+++ b/db/ddlutils/model/C_VALIDCOMBINATION.xml
@@ -51,14 +51,14 @@
       <foreign-key foreignTable="C_CAMPAIGN" name="SOCAMPAIGN_VC">
         <reference local="C_CAMPAIGN_ID" foreign="C_CAMPAIGN_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_VC">
-        <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER2_VC">
+        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEACCOUNT_VC">
         <reference local="ACCOUNT_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER2_VC">
-        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
+      <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"/>
diff --git a/db/ddlutils/model/C_WITHHOLDING.xml b/db/ddlutils/model/C_WITHHOLDING.xml
index f14e7780ef..7f4e736d68 100644
--- a/db/ddlutils/model/C_WITHHOLDING.xml
+++ b/db/ddlutils/model/C_WITHHOLDING.xml
@@ -18,12 +18,12 @@
       <column name="ISPAIDTO3PARTY" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="BENEFICIARY" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ISPERCENTWITHHOLDING" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="PERCENT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="FIXAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="THRESHOLDMIN" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="THRESHOLDMAX" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="MINAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="MAXAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="PERCENT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="FIXAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="THRESHOLDMIN" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="THRESHOLDMAX" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="MINAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="MAXAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="C_PAYMENTTERM" name="CPAYMENTTERM_CWITHHOLDING">
         <reference local="C_PAYMENTTERM_ID" foreign="C_PAYMENTTERM_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/FACT_ACCT.xml b/db/ddlutils/model/FACT_ACCT.xml
index f41a829c78..a733d115ed 100644
--- a/db/ddlutils/model/FACT_ACCT.xml
+++ b/db/ddlutils/model/FACT_ACCT.xml
@@ -24,12 +24,12 @@
       <column name="M_LOCATOR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="POSTINGTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="AMTSOURCEDR" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="AMTSOURCECR" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="AMTACCTDR" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="AMTACCTCR" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="AMTSOURCEDR" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="AMTSOURCECR" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="AMTACCTDR" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="AMTACCTCR" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_UOM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_BPARTNER_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"/>
@@ -78,21 +78,21 @@
       <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 foreignTable="C_LOCATION" name="C_LOCATIONFROM_FACT_ACCT">
+        <reference local="C_LOCFROM_ID" foreign="C_LOCATION_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_LOCATION" name="C_LOCATIONTO_FACT_ACCT">
         <reference local="C_LOCTO_ID" foreign="C_LOCATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_LOCATION" name="C_LOCATIONFROM_FACT_ACCT">
-        <reference local="C_LOCFROM_ID" foreign="C_LOCATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_PERIOD" name="CPERIOD_FACTACCT">
         <reference local="C_PERIOD_ID" foreign="C_PERIOD_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/FACT_ACCT_BALANCE.xml b/db/ddlutils/model/FACT_ACCT_BALANCE.xml
index e21a7a8aeb..b529e0ac8b 100644
--- a/db/ddlutils/model/FACT_ACCT_BALANCE.xml
+++ b/db/ddlutils/model/FACT_ACCT_BALANCE.xml
@@ -20,9 +20,9 @@
       <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="GL_BUDGET_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="AMTACCTDR" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="AMTACCTCR" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="AMTACCTDR" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="AMTACCTCR" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" default="0" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
       <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" default="0" autoIncrement="false"/>
@@ -36,12 +36,12 @@
       <foreign-key foreignTable="AD_CLIENT" name="ADCLIENT_FACTACCTBAL">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_FACTACCTBAL">
-        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORG_FACTACCTBAL">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_FACTACCTBAL">
+        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_FACTACCTBAL">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
@@ -54,12 +54,12 @@
       <foreign-key foreignTable="C_CAMPAIGN" name="CCAMPAIGN_FACTACCTBAL">
         <reference local="C_CAMPAIGN_ID" foreign="C_CAMPAIGN_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="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>
diff --git a/db/ddlutils/model/GL_DISTRIBUTION.xml b/db/ddlutils/model/GL_DISTRIBUTION.xml
index dc6258e7cd..4f21578e5e 100644
--- a/db/ddlutils/model/GL_DISTRIBUTION.xml
+++ b/db/ddlutils/model/GL_DISTRIBUTION.xml
@@ -42,17 +42,17 @@
       <column name="USER1_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ANYUSER2" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="USER2_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="PERCENTTOTAL" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="PERCENTTOTAL" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="ISVALID" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <foreign-key foreignTable="AD_ORG" name="ADORGORG_GLDIST">
-        <reference local="ORG_ID" foreign="AD_ORG_ID"/>
+      <foreign-key foreignTable="AD_ORG" name="ADORG_GLDIST">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORGTRX_GLDIST">
         <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_ORG" name="ADORG_GLDIST">
-        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      <foreign-key foreignTable="AD_ORG" name="ADORGORG_GLDIST">
+        <reference local="ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_GLDIST">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
@@ -69,21 +69,21 @@
       <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="CEVALUEUSER1_GLDIST">
-        <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CEVALUEACCT_GLDIST">
         <reference local="ACCOUNT_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>
-      <foreign-key foreignTable="C_LOCATION" name="CLOCFROM_GLDIST">
-        <reference local="C_LOCFROM_ID" foreign="C_LOCATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_LOCATION" name="CLOCTO_GLDIST">
         <reference local="C_LOCTO_ID" foreign="C_LOCATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_LOCATION" name="CLOCFROM_GLDIST">
+        <reference local="C_LOCFROM_ID" foreign="C_LOCATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_PROJECT" name="CPROJECT_GLDIST">
         <reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
       </foreign-key>
@@ -93,27 +93,6 @@
       <foreign-key foreignTable="M_PRODUCT" name="MPRODUCT_GLDIST">
         <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
       </foreign-key>
-      <check>
-        <rule><![CDATA[AnySalesRegion in ('Y','N')]]></rule>
-      </check>
-      <check>
-        <rule><![CDATA[AnyOrgTrx in ('Y','N')]]></rule>
-      </check>
-      <check>
-        <rule><![CDATA[AnyLocTo in ('Y','N')]]></rule>
-      </check>
-      <check>
-        <rule><![CDATA[AnyLocFrom in ('Y','N')]]></rule>
-      </check>
-      <check>
-        <rule><![CDATA[AnyUser1 in ('Y','N')]]></rule>
-      </check>
-      <check>
-        <rule><![CDATA[AnyUser2 in ('Y','N')]]></rule>
-      </check>
-      <check>
-        <rule><![CDATA[IsValid in ('Y','N')]]></rule>
-      </check>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
@@ -138,5 +117,26 @@
       <check>
         <rule><![CDATA[AnyActivity in ('Y','N')]]></rule>
       </check>
+      <check>
+        <rule><![CDATA[AnySalesRegion in ('Y','N')]]></rule>
+      </check>
+      <check>
+        <rule><![CDATA[AnyOrgTrx in ('Y','N')]]></rule>
+      </check>
+      <check>
+        <rule><![CDATA[AnyLocTo in ('Y','N')]]></rule>
+      </check>
+      <check>
+        <rule><![CDATA[AnyLocFrom in ('Y','N')]]></rule>
+      </check>
+      <check>
+        <rule><![CDATA[AnyUser1 in ('Y','N')]]></rule>
+      </check>
+      <check>
+        <rule><![CDATA[AnyUser2 in ('Y','N')]]></rule>
+      </check>
+      <check>
+        <rule><![CDATA[IsValid in ('Y','N')]]></rule>
+      </check>
     </table>
   </database>
diff --git a/db/ddlutils/model/GL_DISTRIBUTIONLINE.xml b/db/ddlutils/model/GL_DISTRIBUTIONLINE.xml
index 974dd3c11e..ca26b2cead 100644
--- a/db/ddlutils/model/GL_DISTRIBUTIONLINE.xml
+++ b/db/ddlutils/model/GL_DISTRIBUTIONLINE.xml
@@ -12,7 +12,7 @@
       <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="GL_DISTRIBUTION_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="LINE" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
-      <column name="PERCENT" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="PERCENT" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="OVERWRITEORG" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
@@ -40,14 +40,14 @@
       <column name="USER1_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="OVERWRITEUSER2" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="USER2_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <foreign-key foreignTable="AD_ORG" name="ADORGORG_GLDISTLINE">
-        <reference local="ORG_ID" foreign="AD_ORG_ID"/>
+      <foreign-key foreignTable="AD_ORG" name="ADORG_GLDISTLINE">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORGTRX_GLDISTLINE">
         <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_ORG" name="ADORG_GLDISTLINE">
-        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      <foreign-key foreignTable="AD_ORG" name="ADORGORG_GLDISTLINE">
+        <reference local="ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_ACTIVITY" name="CACTIVITY_GLDISTLINE">
         <reference local="C_ACTIVITY_ID" foreign="C_ACTIVITY_ID"/>
@@ -67,12 +67,12 @@
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CEVALUEACCT_GLDISTLINE">
         <reference local="ACCOUNT_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_LOCATION" name="CLOCFROM_GLDISTLINE">
-        <reference local="C_LOCFROM_ID" foreign="C_LOCATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_LOCATION" name="CLOCTO_GLDISTLINE">
         <reference local="C_LOCTO_ID" foreign="C_LOCATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_LOCATION" name="CLOCFROM_GLDISTLINE">
+        <reference local="C_LOCFROM_ID" foreign="C_LOCATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_PROJECT" name="CPROJECT_GLDISTLINE">
         <reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/GL_FUND.xml b/db/ddlutils/model/GL_FUND.xml
index c50a61553a..941699dfed 100644
--- a/db/ddlutils/model/GL_FUND.xml
+++ b/db/ddlutils/model/GL_FUND.xml
@@ -14,7 +14,7 @@
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="AMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="AMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DATEFROM" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATETO" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_GLFUND">
diff --git a/db/ddlutils/model/GL_JOURNAL.xml b/db/ddlutils/model/GL_JOURNAL.xml
index 2c5141ea78..e8eebe8d4c 100644
--- a/db/ddlutils/model/GL_JOURNAL.xml
+++ b/db/ddlutils/model/GL_JOURNAL.xml
@@ -25,11 +25,11 @@
       <column name="DATEACCT" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="C_PERIOD_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="CURRENCYRATE" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="CURRENCYRATE" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="GL_JOURNALBATCH_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="TOTALDR" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="TOTALCR" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="CONTROLAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="TOTALDR" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="TOTALCR" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="CONTROLAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="POSTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/GL_JOURNALBATCH.xml b/db/ddlutils/model/GL_JOURNALBATCH.xml
index e6de95cd9e..0af56cffe7 100644
--- a/db/ddlutils/model/GL_JOURNALBATCH.xml
+++ b/db/ddlutils/model/GL_JOURNALBATCH.xml
@@ -18,9 +18,9 @@
       <column name="DATEACCT" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="C_PERIOD_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="TOTALDR" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="TOTALCR" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="CONTROLAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="TOTALDR" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="TOTALCR" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="CONTROLAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="COPYFROM" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
diff --git a/db/ddlutils/model/GL_JOURNALLINE.xml b/db/ddlutils/model/GL_JOURNALLINE.xml
index 52f0d686df..19ea7a5604 100644
--- a/db/ddlutils/model/GL_JOURNALLINE.xml
+++ b/db/ddlutils/model/GL_JOURNALLINE.xml
@@ -14,15 +14,15 @@
       <column name="LINE" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ISGENERATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="AMTSOURCEDR" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="AMTSOURCECR" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="AMTSOURCEDR" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="AMTSOURCECR" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="CURRENCYRATE" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="CURRENCYRATE" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DATEACCT" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="AMTACCTDR" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="AMTACCTCR" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="AMTACCTDR" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="AMTACCTCR" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_UOM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_VALIDCOMBINATION_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_CONVERSIONTYPE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
@@ -47,6 +47,9 @@
       <foreign-key foreignTable="GL_JOURNAL" name="GLJOURNAL_GLJOURNALLINE">
         <reference local="GL_JOURNAL_ID" foreign="GL_JOURNAL_ID"/>
       </foreign-key>
+      <unique name="GL_JOURNALLINE_KEY">
+        <unique-column name="GL_JOURNALLINE_ID"/>
+      </unique>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/I_BANKSTATEMENT.xml b/db/ddlutils/model/I_BANKSTATEMENT.xml
index 2d596bd8da..a581ae1634 100644
--- a/db/ddlutils/model/I_BANKSTATEMENT.xml
+++ b/db/ddlutils/model/I_BANKSTATEMENT.xml
@@ -30,7 +30,7 @@
       <column name="INVOICEDOCUMENTNO" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="C_CHARGE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="CHARGENAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="CHARGEAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="CHARGEAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_BANKSTATEMENTLINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="LINE" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="DATEACCT" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
@@ -40,10 +40,10 @@
       <column name="REFERENCENO" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="MEMO" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="ISREVERSAL" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="INTERESTAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="TRXAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="INTERESTAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="TRXAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="LINEDESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="STMTAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="STMTAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="EFTSTATEMENTDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="EFTSTATEMENTREFERENCE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="EFTSTATEMENTLINEDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
@@ -55,7 +55,7 @@
       <column name="EFTMEMO" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="EFTPAYEE" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="EFTPAYEEACCOUNT" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
-      <column name="EFTAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="EFTAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="EFTCURRENCY" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="CREATEPAYMENT" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
diff --git a/db/ddlutils/model/I_CONVERSION_RATE.xml b/db/ddlutils/model/I_CONVERSION_RATE.xml
index 714e4ab656..d0ffc766e9 100644
--- a/db/ddlutils/model/I_CONVERSION_RATE.xml
+++ b/db/ddlutils/model/I_CONVERSION_RATE.xml
@@ -19,8 +19,8 @@
       <column name="C_CONVERSIONTYPE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="VALIDFROM" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="VALIDTO" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="MULTIPLYRATE" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="DIVIDERATE" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="MULTIPLYRATE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="DIVIDERATE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="CREATERECIPROCALRATE" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="I_ISIMPORTED" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="I_ERRORMSG" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/I_ELEMENTVALUE.xml b/db/ddlutils/model/I_ELEMENTVALUE.xml
index a069d9a99f..c5db92ed00 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="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>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUE_IELEMENTVALUE">
+        <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 c2f3d2c86d..b10c026a75 100644
--- a/db/ddlutils/model/I_GLJOURNAL.xml
+++ b/db/ddlutils/model/I_GLJOURNAL.xml
@@ -33,17 +33,17 @@
       <column name="LINE" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="DATEACCT" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="AMTSOURCEDR" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="AMTACCTDR" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="AMTSOURCECR" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="AMTACCTCR" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="AMTSOURCEDR" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="AMTACCTDR" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="AMTSOURCECR" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="AMTACCTCR" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISO_CODE" primaryKey="false" required="false" type="CHAR" size="3" autoIncrement="false"/>
       <column name="CONVERSIONTYPEVALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="C_CONVERSIONTYPE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="CURRENCYRATE" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="CURRENCYRATE" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_UOM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_VALIDCOMBINATION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ORGVALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
@@ -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">
-        <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="AD_ORG" name="ADORGTRX_IGLJOURNAL">
         <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
-      <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="C_ACCTSCHEMA" name="CACCTSCHEMA_IGLJOURNAL">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
@@ -101,18 +101,18 @@
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CEVALUEUSER1_IGLJOURNAL">
         <reference local="USER1_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_ELEMENTVALUE" name="CELVALUEACCOUNT_IGLJOURNAL">
         <reference local="ACCOUNT_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_LOCATION" name="CLOCTO_IGLJOURNAL">
-        <reference local="C_LOCTO_ID" foreign="C_LOCATION_ID"/>
+      <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>
+      <foreign-key foreignTable="C_LOCATION" name="CLOCTO_IGLJOURNAL">
+        <reference local="C_LOCTO_ID" foreign="C_LOCATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_PERIOD" name="CPERIOD_IGLJOURNAL">
         <reference local="C_PERIOD_ID" foreign="C_PERIOD_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/I_INOUTLINECONFIRM.xml b/db/ddlutils/model/I_INOUTLINECONFIRM.xml
index 4f54a38ca4..d3ad38ef70 100644
--- a/db/ddlutils/model/I_INOUTLINECONFIRM.xml
+++ b/db/ddlutils/model/I_INOUTLINECONFIRM.xml
@@ -15,9 +15,9 @@
       <column name="M_INOUTLINECONFIRM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="CONFIRMATIONNO" 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="CONFIRMEDQTY" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="SCRAPPEDQTY" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="DIFFERENCEQTY" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="CONFIRMEDQTY" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="SCRAPPEDQTY" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="DIFFERENCEQTY" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <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"/>
       <foreign-key foreignTable="M_INOUTLINECONFIRM" name="MINOUTLINECONFIRM_IMPORT">
diff --git a/db/ddlutils/model/I_INVENTORY.xml b/db/ddlutils/model/I_INVENTORY.xml
index dbb6f42f32..23aa70d030 100644
--- a/db/ddlutils/model/I_INVENTORY.xml
+++ b/db/ddlutils/model/I_INVENTORY.xml
@@ -26,8 +26,8 @@
       <column name="Z" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="M_INVENTORY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="M_INVENTORYLINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="QTYBOOK" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="QTYCOUNT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTYBOOK" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="QTYCOUNT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="MOVEMENTDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
diff --git a/db/ddlutils/model/I_INVOICE.xml b/db/ddlutils/model/I_INVOICE.xml
index 715c2ff959..2db9e3e629 100644
--- a/db/ddlutils/model/I_INVOICE.xml
+++ b/db/ddlutils/model/I_INVOICE.xml
@@ -54,17 +54,17 @@
       <column name="SKU" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="C_TAX_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="TAXINDICATOR" primaryKey="false" required="false" type="VARCHAR" size="5" autoIncrement="false"/>
-      <column name="TAXAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="TAXAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_INVOICELINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="LINEDESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="QTYORDERED" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PRICEACTUAL" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_IINVOICE">
-        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
+      <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_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 7717c8a922..cf7e7e1109 100644
--- a/db/ddlutils/model/I_ORDER.xml
+++ b/db/ddlutils/model/I_ORDER.xml
@@ -56,26 +56,26 @@
       <column name="SKU" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="C_TAX_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="TAXINDICATOR" primaryKey="false" required="false" type="VARCHAR" size="5" autoIncrement="false"/>
-      <column name="TAXAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="TAXAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_ORDERLINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="LINEDESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="C_UOM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="QTYORDERED" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PRICEACTUAL" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="FREIGHTAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" 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"/>
+      <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="ADORGTRX_IORDER">
-        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <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 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>
+      <foreign-key foreignTable="AD_USER" name="ADUSERSALESREP_IORDER">
+        <reference local="SALESREP_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>
diff --git a/db/ddlutils/model/I_PAYMENT.xml b/db/ddlutils/model/I_PAYMENT.xml
index 0adb927f2b..0b3986504a 100644
--- a/db/ddlutils/model/I_PAYMENT.xml
+++ b/db/ddlutils/model/I_PAYMENT.xml
@@ -50,15 +50,15 @@
       <column name="ORIG_TRXID" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="PONUM" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="PAYAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="DISCOUNTAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="WRITEOFFAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="PAYAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="DISCOUNTAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="WRITEOFFAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="ISOVERUNDERPAYMENT" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="OVERUNDERAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="OVERUNDERAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_CHARGE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="CHARGENAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="CHARGEAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="TAXAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="CHARGEAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="TAXAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="ISAPPROVED" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISSELFSERVICE" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISDELAYEDCAPTURE" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/I_PRODUCT.xml b/db/ddlutils/model/I_PRODUCT.xml
index cb0f65044a..3ec75aee77 100644
--- a/db/ddlutils/model/I_PRODUCT.xml
+++ b/db/ddlutils/model/I_PRODUCT.xml
@@ -26,8 +26,8 @@
       <column name="M_PRODUCT_CATEGORY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PRODUCTTYPE" primaryKey="false" required="false" type="CHAR" size="1" default="I" autoIncrement="false"/>
       <column name="CLASSIFICATION" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="VOLUME" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="WEIGHT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="VOLUME" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="WEIGHT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="SHELFWIDTH" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="SHELFHEIGHT" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="SHELFDEPTH" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
@@ -40,21 +40,21 @@
       <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISO_CODE" primaryKey="false" required="false" type="CHAR" size="3" autoIncrement="false"/>
       <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="PRICELIST" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PRICEPO" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="ROYALTYAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="PRICELIST" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PRICEPO" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="ROYALTYAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="PRICEEFFECTIVE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="VENDORPRODUCTNO" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="VENDORCATEGORY" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="MANUFACTURER" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
-      <column name="ORDER_MIN" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="ORDER_PACK" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="COSTPERORDER" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="ORDER_MIN" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="ORDER_PACK" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="COSTPERORDER" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DELIVERYTIME_PROMISED" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="PRICESTD" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="PRICELIMIT" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="PRICESTD" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="PRICELIMIT" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <foreign-key foreignTable="C_BPARTNER" name="CBPARTNER_IPRODUCT">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_ATTRIBUTEINSTANCE.xml b/db/ddlutils/model/M_ATTRIBUTEINSTANCE.xml
index 93bfca4781..7fa133629f 100644
--- a/db/ddlutils/model/M_ATTRIBUTEINSTANCE.xml
+++ b/db/ddlutils/model/M_ATTRIBUTEINSTANCE.xml
@@ -13,7 +13,7 @@
       <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_ATTRIBUTEVALUE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
-      <column name="VALUENUMBER" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="VALUENUMBER" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <foreign-key foreignTable="M_ATTRIBUTE" name="MATTRIBUTE_MATTRIBUTEINST">
         <reference local="M_ATTRIBUTE_ID" foreign="M_ATTRIBUTE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_ATTRIBUTESETEXCLUDE.xml b/db/ddlutils/model/M_ATTRIBUTESETEXCLUDE.xml
index 81329954fc..d9420e28ae 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[IsActive in ('Y','N')]]></rule>
+        <rule><![CDATA[IsSOTrx in ('Y','N')]]></rule>
       </check>
       <check>
-        <rule><![CDATA[IsSOTrx in ('Y','N')]]></rule>
+        <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
     </table>
   </database>
diff --git a/db/ddlutils/model/M_BOMPRODUCT.xml b/db/ddlutils/model/M_BOMPRODUCT.xml
index e290cb4afe..c1bd3cc0c8 100644
--- a/db/ddlutils/model/M_BOMPRODUCT.xml
+++ b/db/ddlutils/model/M_BOMPRODUCT.xml
@@ -18,7 +18,7 @@
       <column name="M_CHANGENOTICE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="M_BOMALTERNATIVE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="BOMQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="BOMQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="M_PRODUCTOPERATION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
diff --git a/db/ddlutils/model/M_COST.xml b/db/ddlutils/model/M_COST.xml
index 2b340d7361..a02b452ac1 100644
--- a/db/ddlutils/model/M_COST.xml
+++ b/db/ddlutils/model/M_COST.xml
@@ -14,11 +14,11 @@
       <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="CURRENTCOSTPRICE" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="CURRENTQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="CUMULATEDAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="CUMULATEDQTY" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="FUTURECOSTPRICE" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="CURRENTCOSTPRICE" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
+      <column name="CURRENTQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="CUMULATEDAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="CUMULATEDQTY" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="FUTURECOSTPRICE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="PERCENT" primaryKey="false" required="false" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="ADCLIENT_MCOST">
diff --git a/db/ddlutils/model/M_COSTDETAIL.xml b/db/ddlutils/model/M_COSTDETAIL.xml
index 6252817020..c50b9b69ce 100644
--- a/db/ddlutils/model/M_COSTDETAIL.xml
+++ b/db/ddlutils/model/M_COSTDETAIL.xml
@@ -22,10 +22,10 @@
       <column name="M_PRODUCTIONLINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_PROJECTISSUE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSOTRX" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="AMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="DELTAAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="DELTAQTY" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="AMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="DELTAAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="DELTAQTY" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="ADCLIENT_MCOSTDETAIL">
diff --git a/db/ddlutils/model/M_COSTQUEUE.xml b/db/ddlutils/model/M_COSTQUEUE.xml
index 921a58f028..fc3975bf57 100644
--- a/db/ddlutils/model/M_COSTQUEUE.xml
+++ b/db/ddlutils/model/M_COSTQUEUE.xml
@@ -15,8 +15,8 @@
       <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_COSTELEMENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="CURRENTCOSTPRICE" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="CURRENTQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="CURRENTCOSTPRICE" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="CURRENTQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_MCOSTQUEUE">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_DEMANDLINE.xml b/db/ddlutils/model/M_DEMANDLINE.xml
index 9e596119ff..7d0ea71ac4 100644
--- a/db/ddlutils/model/M_DEMANDLINE.xml
+++ b/db/ddlutils/model/M_DEMANDLINE.xml
@@ -12,9 +12,9 @@
       <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_DEMAND_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_PERIOD_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="QTYCALCULATED" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTYCALCULATED" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="C_PERIOD" name="CPERIOD_MDEMANDLINE">
         <reference local="C_PERIOD_ID" foreign="C_PERIOD_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_DISCOUNTSCHEMA.xml b/db/ddlutils/model/M_DISCOUNTSCHEMA.xml
index 884bb5cebf..426c680158 100644
--- a/db/ddlutils/model/M_DISCOUNTSCHEMA.xml
+++ b/db/ddlutils/model/M_DISCOUNTSCHEMA.xml
@@ -15,7 +15,7 @@
       <column name="VALIDFROM" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DISCOUNTTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="SCRIPT" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="FLATDISCOUNT" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="FLATDISCOUNT" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="ISQUANTITYBASED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CUMULATIVELEVEL" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
diff --git a/db/ddlutils/model/M_DISCOUNTSCHEMABREAK.xml b/db/ddlutils/model/M_DISCOUNTSCHEMABREAK.xml
index cd8ba23161..cb15b1329a 100644
--- a/db/ddlutils/model/M_DISCOUNTSCHEMABREAK.xml
+++ b/db/ddlutils/model/M_DISCOUNTSCHEMABREAK.xml
@@ -12,8 +12,8 @@
       <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_DISCOUNTSCHEMA_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="SEQNO" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
-      <column name="BREAKVALUE" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="BREAKDISCOUNT" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="BREAKVALUE" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
+      <column name="BREAKDISCOUNT" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="M_PRODUCT_CATEGORY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISBPARTNERFLATDISCOUNT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/M_DISCOUNTSCHEMALINE.xml b/db/ddlutils/model/M_DISCOUNTSCHEMALINE.xml
index 10c88bc1fd..54778fe1ed 100644
--- a/db/ddlutils/model/M_DISCOUNTSCHEMALINE.xml
+++ b/db/ddlutils/model/M_DISCOUNTSCHEMALINE.xml
@@ -17,26 +17,26 @@
       <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="CONVERSIONDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="LIST_BASE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="LIST_ADDAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="LIST_DISCOUNT" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="LIST_ADDAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="LIST_DISCOUNT" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="LIST_ROUNDING" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="LIST_MINAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="LIST_MAXAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="LIST_FIXED" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="LIST_MINAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="LIST_MAXAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="LIST_FIXED" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="STD_BASE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="STD_ADDAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="STD_DISCOUNT" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="STD_ADDAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="STD_DISCOUNT" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="STD_ROUNDING" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="STD_MINAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="STD_MAXAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="STD_FIXED" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="STD_MINAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="STD_MAXAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="STD_FIXED" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="LIMIT_BASE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="LIMIT_ADDAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="LIMIT_DISCOUNT" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="LIMIT_ADDAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="LIMIT_DISCOUNT" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="LIMIT_ROUNDING" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="LIMIT_MINAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="LIMIT_MAXAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="LIMIT_FIXED" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="LIMIT_MINAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="LIMIT_MAXAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="LIMIT_FIXED" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_CONVERSIONTYPE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_BPARTNER" name="CBPARTNER_MDISCOUNTSLINE">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
diff --git a/db/ddlutils/model/M_DISTRIBUTIONLIST.xml b/db/ddlutils/model/M_DISTRIBUTIONLIST.xml
index b4989ce51a..9af1cacfbf 100644
--- a/db/ddlutils/model/M_DISTRIBUTIONLIST.xml
+++ b/db/ddlutils/model/M_DISTRIBUTIONLIST.xml
@@ -13,7 +13,7 @@
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="RATIOTOTAL" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="RATIOTOTAL" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
diff --git a/db/ddlutils/model/M_DISTRIBUTIONLISTLINE.xml b/db/ddlutils/model/M_DISTRIBUTIONLISTLINE.xml
index 9908aedb56..a4e552a98f 100644
--- a/db/ddlutils/model/M_DISTRIBUTIONLISTLINE.xml
+++ b/db/ddlutils/model/M_DISTRIBUTIONLISTLINE.xml
@@ -13,8 +13,8 @@
       <column name="M_DISTRIBUTIONLIST_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="MINQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="RATIO" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="MINQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="RATIO" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <foreign-key foreignTable="C_BPARTNER" name="CBPARTNER_MDISTLISTLINE">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
diff --git a/db/ddlutils/model/M_DISTRIBUTIONRUNLINE.xml b/db/ddlutils/model/M_DISTRIBUTIONRUNLINE.xml
index 97f43c19df..451cdee5a0 100644
--- a/db/ddlutils/model/M_DISTRIBUTIONRUNLINE.xml
+++ b/db/ddlutils/model/M_DISTRIBUTIONRUNLINE.xml
@@ -15,8 +15,8 @@
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="M_DISTRIBUTIONLIST_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="TOTALQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="MINQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="TOTALQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="MINQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="M_DISTRIBUTIONLIST" name="MDISTRIBUTIONLIST_RUNLINE">
         <reference local="M_DISTRIBUTIONLIST_ID" foreign="M_DISTRIBUTIONLIST_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_EDI.xml b/db/ddlutils/model/M_EDI.xml
index 0a245a6ceb..efd9b47217 100644
--- a/db/ddlutils/model/M_EDI.xml
+++ b/db/ddlutils/model/M_EDI.xml
@@ -17,16 +17,16 @@
       <column name="EDISTATUS" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="M_WAREHOUSE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="REQUEST_QTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="REQUEST_QTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="REQUEST_SHIPDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="REQUEST_PRICE" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="REQUEST_PRICE" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="TRXSENT" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="TRXRECEIVED" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="REPLY_RECEIVED" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="REPLY_QTYCONFIRMED" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="REPLY_QTYAVAILABLE" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="REPLY_QTYCONFIRMED" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="REPLY_QTYAVAILABLE" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="REPLY_SHIPDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="REPLY_PRICE" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="REPLY_PRICE" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="REPLY_REMARKS" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="C_BP_EDI" name="CBPEDI_MEDI">
diff --git a/db/ddlutils/model/M_FORECASTLINE.xml b/db/ddlutils/model/M_FORECASTLINE.xml
index 486c46cce6..632945507d 100644
--- a/db/ddlutils/model/M_FORECASTLINE.xml
+++ b/db/ddlutils/model/M_FORECASTLINE.xml
@@ -12,9 +12,9 @@
       <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_FORECAST_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_PERIOD_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="QTYCALCULATED" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTYCALCULATED" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="C_PERIOD" name="CPERIOD_MFORECASTLINE">
         <reference local="C_PERIOD_ID" foreign="C_PERIOD_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_FREIGHT.xml b/db/ddlutils/model/M_FREIGHT.xml
index 95ee4ccded..6ca0efb0b1 100644
--- a/db/ddlutils/model/M_FREIGHT.xml
+++ b/db/ddlutils/model/M_FREIGHT.xml
@@ -18,7 +18,7 @@
       <column name="C_REGION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <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" size="22" default="0" 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>
@@ -28,12 +28,12 @@
       <foreign-key foreignTable="C_CURRENCY" name="CCURRENCY_MFREIGHT">
         <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_REGION" name="CREGIONTO_MFREIGHT">
-        <reference local="TO_REGION_ID" foreign="C_REGION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_REGION" name="CREGION_MFREIGHT">
         <reference local="C_REGION_ID" foreign="C_REGION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_REGION" name="CREGIONTO_MFREIGHT">
+        <reference local="TO_REGION_ID" foreign="C_REGION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="M_FREIGHTCATEGORY" name="MFREIGHTCATEGORY_MFREIGHT">
         <reference local="M_FREIGHTCATEGORY_ID" foreign="M_FREIGHTCATEGORY_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_INOUT.xml b/db/ddlutils/model/M_INOUT.xml
index 5661dd2806..4e308ce92d 100644
--- a/db/ddlutils/model/M_INOUT.xml
+++ b/db/ddlutils/model/M_INOUT.xml
@@ -31,11 +31,11 @@
       <column name="POREFERENCE" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="DELIVERYRULE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="FREIGHTCOSTRULE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="FREIGHTAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="FREIGHTAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DELIVERYVIARULE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="M_SHIPPER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_CHARGE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="CHARGEAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="CHARGEAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="PRIORITYRULE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="DATEPRINTED" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="C_INVOICE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
@@ -61,20 +61,20 @@
       <column name="CREATEPACKAGE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="ISAPPROVED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISINDISPUTE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="VOLUME" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="WEIGHT" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_MINOUT">
-        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
+      <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="ADORG_MINOUT">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_USER" name="ADUSER_MINOUT">
-        <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
+      <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="C_ACTIVITY" name="CACTIVITY_MINOUT">
         <reference local="C_ACTIVITY_ID" foreign="C_ACTIVITY_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_INOUTCONFIRM.xml b/db/ddlutils/model/M_INOUTCONFIRM.xml
index 099249b10a..dd37a5bd02 100644
--- a/db/ddlutils/model/M_INOUTCONFIRM.xml
+++ b/db/ddlutils/model/M_INOUTCONFIRM.xml
@@ -24,7 +24,7 @@
       <column name="ISINDISPUTE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="M_INVENTORY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_INVOICE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="APPROVALAMT" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="APPROVALAMT" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="CONFIRMATIONNO" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <foreign-key foreignTable="M_INOUT" name="MINOUT_MINOUTCONFIRM">
         <reference local="M_INOUT_ID" foreign="M_INOUT_ID"/>
diff --git a/db/ddlutils/model/M_INOUTLINE.xml b/db/ddlutils/model/M_INOUTLINE.xml
index 3052523bcd..11ad2b9ec3 100644
--- a/db/ddlutils/model/M_INOUTLINE.xml
+++ b/db/ddlutils/model/M_INOUTLINE.xml
@@ -17,17 +17,17 @@
       <column name="M_LOCATOR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_UOM_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="MOVEMENTQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="MOVEMENTQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="ISINVOICED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="ID" size="10" default="0" autoIncrement="false"/>
       <column name="ISDESCRIPTION" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="CONFIRMEDQTY" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PICKEDQTY" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="SCRAPPEDQTY" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="TARGETQTY" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="CONFIRMEDQTY" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PICKEDQTY" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="SCRAPPEDQTY" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="TARGETQTY" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="REF_INOUTLINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="QTYENTERED" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="QTYENTERED" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="C_CHARGE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_PROJECTPHASE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
@@ -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="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="AD_ORG" name="ADORG_MINOUTLINE">
+        <reference local="AD_ORG_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="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_ELEMENTVALUE" name="CELEMENRVALUEUSER1_MINOUTLINE">
+        <reference local="USER1_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_INOUTLINECONFIRM.xml b/db/ddlutils/model/M_INOUTLINECONFIRM.xml
index a0cddc9092..040c60837a 100644
--- a/db/ddlutils/model/M_INOUTLINECONFIRM.xml
+++ b/db/ddlutils/model/M_INOUTLINECONFIRM.xml
@@ -12,12 +12,12 @@
       <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_INOUTCONFIRM_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_INOUTLINE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="TARGETQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="CONFIRMEDQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="TARGETQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="CONFIRMEDQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="DIFFERENCEQTY" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="SCRAPPEDQTY" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="DIFFERENCEQTY" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="SCRAPPEDQTY" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="M_INVENTORYLINE_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="CONFIRMATIONNO" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
diff --git a/db/ddlutils/model/M_INOUTLINEMA.xml b/db/ddlutils/model/M_INOUTLINEMA.xml
index b6ec8ecfa9..917e5a95ad 100644
--- a/db/ddlutils/model/M_INOUTLINEMA.xml
+++ b/db/ddlutils/model/M_INOUTLINEMA.xml
@@ -11,7 +11,7 @@
       <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="MOVEMENTQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="MOVEMENTQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="M_ATTRIBUTESETINSTANCE" name="MASI_MINOURLINEMA">
         <reference local="M_ATTRIBUTESETINSTANCE_ID" foreign="M_ATTRIBUTESETINSTANCE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_INVENTORY.xml b/db/ddlutils/model/M_INVENTORY.xml
index 2cfa454f52..3d1cd30aed 100644
--- a/db/ddlutils/model/M_INVENTORY.xml
+++ b/db/ddlutils/model/M_INVENTORY.xml
@@ -29,7 +29,7 @@
       <column name="ISAPPROVED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="DOCSTATUS" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
       <column name="DOCACTION" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
-      <column name="APPROVALAMT" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="APPROVALAMT" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="C_DOCTYPE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_ORG" name="ADORGTRX_MINVENTORY">
         <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
@@ -43,12 +43,12 @@
       <foreign-key foreignTable="C_CAMPAIGN" name="CCAMPAIGN_MINVENTORY">
         <reference local="C_CAMPAIGN_ID" foreign="C_CAMPAIGN_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER2_MINVENT">
-        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_MINVENT">
         <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER2_MINVENT">
+        <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_PROJECT" name="CPROJECT_MINVENTORY">
         <reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_INVENTORYLINE.xml b/db/ddlutils/model/M_INVENTORYLINE.xml
index 658bf16193..06d1d18fb1 100644
--- a/db/ddlutils/model/M_INVENTORYLINE.xml
+++ b/db/ddlutils/model/M_INVENTORYLINE.xml
@@ -14,14 +14,14 @@
       <column name="M_LOCATOR_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="LINE" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
-      <column name="QTYBOOK" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="QTYCOUNT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTYBOOK" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="QTYCOUNT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="ID" size="10" default="0" autoIncrement="false"/>
       <column name="C_CHARGE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="INVENTORYTYPE" primaryKey="false" required="true" type="CHAR" size="1" default="D" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="QTYINTERNALUSE" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="QTYINTERNALUSE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <foreign-key foreignTable="C_CHARGE" name="CCHARGE_MINVENTORYLINE">
         <reference local="C_CHARGE_ID" foreign="C_CHARGE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_INVENTORYLINEMA.xml b/db/ddlutils/model/M_INVENTORYLINEMA.xml
index 50ac0537c1..ed8d338b63 100644
--- a/db/ddlutils/model/M_INVENTORYLINEMA.xml
+++ b/db/ddlutils/model/M_INVENTORYLINEMA.xml
@@ -11,7 +11,7 @@
       <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="MOVEMENTQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="MOVEMENTQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="M_ATTRIBUTESETINSTANCE" name="MASI_MINVENTORYLINEMA">
         <reference local="M_ATTRIBUTESETINSTANCE_ID" foreign="M_ATTRIBUTESETINSTANCE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_MATCHINV.xml b/db/ddlutils/model/M_MATCHINV.xml
index 3bced5c520..88b8204bc7 100644
--- a/db/ddlutils/model/M_MATCHINV.xml
+++ b/db/ddlutils/model/M_MATCHINV.xml
@@ -14,7 +14,7 @@
       <column name="C_INVOICELINE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DATETRX" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="POSTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/M_MATCHPO.xml b/db/ddlutils/model/M_MATCHPO.xml
index b09b34f170..cdca1b9fe5 100644
--- a/db/ddlutils/model/M_MATCHPO.xml
+++ b/db/ddlutils/model/M_MATCHPO.xml
@@ -15,14 +15,14 @@
       <column name="M_INOUTLINE_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="DATETRX" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="POSTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="DOCUMENTNO" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="DATEACCT" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="PRICEMATCHDIFFERENCE" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="PRICEMATCHDIFFERENCE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="ISAPPROVED" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <foreign-key foreignTable="C_INVOICELINE" name="CINVOICELINE_MMATCHPO">
diff --git a/db/ddlutils/model/M_MOVEMENT.xml b/db/ddlutils/model/M_MOVEMENT.xml
index ac4a33da94..f35700e546 100644
--- a/db/ddlutils/model/M_MOVEMENT.xml
+++ b/db/ddlutils/model/M_MOVEMENT.xml
@@ -28,25 +28,25 @@
       <column name="ISINTRANSIT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <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" size="22" autoIncrement="false"/>
-      <foreign-key foreignTable="AD_ORG" name="ADORGTRX_MMOVEMENT">
-        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
+      <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="C_ACTIVITY" name="CACTIVITY_MMOVEMENT">
         <reference local="C_ACTIVITY_ID" foreign="C_ACTIVITY_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_CAMPAIGN" name="CCAMPAIGN_MMOVEMENT">
         <reference local="C_CAMPAIGN_ID" foreign="C_CAMPAIGN_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_MMOVE">
-        <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER2_MMOVE">
         <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_MMOVE">
+        <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_PROJECT" name="CPROJECT_MMOVEMENT">
         <reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_MOVEMENTCONFIRM.xml b/db/ddlutils/model/M_MOVEMENTCONFIRM.xml
index 85e828f67b..eb0f28e943 100644
--- a/db/ddlutils/model/M_MOVEMENTCONFIRM.xml
+++ b/db/ddlutils/model/M_MOVEMENTCONFIRM.xml
@@ -13,7 +13,7 @@
       <column name="M_MOVEMENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" 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" size="22" default="0" autoIncrement="false"/>
+      <column name="APPROVALAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DOCACTION" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
       <column name="DOCSTATUS" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
diff --git a/db/ddlutils/model/M_MOVEMENTLINE.xml b/db/ddlutils/model/M_MOVEMENTLINE.xml
index 67681d41fe..a660f0ce1b 100644
--- a/db/ddlutils/model/M_MOVEMENTLINE.xml
+++ b/db/ddlutils/model/M_MOVEMENTLINE.xml
@@ -15,12 +15,12 @@
       <column name="M_LOCATORTO_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="LINE" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
-      <column name="MOVEMENTQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="MOVEMENTQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="ID" size="10" default="0" autoIncrement="false"/>
-      <column name="CONFIRMEDQTY" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="SCRAPPEDQTY" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="TARGETQTY" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="CONFIRMEDQTY" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="SCRAPPEDQTY" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="TARGETQTY" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="M_ATTRIBUTESETINSTANCETO_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="M_ATTRIBUTESETINSTANCE" name="MATTRSETINST_MMOVEMENTLINE">
diff --git a/db/ddlutils/model/M_MOVEMENTLINECONFIRM.xml b/db/ddlutils/model/M_MOVEMENTLINECONFIRM.xml
index e2f99a003a..b594d2dd0d 100644
--- a/db/ddlutils/model/M_MOVEMENTLINECONFIRM.xml
+++ b/db/ddlutils/model/M_MOVEMENTLINECONFIRM.xml
@@ -13,10 +13,10 @@
       <column name="M_MOVEMENTCONFIRM_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_MOVEMENTLINE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="TARGETQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="CONFIRMEDQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="DIFFERENCEQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="SCRAPPEDQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="TARGETQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="CONFIRMEDQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="DIFFERENCEQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="SCRAPPEDQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="M_INVENTORYLINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="M_INVENTORYLINE" name="MINVENTORYLINE_MMOVLINECONFIRM">
diff --git a/db/ddlutils/model/M_MOVEMENTLINEMA.xml b/db/ddlutils/model/M_MOVEMENTLINEMA.xml
index b28a53db14..3bf6f1476b 100644
--- a/db/ddlutils/model/M_MOVEMENTLINEMA.xml
+++ b/db/ddlutils/model/M_MOVEMENTLINEMA.xml
@@ -11,7 +11,7 @@
       <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="MOVEMENTQTY" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="MOVEMENTQTY" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <foreign-key foreignTable="M_ATTRIBUTESETINSTANCE" name="MASI_MMOVEMENTLINEMA">
         <reference local="M_ATTRIBUTESETINSTANCE_ID" foreign="M_ATTRIBUTESETINSTANCE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_OPERATIONRESOURCE.xml b/db/ddlutils/model/M_OPERATIONRESOURCE.xml
index 7c37cf2548..3920b307f4 100644
--- a/db/ddlutils/model/M_OPERATIONRESOURCE.xml
+++ b/db/ddlutils/model/M_OPERATIONRESOURCE.xml
@@ -16,9 +16,9 @@
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="A_ASSET_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_JOB_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="SETUPTIME" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="UNITRUNTIME" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="TEARDOWNTIME" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="SETUPTIME" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="UNITRUNTIME" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="TEARDOWNTIME" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="A_ASSET" name="AASSET_MOPERATIONRESOURCE">
         <reference local="A_ASSET_ID" foreign="A_ASSET_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_PACKAGELINE.xml b/db/ddlutils/model/M_PACKAGELINE.xml
index 6fe39d506d..dc8d87eb35 100644
--- a/db/ddlutils/model/M_PACKAGELINE.xml
+++ b/db/ddlutils/model/M_PACKAGELINE.xml
@@ -12,7 +12,7 @@
       <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_PACKAGE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_INOUTLINE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <foreign-key foreignTable="M_INOUTLINE" name="MINOUTLINE_MPACKAGELINE">
         <reference local="M_INOUTLINE_ID" foreign="M_INOUTLINE_ID"/>
diff --git a/db/ddlutils/model/M_PRODUCT.xml b/db/ddlutils/model/M_PRODUCT.xml
index 4c29faaec3..662489baf8 100644
--- a/db/ddlutils/model/M_PRODUCT.xml
+++ b/db/ddlutils/model/M_PRODUCT.xml
@@ -30,8 +30,8 @@
       <column name="C_REVENUERECOGNITION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="M_PRODUCT_CATEGORY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="CLASSIFICATION" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="VOLUME" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="WEIGHT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="VOLUME" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="WEIGHT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="SHELFWIDTH" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="SHELFHEIGHT" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="SHELFDEPTH" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
@@ -101,6 +101,9 @@
       <foreign-key foreignTable="S_RESOURCE" name="SRESOURCE_MPRODUCT">
         <reference local="S_RESOURCE_ID" foreign="S_RESOURCE_ID"/>
       </foreign-key>
+      <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"/>
@@ -117,9 +120,6 @@
       <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 e1bb9a7c4a..75a296a85e 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">
         <reference local="C_CAMPAIGN_ID" foreign="C_CAMPAIGN_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_MPROD">
-        <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER2_MPROD">
         <reference local="USER2_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_MPROD">
+        <reference local="USER1_ID" foreign="C_ELEMENTVALUE_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_PROJECT" name="CPROJECT_MPRODUCTION">
         <reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_PRODUCTIONLINE.xml b/db/ddlutils/model/M_PRODUCTIONLINE.xml
index 805bcdc943..e0cfa4d031 100644
--- a/db/ddlutils/model/M_PRODUCTIONLINE.xml
+++ b/db/ddlutils/model/M_PRODUCTIONLINE.xml
@@ -13,7 +13,7 @@
       <column name="M_PRODUCTIONPLAN_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="LINE" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="MOVEMENTQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="MOVEMENTQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="M_LOCATOR_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="ID" size="10" default="0" autoIncrement="false"/>
@@ -33,6 +33,9 @@
       <index name="M_PRODUCTIONLINE_PRODPLAN">
         <index-column name="M_PRODUCTIONPLAN_ID"/>
       </index>
+      <unique name="M_PRODUCTIONLINE_KEY">
+        <unique-column name="M_PRODUCTIONLINE_ID"/>
+      </unique>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/M_PRODUCTIONLINEMA.xml b/db/ddlutils/model/M_PRODUCTIONLINEMA.xml
index fdaff0bf45..ede4faa572 100644
--- a/db/ddlutils/model/M_PRODUCTIONLINEMA.xml
+++ b/db/ddlutils/model/M_PRODUCTIONLINEMA.xml
@@ -11,7 +11,7 @@
       <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="MOVEMENTQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="MOVEMENTQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="M_ATTRIBUTESETINSTANCE" name="MASI_MPRODUCTIONLINEMA">
         <reference local="M_ATTRIBUTESETINSTANCE_ID" foreign="M_ATTRIBUTESETINSTANCE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_PRODUCTIONPLAN.xml b/db/ddlutils/model/M_PRODUCTIONPLAN.xml
index 650a64f7a9..9a682a0c86 100644
--- a/db/ddlutils/model/M_PRODUCTIONPLAN.xml
+++ b/db/ddlutils/model/M_PRODUCTIONPLAN.xml
@@ -13,7 +13,7 @@
       <column name="M_PRODUCTION_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="LINE" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="PRODUCTIONQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="PRODUCTIONQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="M_LOCATOR_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/M_PRODUCTOPERATION.xml b/db/ddlutils/model/M_PRODUCTOPERATION.xml
index d6e337c75b..03deb49315 100644
--- a/db/ddlutils/model/M_PRODUCTOPERATION.xml
+++ b/db/ddlutils/model/M_PRODUCTOPERATION.xml
@@ -14,9 +14,9 @@
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="SETUPTIME" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="UNITRUNTIME" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="TEARDOWNTIME" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="SETUPTIME" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="UNITRUNTIME" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="TEARDOWNTIME" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="M_PRODUCT" name="MPRODUCT_MPRODUCTOPERATION">
         <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_PRODUCTPRICE.xml b/db/ddlutils/model/M_PRODUCTPRICE.xml
index cfc86b45e2..4d00ab8b06 100644
--- a/db/ddlutils/model/M_PRODUCTPRICE.xml
+++ b/db/ddlutils/model/M_PRODUCTPRICE.xml
@@ -11,9 +11,9 @@
       <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="PRICELIST" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PRICESTD" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PRICELIMIT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="PRICELIST" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PRICESTD" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PRICELIMIT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="M_PRICELIST_VERSION" name="MPRICELISTVER_MPRODUCTPRICE">
         <reference local="M_PRICELIST_VERSION_ID" foreign="M_PRICELIST_VERSION_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_PRODUCT_ACCT.xml b/db/ddlutils/model/M_PRODUCT_ACCT.xml
index c11e25fcbd..d96290f592 100644
--- a/db/ddlutils/model/M_PRODUCT_ACCT.xml
+++ b/db/ddlutils/model/M_PRODUCT_ACCT.xml
@@ -24,14 +24,17 @@
       <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_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_PEXPENSE_MPRODUCT">
-        <reference local="P_EXPENSE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      <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"/>
@@ -45,9 +48,6 @@
       <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_BOM.xml b/db/ddlutils/model/M_PRODUCT_BOM.xml
index dd3eb246de..db9cc98f00 100644
--- a/db/ddlutils/model/M_PRODUCT_BOM.xml
+++ b/db/ddlutils/model/M_PRODUCT_BOM.xml
@@ -13,7 +13,7 @@
       <column name="LINE" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_PRODUCTBOM_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="BOMQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="BOMQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="BOMTYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <foreign-key foreignTable="M_PRODUCT" name="MPRODUCT_MPRODUCTBOM">
diff --git a/db/ddlutils/model/M_PRODUCT_CATEGORY.xml b/db/ddlutils/model/M_PRODUCT_CATEGORY.xml
index f7fde9e57a..9af58c646c 100644
--- a/db/ddlutils/model/M_PRODUCT_CATEGORY.xml
+++ b/db/ddlutils/model/M_PRODUCT_CATEGORY.xml
@@ -14,7 +14,7 @@
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="ISDEFAULT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="PLANNEDMARGIN" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="PLANNEDMARGIN" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="A_ASSET_GROUP_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSELFSERVICE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="AD_PRINTCOLOR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
diff --git a/db/ddlutils/model/M_PRODUCT_CATEGORY_ACCT.xml b/db/ddlutils/model/M_PRODUCT_CATEGORY_ACCT.xml
index aa584f176f..03dd942f35 100644
--- a/db/ddlutils/model/M_PRODUCT_CATEGORY_ACCT.xml
+++ b/db/ddlutils/model/M_PRODUCT_CATEGORY_ACCT.xml
@@ -27,14 +27,17 @@
       <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_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_PEXPENSE_MPRODUCTCATEGORY">
-        <reference local="P_EXPENSE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      <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"/>
@@ -48,9 +51,6 @@
       <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_PRODUCT_COSTING.xml b/db/ddlutils/model/M_PRODUCT_COSTING.xml
index 50c0bc5bf4..b4e3d6bf2b 100644
--- a/db/ddlutils/model/M_PRODUCT_COSTING.xml
+++ b/db/ddlutils/model/M_PRODUCT_COSTING.xml
@@ -11,20 +11,20 @@
       <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="CURRENTCOSTPRICE" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="FUTURECOSTPRICE" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="COSTSTANDARD" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="COSTSTANDARDPOQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="COSTSTANDARDPOAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="COSTSTANDARDCUMQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="COSTSTANDARDCUMAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="COSTAVERAGE" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="COSTAVERAGECUMQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="COSTAVERAGECUMAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PRICELASTPO" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PRICELASTINV" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="TOTALINVQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="TOTALINVAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="CURRENTCOSTPRICE" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="FUTURECOSTPRICE" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="COSTSTANDARD" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="COSTSTANDARDPOQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="COSTSTANDARDPOAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="COSTSTANDARDCUMQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="COSTSTANDARDCUMAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="COSTAVERAGE" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="COSTAVERAGECUMQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="COSTAVERAGECUMAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PRICELASTPO" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PRICELASTINV" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="TOTALINVQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="TOTALINVAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_MPRODUCTCOSTING">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_PRODUCT_PO.xml b/db/ddlutils/model/M_PRODUCT_PO.xml
index 0a6f64bb9e..c7654c812a 100644
--- a/db/ddlutils/model/M_PRODUCT_PO.xml
+++ b/db/ddlutils/model/M_PRODUCT_PO.xml
@@ -14,23 +14,23 @@
       <column name="ISCURRENTVENDOR" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="C_UOM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="PRICELIST" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PRICEPO" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="PRICELIST" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PRICEPO" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="PRICEEFFECTIVE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="PRICELASTPO" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PRICELASTINV" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="PRICELASTPO" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PRICELASTINV" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="VENDORPRODUCTNO" primaryKey="false" required="true" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="UPC" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="VENDORCATEGORY" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="DISCONTINUED" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="DISCONTINUEDBY" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="ORDER_MIN" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="ORDER_PACK" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="COSTPERORDER" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="ORDER_MIN" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="ORDER_PACK" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="COSTPERORDER" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DELIVERYTIME_PROMISED" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="DELIVERYTIME_ACTUAL" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
-      <column name="QUALITYRATING" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="ROYALTYAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QUALITYRATING" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="ROYALTYAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="MANUFACTURER" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="M_PRODUCTPO_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
diff --git a/db/ddlutils/model/M_REPLENISH.xml b/db/ddlutils/model/M_REPLENISH.xml
index a415751963..9670744f37 100644
--- a/db/ddlutils/model/M_REPLENISH.xml
+++ b/db/ddlutils/model/M_REPLENISH.xml
@@ -12,8 +12,8 @@
       <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="REPLENISHTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="LEVEL_MIN" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="LEVEL_MAX" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="LEVEL_MIN" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="LEVEL_MAX" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="M_WAREHOUSESOURCE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="M_PRODUCT" name="M_PRODUCT_REPLENISH">
         <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
diff --git a/db/ddlutils/model/M_REQUISITION.xml b/db/ddlutils/model/M_REQUISITION.xml
index 2187456451..5c01ea8a0e 100644
--- a/db/ddlutils/model/M_REQUISITION.xml
+++ b/db/ddlutils/model/M_REQUISITION.xml
@@ -19,7 +19,7 @@
       <column name="ISAPPROVED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="PRIORITYRULE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="DATEREQUIRED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="TOTALLINES" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="TOTALLINES" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DOCACTION" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
       <column name="DOCSTATUS" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
diff --git a/db/ddlutils/model/M_REQUISITIONLINE.xml b/db/ddlutils/model/M_REQUISITIONLINE.xml
index 03fe661e47..8a265c26d3 100644
--- a/db/ddlutils/model/M_REQUISITIONLINE.xml
+++ b/db/ddlutils/model/M_REQUISITIONLINE.xml
@@ -12,13 +12,13 @@
       <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="LINE" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="M_REQUISITION_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="PRICEACTUAL" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="LINENETAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="PRICEACTUAL" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="LINENETAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_ORDERLINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="C_CHARGE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="M_PRODUCT" name="MPRODUCT_MREQUISITIONLINE">
         <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
diff --git a/db/ddlutils/model/M_RMA.xml b/db/ddlutils/model/M_RMA.xml
index 9ace82f4d1..8f1af0d29b 100644
--- a/db/ddlutils/model/M_RMA.xml
+++ b/db/ddlutils/model/M_RMA.xml
@@ -22,7 +22,7 @@
       <column name="DOCACTION" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
       <column name="DOCSTATUS" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
       <column name="ISAPPROVED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="AMT" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="AMT" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="M_RMATYPE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
diff --git a/db/ddlutils/model/M_RMALINE.xml b/db/ddlutils/model/M_RMALINE.xml
index 7c57fd2964..a3d2d1bf5e 100644
--- a/db/ddlutils/model/M_RMALINE.xml
+++ b/db/ddlutils/model/M_RMALINE.xml
@@ -12,7 +12,7 @@
       <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_RMA_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_INOUTLINE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="M_INOUTLINE" name="MINOUTLINE_MRMALINE">
diff --git a/db/ddlutils/model/M_STORAGE.xml b/db/ddlutils/model/M_STORAGE.xml
index 7a0756cf08..56c4e63ce2 100644
--- a/db/ddlutils/model/M_STORAGE.xml
+++ b/db/ddlutils/model/M_STORAGE.xml
@@ -11,9 +11,9 @@
       <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="QTYONHAND" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="QTYRESERVED" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="QTYORDERED" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTYONHAND" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="QTYRESERVED" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="QTYORDERED" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DATELASTINVENTORY" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="true" required="true" type="ID" size="10" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="M_ITEM_STORAGE_CLIENT">
diff --git a/db/ddlutils/model/M_TRANSACTION.xml b/db/ddlutils/model/M_TRANSACTION.xml
index f289b9e779..feef4f2d19 100644
--- a/db/ddlutils/model/M_TRANSACTION.xml
+++ b/db/ddlutils/model/M_TRANSACTION.xml
@@ -14,7 +14,7 @@
       <column name="M_LOCATOR_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="MOVEMENTDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="MOVEMENTQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="MOVEMENTQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="M_INVENTORYLINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="M_MOVEMENTLINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="M_INOUTLINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
diff --git a/db/ddlutils/model/M_TRANSACTIONALLOCATION.xml b/db/ddlutils/model/M_TRANSACTIONALLOCATION.xml
index c90161f348..bf0fc16dfa 100644
--- a/db/ddlutils/model/M_TRANSACTIONALLOCATION.xml
+++ b/db/ddlutils/model/M_TRANSACTIONALLOCATION.xml
@@ -14,7 +14,7 @@
       <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="true" type="ID" size="10" default="0" autoIncrement="false"/>
       <column name="ISALLOCATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="ISMANUAL" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="M_INOUTLINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="M_PRODUCTIONLINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
diff --git a/db/ddlutils/model/M_WAREHOUSE_ACCT.xml b/db/ddlutils/model/M_WAREHOUSE_ACCT.xml
index 93c272b58d..fb1c468b3b 100644
--- a/db/ddlutils/model/M_WAREHOUSE_ACCT.xml
+++ b/db/ddlutils/model/M_WAREHOUSE_ACCT.xml
@@ -18,18 +18,18 @@
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_MWAREHOUSEACCT">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_WDIFFERENCES_MWAREHOUSE">
-        <reference local="W_DIFFERENCES_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_WINVENTORY_MWAREHOUSE">
+        <reference local="W_INVENTORY_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_WINVACTUALADJUST_MWAREHOUSE">
         <reference local="W_INVACTUALADJUST_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_WINVENTORY_MWAREHOUSE">
-        <reference local="W_INVENTORY_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_WREVALUATION_MWAREHOUSE">
         <reference local="W_REVALUATION_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_WDIFFERENCES_MWAREHOUSE">
+        <reference local="W_DIFFERENCES_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="M_WAREHOUSE" name="M_WAREHOUSE_WAREHOUSE_ACCT">
         <reference local="M_WAREHOUSE_ID" foreign="M_WAREHOUSE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/PA_ACHIEVEMENT.xml b/db/ddlutils/model/PA_ACHIEVEMENT.xml
index 2fb14e2de4..6c530409c2 100644
--- a/db/ddlutils/model/PA_ACHIEVEMENT.xml
+++ b/db/ddlutils/model/PA_ACHIEVEMENT.xml
@@ -15,7 +15,7 @@
       <column name="NOTE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="SEQNO" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <column name="PA_MEASURE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="MANUALACTUAL" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="MANUALACTUAL" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="ISACHIEVED" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="DATEDOC" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <foreign-key foreignTable="PA_MEASURE" name="PAMEASURE_PAACHIEVEMENT">
diff --git a/db/ddlutils/model/PA_BENCHMARKDATA.xml b/db/ddlutils/model/PA_BENCHMARKDATA.xml
index fe9304fe83..2d640c7971 100644
--- a/db/ddlutils/model/PA_BENCHMARKDATA.xml
+++ b/db/ddlutils/model/PA_BENCHMARKDATA.xml
@@ -14,7 +14,7 @@
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="PA_BENCHMARK_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="BENCHMARKDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="BENCHMARKVALUE" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="BENCHMARKVALUE" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <foreign-key foreignTable="PA_BENCHMARK" name="PABENCHMARK_PABENCHMARKDATA">
         <reference local="PA_BENCHMARK_ID" foreign="PA_BENCHMARK_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/PA_GOAL.xml b/db/ddlutils/model/PA_GOAL.xml
index 1c03684e58..628c1ec172 100644
--- a/db/ddlutils/model/PA_GOAL.xml
+++ b/db/ddlutils/model/PA_GOAL.xml
@@ -19,14 +19,14 @@
       <column name="ISSUMMARY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="PA_GOALPARENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PA_MEASURE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="RELATIVEWEIGHT" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="MEASURETARGET" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="RELATIVEWEIGHT" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="MEASURETARGET" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="MEASURESCOPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="MEASUREDISPLAY" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="DATEFROM" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATETO" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="MEASUREACTUAL" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="GOALPERFORMANCE" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="MEASUREACTUAL" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="GOALPERFORMANCE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="DATELASTRUN" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="AD_ROLE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_PAGOAL">
diff --git a/db/ddlutils/model/PA_MEASURE.xml b/db/ddlutils/model/PA_MEASURE.xml
index b75c53208f..66a9fa9391 100644
--- a/db/ddlutils/model/PA_MEASURE.xml
+++ b/db/ddlutils/model/PA_MEASURE.xml
@@ -13,7 +13,7 @@
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="MEASURETYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="MANUALACTUAL" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="MANUALACTUAL" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="MANUALNOTE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="CALCULATIONCLASS" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="PA_MEASURECALC_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
diff --git a/db/ddlutils/model/PA_RATIOELEMENT.xml b/db/ddlutils/model/PA_RATIOELEMENT.xml
index 953c34cc3b..31aa8f3bfd 100644
--- a/db/ddlutils/model/PA_RATIOELEMENT.xml
+++ b/db/ddlutils/model/PA_RATIOELEMENT.xml
@@ -18,7 +18,7 @@
       <column name="ACCOUNT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PA_RATIOUSED_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PA_MEASURECALC_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="CONSTANTVALUE" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="CONSTANTVALUE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="SEQNO" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="POSTINGTYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUE_PARATIOELEMENT">
@@ -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="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>
+      <foreign-key foreignTable="PA_RATIO" name="PARATIO_PARATIOELEMENT">
+        <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_REPORTCOLUMN.xml b/db/ddlutils/model/PA_REPORTCOLUMN.xml
index 6c3d17e9fa..7a6e133c0a 100644
--- a/db/ddlutils/model/PA_REPORTCOLUMN.xml
+++ b/db/ddlutils/model/PA_REPORTCOLUMN.xml
@@ -69,12 +69,12 @@
       <foreign-key foreignTable="M_PRODUCT" name="MPRODUCT_PAREPORTCOLUMN">
         <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="PA_REPORTCOLUMN" name="PAREPORTCOLUMN_OPER2">
-        <reference local="OPER_2_ID" foreign="PA_REPORTCOLUMN_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="PA_REPORTCOLUMN" name="PAREPORTCOLUMN_OPER1">
         <reference local="OPER_1_ID" foreign="PA_REPORTCOLUMN_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="PA_REPORTCOLUMN" name="PAREPORTCOLUMN_OPER2">
+        <reference local="OPER_2_ID" foreign="PA_REPORTCOLUMN_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="PA_REPORTCOLUMNSET" name="PAREPORTCOLUMNSET_COLUMN">
         <reference local="PA_REPORTCOLUMNSET_ID" foreign="PA_REPORTCOLUMNSET_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/PA_SLA_GOAL.xml b/db/ddlutils/model/PA_SLA_GOAL.xml
index c68cbefc8a..6da7da765d 100644
--- a/db/ddlutils/model/PA_SLA_GOAL.xml
+++ b/db/ddlutils/model/PA_SLA_GOAL.xml
@@ -17,8 +17,8 @@
       <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="VALIDFROM" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="VALIDTO" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="MEASURETARGET" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="MEASUREACTUAL" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="MEASURETARGET" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="MEASUREACTUAL" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DATELASTRUN" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <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"/>
diff --git a/db/ddlutils/model/PA_SLA_MEASURE.xml b/db/ddlutils/model/PA_SLA_MEASURE.xml
index d9da47850d..6432512121 100644
--- a/db/ddlutils/model/PA_SLA_MEASURE.xml
+++ b/db/ddlutils/model/PA_SLA_MEASURE.xml
@@ -12,7 +12,7 @@
       <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="PA_SLA_GOAL_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DATETRX" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="MEASUREACTUAL" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="MEASUREACTUAL" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="AD_TABLE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="RECORD_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
diff --git a/db/ddlutils/model/R_REQUEST.xml b/db/ddlutils/model/R_REQUEST.xml
index c2ecf64ca7..db97dbfe64 100644
--- a/db/ddlutils/model/R_REQUEST.xml
+++ b/db/ddlutils/model/R_REQUEST.xml
@@ -44,7 +44,7 @@
       <column name="M_RMA_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_TABLE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="RECORD_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="REQUESTAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="REQUESTAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="R_MAILTEXT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="RESULT" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="CONFIDENTIALTYPEENTRY" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
@@ -53,8 +53,8 @@
       <column name="DATENEXTACTION" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="STARTTIME" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="ENDTIME" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="QTYSPENT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="QTYINVOICED" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTYSPENT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="QTYINVOICED" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="M_PRODUCTSPENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="STARTDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
@@ -62,7 +62,7 @@
       <column name="C_INVOICEREQUEST_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="M_CHANGEREQUEST_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="TASKSTATUS" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="QTYPLAN" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="QTYPLAN" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="DATECOMPLETEPLAN" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATESTARTPLAN" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="M_FIXCHANGENOTICE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
@@ -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="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="AD_USER" name="ADUSERSR_RREQUEST">
+        <reference local="SALESREP_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="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_INVOICE" name="RINVOICE_RREQUEST">
+        <reference local="C_INVOICE_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 3db8cb2ada..1a264daf9b 100644
--- a/db/ddlutils/model/R_REQUESTACTION.xml
+++ b/db/ddlutils/model/R_REQUESTACTION.xml
@@ -40,12 +40,12 @@
       <column name="NULLCOLUMNS" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="TASKSTATUS" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="DATECOMPLETEPLAN" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="QTYPLAN" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="QTYSPENT" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="QTYPLAN" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="QTYSPENT" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="STARTDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="ENDDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATESTARTPLAN" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="QTYINVOICED" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="QTYINVOICED" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="M_PRODUCTSPENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_ROLE" name="ADROLE_RREQUESTACTION">
         <reference local="AD_ROLE_ID" foreign="AD_ROLE_ID"/>
diff --git a/db/ddlutils/model/R_REQUESTUPDATE.xml b/db/ddlutils/model/R_REQUESTUPDATE.xml
index d0b3c6ee98..a58294f7b5 100644
--- a/db/ddlutils/model/R_REQUESTUPDATE.xml
+++ b/db/ddlutils/model/R_REQUESTUPDATE.xml
@@ -14,8 +14,8 @@
       <column name="CONFIDENTIALTYPEENTRY" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="STARTTIME" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="ENDTIME" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="QTYSPENT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="QTYINVOICED" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTYSPENT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="QTYINVOICED" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="M_PRODUCTSPENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="RESULT" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <foreign-key foreignTable="R_REQUEST" name="RREQUEST_RREQUESTUPDATE">
diff --git a/db/ddlutils/model/S_RESOURCE.xml b/db/ddlutils/model/S_RESOURCE.xml
index 53da4f0166..62d5ae9e33 100644
--- a/db/ddlutils/model/S_RESOURCE.xml
+++ b/db/ddlutils/model/S_RESOURCE.xml
@@ -17,7 +17,7 @@
       <column name="M_WAREHOUSE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISAVAILABLE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="CHARGEABLEQTY" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="CHARGEABLEQTY" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_SRESOURCE">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/S_RESOURCEASSIGNMENT.xml b/db/ddlutils/model/S_RESOURCEASSIGNMENT.xml
index 9fb65d4313..adbb563cdc 100644
--- a/db/ddlutils/model/S_RESOURCEASSIGNMENT.xml
+++ b/db/ddlutils/model/S_RESOURCEASSIGNMENT.xml
@@ -15,7 +15,7 @@
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="ASSIGNDATEFROM" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="ASSIGNDATETO" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="ISCONFIRMED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="S_RESOURCE" name="SRESOURCE_SRESOURCEASSIGNMENT">
         <reference local="S_RESOURCE_ID" foreign="S_RESOURCE_ID"/>
diff --git a/db/ddlutils/model/S_RESOURCETYPE.xml b/db/ddlutils/model/S_RESOURCETYPE.xml
index f0654bb570..259e9d03b2 100644
--- a/db/ddlutils/model/S_RESOURCETYPE.xml
+++ b/db/ddlutils/model/S_RESOURCETYPE.xml
@@ -29,7 +29,7 @@
       <column name="ONSATURDAY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="M_PRODUCT_CATEGORY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_TAXCATEGORY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="CHARGEABLEQTY" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="CHARGEABLEQTY" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="C_TAXCATEGORY" name="CTAXCATEGORY_SRESOURCETYPE">
         <reference local="C_TAXCATEGORY_ID" foreign="C_TAXCATEGORY_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/S_TIMEEXPENSE.xml b/db/ddlutils/model/S_TIMEEXPENSE.xml
index f58e39c126..a76a412339 100644
--- a/db/ddlutils/model/S_TIMEEXPENSE.xml
+++ b/db/ddlutils/model/S_TIMEEXPENSE.xml
@@ -21,7 +21,7 @@
       <column name="ISAPPROVED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="DOCSTATUS" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
       <column name="DOCACTION" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
-      <column name="APPROVALAMT" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="APPROVALAMT" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <foreign-key foreignTable="C_BPARTNER" name="CBPARTNER_STIMEEXPENSE">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/S_TIMEEXPENSELINE.xml b/db/ddlutils/model/S_TIMEEXPENSELINE.xml
index 8468ea47b8..e7db776a11 100644
--- a/db/ddlutils/model/S_TIMEEXPENSELINE.xml
+++ b/db/ddlutils/model/S_TIMEEXPENSELINE.xml
@@ -15,10 +15,10 @@
       <column name="ISTIMEREPORT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="DATEEXPENSE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="EXPENSEAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="EXPENSEAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="CONVERTEDAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="CONVERTEDAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="S_RESOURCEASSIGNMENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="NOTE" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
@@ -28,17 +28,17 @@
       <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_CAMPAIGN_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="INVOICEPRICE" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="INVOICEPRICE" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_UOM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_ORDERLINE_ID" primaryKey="false" required="false" type="ID" size="10" 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"/>
       <column name="S_TIMETYPE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="QTYINVOICED" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="QTYREIMBURSED" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="PRICEINVOICED" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="PRICEREIMBURSED" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="QTYINVOICED" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="QTYREIMBURSED" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="PRICEINVOICED" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="PRICEREIMBURSED" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <foreign-key foreignTable="C_ACTIVITY" name="CACTIVITY_STIMEEXPENSELINE">
         <reference local="C_ACTIVITY_ID" foreign="C_ACTIVITY_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/TEST.xml b/db/ddlutils/model/TEST.xml
index 6496c56f6c..a734893442 100644
--- a/db/ddlutils/model/TEST.xml
+++ b/db/ddlutils/model/TEST.xml
@@ -14,13 +14,13 @@
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="T_INTEGER" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
-      <column name="T_NUMBER" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="T_NUMBER" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="T_DATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="T_DATETIME" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="C_UOM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="T_QTY" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="T_QTY" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="T_AMOUNT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="T_AMOUNT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_LOCATION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ACCOUNT_ACCT" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_PAYMENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
diff --git a/db/ddlutils/model/T_AGING.xml b/db/ddlutils/model/T_AGING.xml
index 5878b6cbd5..4d74ac8ee5 100644
--- a/db/ddlutils/model/T_AGING.xml
+++ b/db/ddlutils/model/T_AGING.xml
@@ -20,28 +20,28 @@
       <column name="ISLISTINVOICES" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISSOTRX" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="C_BP_GROUP_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="INVOICEDAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="OPENAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PASTDUE91_PLUS" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PASTDUE61_90" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PASTDUE61_PLUS" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PASTDUE31_60" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PASTDUE31_PLUS" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PASTDUE1_30" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PASTDUE8_30" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PASTDUE1_7" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PASTDUEAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="DUEAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="DUE0" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="DUE0_7" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="DUE1_7" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="DUE8_30" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="DUE0_30" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="DUE31_PLUS" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="DUE31_60" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="DUE61_PLUS" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="DUE61_90" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="DUE91_PLUS" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="INVOICEDAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="OPENAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PASTDUE91_PLUS" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PASTDUE61_90" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PASTDUE61_PLUS" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PASTDUE31_60" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PASTDUE31_PLUS" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PASTDUE1_30" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PASTDUE8_30" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PASTDUE1_7" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PASTDUEAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="DUEAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="DUE0" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="DUE0_7" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="DUE1_7" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="DUE8_30" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="DUE0_30" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="DUE31_PLUS" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="DUE31_60" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="DUE61_PLUS" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="DUE61_90" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="DUE91_PLUS" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
diff --git a/db/ddlutils/model/T_DISTRIBUTIONRUNDETAIL.xml b/db/ddlutils/model/T_DISTRIBUTIONRUNDETAIL.xml
index e8d2ecd16d..ca40eb84ba 100644
--- a/db/ddlutils/model/T_DISTRIBUTIONRUNDETAIL.xml
+++ b/db/ddlutils/model/T_DISTRIBUTIONRUNDETAIL.xml
@@ -13,9 +13,9 @@
       <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="RATIO" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="MINQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="RATIO" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
+      <column name="MINQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
diff --git a/db/ddlutils/model/T_INVENTORYVALUE.xml b/db/ddlutils/model/T_INVENTORYVALUE.xml
index 8abec438ad..404d2db683 100644
--- a/db/ddlutils/model/T_INVENTORYVALUE.xml
+++ b/db/ddlutils/model/T_INVENTORYVALUE.xml
@@ -11,19 +11,19 @@
       <column name="M_PRICELIST_VERSION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DATEVALUE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="QTYONHAND" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PRICEPO" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PRICELIST" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PRICESTD" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PRICELIMIT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="COSTSTANDARD" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="COST" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PRICEPOAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PRICELISTAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PRICESTDAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PRICELIMITAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="COSTSTANDARDAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="COSTAMT" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTYONHAND" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PRICEPO" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PRICELIST" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PRICESTD" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PRICELIMIT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="COSTSTANDARD" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="COST" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PRICEPOAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PRICELISTAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PRICESTDAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PRICELIMITAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="COSTSTANDARDAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="COSTAMT" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="M_COSTELEMENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_PINSTANCE" name="ADPINSTANCE_TINVENTORYVALUE">
         <reference local="AD_PINSTANCE_ID" foreign="AD_PINSTANCE_ID"/>
diff --git a/db/ddlutils/model/T_INVOICEGL.xml b/db/ddlutils/model/T_INVOICEGL.xml
index 7f3eb4de95..208191723b 100644
--- a/db/ddlutils/model/T_INVOICEGL.xml
+++ b/db/ddlutils/model/T_INVOICEGL.xml
@@ -12,18 +12,18 @@
       <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="GRANDTOTAL" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="OPENAMT" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PERCENT" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="GRANDTOTAL" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="OPENAMT" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PERCENT" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="APAR" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="AMTSOURCEBALANCE" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="AMTACCTBALANCE" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="AMTSOURCEBALANCE" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="AMTACCTBALANCE" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_CONVERSIONTYPEREVAL_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="AMTREVALDR" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="AMTREVALCR" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="AMTREVALDR" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="AMTREVALCR" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="DATEREVAL" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="AMTREVALDRDIFF" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="AMTREVALCRDIFF" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="AMTREVALDRDIFF" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="AMTREVALCRDIFF" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_DOCTYPEREVAL_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISALLCURRENCIES" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="AD_PINSTANCE" name="ADPINSTANCE_TINVOICEGL">
diff --git a/db/ddlutils/model/T_REPLENISH.xml b/db/ddlutils/model/T_REPLENISH.xml
index ecf55d7f25..59ae2f5ea8 100644
--- a/db/ddlutils/model/T_REPLENISH.xml
+++ b/db/ddlutils/model/T_REPLENISH.xml
@@ -7,16 +7,16 @@
       <column name="M_PRODUCT_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="QTYONHAND" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="QTYRESERVED" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="QTYORDERED" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTYONHAND" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="QTYRESERVED" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="QTYORDERED" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="REPLENISHTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="LEVEL_MIN" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="LEVEL_MAX" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="LEVEL_MIN" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="LEVEL_MAX" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="ORDER_MIN" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="ORDER_PACK" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="QTYTOORDER" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="ORDER_MIN" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="ORDER_PACK" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="QTYTOORDER" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="REPLENISHMENTCREATE" primaryKey="false" required="false" type="CHAR" size="3" autoIncrement="false"/>
       <column name="M_WAREHOUSESOURCE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_DOCTYPE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
diff --git a/db/ddlutils/model/T_REPORT.xml b/db/ddlutils/model/T_REPORT.xml
index c76b61bdd2..92e83fc757 100644
--- a/db/ddlutils/model/T_REPORT.xml
+++ b/db/ddlutils/model/T_REPORT.xml
@@ -6,31 +6,31 @@
       <column name="PA_REPORTLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="RECORD_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="FACT_ACCT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="SEQNO" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="LEVELNO" primaryKey="false" required="false" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="COL_0" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="COL_2" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="COL_1" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="COL_3" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="COL_4" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="COL_5" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="COL_6" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="COL_7" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="COL_8" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="COL_9" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="COL_10" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="COL_11" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="COL_12" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="COL_13" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="COL_14" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="COL_15" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="COL_16" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="COL_17" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="COL_18" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="COL_19" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="COL_20" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="COL_0" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="COL_2" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="COL_1" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="COL_3" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="COL_4" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="COL_5" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="COL_6" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="COL_7" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="COL_8" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="COL_9" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="COL_10" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="COL_11" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="COL_12" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="COL_13" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="COL_14" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="COL_15" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="COL_16" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="COL_17" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="COL_18" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="COL_19" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="COL_20" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <foreign-key foreignTable="AD_PINSTANCE" name="ADPINSTANCE_TREPORT">
         <reference local="AD_PINSTANCE_ID" foreign="AD_PINSTANCE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/T_REPORTSTATEMENT.xml b/db/ddlutils/model/T_REPORTSTATEMENT.xml
index c9d6116672..28da9227d6 100644
--- a/db/ddlutils/model/T_REPORTSTATEMENT.xml
+++ b/db/ddlutils/model/T_REPORTSTATEMENT.xml
@@ -8,10 +8,10 @@
       <column name="DATEACCT" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="AMTACCTDR" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="AMTACCTCR" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="BALANCE" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="false" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="AMTACCTDR" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="AMTACCTCR" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="BALANCE" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="false" type="DECIMAL" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="AD_PINSTANCE" name="ADPINSTANCE_TREPORTSTATEMENT">
         <reference local="AD_PINSTANCE_ID" foreign="AD_PINSTANCE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/T_SELECTION2.xml b/db/ddlutils/model/T_SELECTION2.xml
index 73cd7f13d4..c0994a17dd 100644
--- a/db/ddlutils/model/T_SELECTION2.xml
+++ b/db/ddlutils/model/T_SELECTION2.xml
@@ -3,7 +3,7 @@
   <database name="default" defaultIdMethod="none">
     <table name="T_SELECTION2">
       <column name="AD_PINSTANCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
-      <column name="QUERY_ID" primaryKey="true" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="QUERY_ID" primaryKey="true" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="T_SELECTION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
     </table>
   </database>
diff --git a/db/ddlutils/model/T_TRANSACTION.xml b/db/ddlutils/model/T_TRANSACTION.xml
index ae16352595..892f4d8d8d 100644
--- a/db/ddlutils/model/T_TRANSACTION.xml
+++ b/db/ddlutils/model/T_TRANSACTION.xml
@@ -16,7 +16,7 @@
       <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="MOVEMENTDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="MOVEMENTQTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="MOVEMENTQTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="M_INOUTLINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="M_INOUT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="M_MOVEMENTLINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
diff --git a/db/ddlutils/model/T_TRIALBALANCE.xml b/db/ddlutils/model/T_TRIALBALANCE.xml
index 8b76a5ac13..d83a731557 100644
--- a/db/ddlutils/model/T_TRIALBALANCE.xml
+++ b/db/ddlutils/model/T_TRIALBALANCE.xml
@@ -24,14 +24,14 @@
       <column name="M_LOCATOR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="POSTINGTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="AMTSOURCEDR" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="AMTSOURCECR" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="AMTSOURCEBALANCE" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="AMTACCTDR" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="AMTACCTCR" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
-      <column name="AMTACCTBALANCE" primaryKey="false" required="true" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="AMTSOURCEDR" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="AMTSOURCECR" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="AMTSOURCEBALANCE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
+      <column name="AMTACCTDR" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
+      <column name="AMTACCTCR" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
+      <column name="AMTACCTBALANCE" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false"/>
       <column name="C_UOM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="false" type="DECIMAL" size="22" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="C_BPARTNER_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"/>
diff --git a/db/ddlutils/model/W_BASKETLINE.xml b/db/ddlutils/model/W_BASKETLINE.xml
index b89ed7091a..0454f14862 100644
--- a/db/ddlutils/model/W_BASKETLINE.xml
+++ b/db/ddlutils/model/W_BASKETLINE.xml
@@ -12,8 +12,8 @@
       <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="W_BASKET_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="LINE" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
-      <column name="PRICE" primaryKey="false" required="true" type="DECIMAL" size="22" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
+      <column name="PRICE" primaryKey="false" required="true" type="DECIMAL" default="0" autoIncrement="false"/>
       <column name="PRODUCT" primaryKey="false" required="true" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="true" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
diff --git a/db/ddlutils/model/W_STORE.xml b/db/ddlutils/model/W_STORE.xml
index 98745148b2..70374c7aad 100644
--- a/db/ddlutils/model/W_STORE.xml
+++ b/db/ddlutils/model/W_STORE.xml
@@ -50,9 +50,6 @@
       <unique name="W_STORE_WEBCONTEXT">
         <unique-column name="WEBCONTEXT"/>
       </unique>
-      <check>
-        <rule><![CDATA[IsMenuContact in ('Y','N')]]></rule>
-      </check>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
@@ -83,5 +80,8 @@
       <check>
         <rule><![CDATA[IsMenuRegistrations in ('Y','N')]]></rule>
       </check>
+      <check>
+        <rule><![CDATA[IsMenuContact in ('Y','N')]]></rule>
+      </check>
     </table>
   </database>