diff --git a/db/ddlutils/model/AD_ACCESSLOG.xml b/db/ddlutils/model/AD_ACCESSLOG.xml
index e78c01417e..a8edad374f 100644
--- a/db/ddlutils/model/AD_ACCESSLOG.xml
+++ b/db/ddlutils/model/AD_ACCESSLOG.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_ACCESSLOG">
-      <column name="AD_ACCESSLOG_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_ACCESSLOG_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_COLUMN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="RECORD_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_COLUMN_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="REMOTE_ADDR" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="REMOTE_HOST" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_ALERT.xml b/db/ddlutils/model/AD_ALERT.xml
index 3edacd458c..aa401c7b0a 100644
--- a/db/ddlutils/model/AD_ALERT.xml
+++ b/db/ddlutils/model/AD_ALERT.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_ALERT">
-      <column name="AD_ALERT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_ALERT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
@@ -17,7 +17,7 @@
       <column name="ALERTMESSAGE" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="ENFORCECLIENTSECURITY" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ENFORCEROLESECURITY" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="AD_ALERTPROCESSOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_ALERTPROCESSOR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISVALID" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <foreign-key foreignTable="AD_ALERTPROCESSOR" name="CALERTPROCESSOR_ADALERT">
         <reference local="AD_ALERTPROCESSOR_ID" foreign="AD_ALERTPROCESSOR_ID"/>
diff --git a/db/ddlutils/model/AD_ALERTPROCESSOR.xml b/db/ddlutils/model/AD_ALERTPROCESSOR.xml
index ca59c01203..31cf995487 100644
--- a/db/ddlutils/model/AD_ALERTPROCESSOR.xml
+++ b/db/ddlutils/model/AD_ALERTPROCESSOR.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_ALERTPROCESSOR">
-      <column name="AD_ALERTPROCESSOR_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_ALERTPROCESSOR_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="FREQUENCYTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="FREQUENCY" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="FREQUENCY" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="DATELASTRUN" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATENEXTRUN" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="SUPERVISOR_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="KEEPLOGDAYS" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="SUPERVISOR_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="KEEPLOGDAYS" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_CALERTPROCESSOR">
         <reference local="SUPERVISOR_ID" foreign="AD_USER_ID"/>
diff --git a/db/ddlutils/model/AD_ALERTPROCESSORLOG.xml b/db/ddlutils/model/AD_ALERTPROCESSORLOG.xml
index a20463f7c4..336da0ad06 100644
--- a/db/ddlutils/model/AD_ALERTPROCESSORLOG.xml
+++ b/db/ddlutils/model/AD_ALERTPROCESSORLOG.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_ALERTPROCESSORLOG">
-      <column name="AD_ALERTPROCESSOR_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ALERTPROCESSORLOG_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_ALERTPROCESSOR_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ALERTPROCESSORLOG_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISERROR" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="SUMMARY" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="REFERENCE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_ALERTRECIPIENT.xml b/db/ddlutils/model/AD_ALERTRECIPIENT.xml
index dd5bc9265b..54395b4852 100644
--- a/db/ddlutils/model/AD_ALERTRECIPIENT.xml
+++ b/db/ddlutils/model/AD_ALERTRECIPIENT.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_ALERTRECIPIENT">
-      <column name="AD_ALERTRECIPIENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_ALERTRECIPIENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ALERT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ROLE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ALERT_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="AD_ROLE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_ALERT" name="ADALERT_ADALERTRECIPIENT">
         <reference local="AD_ALERT_ID" foreign="AD_ALERT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_ALERTRULE.xml b/db/ddlutils/model/AD_ALERTRULE.xml
index 668e98f9c9..263168a448 100644
--- a/db/ddlutils/model/AD_ALERTRULE.xml
+++ b/db/ddlutils/model/AD_ALERTRULE.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_ALERTRULE">
-      <column name="AD_ALERTRULE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_ALERTRULE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="AD_ALERT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_ALERT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="SELECTCLAUSE" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="FROMCLAUSE" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="WHERECLAUSE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PREPROCESSING" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="POSTPROCESSING" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="ISVALID" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_ARCHIVE.xml b/db/ddlutils/model/AD_ARCHIVE.xml
index 377746b6f2..9fb661246e 100644
--- a/db/ddlutils/model/AD_ARCHIVE.xml
+++ b/db/ddlutils/model/AD_ARCHIVE.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_ARCHIVE">
-      <column name="AD_ARCHIVE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_ARCHIVE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="AD_TABLE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="RECORD_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_PROCESS_ID" primaryKey="false" required="false" type="ID" 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="AD_PROCESS_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="BINARYDATA" primaryKey="false" required="false" type="BLOB" size="4000" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISREPORT" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <foreign-key foreignTable="AD_PROCESS" name="ADPROCESS_ADARCHIVE">
         <reference local="AD_PROCESS_ID" foreign="AD_PROCESS_ID"/>
diff --git a/db/ddlutils/model/AD_ATTACHMENT.xml b/db/ddlutils/model/AD_ATTACHMENT.xml
index 59e0243bd3..fec4a261ce 100644
--- a/db/ddlutils/model/AD_ATTACHMENT.xml
+++ b/db/ddlutils/model/AD_ATTACHMENT.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_ATTACHMENT">
-      <column name="AD_ATTACHMENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_ATTACHMENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="RECORD_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="RECORD_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="TITLE" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="BINARYDATA" primaryKey="false" required="false" type="BLOB" size="4000" autoIncrement="false"/>
       <column name="TEXTMSG" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_ATTACHMENTNOTE.xml b/db/ddlutils/model/AD_ATTACHMENTNOTE.xml
index 06a63b5554..2775ad5fba 100644
--- a/db/ddlutils/model/AD_ATTACHMENTNOTE.xml
+++ b/db/ddlutils/model/AD_ATTACHMENTNOTE.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_ATTACHMENTNOTE">
-      <column name="AD_ATTACHMENTNOTE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_ATTACHMENTNOTE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ATTACHMENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ATTACHMENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="TITLE" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="TEXTMSG" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false"/>
       <foreign-key foreignTable="AD_ATTACHMENT" name="ADATTACHMENT_NOTE">
diff --git a/db/ddlutils/model/AD_ATTRIBUTE.xml b/db/ddlutils/model/AD_ATTRIBUTE.xml
index dd59d9cf88..c7716b61d1 100644
--- a/db/ddlutils/model/AD_ATTRIBUTE.xml
+++ b/db/ddlutils/model/AD_ATTRIBUTE.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_ATTRIBUTE">
-      <column name="AD_ATTRIBUTE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_ATTRIBUTE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="AD_TABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_REFERENCE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_REFERENCE_VALUE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_VAL_RULE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_REFERENCE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_REFERENCE_VALUE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_VAL_RULE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="CALLOUT" primaryKey="false" required="false" type="VARCHAR" size="60" 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"/>
@@ -25,14 +25,14 @@
       <column name="ISUPDATEABLE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISMANDATORY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISENCRYPTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="FIELDLENGTH" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="DISPLAYLENGTH" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="FIELDLENGTH" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="DISPLAYLENGTH" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="DISPLAYLOGIC" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="VFORMAT" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ISSAMELINE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <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="INTEGER" 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>
diff --git a/db/ddlutils/model/AD_ATTRIBUTE_VALUE.xml b/db/ddlutils/model/AD_ATTRIBUTE_VALUE.xml
index f2ef3310fe..1369290b4c 100644
--- a/db/ddlutils/model/AD_ATTRIBUTE_VALUE.xml
+++ b/db/ddlutils/model/AD_ATTRIBUTE_VALUE.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_ATTRIBUTE_VALUE">
-      <column name="AD_ATTRIBUTE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="RECORD_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="V_NUMBER" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
+      <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_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_CHANGELOG.xml b/db/ddlutils/model/AD_CHANGELOG.xml
index 58212366e2..f4592818eb 100644
--- a/db/ddlutils/model/AD_CHANGELOG.xml
+++ b/db/ddlutils/model/AD_CHANGELOG.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_CHANGELOG">
-      <column name="AD_CHANGELOG_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_SESSION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_COLUMN_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CHANGELOG_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_SESSION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_COLUMN_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="RECORD_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="RECORD_ID" primaryKey="false" required="true" type="ID" size="10" 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"/>
       <column name="UNDO" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_CLIENT.xml b/db/ddlutils/model/AD_CLIENT.xml
index 9d82e356cb..bdc2944ce1 100644
--- a/db/ddlutils/model/AD_CLIENT.xml
+++ b/db/ddlutils/model/AD_CLIENT.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_CLIENT">
-      <column name="AD_CLIENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" 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"/>
diff --git a/db/ddlutils/model/AD_CLIENTINFO.xml b/db/ddlutils/model/AD_CLIENTINFO.xml
index 68ec23963c..82b774513f 100644
--- a/db/ddlutils/model/AD_CLIENTINFO.xml
+++ b/db/ddlutils/model/AD_CLIENTINFO.xml
@@ -2,37 +2,34 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_CLIENTINFO">
-      <column name="AD_CLIENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISDISCOUNTLINEAMT" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="C_CALENDAR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA1_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_UOM_VOLUME_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_UOM_WEIGHT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_UOM_LENGTH_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_UOM_TIME_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_TREE_MENU_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_TREE_ORG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_TREE_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_TREE_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_TREE_SALESREGION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_TREE_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCTFREIGHT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNERCASHTRX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="KEEPLOGDAYS" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="AD_TREE_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_TREE_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_CALENDAR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA1_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_UOM_VOLUME_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_UOM_WEIGHT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_UOM_LENGTH_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_UOM_TIME_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TREE_MENU_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TREE_ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TREE_BPARTNER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TREE_PROJECT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TREE_SALESREGION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TREE_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_PRODUCTFREIGHT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_BPARTNERCASHTRX_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="KEEPLOGDAYS" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="AD_TREE_ACTIVITY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TREE_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <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="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>
@@ -45,6 +42,9 @@
       <foreign-key foreignTable="AD_TREE" name="ADTREEPROJECT_ADCLIENTINFO">
         <reference local="AD_TREE_PROJECT_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
+      <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="ADTREEBPARTNER_ADCLIENTINFO">
         <reference local="AD_TREE_BPARTNER_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_CLIENTSHARE.xml b/db/ddlutils/model/AD_CLIENTSHARE.xml
index 6422cc926a..3033c1a40d 100644
--- a/db/ddlutils/model/AD_CLIENTSHARE.xml
+++ b/db/ddlutils/model/AD_CLIENTSHARE.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_CLIENTSHARE">
-      <column name="AD_CLIENTSHARE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENTSHARE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="SHARETYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="ADCLIENT_ADCLIENTSHARE">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
diff --git a/db/ddlutils/model/AD_COLOR.xml b/db/ddlutils/model/AD_COLOR.xml
index dcbae1222e..1405c77a4b 100644
--- a/db/ddlutils/model/AD_COLOR.xml
+++ b/db/ddlutils/model/AD_COLOR.xml
@@ -2,31 +2,31 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_COLOR">
-      <column name="AD_COLOR_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_COLOR_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ISDEFAULT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="COLORTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="RED" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="GREEN" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="BLUE" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="ALPHA" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="AD_IMAGE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="IMAGEALPHA" primaryKey="false" required="true" type="NUMERIC" autoIncrement="false"/>
-      <column name="RED_1" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="GREEN_1" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="BLUE_1" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="ALPHA_1" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="LINEWIDTH" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="LINEDISTANCE" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="STARTPOINT" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="REPEATDISTANCE" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="RED" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="GREEN" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <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="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"/>
+      <column name="ALPHA_1" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="LINEWIDTH" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="LINEDISTANCE" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="STARTPOINT" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="REPEATDISTANCE" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_IMAGE" name="ADIMAGE_ADCOLOR">
         <reference local="AD_IMAGE_ID" foreign="AD_IMAGE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_COLUMN.xml b/db/ddlutils/model/AD_COLUMN.xml
index 9d45ef122a..8f856ce735 100644
--- a/db/ddlutils/model/AD_COLUMN.xml
+++ b/db/ddlutils/model/AD_COLUMN.xml
@@ -2,25 +2,25 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_COLUMN">
-      <column name="AD_COLUMN_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_COLUMN_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="NUMERIC" autoIncrement="false"/>
+      <column name="VERSION" primaryKey="false" required="true" type="DECIMAL" size="22" 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" autoIncrement="false"/>
-      <column name="AD_REFERENCE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_REFERENCE_VALUE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_VAL_RULE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="FIELDLENGTH" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_REFERENCE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_REFERENCE_VALUE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_VAL_RULE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="FIELDLENGTH" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="DEFAULTVALUE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="ISKEY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISPARENT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
@@ -28,7 +28,7 @@
       <column name="ISUPDATEABLE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="READONLYLOGIC" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="ISIDENTIFIER" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="SEQNO" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ISTRANSLATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISENCRYPTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="CALLOUT" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
@@ -36,8 +36,8 @@
       <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"/>
       <column name="ISSELECTIONCOLUMN" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="AD_ELEMENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_PROCESS_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_ELEMENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_PROCESS_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSYNCDATABASE" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISALWAYSUPDATEABLE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="COLUMNSQL" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
@@ -69,12 +69,6 @@
         <unique-column name="AD_TABLE_ID"/>
         <unique-column name="COLUMNNAME"/>
       </unique>
-      <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>
@@ -99,5 +93,11 @@
       <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_COLUMN_ACCESS.xml b/db/ddlutils/model/AD_COLUMN_ACCESS.xml
index e6a5131cd4..3637d42910 100644
--- a/db/ddlutils/model/AD_COLUMN_ACCESS.xml
+++ b/db/ddlutils/model/AD_COLUMN_ACCESS.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_COLUMN_ACCESS">
-      <column name="AD_ROLE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_COLUMN_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_ROLE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_COLUMN_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISREADONLY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISEXCLUDE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_COLUMN" name="ADCOLUMN_ADCOLUMNACCESS">
         <reference local="AD_COLUMN_ID" foreign="AD_COLUMN_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_COLUMN_TRL.xml b/db/ddlutils/model/AD_COLUMN_TRL.xml
index e2d47aeffd..bdc13553fc 100644
--- a/db/ddlutils/model/AD_COLUMN_TRL.xml
+++ b/db/ddlutils/model/AD_COLUMN_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_COLUMN_TRL">
-      <column name="AD_COLUMN_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_COLUMN_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ISTRANSLATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="AD_COLUMN" name="ADCOLUMN_ADCOLUMNTRL">
diff --git a/db/ddlutils/model/AD_DESKTOP.xml b/db/ddlutils/model/AD_DESKTOP.xml
index 38546142df..a3544a10ed 100644
--- a/db/ddlutils/model/AD_DESKTOP.xml
+++ b/db/ddlutils/model/AD_DESKTOP.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_DESKTOP">
-      <column name="AD_DESKTOP_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_DESKTOP_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="AD_IMAGE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_COLOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_IMAGE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_COLOR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_COLOR" name="ADCOLOR_ADDESKTOP">
         <reference local="AD_COLOR_ID" foreign="AD_COLOR_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_DESKTOPWORKBENCH.xml b/db/ddlutils/model/AD_DESKTOPWORKBENCH.xml
index 59439b2c9a..39ac5c9247 100644
--- a/db/ddlutils/model/AD_DESKTOPWORKBENCH.xml
+++ b/db/ddlutils/model/AD_DESKTOPWORKBENCH.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_DESKTOPWORKBENCH">
-      <column name="AD_DESKTOPWORKBENCH_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_DESKTOPWORKBENCH_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_WORKBENCH_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_DESKTOP_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_WORKBENCH_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_DESKTOP_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="SEQNO" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_DESKTOP" name="ADDESKTOP_ADDESKTOPWB">
         <reference local="AD_DESKTOP_ID" foreign="AD_DESKTOP_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_DESKTOP_TRL.xml b/db/ddlutils/model/AD_DESKTOP_TRL.xml
index 0d87459d1f..5b4d9bc080 100644
--- a/db/ddlutils/model/AD_DESKTOP_TRL.xml
+++ b/db/ddlutils/model/AD_DESKTOP_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_DESKTOP_TRL">
-      <column name="AD_DESKTOP_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_DESKTOP_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_ELEMENT.xml b/db/ddlutils/model/AD_ELEMENT.xml
index f297b731f9..5ec9546649 100644
--- a/db/ddlutils/model/AD_ELEMENT.xml
+++ b/db/ddlutils/model/AD_ELEMENT.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_ELEMENT">
-      <column name="AD_ELEMENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_ELEMENT_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="false" 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="false" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="false" 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="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="COLUMNNAME" primaryKey="false" required="true" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="ENTITYTYPE" primaryKey="false" required="true" type="VARCHAR" size="4" default="D" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_ELEMENT_TRL.xml b/db/ddlutils/model/AD_ELEMENT_TRL.xml
index 47eb8cdd1d..4631a12efa 100644
--- a/db/ddlutils/model/AD_ELEMENT_TRL.xml
+++ b/db/ddlutils/model/AD_ELEMENT_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_ELEMENT_TRL">
-      <column name="AD_ELEMENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_ELEMENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="PRINTNAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_ENTITYTYPE.xml b/db/ddlutils/model/AD_ENTITYTYPE.xml
index 0ed06d5ddd..8b05e7ba9c 100644
--- a/db/ddlutils/model/AD_ENTITYTYPE.xml
+++ b/db/ddlutils/model/AD_ENTITYTYPE.xml
@@ -3,14 +3,14 @@
   <database name="default" defaultIdMethod="none">
     <table name="AD_ENTITYTYPE">
       <column name="ENTITYTYPE" primaryKey="true" required="true" type="VARCHAR" size="4" default="D" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ENTITYTYPE_ID" primaryKey="false" required="true" type="ID" 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="AD_ENTITYTYPE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_ERROR.xml b/db/ddlutils/model/AD_ERROR.xml
index 3380ec1ee7..efc0e07fde 100644
--- a/db/ddlutils/model/AD_ERROR.xml
+++ b/db/ddlutils/model/AD_ERROR.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_ERROR">
-      <column name="AD_ERROR_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_ERROR_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="CODE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="false" required="false" type="VARCHAR" size="6" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_FIELD.xml b/db/ddlutils/model/AD_FIELD.xml
index 9a02704f76..16d36183d5 100644
--- a/db/ddlutils/model/AD_FIELD.xml
+++ b/db/ddlutils/model/AD_FIELD.xml
@@ -2,34 +2,34 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_FIELD">
-      <column name="AD_FIELD_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_FIELD_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="ISCENTRALLYMAINTAINED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="AD_TAB_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_COLUMN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_FIELDGROUP_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_TAB_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_COLUMN_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_FIELDGROUP_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISDISPLAYED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="DISPLAYLOGIC" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="DISPLAYLENGTH" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="DISPLAYLENGTH" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ISREADONLY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="SORTNO" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="SEQNO" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="SORTNO" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ISSAMELINE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <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="ISENCRYPTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ENTITYTYPE" primaryKey="false" required="true" type="VARCHAR" size="4" default="D" autoIncrement="false"/>
       <column name="OBSCURETYPE" primaryKey="false" required="false" type="CHAR" size="3" autoIncrement="false"/>
-      <column name="AD_REFERENCE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_REFERENCE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISMANDATORY" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="FIELDCLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
diff --git a/db/ddlutils/model/AD_FIELDGROUP.xml b/db/ddlutils/model/AD_FIELDGROUP.xml
index 66d103edd1..cb39009362 100644
--- a/db/ddlutils/model/AD_FIELDGROUP.xml
+++ b/db/ddlutils/model/AD_FIELDGROUP.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_FIELDGROUP">
-      <column name="AD_FIELDGROUP_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_FIELDGROUP_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ENTITYTYPE" primaryKey="false" required="true" type="VARCHAR" size="4" default="D" autoIncrement="false"/>
       <check>
diff --git a/db/ddlutils/model/AD_FIELDGROUP_TRL.xml b/db/ddlutils/model/AD_FIELDGROUP_TRL.xml
index beeab90780..ae1a3db072 100644
--- a/db/ddlutils/model/AD_FIELDGROUP_TRL.xml
+++ b/db/ddlutils/model/AD_FIELDGROUP_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_FIELDGROUP_TRL">
-      <column name="AD_FIELDGROUP_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_FIELDGROUP_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ISTRANSLATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="AD_FIELDGROUP" name="ADFIELDGROUP_TRL">
diff --git a/db/ddlutils/model/AD_FIELD_TRL.xml b/db/ddlutils/model/AD_FIELD_TRL.xml
index 361e731447..cb0b7d0ea1 100644
--- a/db/ddlutils/model/AD_FIELD_TRL.xml
+++ b/db/ddlutils/model/AD_FIELD_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_FIELD_TRL">
-      <column name="AD_FIELD_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_FIELD_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_FIND.xml b/db/ddlutils/model/AD_FIND.xml
index aeed34c2b1..ee98025df3 100644
--- a/db/ddlutils/model/AD_FIND.xml
+++ b/db/ddlutils/model/AD_FIND.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_FIND">
-      <column name="AD_FIND_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="FIND_ID" primaryKey="false" required="true" type="NUMERIC" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <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="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ANDOR" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="AD_COLUMN_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_COLUMN_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="OPERATION" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="VALUE2" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_FORM.xml b/db/ddlutils/model/AD_FORM.xml
index 0a57408d27..45af3e12c7 100644
--- a/db/ddlutils/model/AD_FORM.xml
+++ b/db/ddlutils/model/AD_FORM.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_FORM">
-      <column name="AD_FORM_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_FORM_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_FORM_ACCESS.xml b/db/ddlutils/model/AD_FORM_ACCESS.xml
index f3537640ed..7e38eba826 100644
--- a/db/ddlutils/model/AD_FORM_ACCESS.xml
+++ b/db/ddlutils/model/AD_FORM_ACCESS.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_FORM_ACCESS">
-      <column name="AD_FORM_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ROLE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_FORM_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ROLE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISREADWRITE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <foreign-key foreignTable="AD_FORM" name="ADFORM_ADFORMACCESS">
         <reference local="AD_FORM_ID" foreign="AD_FORM_ID"/>
diff --git a/db/ddlutils/model/AD_FORM_TRL.xml b/db/ddlutils/model/AD_FORM_TRL.xml
index 25a56d301f..fcba5fcd31 100644
--- a/db/ddlutils/model/AD_FORM_TRL.xml
+++ b/db/ddlutils/model/AD_FORM_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_FORM_TRL">
-      <column name="AD_FORM_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_FORM_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_IMAGE.xml b/db/ddlutils/model/AD_IMAGE.xml
index a432a19b5a..2517d7b304 100644
--- a/db/ddlutils/model/AD_IMAGE.xml
+++ b/db/ddlutils/model/AD_IMAGE.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_IMAGE">
-      <column name="AD_IMAGE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_IMAGE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="IMAGEURL" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
       <column name="BINARYDATA" primaryKey="false" required="false" type="BLOB" size="4000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_IMPFORMAT.xml b/db/ddlutils/model/AD_IMPFORMAT.xml
index 7f7691f4dd..7783dadbe9 100644
--- a/db/ddlutils/model/AD_IMPFORMAT.xml
+++ b/db/ddlutils/model/AD_IMPFORMAT.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_IMPFORMAT">
-      <column name="AD_IMPFORMAT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_IMPFORMAT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="FORMATTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <foreign-key foreignTable="AD_TABLE" name="ADTABLE_ADIMPFORMAT">
diff --git a/db/ddlutils/model/AD_IMPFORMAT_ROW.xml b/db/ddlutils/model/AD_IMPFORMAT_ROW.xml
index 3982375d89..a483eca90c 100644
--- a/db/ddlutils/model/AD_IMPFORMAT_ROW.xml
+++ b/db/ddlutils/model/AD_IMPFORMAT_ROW.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_IMPFORMAT_ROW">
-      <column name="AD_IMPFORMAT_ROW_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_IMPFORMAT_ROW_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_IMPFORMAT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_IMPFORMAT_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="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="AD_COLUMN_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="STARTNO" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="ENDNO" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="AD_COLUMN_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="STARTNO" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="ENDNO" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="DATATYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="DATAFORMAT" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="DECIMALPOINT" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_INFOCOLUMN.xml b/db/ddlutils/model/AD_INFOCOLUMN.xml
index 6672681188..efe35de181 100644
--- a/db/ddlutils/model/AD_INFOCOLUMN.xml
+++ b/db/ddlutils/model/AD_INFOCOLUMN.xml
@@ -2,25 +2,25 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_INFOCOLUMN">
-      <column name="AD_INFOCOLUMN_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_INFOCOLUMN_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="AD_INFOWINDOW_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_INFOWINDOW_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ENTITYTYPE" primaryKey="false" required="true" type="VARCHAR" size="4" default="D" autoIncrement="false"/>
       <column name="SELECTCLAUSE" primaryKey="false" required="true" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="SEQNO" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <column name="ISDISPLAYED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISQUERYCRITERIA" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="AD_ELEMENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_REFERENCE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_ELEMENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_REFERENCE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_ELEMENT" name="ADELEMENT_ADINFOCOLUMN">
         <reference local="AD_ELEMENT_ID" foreign="AD_ELEMENT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_INFOCOLUMN_TRL.xml b/db/ddlutils/model/AD_INFOCOLUMN_TRL.xml
index 4c05d1477c..9e7f64a027 100644
--- a/db/ddlutils/model/AD_INFOCOLUMN_TRL.xml
+++ b/db/ddlutils/model/AD_INFOCOLUMN_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_INFOCOLUMN_TRL">
-      <column name="AD_INFOCOLUMN_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_INFOCOLUMN_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISTRANSLATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" 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"/>
diff --git a/db/ddlutils/model/AD_INFOWINDOW.xml b/db/ddlutils/model/AD_INFOWINDOW.xml
index bbefa21242..1c9d717976 100644
--- a/db/ddlutils/model/AD_INFOWINDOW.xml
+++ b/db/ddlutils/model/AD_INFOWINDOW.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_INFOWINDOW">
-      <column name="AD_INFOWINDOW_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_INFOWINDOW_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="AD_TABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ENTITYTYPE" primaryKey="false" required="true" type="VARCHAR" size="4" default="D" autoIncrement="false"/>
       <column name="FROMCLAUSE" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="OTHERCLAUSE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_INFOWINDOW_TRL.xml b/db/ddlutils/model/AD_INFOWINDOW_TRL.xml
index 2ae96dff6b..2bb0a4cde0 100644
--- a/db/ddlutils/model/AD_INFOWINDOW_TRL.xml
+++ b/db/ddlutils/model/AD_INFOWINDOW_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_INFOWINDOW_TRL">
-      <column name="AD_INFOWINDOW_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_INFOWINDOW_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISTRANSLATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" 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"/>
diff --git a/db/ddlutils/model/AD_ISSUE.xml b/db/ddlutils/model/AD_ISSUE.xml
index baab8c2b85..5088385db4 100644
--- a/db/ddlutils/model/AD_ISSUE.xml
+++ b/db/ddlutils/model/AD_ISSUE.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_ISSUE">
-      <column name="AD_ISSUE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_ISSUE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="RELEASENO" primaryKey="false" required="true" type="CHAR" size="4" autoIncrement="false"/>
       <column name="VERSION" primaryKey="false" required="true" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
@@ -28,29 +28,29 @@
       <column name="SOURCECLASSNAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="SOURCEMETHODNAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="LOGGERNAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="LINENO" primaryKey="false" required="false" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="LINENO" primaryKey="false" required="false" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <column name="STACKTRACE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="ERRORTRACE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="RECORD_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="RECORD_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="REQUESTDOCUMENTNO" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
-      <column name="A_ASSET_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="R_REQUEST_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="A_ASSET_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_REQUEST_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="RESPONSETEXT" primaryKey="false" required="false" type="VARCHAR" size="2000" 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="ISVANILLASYSTEM" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISREPRODUCIBLE" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="R_ISSUEKNOWN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="R_ISSUEKNOWN_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="STATISTICSINFO" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="PROFILEINFO" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="SYSTEMSTATUS" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="R_ISSUEPROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="R_ISSUEUSER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="R_ISSUESYSTEM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="R_ISSUEPROJECT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_ISSUEUSER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_ISSUESYSTEM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSUESOURCE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="AD_WINDOW_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_PROCESS_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_FORM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_WINDOW_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_PROCESS_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_FORM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_FORM" name="ADFORM_ADISSUE">
         <reference local="AD_FORM_ID" foreign="AD_FORM_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_LABELPRINTER.xml b/db/ddlutils/model/AD_LABELPRINTER.xml
index 9f5a777996..2c40834759 100644
--- a/db/ddlutils/model/AD_LABELPRINTER.xml
+++ b/db/ddlutils/model/AD_LABELPRINTER.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_LABELPRINTER">
-      <column name="AD_LABELPRINTER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_LABELPRINTER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <check>
diff --git a/db/ddlutils/model/AD_LABELPRINTERFUNCTION.xml b/db/ddlutils/model/AD_LABELPRINTERFUNCTION.xml
index 055839228e..615ba915f4 100644
--- a/db/ddlutils/model/AD_LABELPRINTERFUNCTION.xml
+++ b/db/ddlutils/model/AD_LABELPRINTERFUNCTION.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_LABELPRINTERFUNCTION">
-      <column name="AD_LABELPRINTERFUNCTION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_LABELPRINTERFUNCTION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="AD_LABELPRINTER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_LABELPRINTER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="FUNCTIONPREFIX" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="FUNCTIONSUFFIX" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="ISXYPOSITION" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_LANGUAGE.xml b/db/ddlutils/model/AD_LANGUAGE.xml
index c27f7443b6..ea0d05f738 100644
--- a/db/ddlutils/model/AD_LANGUAGE.xml
+++ b/db/ddlutils/model/AD_LANGUAGE.xml
@@ -3,20 +3,20 @@
   <database name="default" defaultIdMethod="none">
     <table name="AD_LANGUAGE">
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" 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="N" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="LANGUAGEISO" primaryKey="false" required="false" type="CHAR" size="2" autoIncrement="false"/>
       <column name="COUNTRYCODE" primaryKey="false" required="false" type="CHAR" size="2" autoIncrement="false"/>
       <column name="ISBASELANGUAGE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISSYSTEMLANGUAGE" 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="AD_LANGUAGE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_LANGUAGE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISDECIMALPOINT" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="DATEPATTERN" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="TIMEPATTERN" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_LDAPACCESS.xml b/db/ddlutils/model/AD_LDAPACCESS.xml
index ff9229f3c1..ceca6aa89b 100644
--- a/db/ddlutils/model/AD_LDAPACCESS.xml
+++ b/db/ddlutils/model/AD_LDAPACCESS.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_LDAPACCESS">
-      <column name="AD_LDAPACCESS_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_LDAPACCESS_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_LDAPPROCESSOR_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="R_INTERESTAREA_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_LDAPPROCESSOR_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="R_INTERESTAREA_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISERROR" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="SUMMARY" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_LDAPPROCESSOR.xml b/db/ddlutils/model/AD_LDAPPROCESSOR.xml
index c6190b15f4..52ecaac079 100644
--- a/db/ddlutils/model/AD_LDAPPROCESSOR.xml
+++ b/db/ddlutils/model/AD_LDAPPROCESSOR.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_LDAPPROCESSOR">
-      <column name="AD_LDAPPROCESSOR_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_LDAPPROCESSOR_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="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="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="LDAPPORT" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="LDAPPORT" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <column name="DATELASTRUN" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATENEXTRUN" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="SUPERVISOR_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="KEEPLOGDAYS" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="SUPERVISOR_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="KEEPLOGDAYS" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_ADLDAPPROCESSOR">
         <reference local="SUPERVISOR_ID" foreign="AD_USER_ID"/>
diff --git a/db/ddlutils/model/AD_LDAPPROCESSORLOG.xml b/db/ddlutils/model/AD_LDAPPROCESSORLOG.xml
index a2a9e319a0..ef911fe4cb 100644
--- a/db/ddlutils/model/AD_LDAPPROCESSORLOG.xml
+++ b/db/ddlutils/model/AD_LDAPPROCESSORLOG.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_LDAPPROCESSORLOG">
-      <column name="AD_LDAPPROCESSOR_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_LDAPPROCESSORLOG_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_LDAPPROCESSOR_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_LDAPPROCESSORLOG_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="SUMMARY" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="ISERROR" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="REFERENCE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_MENU.xml b/db/ddlutils/model/AD_MENU.xml
index ec29c29ce8..6832bc25e7 100644
--- a/db/ddlutils/model/AD_MENU.xml
+++ b/db/ddlutils/model/AD_MENU.xml
@@ -2,26 +2,26 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_MENU">
-      <column name="AD_MENU_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_MENU_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="ISSUMMARY" 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="ISREADONLY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ACTION" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="AD_WINDOW_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_WORKFLOW_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_TASK_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_PROCESS_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_FORM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_WORKBENCH_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_WINDOW_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_WORKFLOW_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TASK_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_PROCESS_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_FORM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_WORKBENCH_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ENTITYTYPE" primaryKey="false" required="true" type="VARCHAR" size="4" default="D" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="ADCLIENT_ADMENU">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
diff --git a/db/ddlutils/model/AD_MENU_TRL.xml b/db/ddlutils/model/AD_MENU_TRL.xml
index a3de0c5909..0f1ee646a5 100644
--- a/db/ddlutils/model/AD_MENU_TRL.xml
+++ b/db/ddlutils/model/AD_MENU_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_MENU_TRL">
-      <column name="AD_MENU_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_MENU_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="ISTRANSLATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_MESSAGE.xml b/db/ddlutils/model/AD_MESSAGE.xml
index 5a356b7ce1..2f82206b15 100644
--- a/db/ddlutils/model/AD_MESSAGE.xml
+++ b/db/ddlutils/model/AD_MESSAGE.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_MESSAGE">
-      <column name="AD_MESSAGE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_MESSAGE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="MSGTEXT" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="MSGTIP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_MESSAGE_TRL.xml b/db/ddlutils/model/AD_MESSAGE_TRL.xml
index a3768e357b..5a76f2a914 100644
--- a/db/ddlutils/model/AD_MESSAGE_TRL.xml
+++ b/db/ddlutils/model/AD_MESSAGE_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_MESSAGE_TRL">
-      <column name="AD_MESSAGE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_MESSAGE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="MSGTEXT" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="MSGTIP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="ISTRANSLATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_MODIFICATION.xml b/db/ddlutils/model/AD_MODIFICATION.xml
index 3a4fea8c10..ceaa5e5b18 100644
--- a/db/ddlutils/model/AD_MODIFICATION.xml
+++ b/db/ddlutils/model/AD_MODIFICATION.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_MODIFICATION">
-      <column name="AD_MODIFICATION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_MODIFICATION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="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"/>
diff --git a/db/ddlutils/model/AD_NOTE.xml b/db/ddlutils/model/AD_NOTE.xml
index a79644b475..5d5fcad2a9 100644
--- a/db/ddlutils/model/AD_NOTE.xml
+++ b/db/ddlutils/model/AD_NOTE.xml
@@ -2,23 +2,23 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_NOTE">
-      <column name="AD_NOTE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_NOTE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_MESSAGE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="AD_MESSAGE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="REFERENCE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="RECORD_ID" primaryKey="false" required="false" type="ID" 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="PROCESSED" 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="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="AD_WF_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_WF_ACTIVITY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="TEXTMSG" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <foreign-key foreignTable="AD_MESSAGE" name="ADMESSAGE_ADNOTE">
         <reference local="AD_MESSAGE_ID" foreign="AD_MESSAGE_ID"/>
diff --git a/db/ddlutils/model/AD_ORG.xml b/db/ddlutils/model/AD_ORG.xml
index a189b3b2ce..1ca22438bb 100644
--- a/db/ddlutils/model/AD_ORG.xml
+++ b/db/ddlutils/model/AD_ORG.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_ORG">
-      <column name="AD_ORG_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_ORG_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="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" 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"/>
diff --git a/db/ddlutils/model/AD_ORGINFO.xml b/db/ddlutils/model/AD_ORGINFO.xml
index 0244211736..81b4e9907a 100644
--- a/db/ddlutils/model/AD_ORGINFO.xml
+++ b/db/ddlutils/model/AD_ORGINFO.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_ORGINFO">
-      <column name="AD_ORG_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_ORG_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="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_LOCATION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_LOCATION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DUNS" primaryKey="false" required="true" type="CHAR" size="11" autoIncrement="false"/>
       <column name="TAXID" primaryKey="false" required="true" type="VARCHAR" size="20" autoIncrement="false"/>
-      <column name="PA_GOAL_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="SUPERVISOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="PARENT_ORG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORGTYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_WAREHOUSE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="PA_GOAL_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="SUPERVISOR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <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>
diff --git a/db/ddlutils/model/AD_ORGTYPE.xml b/db/ddlutils/model/AD_ORGTYPE.xml
index 1fcf66f509..55a59a4d98 100644
--- a/db/ddlutils/model/AD_ORGTYPE.xml
+++ b/db/ddlutils/model/AD_ORGTYPE.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_ORGTYPE">
-      <column name="AD_ORGTYPE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_ORGTYPE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="AD_PRINTCOLOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_PRINTCOLOR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
     </table>
   </database>
diff --git a/db/ddlutils/model/AD_PACKAGE_EXP.xml b/db/ddlutils/model/AD_PACKAGE_EXP.xml
index 86081ff577..3acd31599c 100644
--- a/db/ddlutils/model/AD_PACKAGE_EXP.xml
+++ b/db/ddlutils/model/AD_PACKAGE_EXP.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PACKAGE_EXP">
-      <column name="AD_PACKAGE_EXP_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PACKAGE_EXP_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_PACKAGE_TYPE" primaryKey="false" required="false" type="VARCHAR" size="1" autoIncrement="false"/>
       <column name="EMAIL" primaryKey="false" required="true" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="INSTRUCTIONS" primaryKey="false" required="true" type="VARCHAR" size="1000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_PACKAGE_EXP_COMMON.xml b/db/ddlutils/model/AD_PACKAGE_EXP_COMMON.xml
index 9f126bf061..4ef1270937 100644
--- a/db/ddlutils/model/AD_PACKAGE_EXP_COMMON.xml
+++ b/db/ddlutils/model/AD_PACKAGE_EXP_COMMON.xml
@@ -2,24 +2,24 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PACKAGE_EXP_COMMON">
-      <column name="AD_PACKAGE_EXP_COMMON_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PACKAGE_EXP_COMMON_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_FORM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_IMPFORMAT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_REPORTVIEW_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_WORKBENCH_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" 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_REPORTVIEW_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_WORKBENCH_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DBTYPE" primaryKey="false" required="false" type="VARCHAR" size="22" autoIncrement="false"/>
       <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="NUMERIC" autoIncrement="false"/>
+      <column name="LINE" primaryKey="false" required="false" type="DECIMAL" size="22" 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"/>
@@ -28,10 +28,10 @@
       <column name="TARGET_DIRECTORY" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="SQLSTATEMENT" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="AD_WORKFLOW_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_WINDOW_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ROLE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_PROCESS_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_MENU_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_WORKFLOW_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_WINDOW_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ROLE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_PROCESS_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"/>
     </table>
   </database>
diff --git a/db/ddlutils/model/AD_PACKAGE_EXP_DETAIL.xml b/db/ddlutils/model/AD_PACKAGE_EXP_DETAIL.xml
index 2826be4bdd..04ae7de294 100644
--- a/db/ddlutils/model/AD_PACKAGE_EXP_DETAIL.xml
+++ b/db/ddlutils/model/AD_PACKAGE_EXP_DETAIL.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PACKAGE_EXP_DETAIL">
-      <column name="AD_PACKAGE_EXP_DETAIL_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PACKAGE_EXP_DETAIL_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="NUMERIC" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="DECIMAL" size="22" 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="NUMERIC" autoIncrement="false"/>
-      <column name="AD_FORM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_IMPFORMAT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_MENU_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_PROCESS_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ROLE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_WINDOW_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_WORKFLOW_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="DECIMAL" size="22" 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"/>
+      <column name="AD_PROCESS_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ROLE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_WINDOW_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_WORKFLOW_ID" primaryKey="false" required="false" type="ID" size="10" 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_FILENAME" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
@@ -30,11 +30,11 @@
       <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="NUMERIC" autoIncrement="false"/>
-      <column name="AD_WORKBENCH_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_REPORTVIEW_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_PACKAGE_EXP_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="LINE" primaryKey="false" required="false" type="DECIMAL" size="22" 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"/>
+      <column name="AD_PACKAGE_EXP_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_PACKAGE_CODE_NEW" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="AD_PACKAGE_CODE_OLD" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
     </table>
diff --git a/db/ddlutils/model/AD_PACKAGE_IMP.xml b/db/ddlutils/model/AD_PACKAGE_IMP.xml
index 0b2358b5ce..f8e3164f7a 100644
--- a/db/ddlutils/model/AD_PACKAGE_IMP.xml
+++ b/db/ddlutils/model/AD_PACKAGE_IMP.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PACKAGE_IMP">
-      <column name="AD_PACKAGE_IMP_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PACKAGE_IMP_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="PK_STATUS" primaryKey="false" required="false" type="VARCHAR" size="22" autoIncrement="false"/>
       <column name="RELEASENO" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_PACKAGE_IMP_BACKUP.xml b/db/ddlutils/model/AD_PACKAGE_IMP_BACKUP.xml
index 14b5ceb419..7fd1c8c4fa 100644
--- a/db/ddlutils/model/AD_PACKAGE_IMP_BACKUP.xml
+++ b/db/ddlutils/model/AD_PACKAGE_IMP_BACKUP.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PACKAGE_IMP_BACKUP">
-      <column name="AD_PACKAGE_IMP_BACKUP_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PACKAGE_IMP_BACKUP_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_PACKAGE_IMP_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_PACKAGE_IMP_DETAIL_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_COLUMN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_REFERENCE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_PACKAGE_IMP_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_PACKAGE_IMP_DETAIL_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_COLUMN_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_REFERENCE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_PACKAGE_IMP_BCK_DIR" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="AD_PACKAGE_IMP_ORG_DIR" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="COLVALUE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_PACKAGE_IMP_DETAIL.xml b/db/ddlutils/model/AD_PACKAGE_IMP_DETAIL.xml
index d0b2fb6b55..a975cd3ac3 100644
--- a/db/ddlutils/model/AD_PACKAGE_IMP_DETAIL.xml
+++ b/db/ddlutils/model/AD_PACKAGE_IMP_DETAIL.xml
@@ -2,23 +2,23 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PACKAGE_IMP_DETAIL">
-      <column name="AD_PACKAGE_IMP_DETAIL_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PACKAGE_IMP_DETAIL_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="AD_PACKAGE_IMP_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORIGINAL_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_BACKUP_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_PACKAGE_IMP_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORIGINAL_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_BACKUP_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ACTION" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="SUCCESS" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="TYPE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="TABLENAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="UNINSTALL" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
     </table>
   </database>
diff --git a/db/ddlutils/model/AD_PACKAGE_IMP_INST.xml b/db/ddlutils/model/AD_PACKAGE_IMP_INST.xml
index 772ff8ed4f..0baf387740 100644
--- a/db/ddlutils/model/AD_PACKAGE_IMP_INST.xml
+++ b/db/ddlutils/model/AD_PACKAGE_IMP_INST.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PACKAGE_IMP_INST">
-      <column name="AD_PACKAGE_IMP_INST_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_PACKAGE_IMP_INST_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="false" type="VARCHAR" size="240" autoIncrement="false"/>
       <column name="PK_STATUS" primaryKey="false" required="false" type="VARCHAR" size="44" autoIncrement="false"/>
       <column name="RELEASENO" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_PACKAGE_IMP_PROC.xml b/db/ddlutils/model/AD_PACKAGE_IMP_PROC.xml
index f6df0580a0..3893e7cbaa 100644
--- a/db/ddlutils/model/AD_PACKAGE_IMP_PROC.xml
+++ b/db/ddlutils/model/AD_PACKAGE_IMP_PROC.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PACKAGE_IMP_PROC">
-      <column name="AD_PACKAGE_IMP_PROC_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PACKAGE_IMP_PROC_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_OVERRIDE_DICT" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="AD_PACKAGE_DIR" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="AD_PACKAGE_SOURCE" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_PINSTANCE.xml b/db/ddlutils/model/AD_PINSTANCE.xml
index 25c1bc2747..969efdb3f8 100644
--- a/db/ddlutils/model/AD_PINSTANCE.xml
+++ b/db/ddlutils/model/AD_PINSTANCE.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PINSTANCE">
-      <column name="AD_PINSTANCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_PROCESS_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="RECORD_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PINSTANCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_PROCESS_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="RECORD_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISPROCESSING" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="RESULT" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="RESULT" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ERRORMSG" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <foreign-key foreignTable="AD_PROCESS" name="ADPROCESS_ADPINSTANCE">
         <reference local="AD_PROCESS_ID" foreign="AD_PROCESS_ID"/>
diff --git a/db/ddlutils/model/AD_PINSTANCE_LOG.xml b/db/ddlutils/model/AD_PINSTANCE_LOG.xml
index a4aaf0d224..6540a3a972 100644
--- a/db/ddlutils/model/AD_PINSTANCE_LOG.xml
+++ b/db/ddlutils/model/AD_PINSTANCE_LOG.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PINSTANCE_LOG">
-      <column name="AD_PINSTANCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="LOG_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PINSTANCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <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" autoIncrement="false"/>
-      <column name="P_NUMBER" primaryKey="false" required="false" type="NUMERIC" 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_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 4f3a571426..a2afb66727 100644
--- a/db/ddlutils/model/AD_PINSTANCE_PARA.xml
+++ b/db/ddlutils/model/AD_PINSTANCE_PARA.xml
@@ -2,23 +2,23 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PINSTANCE_PARA">
-      <column name="AD_PINSTANCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="true" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="AD_PINSTANCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="SEQNO" primaryKey="true" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <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="NUMERIC" autoIncrement="false"/>
-      <column name="P_NUMBER_TO" primaryKey="false" required="false" type="NUMERIC" 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_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"/>
       <column name="INFO_TO" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <foreign-key foreignTable="AD_PINSTANCE" name="ADPINSTANCE_ADPINSTANCEPARA">
         <reference local="AD_PINSTANCE_ID" foreign="AD_PINSTANCE_ID"/>
diff --git a/db/ddlutils/model/AD_PREFERENCE.xml b/db/ddlutils/model/AD_PREFERENCE.xml
index 9956e5da19..5ad5a98d73 100644
--- a/db/ddlutils/model/AD_PREFERENCE.xml
+++ b/db/ddlutils/model/AD_PREFERENCE.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PREFERENCE">
-      <column name="AD_PREFERENCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PREFERENCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_WINDOW_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_WINDOW_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="ATTRIBUTE" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="AD_PREFERENCE_CLIENT">
diff --git a/db/ddlutils/model/AD_PRINTCOLOR.xml b/db/ddlutils/model/AD_PRINTCOLOR.xml
index 3d7aa12a48..e2085684d6 100644
--- a/db/ddlutils/model/AD_PRINTCOLOR.xml
+++ b/db/ddlutils/model/AD_PRINTCOLOR.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PRINTCOLOR">
-      <column name="AD_PRINTCOLOR_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PRINTCOLOR_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ISDEFAULT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="CODE" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_PRINTFONT.xml b/db/ddlutils/model/AD_PRINTFONT.xml
index e93eaddff0..8c341dc622 100644
--- a/db/ddlutils/model/AD_PRINTFONT.xml
+++ b/db/ddlutils/model/AD_PRINTFONT.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PRINTFONT">
-      <column name="AD_PRINTFONT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PRINTFONT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ISDEFAULT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="CODE" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_PRINTFORM.xml b/db/ddlutils/model/AD_PRINTFORM.xml
index cd9bb731d8..e7a09926d2 100644
--- a/db/ddlutils/model/AD_PRINTFORM.xml
+++ b/db/ddlutils/model/AD_PRINTFORM.xml
@@ -2,32 +2,29 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PRINTFORM">
-      <column name="AD_PRINTFORM_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PRINTFORM_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="INVOICE_PRINTFORMAT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="ORDER_PRINTFORMAT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="REMITTANCE_PRINTFORMAT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="SHIPMENT_PRINTFORMAT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="INVOICE_MAILTEXT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="ORDER_MAILTEXT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="REMITTANCE_MAILTEXT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="SHIPMENT_MAILTEXT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="PROJECT_MAILTEXT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="PROJECT_PRINTFORMAT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="INVOICE_PRINTFORMAT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="ORDER_PRINTFORMAT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="REMITTANCE_PRINTFORMAT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="SHIPMENT_PRINTFORMAT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="INVOICE_MAILTEXT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="ORDER_MAILTEXT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="REMITTANCE_MAILTEXT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="SHIPMENT_MAILTEXT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="PROJECT_MAILTEXT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="PROJECT_PRINTFORMAT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <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_FORMPROJECT">
-        <reference local="PROJECT_PRINTFORMAT_ID" foreign="AD_PRINTFORMAT_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_PRINTFORMAT" name="ADPRINTFORMAT_FORMORDER">
         <reference local="ORDER_PRINTFORMAT_ID" foreign="AD_PRINTFORMAT_ID"/>
       </foreign-key>
@@ -37,6 +34,9 @@
       <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>
diff --git a/db/ddlutils/model/AD_PRINTFORMAT.xml b/db/ddlutils/model/AD_PRINTFORMAT.xml
index 7eb0e118de..46e90b87c4 100644
--- a/db/ddlutils/model/AD_PRINTFORMAT.xml
+++ b/db/ddlutils/model/AD_PRINTFORMAT.xml
@@ -2,28 +2,28 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PRINTFORMAT">
-      <column name="AD_PRINTFORMAT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PRINTFORMAT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="ISTABLEBASED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISFORM" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_PRINTPAPER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_PRINTCOLOR_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_PRINTFONT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_PRINTPAPER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_PRINTCOLOR_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_PRINTFONT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSTANDARDHEADERFOOTER" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="HEADERMARGIN" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="FOOTERMARGIN" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="HEADERMARGIN" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="FOOTERMARGIN" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="CREATECOPY" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="AD_REPORTVIEW_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_PRINTTABLEFORMAT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_REPORTVIEW_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_PRINTTABLEFORMAT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PRINTERNAME" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="ISDEFAULT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="AD_PRINTCOLOR" name="ADPRINTCOLOR_ADPRINTFORMAT">
diff --git a/db/ddlutils/model/AD_PRINTFORMATITEM.xml b/db/ddlutils/model/AD_PRINTFORMATITEM.xml
index bafeabb5d7..d7e0b56008 100644
--- a/db/ddlutils/model/AD_PRINTFORMATITEM.xml
+++ b/db/ddlutils/model/AD_PRINTFORMATITEM.xml
@@ -2,38 +2,38 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PRINTFORMATITEM">
-      <column name="AD_PRINTFORMATITEM_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PRINTFORMATITEM_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_PRINTFORMAT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_PRINTFORMAT_ID" 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="PRINTNAME" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="ISPRINTED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="PRINTAREATYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="SEQNO" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="PRINTFORMATTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="AD_COLUMN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_PRINTFORMATCHILD_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_COLUMN_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_PRINTFORMATCHILD_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISRELATIVEPOSITION" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISNEXTLINE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="XSPACE" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="YSPACE" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="XPOSITION" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="YPOSITION" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="MAXWIDTH" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="XSPACE" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="YSPACE" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="XPOSITION" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="YPOSITION" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="MAXWIDTH" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ISHEIGHTONELINE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="MAXHEIGHT" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="MAXHEIGHT" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="FIELDALIGNMENTTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="LINEALIGNMENTTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="AD_PRINTCOLOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_PRINTFONT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_PRINTCOLOR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_PRINTFONT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISORDERBY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="SORTNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="SORTNO" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ISGROUPBY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISPAGEBREAK" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISSUMMARIZED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
@@ -43,20 +43,20 @@
       <column name="ISCOUNTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISSETNLPOSITION" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISSUPPRESSNULL" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="BELOWCOLUMN" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="AD_PRINTGRAPH_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="BELOWCOLUMN" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="AD_PRINTGRAPH_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISFIXEDWIDTH" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISNEXTPAGE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="PRINTNAMESUFFIX" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ISMINCALC" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISMAXCALC" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISRUNNINGTOTAL" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="RUNNINGTOTALLINES" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="RUNNINGTOTALLINES" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ISVARIANCECALC" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISDEVIATIONCALC" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISFILLEDRECTANGLE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="LINEWIDTH" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="ARCDIAMETER" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="LINEWIDTH" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="ARCDIAMETER" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="SHAPETYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="ISCENTRALLYMAINTAINED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISIMAGEFIELD" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_PRINTFORMATITEM_TRL.xml b/db/ddlutils/model/AD_PRINTFORMATITEM_TRL.xml
index 17aa5e6921..54ec23da68 100644
--- a/db/ddlutils/model/AD_PRINTFORMATITEM_TRL.xml
+++ b/db/ddlutils/model/AD_PRINTFORMATITEM_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PRINTFORMATITEM_TRL">
-      <column name="AD_PRINTFORMATITEM_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PRINTFORMATITEM_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="PRINTNAME" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="ISTRANSLATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="PRINTNAMESUFFIX" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_PRINTGRAPH.xml b/db/ddlutils/model/AD_PRINTGRAPH.xml
index 7d6baf0c5e..f5a9619217 100644
--- a/db/ddlutils/model/AD_PRINTGRAPH.xml
+++ b/db/ddlutils/model/AD_PRINTGRAPH.xml
@@ -2,35 +2,32 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PRINTGRAPH">
-      <column name="AD_PRINTGRAPH_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PRINTGRAPH_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="GRAPHTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="DESCRIPTION_PRINTFORMATITEM_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="DATA_PRINTFORMATITEM_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="DATA1_PRINTFORMATITEM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="DATA2_PRINTFORMATITEM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="DATA3_PRINTFORMATITEM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="DATA4_PRINTFORMATITEM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_PRINTFORMAT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="DESCRIPTION_PRINTFORMATITEM_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="DATA_PRINTFORMATITEM_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="DATA1_PRINTFORMATITEM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="DATA2_PRINTFORMATITEM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="DATA3_PRINTFORMATITEM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="DATA4_PRINTFORMATITEM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_PRINTFORMAT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <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_GRAPHDESCR">
-        <reference local="DESCRIPTION_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>
-      <foreign-key foreignTable="AD_PRINTFORMATITEM" name="ADPRINTFORMATITEM_GRAPHDATA4">
-        <reference local="DATA4_PRINTFORMATITEM_ID" foreign="AD_PRINTFORMATITEM_ID"/>
+      <foreign-key foreignTable="AD_PRINTFORMATITEM" name="ADPRINTFORMATITEM_GRAPHDATA3">
+        <reference local="DATA3_PRINTFORMATITEM_ID" foreign="AD_PRINTFORMATITEM_ID"/>
       </foreign-key>
       <foreign-key foreignTable="AD_PRINTFORMATITEM" name="ADPRINTFORMATITEM_GRAPHDATA">
         <reference local="DATA_PRINTFORMATITEM_ID" foreign="AD_PRINTFORMATITEM_ID"/>
@@ -38,8 +35,11 @@
       <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_GRAPHDATA3">
-        <reference local="DATA3_PRINTFORMATITEM_ID" foreign="AD_PRINTFORMATITEM_ID"/>
+      <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_GRAPHDATA4">
+        <reference local="DATA4_PRINTFORMATITEM_ID" foreign="AD_PRINTFORMATITEM_ID"/>
       </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
diff --git a/db/ddlutils/model/AD_PRINTLABEL.xml b/db/ddlutils/model/AD_PRINTLABEL.xml
index 74b54f627a..551f15388b 100644
--- a/db/ddlutils/model/AD_PRINTLABEL.xml
+++ b/db/ddlutils/model/AD_PRINTLABEL.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PRINTLABEL">
-      <column name="AD_PRINTLABEL_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PRINTLABEL_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="PRINTERNAME" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="ISLANDSCAPE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="LABELHEIGHT" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="LABELWIDTH" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="AD_LABELPRINTER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="LABELHEIGHT" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="LABELWIDTH" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="AD_LABELPRINTER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_LABELPRINTER" name="ADLABELPRINTER_PRINTLABEL">
         <reference local="AD_LABELPRINTER_ID" foreign="AD_LABELPRINTER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_PRINTLABELLINE.xml b/db/ddlutils/model/AD_PRINTLABELLINE.xml
index 053517fe03..4e2b791914 100644
--- a/db/ddlutils/model/AD_PRINTLABELLINE.xml
+++ b/db/ddlutils/model/AD_PRINTLABELLINE.xml
@@ -2,23 +2,23 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PRINTLABELLINE">
-      <column name="AD_PRINTLABELLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PRINTLABELLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_PRINTLABEL_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_PRINTLABEL_ID" 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="SEQNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="SEQNO" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="LABELFORMATTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="PRINTNAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="AD_COLUMN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_LABELPRINTERFUNCTION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="XPOSITION" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="YPOSITION" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="AD_COLUMN_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_LABELPRINTERFUNCTION_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="XPOSITION" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="YPOSITION" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_COLUMN" name="ADCOLUMN_ADPRINTLABELLINE">
         <reference local="AD_COLUMN_ID" foreign="AD_COLUMN_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_PRINTLABELLINE_TRL.xml b/db/ddlutils/model/AD_PRINTLABELLINE_TRL.xml
index 451118b511..ec4e0336fa 100644
--- a/db/ddlutils/model/AD_PRINTLABELLINE_TRL.xml
+++ b/db/ddlutils/model/AD_PRINTLABELLINE_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PRINTLABELLINE_TRL">
-      <column name="AD_PRINTLABELLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PRINTLABELLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="PRINTNAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ISTRANSLATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="AD_LANGUAGE" name="ADLANGUAGE_ADPLABELLINETRL">
diff --git a/db/ddlutils/model/AD_PRINTPAPER.xml b/db/ddlutils/model/AD_PRINTPAPER.xml
index 400c218a40..0c20644d07 100644
--- a/db/ddlutils/model/AD_PRINTPAPER.xml
+++ b/db/ddlutils/model/AD_PRINTPAPER.xml
@@ -2,26 +2,26 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PRINTPAPER">
-      <column name="AD_PRINTPAPER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PRINTPAPER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="ISLANDSCAPE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CODE" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="MARGINTOP" primaryKey="false" required="true" type="INTEGER" default="36" autoIncrement="false"/>
-      <column name="MARGINLEFT" primaryKey="false" required="true" type="INTEGER" default="36" autoIncrement="false"/>
-      <column name="MARGINRIGHT" primaryKey="false" required="true" type="INTEGER" default="36" autoIncrement="false"/>
-      <column name="MARGINBOTTOM" primaryKey="false" required="true" type="INTEGER" default="36" autoIncrement="false"/>
+      <column name="MARGINTOP" primaryKey="false" required="true" type="DECIMAL" size="10" default="36" autoIncrement="false"/>
+      <column name="MARGINLEFT" primaryKey="false" required="true" type="DECIMAL" size="10" default="36" autoIncrement="false"/>
+      <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="NUMERIC" autoIncrement="false"/>
-      <column name="SIZEY" primaryKey="false" required="false" type="NUMERIC" 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="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 92e2f0b97f..83c6827b48 100644
--- a/db/ddlutils/model/AD_PRINTTABLEFORMAT.xml
+++ b/db/ddlutils/model/AD_PRINTTABLEFORMAT.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PRINTTABLEFORMAT">
-      <column name="AD_PRINTTABLEFORMAT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PRINTTABLEFORMAT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="HDR_PRINTFONT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="HDRTEXTFG_PRINTCOLOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="HDRTEXTBG_PRINTCOLOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="HDRLINE_PRINTCOLOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="FUNCT_PRINTFONT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="FUNCTBG_PRINTCOLOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="FUNCTFG_PRINTCOLOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="LINE_PRINTCOLOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="HDR_PRINTFONT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="HDRTEXTFG_PRINTCOLOR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="HDRTEXTBG_PRINTCOLOR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="HDRLINE_PRINTCOLOR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="FUNCT_PRINTFONT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="FUNCTBG_PRINTCOLOR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="FUNCTFG_PRINTCOLOR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="LINE_PRINTCOLOR_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="ISPAINTBOUNDARYLINES" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISPAINTHLINES" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
@@ -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="NUMERIC" autoIncrement="false"/>
-      <column name="LINESTROKE" primaryKey="false" required="false" type="NUMERIC" 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="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"/>
@@ -50,12 +50,12 @@
       <foreign-key foreignTable="AD_PRINTCOLOR" name="ADPRINTCOLOR_TABLEHDRTEXTBG">
         <reference local="HDRTEXTBG_PRINTCOLOR_ID" foreign="AD_PRINTCOLOR_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_PRINTCOLOR" name="ADPRINTCOLOR_TABLEHDRTEXTFG">
-        <reference local="HDRTEXTFG_PRINTCOLOR_ID" foreign="AD_PRINTCOLOR_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_PRINTCOLOR" name="ADPRINTCOLOR_TABLELINE">
         <reference local="LINE_PRINTCOLOR_ID" foreign="AD_PRINTCOLOR_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_PRINTCOLOR" name="ADPRINTCOLOR_TABLEHDRTEXTFG">
+        <reference local="HDRTEXTFG_PRINTCOLOR_ID" foreign="AD_PRINTCOLOR_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="AD_PRINTFONT" name="ADPRINTFONT_TABLEFORMATFUNC">
         <reference local="FUNCT_PRINTFONT_ID" foreign="AD_PRINTFONT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_PRIVATE_ACCESS.xml b/db/ddlutils/model/AD_PRIVATE_ACCESS.xml
index d6de0dad3e..753292dbfc 100644
--- a/db/ddlutils/model/AD_PRIVATE_ACCESS.xml
+++ b/db/ddlutils/model/AD_PRIVATE_ACCESS.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PRIVATE_ACCESS">
-      <column name="AD_USER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="RECORD_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TABLE_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="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_TABLE" name="ADTABLE_ADPRIVATEACCESS">
         <reference local="AD_TABLE_ID" foreign="AD_TABLE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_PROCESS.xml b/db/ddlutils/model/AD_PROCESS.xml
index 6d9b6ac91a..2b83ea6eb7 100644
--- a/db/ddlutils/model/AD_PROCESS.xml
+++ b/db/ddlutils/model/AD_PROCESS.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PROCESS">
-      <column name="AD_PROCESS_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PROCESS_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" 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"/>
@@ -19,13 +19,13 @@
       <column name="PROCEDURENAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ISREPORT" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISDIRECTPRINT" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="AD_REPORTVIEW_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <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="INTEGER" autoIncrement="false"/>
-      <column name="STATISTIC_SECONDS" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="AD_PRINTFORMAT_ID" primaryKey="false" required="false" type="ID" 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="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" 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"/>
diff --git a/db/ddlutils/model/AD_PROCESS_ACCESS.xml b/db/ddlutils/model/AD_PROCESS_ACCESS.xml
index e0e52e3c49..126e9c075d 100644
--- a/db/ddlutils/model/AD_PROCESS_ACCESS.xml
+++ b/db/ddlutils/model/AD_PROCESS_ACCESS.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PROCESS_ACCESS">
-      <column name="AD_PROCESS_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ROLE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PROCESS_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ROLE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISREADWRITE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="AD_PROCESSACCESS_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
diff --git a/db/ddlutils/model/AD_PROCESS_PARA.xml b/db/ddlutils/model/AD_PROCESS_PARA.xml
index 7c09637787..f05ac5bd35 100644
--- a/db/ddlutils/model/AD_PROCESS_PARA.xml
+++ b/db/ddlutils/model/AD_PROCESS_PARA.xml
@@ -2,25 +2,25 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PROCESS_PARA">
-      <column name="AD_PROCESS_PARA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PROCESS_PARA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="AD_PROCESS_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="AD_REFERENCE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_REFERENCE_VALUE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_VAL_RULE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_PROCESS_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="AD_REFERENCE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_REFERENCE_VALUE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_VAL_RULE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="COLUMNNAME" primaryKey="false" required="true" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="ISCENTRALLYMAINTAINED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="FIELDLENGTH" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <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"/>
@@ -28,7 +28,7 @@
       <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"/>
-      <column name="AD_ELEMENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_ELEMENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ENTITYTYPE" primaryKey="false" required="true" type="VARCHAR" size="4" default="D" autoIncrement="false"/>
       <foreign-key foreignTable="AD_ELEMENT" name="ADELEMENT_ADPROCESSPARA">
         <reference local="AD_ELEMENT_ID" foreign="AD_ELEMENT_ID"/>
diff --git a/db/ddlutils/model/AD_PROCESS_PARA_TRL.xml b/db/ddlutils/model/AD_PROCESS_PARA_TRL.xml
index 01d9c6d581..1c1d885a74 100644
--- a/db/ddlutils/model/AD_PROCESS_PARA_TRL.xml
+++ b/db/ddlutils/model/AD_PROCESS_PARA_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PROCESS_PARA_TRL">
-      <column name="AD_PROCESS_PARA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PROCESS_PARA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_PROCESS_TRL.xml b/db/ddlutils/model/AD_PROCESS_TRL.xml
index 0d7427a647..0f86a77cc0 100644
--- a/db/ddlutils/model/AD_PROCESS_TRL.xml
+++ b/db/ddlutils/model/AD_PROCESS_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_PROCESS_TRL">
-      <column name="AD_PROCESS_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PROCESS_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_RECORD_ACCESS.xml b/db/ddlutils/model/AD_RECORD_ACCESS.xml
index ae63c68014..71468b8e13 100644
--- a/db/ddlutils/model/AD_RECORD_ACCESS.xml
+++ b/db/ddlutils/model/AD_RECORD_ACCESS.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_RECORD_ACCESS">
-      <column name="AD_ROLE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="RECORD_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_ROLE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TABLE_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="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISREADONLY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISEXCLUDE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISDEPENDENTENTITIES" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_REFERENCE.xml b/db/ddlutils/model/AD_REFERENCE.xml
index 1c6fd9b596..b409be9aa0 100644
--- a/db/ddlutils/model/AD_REFERENCE.xml
+++ b/db/ddlutils/model/AD_REFERENCE.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_REFERENCE">
-      <column name="AD_REFERENCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_REFERENCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_REFERENCE_TRL.xml b/db/ddlutils/model/AD_REFERENCE_TRL.xml
index 523a6d24d0..553c3813cf 100644
--- a/db/ddlutils/model/AD_REFERENCE_TRL.xml
+++ b/db/ddlutils/model/AD_REFERENCE_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_REFERENCE_TRL">
-      <column name="AD_REFERENCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_REFERENCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_REF_LIST.xml b/db/ddlutils/model/AD_REF_LIST.xml
index e9989de8ea..287b2a63b9 100644
--- a/db/ddlutils/model/AD_REF_LIST.xml
+++ b/db/ddlutils/model/AD_REF_LIST.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_REF_LIST">
-      <column name="AD_REF_LIST_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_REF_LIST_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="60" 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="AD_REFERENCE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_REFERENCE_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="ENTITYTYPE" primaryKey="false" required="true" type="VARCHAR" size="4" default="D" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_REF_LIST_TRL.xml b/db/ddlutils/model/AD_REF_LIST_TRL.xml
index 04bdbc6ce9..e3e2f6e160 100644
--- a/db/ddlutils/model/AD_REF_LIST_TRL.xml
+++ b/db/ddlutils/model/AD_REF_LIST_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_REF_LIST_TRL">
-      <column name="AD_REF_LIST_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_REF_LIST_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="ISTRANSLATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_REF_TABLE.xml b/db/ddlutils/model/AD_REF_TABLE.xml
index 0880266de8..2a7ce429c0 100644
--- a/db/ddlutils/model/AD_REF_TABLE.xml
+++ b/db/ddlutils/model/AD_REF_TABLE.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_REF_TABLE">
-      <column name="AD_REFERENCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_REFERENCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_KEY" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="AD_DISPLAY" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_KEY" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="AD_DISPLAY" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ISVALUEDISPLAYED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="WHERECLAUSE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="ORDERBYCLAUSE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_REGISTRATION.xml b/db/ddlutils/model/AD_REGISTRATION.xml
index 1608281096..54acca2400 100644
--- a/db/ddlutils/model/AD_REGISTRATION.xml
+++ b/db/ddlutils/model/AD_REGISTRATION.xml
@@ -2,28 +2,28 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_REGISTRATION">
-      <column name="AD_REGISTRATION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_SYSTEM_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_REGISTRATION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_SYSTEM_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISREGISTERED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="RECORD_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="RECORD_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="C_LOCATION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_LOCATION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISINPRODUCTION" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="STARTPRODUCTIONDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="ISALLOWPUBLISH" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISALLOWSTATISTICS" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="PLATFORMINFO" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="INDUSTRYINFO" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="SALESVOLUME" primaryKey="false" required="false" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="NUMBEREMPLOYEES" primaryKey="false" required="false" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="SALESVOLUME" primaryKey="false" required="false" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
+      <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="NUMBEREMPLOYEES" primaryKey="false" required="false" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="REMOTE_HOST" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
       <column name="REMOTE_ADDR" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_REPLICATION.xml b/db/ddlutils/model/AD_REPLICATION.xml
index f9fdc9258e..d8ccfee947 100644
--- a/db/ddlutils/model/AD_REPLICATION.xml
+++ b/db/ddlutils/model/AD_REPLICATION.xml
@@ -2,26 +2,26 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_REPLICATION">
-      <column name="AD_REPLICATION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_REPLICATION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="HOSTADDRESS" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="HOSTPORT" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="AD_REPLICATIONSTRATEGY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="HOSTPORT" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <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="NUMERIC" autoIncrement="false"/>
-      <column name="IDRANGEEND" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="REMOTE_CLIENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="REMOTE_ORG_ID" primaryKey="false" required="false" type="ID" 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="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"/>
       <column name="SUFFIX" primaryKey="false" required="false" type="VARCHAR" size="10" autoIncrement="false"/>
       <column name="DATELASTRUN" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_REPLICATIONSTRATEGY.xml b/db/ddlutils/model/AD_REPLICATIONSTRATEGY.xml
index 2b36728dd7..aa1a0ca67b 100644
--- a/db/ddlutils/model/AD_REPLICATIONSTRATEGY.xml
+++ b/db/ddlutils/model/AD_REPLICATIONSTRATEGY.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_REPLICATIONSTRATEGY">
-      <column name="AD_REPLICATIONSTRATEGY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_REPLICATIONSTRATEGY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_REPLICATIONTABLE.xml b/db/ddlutils/model/AD_REPLICATIONTABLE.xml
index 7c8c9e68ef..2b6e810765 100644
--- a/db/ddlutils/model/AD_REPLICATIONTABLE.xml
+++ b/db/ddlutils/model/AD_REPLICATIONTABLE.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_REPLICATIONTABLE">
-      <column name="AD_REPLICATIONTABLE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_REPLICATIONTABLE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_REPLICATIONSTRATEGY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_REPLICATIONSTRATEGY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="REPLICATIONTYPE" primaryKey="false" required="true" type="CHAR" size="1" default="L" autoIncrement="false"/>
       <column name="ENTITYTYPE" primaryKey="false" required="true" type="VARCHAR" size="4" default="D" autoIncrement="false"/>
       <foreign-key foreignTable="AD_REPLICATIONSTRATEGY" name="ADREPSTRATEGY_ADREPTABLE">
diff --git a/db/ddlutils/model/AD_REPLICATION_LOG.xml b/db/ddlutils/model/AD_REPLICATION_LOG.xml
index a4c5019506..183565afa0 100644
--- a/db/ddlutils/model/AD_REPLICATION_LOG.xml
+++ b/db/ddlutils/model/AD_REPLICATION_LOG.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_REPLICATION_LOG">
-      <column name="AD_REPLICATION_LOG_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_REPLICATION_LOG_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_REPLICATION_RUN_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_REPLICATIONTABLE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_REPLICATION_RUN_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_REPLICATIONTABLE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="P_MSG" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="ISREPLICATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="AD_REPLICATIONTABLE" name="ADREPTABLE_ADREPLOG">
diff --git a/db/ddlutils/model/AD_REPLICATION_RUN.xml b/db/ddlutils/model/AD_REPLICATION_RUN.xml
index d95fefa401..570a4096fc 100644
--- a/db/ddlutils/model/AD_REPLICATION_RUN.xml
+++ b/db/ddlutils/model/AD_REPLICATION_RUN.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_REPLICATION_RUN">
-      <column name="AD_REPLICATION_RUN_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_REPLICATION_RUN_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="AD_REPLICATION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_REPLICATION_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISREPLICATED" 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"/>
       <foreign-key foreignTable="AD_REPLICATION" name="ADREPLICATION_ADREPRUN">
diff --git a/db/ddlutils/model/AD_REPORTVIEW.xml b/db/ddlutils/model/AD_REPORTVIEW.xml
index 8d98610754..b395ebd094 100644
--- a/db/ddlutils/model/AD_REPORTVIEW.xml
+++ b/db/ddlutils/model/AD_REPORTVIEW.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_REPORTVIEW">
-      <column name="AD_REPORTVIEW_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_REPORTVIEW_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="WHERECLAUSE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="ORDERBYCLAUSE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="ENTITYTYPE" primaryKey="false" required="true" type="VARCHAR" size="4" default="D" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_REPORTVIEW_COL.xml b/db/ddlutils/model/AD_REPORTVIEW_COL.xml
index bd8cdbbaa3..e6cdf35978 100644
--- a/db/ddlutils/model/AD_REPORTVIEW_COL.xml
+++ b/db/ddlutils/model/AD_REPORTVIEW_COL.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_REPORTVIEW_COL">
-      <column name="AD_REPORTVIEW_COL_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_REPORTVIEW_COL_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_REPORTVIEW_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_COLUMN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_REPORTVIEW_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_COLUMN_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="FUNCTIONCOLUMN" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ISGROUPFUNCTION" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="AD_COLUMN" name="ADCOLUMN_ADREPORTVIEWCOL">
diff --git a/db/ddlutils/model/AD_ROLE.xml b/db/ddlutils/model/AD_ROLE.xml
index 61058e1bfb..c66dc63f66 100644
--- a/db/ddlutils/model/AD_ROLE.xml
+++ b/db/ddlutils/model/AD_ROLE.xml
@@ -2,36 +2,36 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_ROLE">
-      <column name="AD_ROLE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_ROLE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="USERLEVEL" primaryKey="false" required="true" type="CHAR" size="3" default="  O" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AMTAPPROVAL" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="AD_TREE_MENU_ID" primaryKey="false" required="false" type="ID" 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="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"/>
       <column name="ISPERSONALLOCK" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISPERSONALACCESS" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISCANEXPORT" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISCANREPORT" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="SUPERVISOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="SUPERVISOR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISCANAPPROVEOWNDOC" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISACCESSALLORGS" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISCHANGELOG" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="PREFERENCETYPE" primaryKey="false" required="true" type="CHAR" size="1" default="C" autoIncrement="false"/>
       <column name="OVERWRITEPRICELIMIT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISUSEUSERORGACCESS" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="AD_TREE_ORG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="CONFIRMQUERYRECORDS" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="MAXQUERYRECORDS" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="AD_TREE_ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="CONFIRMQUERYRECORDS" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
+      <column name="MAXQUERYRECORDS" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <column name="CONNECTIONPROFILE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="AD_ROLECLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
diff --git a/db/ddlutils/model/AD_ROLE_ORGACCESS.xml b/db/ddlutils/model/AD_ROLE_ORGACCESS.xml
index c2f015cefe..abd0a9b967 100644
--- a/db/ddlutils/model/AD_ROLE_ORGACCESS.xml
+++ b/db/ddlutils/model/AD_ROLE_ORGACCESS.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_ROLE_ORGACCESS">
-      <column name="AD_ROLE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_ROLE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_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="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISREADONLY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="AD_ORG" name="ADORG_ADROLEORGACCESS">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
diff --git a/db/ddlutils/model/AD_SCHEDULER.xml b/db/ddlutils/model/AD_SCHEDULER.xml
index 3d2c5b7143..81a4e26f74 100644
--- a/db/ddlutils/model/AD_SCHEDULER.xml
+++ b/db/ddlutils/model/AD_SCHEDULER.xml
@@ -2,27 +2,27 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_SCHEDULER">
-      <column name="AD_SCHEDULER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_SCHEDULER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="AD_PROCESS_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PROCESS_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="FREQUENCYTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="FREQUENCY" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="FREQUENCY" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="DATELASTRUN" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATENEXTRUN" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="SUPERVISOR_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="KEEPLOGDAYS" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="SUPERVISOR_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="KEEPLOGDAYS" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="WEEKDAY" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="SCHEDULETYPE" primaryKey="false" required="true" type="CHAR" size="1" default="F" autoIncrement="false"/>
-      <column name="MONTHDAY" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="MONTHDAY" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_PROCESS" name="ADPROCESS_ADSCHEDULER">
         <reference local="AD_PROCESS_ID" foreign="AD_PROCESS_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_SCHEDULERLOG.xml b/db/ddlutils/model/AD_SCHEDULERLOG.xml
index 6eb91e3589..be7bdbdf80 100644
--- a/db/ddlutils/model/AD_SCHEDULERLOG.xml
+++ b/db/ddlutils/model/AD_SCHEDULERLOG.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_SCHEDULERLOG">
-      <column name="AD_SCHEDULER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_SCHEDULERLOG_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_SCHEDULER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_SCHEDULERLOG_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISERROR" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="SUMMARY" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="REFERENCE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_SCHEDULERRECIPIENT.xml b/db/ddlutils/model/AD_SCHEDULERRECIPIENT.xml
index 58b3106a5a..1a09b2922a 100644
--- a/db/ddlutils/model/AD_SCHEDULERRECIPIENT.xml
+++ b/db/ddlutils/model/AD_SCHEDULERRECIPIENT.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_SCHEDULERRECIPIENT">
-      <column name="AD_SCHEDULERRECIPIENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_SCHEDULERRECIPIENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_SCHEDULER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ROLE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_SCHEDULER_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="AD_ROLE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_ROLE" name="ADROLE_ADSCHEDULERRECIPIENT">
         <reference local="AD_ROLE_ID" foreign="AD_ROLE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_SCHEDULER_PARA.xml b/db/ddlutils/model/AD_SCHEDULER_PARA.xml
index 9d5ed2bcbe..74e229df9d 100644
--- a/db/ddlutils/model/AD_SCHEDULER_PARA.xml
+++ b/db/ddlutils/model/AD_SCHEDULER_PARA.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_SCHEDULER_PARA">
-      <column name="AD_SCHEDULER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_PROCESS_PARA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_SCHEDULER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_PROCESS_PARA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="PARAMETERDEFAULT" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <foreign-key foreignTable="AD_PROCESS_PARA" name="ADPROCESSPARA_ADSCHEDULERPARA">
diff --git a/db/ddlutils/model/AD_SEQUENCE.xml b/db/ddlutils/model/AD_SEQUENCE.xml
index 50b9bd8766..4b59ffb13f 100644
--- a/db/ddlutils/model/AD_SEQUENCE.xml
+++ b/db/ddlutils/model/AD_SEQUENCE.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_SEQUENCE">
-      <column name="AD_SEQUENCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_SEQUENCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="VFORMAT" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="ISAUTOSEQUENCE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="INCREMENTNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="STARTNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="CURRENTNEXT" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="CURRENTNEXTSYS" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="INCREMENTNO" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="STARTNO" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="CURRENTNEXT" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="CURRENTNEXTSYS" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ISAUDITED" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISTABLEID" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="PREFIX" primaryKey="false" required="false" type="VARCHAR" size="10" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_SEQUENCE_AUDIT.xml b/db/ddlutils/model/AD_SEQUENCE_AUDIT.xml
index 665c0cb6cc..2a6d3699be 100644
--- a/db/ddlutils/model/AD_SEQUENCE_AUDIT.xml
+++ b/db/ddlutils/model/AD_SEQUENCE_AUDIT.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_SEQUENCE_AUDIT">
-      <column name="AD_SEQUENCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_SEQUENCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DOCUMENTNO" primaryKey="true" required="true" type="VARCHAR" size="30" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="RECORD_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="RECORD_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="SEQUENCE_AUDITCLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_SEQUENCE_NO.xml b/db/ddlutils/model/AD_SEQUENCE_NO.xml
index 59697893f1..13ec18f21e 100644
--- a/db/ddlutils/model/AD_SEQUENCE_NO.xml
+++ b/db/ddlutils/model/AD_SEQUENCE_NO.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_SEQUENCE_NO">
-      <column name="AD_SEQUENCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_SEQUENCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="CALENDARYEAR" primaryKey="true" required="true" type="VARCHAR" size="4" default="0000" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CURRENTNEXT" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CURRENTNEXT" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="SEQUENCE_NOCLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_SESSION.xml b/db/ddlutils/model/AD_SESSION.xml
index 9ec9c31ac3..74b337f26b 100644
--- a/db/ddlutils/model/AD_SESSION.xml
+++ b/db/ddlutils/model/AD_SESSION.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_SESSION">
-      <column name="AD_SESSION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_SESSION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="WEBSESSION" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="REMOTE_ADDR" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="REMOTE_HOST" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_SYSTEM.xml b/db/ddlutils/model/AD_SYSTEM.xml
index ba548be29e..db662ee169 100644
--- a/db/ddlutils/model/AD_SYSTEM.xml
+++ b/db/ddlutils/model/AD_SYSTEM.xml
@@ -2,35 +2,35 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_SYSTEM">
-      <column name="AD_SYSTEM_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_SYSTEM_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="USERNAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="INFO" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="VERSION" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="RELEASENO" primaryKey="false" required="true" type="CHAR" size="4" autoIncrement="false"/>
-      <column name="SUPPORTUNITS" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <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="NUMERIC" autoIncrement="false"/>
-      <column name="IDRANGEEND" primaryKey="false" required="false" type="NUMERIC" 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="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"/>
       <column name="DBINSTANCE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DBADDRESS" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="NOPROCESSORS" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="NOPROCESSORS" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="SUMMARY" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="ENCRYPTIONKEY" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="LDAPDOMAIN" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="ISAUTOERRORREPORT" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="RECORD_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="RECORD_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="SUPPORTEXPDATE" 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="SUPPORTEMAIL" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_TAB.xml b/db/ddlutils/model/AD_TAB.xml
index 25299e7d3f..337ef7d8aa 100644
--- a/db/ddlutils/model/AD_TAB.xml
+++ b/db/ddlutils/model/AD_TAB.xml
@@ -2,39 +2,39 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_TAB">
-      <column name="AD_TAB_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TAB_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="AD_TABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_WINDOW_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="TABLEVEL" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_WINDOW_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="TABLEVEL" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ISSINGLEROW" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISINFOTAB" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISTRANSLATIONTAB" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISREADONLY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="AD_COLUMN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_COLUMN_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="HASTREE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="WHERECLAUSE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="ORDERBYCLAUSE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="COMMITWARNING" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="AD_PROCESS_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_PROCESS_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="AD_IMAGE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_IMAGE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="IMPORTFIELDS" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="AD_COLUMNSORTORDER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_COLUMNSORTYESNO_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_COLUMNSORTORDER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_COLUMNSORTYESNO_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSORTTAB" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ENTITYTYPE" primaryKey="false" required="true" type="VARCHAR" size="4" default="D" autoIncrement="false"/>
-      <column name="INCLUDED_TAB_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="INCLUDED_TAB_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="READONLYLOGIC" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="DISPLAYLOGIC" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="ISINSERTRECORD" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_TABLE.xml b/db/ddlutils/model/AD_TABLE.xml
index 0a96ad823c..a1d5e4f5ee 100644
--- a/db/ddlutils/model/AD_TABLE.xml
+++ b/db/ddlutils/model/AD_TABLE.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_TABLE">
-      <column name="AD_TABLE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
@@ -17,16 +17,16 @@
       <column name="ISVIEW" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ACCESSLEVEL" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="ENTITYTYPE" primaryKey="false" required="true" type="VARCHAR" size="4" default="D" autoIncrement="false"/>
-      <column name="AD_WINDOW_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_VAL_RULE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="LOADSEQ" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="AD_WINDOW_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_VAL_RULE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="LOADSEQ" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ISSECURITYENABLED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISDELETEABLE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISHIGHVOLUME" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="IMPORTTABLE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="ISCHANGELOG" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="REPLICATIONTYPE" primaryKey="false" required="true" type="CHAR" size="1" default="L" autoIncrement="false"/>
-      <column name="PO_WINDOW_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="PO_WINDOW_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="TABLECLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_TABLE_ACCESS.xml b/db/ddlutils/model/AD_TABLE_ACCESS.xml
index 421f99e549..53cab76c89 100644
--- a/db/ddlutils/model/AD_TABLE_ACCESS.xml
+++ b/db/ddlutils/model/AD_TABLE_ACCESS.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_TABLE_ACCESS">
-      <column name="AD_ROLE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_ROLE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ACCESSTYPERULE" primaryKey="true" required="true" type="CHAR" size="1" default="G" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="ISREADONLY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISCANREPORT" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_TABLE_TRL.xml b/db/ddlutils/model/AD_TABLE_TRL.xml
index df04e5c775..f6afa292dc 100644
--- a/db/ddlutils/model/AD_TABLE_TRL.xml
+++ b/db/ddlutils/model/AD_TABLE_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_TABLE_TRL">
-      <column name="AD_TABLE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ISTRANSLATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="AD_LANGUAGE" name="ADLANGUAGE_ADTABLETRL">
diff --git a/db/ddlutils/model/AD_TAB_TRL.xml b/db/ddlutils/model/AD_TAB_TRL.xml
index 2f92dcc460..c1afd71f55 100644
--- a/db/ddlutils/model/AD_TAB_TRL.xml
+++ b/db/ddlutils/model/AD_TAB_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_TAB_TRL">
-      <column name="AD_TAB_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TAB_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_TASK.xml b/db/ddlutils/model/AD_TASK.xml
index f044b0a942..722bd4439a 100644
--- a/db/ddlutils/model/AD_TASK.xml
+++ b/db/ddlutils/model/AD_TASK.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_TASK">
-      <column name="AD_TASK_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TASK_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_TASKINSTANCE.xml b/db/ddlutils/model/AD_TASKINSTANCE.xml
index 7c677f0752..16eef2fbf1 100644
--- a/db/ddlutils/model/AD_TASKINSTANCE.xml
+++ b/db/ddlutils/model/AD_TASKINSTANCE.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_TASKINSTANCE">
-      <column name="AD_TASKINSTANCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TASKINSTANCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="false" 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="false" type="ID" autoIncrement="false"/>
-      <column name="AD_TASK_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TASK_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="TASKINSTANCECLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_TASK_ACCESS.xml b/db/ddlutils/model/AD_TASK_ACCESS.xml
index c5e643373d..8301e8118b 100644
--- a/db/ddlutils/model/AD_TASK_ACCESS.xml
+++ b/db/ddlutils/model/AD_TASK_ACCESS.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_TASK_ACCESS">
-      <column name="AD_TASK_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ROLE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TASK_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ROLE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISREADWRITE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="AD_TASKACCESS_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
diff --git a/db/ddlutils/model/AD_TASK_TRL.xml b/db/ddlutils/model/AD_TASK_TRL.xml
index 1013ae42fe..9832be690e 100644
--- a/db/ddlutils/model/AD_TASK_TRL.xml
+++ b/db/ddlutils/model/AD_TASK_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_TASK_TRL">
-      <column name="AD_TASK_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TASK_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_TREE.xml b/db/ddlutils/model/AD_TREE.xml
index c14c9d1ead..f96daa4ea4 100644
--- a/db/ddlutils/model/AD_TREE.xml
+++ b/db/ddlutils/model/AD_TREE.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_TREE">
-      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TREE_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="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_TREEBAR.xml b/db/ddlutils/model/AD_TREEBAR.xml
index d37fec8341..e318d0d337 100644
--- a/db/ddlutils/model/AD_TREEBAR.xml
+++ b/db/ddlutils/model/AD_TREEBAR.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_TREEBAR">
-      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="NODE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="NODE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_TREE" name="ADTREE_ADTREEBAR">
         <reference local="AD_TREE_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_TREENODE.xml b/db/ddlutils/model/AD_TREENODE.xml
index 42999ecefc..168a6751b1 100644
--- a/db/ddlutils/model/AD_TREENODE.xml
+++ b/db/ddlutils/model/AD_TREENODE.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_TREENODE">
-      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="NODE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="NODE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="PARENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="PARENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="SEQNO" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_TREE" name="ADTREE_ADTREENODE">
         <reference local="AD_TREE_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_TREENODEBP.xml b/db/ddlutils/model/AD_TREENODEBP.xml
index 6addfe999b..cdfd3dbfab 100644
--- a/db/ddlutils/model/AD_TREENODEBP.xml
+++ b/db/ddlutils/model/AD_TREENODEBP.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_TREENODEBP">
-      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="NODE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="NODE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="PARENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="PARENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="SEQNO" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_TREE" name="ADTREE_ADTREENODEBP">
         <reference local="AD_TREE_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_TREENODECMC.xml b/db/ddlutils/model/AD_TREENODECMC.xml
index fd34b1c650..1338ac55b8 100644
--- a/db/ddlutils/model/AD_TREENODECMC.xml
+++ b/db/ddlutils/model/AD_TREENODECMC.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_TREENODECMC">
-      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="NODE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="NODE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="PARENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="PARENT_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"/>
       <foreign-key foreignTable="AD_TREE" name="ADTREE_ADTREENODECMC">
         <reference local="AD_TREE_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_TREENODECMM.xml b/db/ddlutils/model/AD_TREENODECMM.xml
index e562f280f2..2d73eb3819 100644
--- a/db/ddlutils/model/AD_TREENODECMM.xml
+++ b/db/ddlutils/model/AD_TREENODECMM.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_TREENODECMM">
-      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="NODE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="NODE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="PARENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="PARENT_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"/>
       <foreign-key foreignTable="AD_TREE" name="ADTREE_ADTREENODECMM">
         <reference local="AD_TREE_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_TREENODECMS.xml b/db/ddlutils/model/AD_TREENODECMS.xml
index 7b6276a5aa..48fb3c4ea4 100644
--- a/db/ddlutils/model/AD_TREENODECMS.xml
+++ b/db/ddlutils/model/AD_TREENODECMS.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_TREENODECMS">
-      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="NODE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="NODE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="PARENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="PARENT_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"/>
       <foreign-key foreignTable="AD_TREE" name="ADTREE_ADTREENODECMS">
         <reference local="AD_TREE_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_TREENODECMT.xml b/db/ddlutils/model/AD_TREENODECMT.xml
index 7a6499a660..6c80e4db87 100644
--- a/db/ddlutils/model/AD_TREENODECMT.xml
+++ b/db/ddlutils/model/AD_TREENODECMT.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_TREENODECMT">
-      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="NODE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="NODE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="PARENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="PARENT_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"/>
       <foreign-key foreignTable="AD_TREE" name="ADTREE_ADTREENODECMT">
         <reference local="AD_TREE_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_TREENODEMM.xml b/db/ddlutils/model/AD_TREENODEMM.xml
index 1846d44ece..07bb91671f 100644
--- a/db/ddlutils/model/AD_TREENODEMM.xml
+++ b/db/ddlutils/model/AD_TREENODEMM.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_TREENODEMM">
-      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="NODE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="NODE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="PARENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="PARENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="SEQNO" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_TREE" name="ADTREE_ADTREENODEMM">
         <reference local="AD_TREE_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_TREENODEPR.xml b/db/ddlutils/model/AD_TREENODEPR.xml
index ccaf39b5ec..27504574f9 100644
--- a/db/ddlutils/model/AD_TREENODEPR.xml
+++ b/db/ddlutils/model/AD_TREENODEPR.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_TREENODEPR">
-      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="NODE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="NODE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="PARENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="PARENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="SEQNO" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_TREE" name="ADTREE_ADTREENODEPR">
         <reference local="AD_TREE_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_TREENODEU1.xml b/db/ddlutils/model/AD_TREENODEU1.xml
index 1f038fda20..f0acfc6edd 100644
--- a/db/ddlutils/model/AD_TREENODEU1.xml
+++ b/db/ddlutils/model/AD_TREENODEU1.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_TREENODEU1">
-      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="NODE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="NODE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="PARENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="PARENT_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"/>
       <foreign-key foreignTable="AD_TREE" name="ADTREE_ADTREENODEU1">
         <reference local="AD_TREE_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_TREENODEU2.xml b/db/ddlutils/model/AD_TREENODEU2.xml
index a3544ccdd7..38ede8814d 100644
--- a/db/ddlutils/model/AD_TREENODEU2.xml
+++ b/db/ddlutils/model/AD_TREENODEU2.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_TREENODEU2">
-      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="NODE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="NODE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="PARENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="PARENT_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"/>
       <foreign-key foreignTable="AD_TREE" name="ADTREE_ADTREENODEU2">
         <reference local="AD_TREE_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_TREENODEU3.xml b/db/ddlutils/model/AD_TREENODEU3.xml
index 499af7ce82..f52a4c8608 100644
--- a/db/ddlutils/model/AD_TREENODEU3.xml
+++ b/db/ddlutils/model/AD_TREENODEU3.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_TREENODEU3">
-      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="NODE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="NODE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="PARENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="PARENT_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"/>
       <foreign-key foreignTable="AD_TREE" name="ADTREE_ADTREENODEU3">
         <reference local="AD_TREE_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_TREENODEU4.xml b/db/ddlutils/model/AD_TREENODEU4.xml
index 5185a11940..55976d5b93 100644
--- a/db/ddlutils/model/AD_TREENODEU4.xml
+++ b/db/ddlutils/model/AD_TREENODEU4.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_TREENODEU4">
-      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="NODE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TREE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="NODE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="PARENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="PARENT_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"/>
       <foreign-key foreignTable="AD_TREE" name="ADTREE_ADTREENODEU4">
         <reference local="AD_TREE_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_USER.xml b/db/ddlutils/model/AD_USER.xml
index ee3597eca2..c3a666c7e4 100644
--- a/db/ddlutils/model/AD_USER.xml
+++ b/db/ddlutils/model/AD_USER.xml
@@ -2,25 +2,25 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_USER">
-      <column name="AD_USER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="PASSWORD" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="EMAIL" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="SUPERVISOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="SUPERVISOR_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="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="EMAILUSER" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="EMAILUSERPW" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
-      <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_GREETING_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_GREETING_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="TITLE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="COMMENTS" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="PHONE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
@@ -29,12 +29,12 @@
       <column name="LASTCONTACT" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="LASTRESULT" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="BIRTHDAY" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="EMAILVERIFY" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="EMAILVERIFYDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="NOTIFICATIONTYPE" primaryKey="false" required="true" type="CHAR" size="1" default="E" autoIncrement="false"/>
       <column name="ISFULLBPACCESS" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="C_JOB_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_JOB_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="LDAPUSER" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="CONNECTIONPROFILE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_USERBPACCESS.xml b/db/ddlutils/model/AD_USERBPACCESS.xml
index ef52d93e55..91cd5634f1 100644
--- a/db/ddlutils/model/AD_USERBPACCESS.xml
+++ b/db/ddlutils/model/AD_USERBPACCESS.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_USERBPACCESS">
-      <column name="AD_USERBPACCESS_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_USERBPACCESS_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="BPACCESSTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="R_REQUESTTYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="R_REQUESTTYPE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DOCBASETYPE" primaryKey="false" required="false" type="CHAR" size="3" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_ADUSERBPACCESS">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
diff --git a/db/ddlutils/model/AD_USERDEF_FIELD.xml b/db/ddlutils/model/AD_USERDEF_FIELD.xml
index 56acce700b..cb822587cb 100644
--- a/db/ddlutils/model/AD_USERDEF_FIELD.xml
+++ b/db/ddlutils/model/AD_USERDEF_FIELD.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_USERDEF_FIELD">
-      <column name="AD_USERDEF_FIELD_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_USERDEF_FIELD_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USERDEF_TAB_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_FIELD_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_USERDEF_TAB_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_FIELD_ID" 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="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
@@ -19,11 +19,11 @@
       <column name="ISREADONLY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISSAMELINE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISUPDATEABLE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="DISPLAYLENGTH" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="DISPLAYLENGTH" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <column name="DISPLAYLOGIC" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="DEFAULTVALUE" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="SORTNO" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="SORTNO" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
+      <column name="SEQNO" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="AD_FIELD" name="ADFIELD_ADUSERDEFFIELD">
         <reference local="AD_FIELD_ID" foreign="AD_FIELD_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_USERDEF_TAB.xml b/db/ddlutils/model/AD_USERDEF_TAB.xml
index a17420dfa2..61d0efaec3 100644
--- a/db/ddlutils/model/AD_USERDEF_TAB.xml
+++ b/db/ddlutils/model/AD_USERDEF_TAB.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_USERDEF_TAB">
-      <column name="AD_USERDEF_TAB_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_USERDEF_TAB_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USERDEF_WIN_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TAB_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_USERDEF_WIN_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TAB_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISMULTIROWONLY" primaryKey="false" required="true" type="CHAR" size="1" default="N" 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"/>
diff --git a/db/ddlutils/model/AD_USERDEF_WIN.xml b/db/ddlutils/model/AD_USERDEF_WIN.xml
index 9a1a6d600c..a8585e31e2 100644
--- a/db/ddlutils/model/AD_USERDEF_WIN.xml
+++ b/db/ddlutils/model/AD_USERDEF_WIN.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_USERDEF_WIN">
-      <column name="AD_USERDEF_WIN_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_USERDEF_WIN_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ROLE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_WINDOW_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ROLE_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="AD_WINDOW_ID" 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="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_USERMAIL.xml b/db/ddlutils/model/AD_USERMAIL.xml
index f9af069038..9776d3248f 100644
--- a/db/ddlutils/model/AD_USERMAIL.xml
+++ b/db/ddlutils/model/AD_USERMAIL.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_USERMAIL">
-      <column name="AD_USERMAIL_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_USERMAIL_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="R_MAILTEXT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="W_MAILMSG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_MAILTEXT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="W_MAILMSG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="MESSAGEID" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
       <column name="DELIVERYCONFIRMATION" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
       <column name="ISDELIVERED" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_USERQUERY.xml b/db/ddlutils/model/AD_USERQUERY.xml
index 32388f971b..04e95d7415 100644
--- a/db/ddlutils/model/AD_USERQUERY.xml
+++ b/db/ddlutils/model/AD_USERQUERY.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_USERQUERY">
-      <column name="AD_USERQUERY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_USERQUERY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="CODE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <foreign-key foreignTable="AD_TABLE" name="ADTABLE_ADUSERQUERY">
         <reference local="AD_TABLE_ID" foreign="AD_TABLE_ID"/>
diff --git a/db/ddlutils/model/AD_USER_ORGACCESS.xml b/db/ddlutils/model/AD_USER_ORGACCESS.xml
index cf8eb7f2e4..2a7f8745f0 100644
--- a/db/ddlutils/model/AD_USER_ORGACCESS.xml
+++ b/db/ddlutils/model/AD_USER_ORGACCESS.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_USER_ORGACCESS">
-      <column name="AD_USER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_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="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISREADONLY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="AD_ORG" name="ADORG_ADUSERORGACCESS">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
diff --git a/db/ddlutils/model/AD_USER_ROLES.xml b/db/ddlutils/model/AD_USER_ROLES.xml
index 7d78eb4567..a1196a3ccc 100644
--- a/db/ddlutils/model/AD_USER_ROLES.xml
+++ b/db/ddlutils/model/AD_USER_ROLES.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_USER_ROLES">
-      <column name="AD_USER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ROLE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ROLE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="AD_USERROLESCLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_USER_SUBSTITUTE.xml b/db/ddlutils/model/AD_USER_SUBSTITUTE.xml
index 5aa33bc7c1..a4551e20af 100644
--- a/db/ddlutils/model/AD_USER_SUBSTITUTE.xml
+++ b/db/ddlutils/model/AD_USER_SUBSTITUTE.xml
@@ -2,26 +2,26 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_USER_SUBSTITUTE">
-      <column name="AD_USER_SUBSTITUTE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_SUBSTITUTE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_USER_ID" 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="SUBSTITUTE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="SUBSTITUTE_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"/>
-      <foreign-key foreignTable="AD_USER" name="ADUSERSUB_AD_USERSUB">
-        <reference local="SUBSTITUTE_ID" foreign="AD_USER_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_USER" name="ADUSER_ADUSERSUB">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_USER" name="ADUSERSUB_AD_USERSUB">
+        <reference local="SUBSTITUTE_ID" foreign="AD_USER_ID"/>
+      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/AD_VAL_RULE.xml b/db/ddlutils/model/AD_VAL_RULE.xml
index 36afc316ef..bb8da94a06 100644
--- a/db/ddlutils/model/AD_VAL_RULE.xml
+++ b/db/ddlutils/model/AD_VAL_RULE.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_VAL_RULE">
-      <column name="AD_VAL_RULE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_VAL_RULE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="TYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_WF_ACTIVITY.xml b/db/ddlutils/model/AD_WF_ACTIVITY.xml
index e15105c61c..82feb90955 100644
--- a/db/ddlutils/model/AD_WF_ACTIVITY.xml
+++ b/db/ddlutils/model/AD_WF_ACTIVITY.xml
@@ -2,30 +2,30 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_WF_ACTIVITY">
-      <column name="AD_WF_ACTIVITY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_WF_ACTIVITY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_WF_PROCESS_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_WF_NODE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_WF_RESPONSIBLE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_WF_PROCESS_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_WF_NODE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_WF_RESPONSIBLE_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="WFSTATE" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
-      <column name="AD_MESSAGE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_MESSAGE_ID" primaryKey="false" required="false" type="ID" size="10" 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="TEXTMSG" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="AD_WORKFLOW_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="RECORD_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="PRIORITY" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="AD_WORKFLOW_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="RECORD_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="PRIORITY" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ENDWAITTIME" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATELASTALERT" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="DYNPRIORITYSTART" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="DYNPRIORITYSTART" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_MESSAGE" name="ADMESSAGE_ADWFACTIVITY">
         <reference local="AD_MESSAGE_ID" foreign="AD_MESSAGE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_WF_ACTIVITYRESULT.xml b/db/ddlutils/model/AD_WF_ACTIVITYRESULT.xml
index 67e332db57..85680102d7 100644
--- a/db/ddlutils/model/AD_WF_ACTIVITYRESULT.xml
+++ b/db/ddlutils/model/AD_WF_ACTIVITYRESULT.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_WF_ACTIVITYRESULT">
-      <column name="AD_WF_ACTIVITYRESULT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_WF_ACTIVITYRESULT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_WF_ACTIVITY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_WF_ACTIVITY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ATTRIBUTENAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ATTRIBUTEVALUE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_WF_BLOCK.xml b/db/ddlutils/model/AD_WF_BLOCK.xml
index f7dd6b6b48..e01a11fc5d 100644
--- a/db/ddlutils/model/AD_WF_BLOCK.xml
+++ b/db/ddlutils/model/AD_WF_BLOCK.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_WF_BLOCK">
-      <column name="AD_WF_BLOCK_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_WF_BLOCK_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="AD_WORKFLOW_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_WORKFLOW_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_WORKFLOW" name="ADWORKFLOW_ADWFBLOCK">
         <reference local="AD_WORKFLOW_ID" foreign="AD_WORKFLOW_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_WF_EVENTAUDIT.xml b/db/ddlutils/model/AD_WF_EVENTAUDIT.xml
index 18c79cc160..8c3e7a1058 100644
--- a/db/ddlutils/model/AD_WF_EVENTAUDIT.xml
+++ b/db/ddlutils/model/AD_WF_EVENTAUDIT.xml
@@ -2,23 +2,23 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_WF_EVENTAUDIT">
-      <column name="AD_WF_EVENTAUDIT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_WF_EVENTAUDIT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="EVENTTYPE" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
       <column name="WFSTATE" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
-      <column name="AD_WF_PROCESS_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_WF_NODE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="RECORD_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_WF_RESPONSIBLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="ELAPSEDTIMEMS" primaryKey="false" required="true" type="NUMERIC" autoIncrement="false"/>
+      <column name="AD_WF_PROCESS_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_WF_NODE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <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="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_NEXTCONDITION.xml b/db/ddlutils/model/AD_WF_NEXTCONDITION.xml
index 86bb1a40d7..2984f2bb2a 100644
--- a/db/ddlutils/model/AD_WF_NEXTCONDITION.xml
+++ b/db/ddlutils/model/AD_WF_NEXTCONDITION.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_WF_NEXTCONDITION">
-      <column name="AD_WF_NEXTCONDITION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_WF_NEXTCONDITION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_WF_NODENEXT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_WF_NODENEXT_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="ENTITYTYPE" primaryKey="false" required="true" type="VARCHAR" size="4" default="D" autoIncrement="false"/>
       <column name="ANDOR" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="AD_COLUMN_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_COLUMN_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="OPERATION" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="VALUE2" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_WF_NODE.xml b/db/ddlutils/model/AD_WF_NODE.xml
index 6e6722c099..23f4b603b1 100644
--- a/db/ddlutils/model/AD_WF_NODE.xml
+++ b/db/ddlutils/model/AD_WF_NODE.xml
@@ -2,53 +2,53 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_WF_NODE">
-      <column name="AD_WF_NODE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_WF_NODE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="AD_WORKFLOW_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_WORKFLOW_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISCENTRALLYMAINTAINED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ACTION" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="AD_WINDOW_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="WORKFLOW_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_TASK_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_PROCESS_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_FORM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_WINDOW_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="WORKFLOW_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TASK_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_PROCESS_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_FORM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ENTITYTYPE" primaryKey="false" required="true" type="VARCHAR" size="4" default="D" autoIncrement="false"/>
-      <column name="XPOSITION" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="YPOSITION" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="AD_WF_BLOCK_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="XPOSITION" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
+      <column name="YPOSITION" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
+      <column name="AD_WF_BLOCK_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="SUBFLOWEXECUTION" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="STARTMODE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="FINISHMODE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="LIMIT" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="PRIORITY" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="DURATION" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="COST" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="WORKINGTIME" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="WAITINGTIME" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="AD_WF_RESPONSIBLE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_IMAGE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <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="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"/>
+      <column name="AD_IMAGE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="JOINELEMENT" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="SPLITELEMENT" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="WAITTIME" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="AD_COLUMN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="WAITTIME" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="AD_COLUMN_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ATTRIBUTENAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ATTRIBUTEVALUE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <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="NUMERIC" autoIncrement="false"/>
+      <column name="DYNPRIORITYCHANGE" primaryKey="false" required="false" type="DECIMAL" size="22" 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" autoIncrement="false"/>
+      <column name="R_MAILTEXT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="WF_NODECLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_WF_NODENEXT.xml b/db/ddlutils/model/AD_WF_NODENEXT.xml
index b2d3b73bd4..e8d1172c67 100644
--- a/db/ddlutils/model/AD_WF_NODENEXT.xml
+++ b/db/ddlutils/model/AD_WF_NODENEXT.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_WF_NODENEXT">
-      <column name="AD_WF_NODENEXT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_WF_NODENEXT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_WF_NODE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_WF_NEXT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_WF_NODE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_WF_NEXT_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="SEQNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="SEQNO" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ENTITYTYPE" primaryKey="false" required="true" type="VARCHAR" size="4" default="D" autoIncrement="false"/>
       <column name="TRANSITIONCODE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="ISSTDUSERWORKFLOW" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_WF_NODE_PARA.xml b/db/ddlutils/model/AD_WF_NODE_PARA.xml
index bbabd1ea31..33396cf105 100644
--- a/db/ddlutils/model/AD_WF_NODE_PARA.xml
+++ b/db/ddlutils/model/AD_WF_NODE_PARA.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_WF_NODE_PARA">
-      <column name="AD_WF_NODE_PARA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_WF_NODE_PARA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_WF_NODE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_WF_NODE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ATTRIBUTENAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="AD_PROCESS_PARA_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_PROCESS_PARA_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="ATTRIBUTEVALUE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ENTITYTYPE" primaryKey="false" required="true" type="VARCHAR" size="4" default="D" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_WF_NODE_TRL.xml b/db/ddlutils/model/AD_WF_NODE_TRL.xml
index 437acde64a..0afe8db80e 100644
--- a/db/ddlutils/model/AD_WF_NODE_TRL.xml
+++ b/db/ddlutils/model/AD_WF_NODE_TRL.xml
@@ -3,14 +3,14 @@
   <database name="default" defaultIdMethod="none">
     <table name="AD_WF_NODE_TRL">
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_WF_NODE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_WF_NODE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_WF_PROCESS.xml b/db/ddlutils/model/AD_WF_PROCESS.xml
index 54e59d0362..4b9ef0b7c5 100644
--- a/db/ddlutils/model/AD_WF_PROCESS.xml
+++ b/db/ddlutils/model/AD_WF_PROCESS.xml
@@ -2,25 +2,25 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_WF_PROCESS">
-      <column name="AD_WF_PROCESS_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_WF_PROCESS_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_WORKFLOW_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_WF_RESPONSIBLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_WORKFLOW_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="WFSTATE" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
-      <column name="AD_MESSAGE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_MESSAGE_ID" primaryKey="false" required="false" type="ID" size="10" 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="TEXTMSG" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="RECORD_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="PRIORITY" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="RECORD_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="PRIORITY" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="WF_INSTANCECLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_WF_PROCESSDATA.xml b/db/ddlutils/model/AD_WF_PROCESSDATA.xml
index 2e5a7c9dfe..e97ef3e860 100644
--- a/db/ddlutils/model/AD_WF_PROCESSDATA.xml
+++ b/db/ddlutils/model/AD_WF_PROCESSDATA.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_WF_PROCESSDATA">
-      <column name="AD_WF_PROCESSDATA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_WF_PROCESSDATA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_WF_PROCESS_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_WF_PROCESS_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ATTRIBUTENAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ATTRIBUTEVALUE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <foreign-key foreignTable="AD_WF_PROCESS" name="ADWFPROCCESS_ADWFPROCESSDATA">
diff --git a/db/ddlutils/model/AD_WF_RESPONSIBLE.xml b/db/ddlutils/model/AD_WF_RESPONSIBLE.xml
index 8cdeae3c1d..2ddb5f0882 100644
--- a/db/ddlutils/model/AD_WF_RESPONSIBLE.xml
+++ b/db/ddlutils/model/AD_WF_RESPONSIBLE.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_WF_RESPONSIBLE">
-      <column name="AD_WF_RESPONSIBLE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_WF_RESPONSIBLE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="RESPONSIBLETYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ROLE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ROLE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ENTITYTYPE" primaryKey="false" required="true" type="VARCHAR" size="4" default="D" autoIncrement="false"/>
       <foreign-key foreignTable="AD_ORG" name="ADORG_ADWFRESPONSIBLE">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
diff --git a/db/ddlutils/model/AD_WINDOW.xml b/db/ddlutils/model/AD_WINDOW.xml
index 2d2c4478bd..944ec2cfb9 100644
--- a/db/ddlutils/model/AD_WINDOW.xml
+++ b/db/ddlutils/model/AD_WINDOW.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_WINDOW">
-      <column name="AD_WINDOW_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_WINDOW_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
@@ -17,11 +17,11 @@
       <column name="ISSOTRX" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ENTITYTYPE" primaryKey="false" required="true" type="VARCHAR" size="4" default="D" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="AD_IMAGE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_COLOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_IMAGE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_COLOR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISDEFAULT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="WINHEIGHT" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="WINWIDTH" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="WINHEIGHT" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="WINWIDTH" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ISBETAFUNCTIONALITY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="WINDOWCLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
diff --git a/db/ddlutils/model/AD_WINDOW_ACCESS.xml b/db/ddlutils/model/AD_WINDOW_ACCESS.xml
index 0aff8a7ab8..e966053838 100644
--- a/db/ddlutils/model/AD_WINDOW_ACCESS.xml
+++ b/db/ddlutils/model/AD_WINDOW_ACCESS.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_WINDOW_ACCESS">
-      <column name="AD_WINDOW_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ROLE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_WINDOW_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ROLE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISREADWRITE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="AD_FUNCTACCESS_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
diff --git a/db/ddlutils/model/AD_WINDOW_TRL.xml b/db/ddlutils/model/AD_WINDOW_TRL.xml
index 36d710b710..2d122dcc95 100644
--- a/db/ddlutils/model/AD_WINDOW_TRL.xml
+++ b/db/ddlutils/model/AD_WINDOW_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_WINDOW_TRL">
-      <column name="AD_WINDOW_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_WINDOW_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_WORKBENCH.xml b/db/ddlutils/model/AD_WORKBENCH.xml
index d39837506f..544782ff22 100644
--- a/db/ddlutils/model/AD_WORKBENCH.xml
+++ b/db/ddlutils/model/AD_WORKBENCH.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_WORKBENCH">
-      <column name="AD_WORKBENCH_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_WORKBENCH_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="AD_COLUMN_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_IMAGE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_COLOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_COLUMN_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_IMAGE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_COLOR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ENTITYTYPE" primaryKey="false" required="true" type="VARCHAR" size="4" default="D" autoIncrement="false"/>
       <foreign-key foreignTable="AD_COLOR" name="ADCOLOR_ADWORKBENCH">
         <reference local="AD_COLOR_ID" foreign="AD_COLOR_ID"/>
diff --git a/db/ddlutils/model/AD_WORKBENCHWINDOW.xml b/db/ddlutils/model/AD_WORKBENCHWINDOW.xml
index 412cef94f1..211e57fd37 100644
--- a/db/ddlutils/model/AD_WORKBENCHWINDOW.xml
+++ b/db/ddlutils/model/AD_WORKBENCHWINDOW.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_WORKBENCHWINDOW">
-      <column name="AD_WORKBENCHWINDOW_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_WORKBENCHWINDOW_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_WORKBENCH_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_WORKBENCH_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="ISPRIMARY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="AD_WINDOW_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_FORM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_PROCESS_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_TASK_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_WINDOW_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_FORM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_PROCESS_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TASK_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ENTITYTYPE" primaryKey="false" required="true" type="VARCHAR" size="4" default="D" autoIncrement="false"/>
       <foreign-key foreignTable="AD_FORM" name="ADFORM_ADWORKBENCHWINDOW">
         <reference local="AD_FORM_ID" foreign="AD_FORM_ID"/>
diff --git a/db/ddlutils/model/AD_WORKBENCH_TRL.xml b/db/ddlutils/model/AD_WORKBENCH_TRL.xml
index 527590d439..2f8567ae70 100644
--- a/db/ddlutils/model/AD_WORKBENCH_TRL.xml
+++ b/db/ddlutils/model/AD_WORKBENCH_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_WORKBENCH_TRL">
-      <column name="AD_WORKBENCH_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_WORKBENCH_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_WORKFLOW.xml b/db/ddlutils/model/AD_WORKFLOW.xml
index 4ad74adbf5..d97bf2bf01 100644
--- a/db/ddlutils/model/AD_WORKFLOW.xml
+++ b/db/ddlutils/model/AD_WORKFLOW.xml
@@ -2,37 +2,37 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_WORKFLOW">
-      <column name="AD_WORKFLOW_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_WORKFLOW_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="ACCESSLEVEL" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="AD_WF_NODE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_WF_NODE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ENTITYTYPE" primaryKey="false" required="true" type="VARCHAR" size="4" default="D" autoIncrement="false"/>
       <column name="DURATIONUNIT" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="AUTHOR" primaryKey="false" required="true" type="VARCHAR" size="20" default="ComPiere" autoIncrement="false"/>
-      <column name="VERSION" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="VERSION" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" 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="PRIORITY" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="LIMIT" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="DURATION" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="COST" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="WORKINGTIME" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="WAITINGTIME" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="AD_WF_RESPONSIBLE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <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="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"/>
       <column name="PUBLISHSTATUS" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="AD_WORKFLOWPROCESSOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_WORKFLOWPROCESSOR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="ISDEFAULT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="VALIDATEWORKFLOW" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="WORKFLOWTYPE" primaryKey="false" required="true" type="CHAR" size="1" default="G" autoIncrement="false"/>
       <column name="DOCVALUELOGIC" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_WORKFLOWPROCESSOR.xml b/db/ddlutils/model/AD_WORKFLOWPROCESSOR.xml
index 2f9f04470d..15815c391f 100644
--- a/db/ddlutils/model/AD_WORKFLOWPROCESSOR.xml
+++ b/db/ddlutils/model/AD_WORKFLOWPROCESSOR.xml
@@ -2,26 +2,26 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_WORKFLOWPROCESSOR">
-      <column name="AD_WORKFLOWPROCESSOR_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_WORKFLOWPROCESSOR_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="FREQUENCYTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="FREQUENCY" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="FREQUENCY" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="DATELASTRUN" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATENEXTRUN" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="SUPERVISOR_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="KEEPLOGDAYS" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="SUPERVISOR_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="KEEPLOGDAYS" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="INACTIVITYALERTDAYS" primaryKey="false" required="false" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="REMINDDAYS" primaryKey="false" required="false" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="ALERTOVERPRIORITY" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="INACTIVITYALERTDAYS" primaryKey="false" required="false" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
+      <column name="REMINDDAYS" primaryKey="false" required="false" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
+      <column name="ALERTOVERPRIORITY" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_ADWORKFLOWPROCESSOR">
         <reference local="SUPERVISOR_ID" foreign="AD_USER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/AD_WORKFLOWPROCESSORLOG.xml b/db/ddlutils/model/AD_WORKFLOWPROCESSORLOG.xml
index 6cbabded8c..6ab65fd235 100644
--- a/db/ddlutils/model/AD_WORKFLOWPROCESSORLOG.xml
+++ b/db/ddlutils/model/AD_WORKFLOWPROCESSORLOG.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_WORKFLOWPROCESSORLOG">
-      <column name="AD_WORKFLOWPROCESSOR_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_WORKFLOWPROCESSORLOG_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_WORKFLOWPROCESSOR_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_WORKFLOWPROCESSORLOG_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISERROR" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="SUMMARY" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="REFERENCE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
diff --git a/db/ddlutils/model/AD_WORKFLOW_ACCESS.xml b/db/ddlutils/model/AD_WORKFLOW_ACCESS.xml
index 519aea3f9b..151abbd8b8 100644
--- a/db/ddlutils/model/AD_WORKFLOW_ACCESS.xml
+++ b/db/ddlutils/model/AD_WORKFLOW_ACCESS.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_WORKFLOW_ACCESS">
-      <column name="AD_WORKFLOW_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ROLE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_WORKFLOW_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ROLE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISREADWRITE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="AD_WORKFLOWACCESS_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
diff --git a/db/ddlutils/model/AD_WORKFLOW_TRL.xml b/db/ddlutils/model/AD_WORKFLOW_TRL.xml
index 232ab5d63a..c3a24f0356 100644
--- a/db/ddlutils/model/AD_WORKFLOW_TRL.xml
+++ b/db/ddlutils/model/AD_WORKFLOW_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="AD_WORKFLOW_TRL">
-      <column name="AD_WORKFLOW_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_WORKFLOW_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/A_ASSET.xml b/db/ddlutils/model/A_ASSET.xml
index 7d3988e8b2..fae69e4778 100644
--- a/db/ddlutils/model/A_ASSET.xml
+++ b/db/ddlutils/model/A_ASSET.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="A_ASSET">
-      <column name="A_ASSET_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="A_ASSET_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" 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="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="A_ASSET_GROUP_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="A_ASSET_GROUP_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="SERNO" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="LOT" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="VERSIONNO" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
@@ -23,37 +23,37 @@
       <column name="ASSETSERVICEDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="ISOWNED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ASSETDEPRECIATIONDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="USELIFEYEARS" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="USELIFEMONTHS" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="LIFEUSEUNITS" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="USEUNITS" primaryKey="false" required="false" type="NUMERIC" 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="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"/>
       <column name="LOCATIONCOMMENT" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="M_LOCATOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_LOCATION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="M_LOCATOR_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="C_BPARTNER_LOCATION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_LOCATION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="ISDEPRECIATED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <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" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="ID" default="0" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNERSR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_INOUTLINE_ID" primaryKey="false" required="false" type="ID" 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="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"/>
       <column name="LASTMAINTENENCEDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="NEXTMAINTENENCEDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="LASTMAINTENANCEUSEUNIT" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="NEXTMAINTENANCEUSEUNIT" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="LASTMAINTENANCEUSEUNIT" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="NEXTMAINTENANCEUSEUNIT" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="LEASETERMINATIONDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="LEASE_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="LEASE_BPARTNER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="LASTMAINTENANCENOTE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="LASTMAINTENANCEDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="LASTMAINTENANCEUNIT" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="NEXTMAINTENENCEUNIT" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="LASTMAINTENANCEUNIT" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="NEXTMAINTENENCEUNIT" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_AASSET">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/A_ASSET_ACCT.xml b/db/ddlutils/model/A_ASSET_ACCT.xml
index 23b0fe4cc7..c1d23f269c 100644
--- a/db/ddlutils/model/A_ASSET_ACCT.xml
+++ b/db/ddlutils/model/A_ASSET_ACCT.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="A_ASSET_ACCT">
-      <column name="A_ASSET_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="A_ASSET_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="A_DEPRECIATION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="A_DEPRECIATION_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="A_ACCUMDEPRECIATION_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="A_DISPOSAL_LOSS" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="A_DISPOSAL_GAIN" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="A_ASSET_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="A_DEPRECIATION_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="A_DEPRECIATION_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="A_ACCUMDEPRECIATION_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="A_DISPOSAL_LOSS" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="A_DISPOSAL_GAIN" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="A_ASSET_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="A_ASSET" name="AASSET_AASSETACCT">
         <reference local="A_ASSET_ID" foreign="A_ASSET_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/A_ASSET_ADDITION.xml b/db/ddlutils/model/A_ASSET_ADDITION.xml
index 7bc0ff46b3..b15aeeb3e0 100644
--- a/db/ddlutils/model/A_ASSET_ADDITION.xml
+++ b/db/ddlutils/model/A_ASSET_ADDITION.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="A_ASSET_ADDITION">
-      <column name="A_ASSET_ADDITION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="A_ASSET_ADDITION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="A_ASSET_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="ASSETVALUEAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_INVOICELINE_ID" primaryKey="false" required="false" type="ID" 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="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"/>
       </foreign-key>
diff --git a/db/ddlutils/model/A_ASSET_CHANGE.xml b/db/ddlutils/model/A_ASSET_CHANGE.xml
index 5ff0cd492c..dd447d4a2d 100644
--- a/db/ddlutils/model/A_ASSET_CHANGE.xml
+++ b/db/ddlutils/model/A_ASSET_CHANGE.xml
@@ -2,24 +2,24 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="A_ASSET_CHANGE">
-      <column name="A_ASSET_CHANGE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="A_ASSET_CHANGE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="A_ASSET_ID" primaryKey="false" required="true" type="ID" 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="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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="USELIFEYEARS" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="USELIFEMONTHS" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="LIFEUSEUNITS" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
+      <column name="CHANGEAMT" primaryKey="false" required="false" type="DECIMAL" size="22" 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="ASSETDEPRECIATIONDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="A_ASSET_RETIREMENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="A_ASSET_ADDITION_ID" primaryKey="false" required="false" type="ID" 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"/>
       <column name="SERNO" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="LOT" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="VERSIONNO" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
diff --git a/db/ddlutils/model/A_ASSET_CHANGE_AMT.xml b/db/ddlutils/model/A_ASSET_CHANGE_AMT.xml
index d86228cf14..dae271679f 100644
--- a/db/ddlutils/model/A_ASSET_CHANGE_AMT.xml
+++ b/db/ddlutils/model/A_ASSET_CHANGE_AMT.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="A_ASSET_CHANGE_AMT">
-      <column name="A_ASSET_CHANGE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="A_ASSET_CHANGE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="ASSETVALUEAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="ASSETMARKETVALUEAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="ASSETBOOKVALUEAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="ASSETACCUMDEPRECIATIONAMT" primaryKey="false" required="true" type="NUMERIC" default="0" 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"/>
       <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_DELIVERY.xml b/db/ddlutils/model/A_ASSET_DELIVERY.xml
index 77db50a2e5..0b658fcb54 100644
--- a/db/ddlutils/model/A_ASSET_DELIVERY.xml
+++ b/db/ddlutils/model/A_ASSET_DELIVERY.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="A_ASSET_DELIVERY">
-      <column name="A_ASSET_DELIVERY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="A_ASSET_DELIVERY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="A_ASSET_ID" primaryKey="false" required="true" type="ID" 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="MOVEMENTDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="SERNO" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="LOT" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="VERSIONNO" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
-      <column name="M_INOUTLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="M_INOUTLINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="EMAIL" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="MESSAGEID" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
       <column name="DELIVERYCONFIRMATION" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
@@ -23,9 +23,9 @@
       <column name="REMOTE_ADDR" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="REMOTE_HOST" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="REFERRER" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_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="M_PRODUCTDOWNLOAD_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCTDOWNLOAD_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_AASSETDELIVERY">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/A_ASSET_GROUP.xml b/db/ddlutils/model/A_ASSET_GROUP.xml
index 13ed1f3a52..496007b7b2 100644
--- a/db/ddlutils/model/A_ASSET_GROUP.xml
+++ b/db/ddlutils/model/A_ASSET_GROUP.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="A_ASSET_GROUP">
-      <column name="A_ASSET_GROUP_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="A_ASSET_GROUP_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/A_ASSET_GROUP_ACCT.xml b/db/ddlutils/model/A_ASSET_GROUP_ACCT.xml
index 3e4e0da8d0..436ae7a5cb 100644
--- a/db/ddlutils/model/A_ASSET_GROUP_ACCT.xml
+++ b/db/ddlutils/model/A_ASSET_GROUP_ACCT.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="A_ASSET_GROUP_ACCT">
-      <column name="A_ASSET_GROUP_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="A_ASSET_GROUP_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="A_ASSET_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="A_DEPRECIATION_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="A_ACCUMDEPRECIATION_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="A_DISPOSAL_LOSS" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="A_DISPOSAL_GAIN" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="A_DEPRECIATION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="A_ASSET_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="A_DEPRECIATION_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="A_ACCUMDEPRECIATION_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="A_DISPOSAL_LOSS" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="A_DISPOSAL_GAIN" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="A_DEPRECIATION_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="A_ASSET_GROUP" name="AASSETGROUP_AASSETGROUPACCT">
         <reference local="A_ASSET_GROUP_ID" foreign="A_ASSET_GROUP_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/A_ASSET_RETIREMENT.xml b/db/ddlutils/model/A_ASSET_RETIREMENT.xml
index 75bf13aed7..cc5c6346c6 100644
--- a/db/ddlutils/model/A_ASSET_RETIREMENT.xml
+++ b/db/ddlutils/model/A_ASSET_RETIREMENT.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="A_ASSET_RETIREMENT">
-      <column name="A_ASSET_RETIREMENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="A_ASSET_RETIREMENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="A_ASSET_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="ASSETVALUEAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="ASSETMARKETVALUEAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_INVOICELINE_ID" primaryKey="false" required="false" type="ID" 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="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"/>
       </foreign-key>
diff --git a/db/ddlutils/model/A_ASSET_USE.xml b/db/ddlutils/model/A_ASSET_USE.xml
index 7d4d005605..557e8f1097 100644
--- a/db/ddlutils/model/A_ASSET_USE.xml
+++ b/db/ddlutils/model/A_ASSET_USE.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="A_ASSET_USE">
-      <column name="A_ASSET_USE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="A_ASSET_USE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="A_ASSET_ID" primaryKey="false" required="true" type="ID" 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="USEDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="USEUNITS" primaryKey="false" required="true" type="NUMERIC" autoIncrement="false"/>
+      <column name="USEUNITS" primaryKey="false" required="true" type="DECIMAL" size="22" 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/A_DEPRECIATION.xml b/db/ddlutils/model/A_DEPRECIATION.xml
index d7bff976fe..462b78501b 100644
--- a/db/ddlutils/model/A_DEPRECIATION.xml
+++ b/db/ddlutils/model/A_DEPRECIATION.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="A_DEPRECIATION">
-      <column name="A_DEPRECIATION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="A_DEPRECIATION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="DEPRECIATIONTYPE" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
diff --git a/db/ddlutils/model/A_REGISTRATION.xml b/db/ddlutils/model/A_REGISTRATION.xml
index b0e90024b7..5326b3c5bf 100644
--- a/db/ddlutils/model/A_REGISTRATION.xml
+++ b/db/ddlutils/model/A_REGISTRATION.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="A_REGISTRATION">
-      <column name="A_REGISTRATION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="A_REGISTRATION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="A_ASSET_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="A_ASSET_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_BPARTNER_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="ISREGISTERED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISINPRODUCTION" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISALLOWPUBLISH" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
diff --git a/db/ddlutils/model/A_REGISTRATIONATTRIBUTE.xml b/db/ddlutils/model/A_REGISTRATIONATTRIBUTE.xml
index f1f5154e08..3ed395a46d 100644
--- a/db/ddlutils/model/A_REGISTRATIONATTRIBUTE.xml
+++ b/db/ddlutils/model/A_REGISTRATIONATTRIBUTE.xml
@@ -2,27 +2,27 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="A_REGISTRATIONATTRIBUTE">
-      <column name="A_REGISTRATIONATTRIBUTE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="A_REGISTRATIONATTRIBUTE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="AD_REFERENCE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="SEQNO" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
+      <column name="AD_REFERENCE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="COLUMNNAME" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
-      <column name="AD_REFERENCE_VALUE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_REFERENCE_VALUE_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"/>
-      <foreign-key foreignTable="AD_REFERENCE" name="ADREFERENCEVALUE_AREGATTRIBUTE">
-        <reference local="AD_REFERENCE_VALUE_ID" foreign="AD_REFERENCE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_REFERENCE" name="ADREFERENCE_AREGATTRIBUTE">
         <reference local="AD_REFERENCE_ID" foreign="AD_REFERENCE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="AD_REFERENCE" name="ADREFERENCEVALUE_AREGATTRIBUTE">
+        <reference local="AD_REFERENCE_VALUE_ID" foreign="AD_REFERENCE_ID"/>
+      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/A_REGISTRATIONPRODUCT.xml b/db/ddlutils/model/A_REGISTRATIONPRODUCT.xml
index d8bf03a281..8920ddd71d 100644
--- a/db/ddlutils/model/A_REGISTRATIONPRODUCT.xml
+++ b/db/ddlutils/model/A_REGISTRATIONPRODUCT.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="A_REGISTRATIONPRODUCT">
-      <column name="A_REGISTRATIONATTRIBUTE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="A_REGISTRATIONATTRIBUTE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <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="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <foreign-key foreignTable="A_REGISTRATIONATTRIBUTE" name="AREGATTRIBUTE_AREGPRODUCT">
         <reference local="A_REGISTRATIONATTRIBUTE_ID" foreign="A_REGISTRATIONATTRIBUTE_ID"/>
diff --git a/db/ddlutils/model/A_REGISTRATIONVALUE.xml b/db/ddlutils/model/A_REGISTRATIONVALUE.xml
index 480d8d0dae..5759a39301 100644
--- a/db/ddlutils/model/A_REGISTRATIONVALUE.xml
+++ b/db/ddlutils/model/A_REGISTRATIONVALUE.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="A_REGISTRATIONVALUE">
-      <column name="A_REGISTRATION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="A_REGISTRATIONATTRIBUTE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="A_REGISTRATION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="A_REGISTRATIONATTRIBUTE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <foreign-key foreignTable="A_REGISTRATION" name="AREGISTRATION_AREGVALUE">
diff --git a/db/ddlutils/model/B_BID.xml b/db/ddlutils/model/B_BID.xml
index 9a10f1b974..8fbc7d29a4 100644
--- a/db/ddlutils/model/B_BID.xml
+++ b/db/ddlutils/model/B_BID.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="B_BID">
-      <column name="B_BID_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="B_BID_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="B_TOPIC_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="B_TOPIC_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISWILLINGTOCOMMIT" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="B_BUYERFUNDS_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="B_BUYERFUNDS_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="TEXTMSG" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="PRIVATENOTE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <foreign-key foreignTable="B_BUYER" name="BBUYER_BBID">
diff --git a/db/ddlutils/model/B_BIDCOMMENT.xml b/db/ddlutils/model/B_BIDCOMMENT.xml
index d32e17810e..42748787c2 100644
--- a/db/ddlutils/model/B_BIDCOMMENT.xml
+++ b/db/ddlutils/model/B_BIDCOMMENT.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="B_BIDCOMMENT">
-      <column name="B_TOPIC_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="B_BIDCOMMENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="B_TOPIC_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="B_BIDCOMMENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="TEXTMSG" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_BIDCOMMENT">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
diff --git a/db/ddlutils/model/B_BUYER.xml b/db/ddlutils/model/B_BUYER.xml
index 0d3cc5284b..06ffa46db0 100644
--- a/db/ddlutils/model/B_BUYER.xml
+++ b/db/ddlutils/model/B_BUYER.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="B_BUYER">
-      <column name="AD_USER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="VALIDTO" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
diff --git a/db/ddlutils/model/B_BUYERFUNDS.xml b/db/ddlutils/model/B_BUYERFUNDS.xml
index 556cc8df17..99ba2ad5fa 100644
--- a/db/ddlutils/model/B_BUYERFUNDS.xml
+++ b/db/ddlutils/model/B_BUYERFUNDS.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="B_BUYERFUNDS">
-      <column name="B_BUYERFUNDS_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="B_BUYERFUNDS_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ORDER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PAYMENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="COMMITTEDAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="NONCOMMITTEDAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <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"/>
       <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_OFFER.xml b/db/ddlutils/model/B_OFFER.xml
index 15ed28a9b5..422b330aa6 100644
--- a/db/ddlutils/model/B_OFFER.xml
+++ b/db/ddlutils/model/B_OFFER.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="B_OFFER">
-      <column name="B_OFFER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="B_OFFER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="B_TOPIC_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="B_TOPIC_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISWILLINGTOCOMMIT" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="B_SELLERFUNDS_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="B_SELLERFUNDS_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="TEXTMSG" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="PRIVATENOTE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <foreign-key foreignTable="B_SELLER" name="BSELLER_BOFFER">
diff --git a/db/ddlutils/model/B_SELLER.xml b/db/ddlutils/model/B_SELLER.xml
index 90485ea578..71b7212c5b 100644
--- a/db/ddlutils/model/B_SELLER.xml
+++ b/db/ddlutils/model/B_SELLER.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="B_SELLER">
-      <column name="AD_USER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="VALIDTO" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
diff --git a/db/ddlutils/model/B_SELLERFUNDS.xml b/db/ddlutils/model/B_SELLERFUNDS.xml
index 56e4c1013d..bc54e9b61f 100644
--- a/db/ddlutils/model/B_SELLERFUNDS.xml
+++ b/db/ddlutils/model/B_SELLERFUNDS.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="B_SELLERFUNDS">
-      <column name="B_SELLERFUNDS_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="B_SELLERFUNDS_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ORDER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PAYMENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="COMMITTEDAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="NONCOMMITTEDAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <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"/>
       <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/B_TOPIC.xml b/db/ddlutils/model/B_TOPIC.xml
index c54e2dd391..c159e9bed1 100644
--- a/db/ddlutils/model/B_TOPIC.xml
+++ b/db/ddlutils/model/B_TOPIC.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="B_TOPIC">
-      <column name="B_TOPIC_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="B_TOPIC_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DOCUMENTNO" primaryKey="false" required="true" type="VARCHAR" size="30" 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"/>
@@ -20,8 +20,8 @@
       <column name="TEXTDETAILS" primaryKey="false" required="false" type="CLOB" size="4000" 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="B_TOPICTYPE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="B_TOPICCATEGORY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="B_TOPICTYPE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="B_TOPICCATEGORY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DECISIONDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <foreign-key foreignTable="B_TOPICCATEGORY" name="BTOPICCATEGORY_BTOPIC">
         <reference local="B_TOPICCATEGORY_ID" foreign="B_TOPICCATEGORY_ID"/>
diff --git a/db/ddlutils/model/B_TOPICCATEGORY.xml b/db/ddlutils/model/B_TOPICCATEGORY.xml
index a605164811..0134c39599 100644
--- a/db/ddlutils/model/B_TOPICCATEGORY.xml
+++ b/db/ddlutils/model/B_TOPICCATEGORY.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="B_TOPICCATEGORY">
-      <column name="B_TOPICCATEGORY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="B_TOPICCATEGORY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="B_TOPICTYPE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="B_TOPICTYPE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="B_TOPICTYPE" name="BTOPICTYPE_BTOPICCATEGORY">
         <reference local="B_TOPICTYPE_ID" foreign="B_TOPICTYPE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/B_TOPICTYPE.xml b/db/ddlutils/model/B_TOPICTYPE.xml
index ca6ed29691..a4c5f12749 100644
--- a/db/ddlutils/model/B_TOPICTYPE.xml
+++ b/db/ddlutils/model/B_TOPICTYPE.xml
@@ -2,30 +2,30 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="B_TOPICTYPE">
-      <column name="B_TOPICTYPE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="B_TOPICTYPE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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_PRICELIST_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PRICELIST_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="AUCTIONTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="M_PRODUCTMEMBER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCTMEMBER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="M_PRICELIST" name="MPRICELIST_BTOPICTYPE">
         <reference local="M_PRICELIST_ID" foreign="M_PRICELIST_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="M_PRODUCT" name="MPRODUCT_BTOPICTYPE">
-        <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="M_PRODUCT" name="MPRODUCT_BTOPICTYPEMEMBER">
         <reference local="M_PRODUCTMEMBER_ID" foreign="M_PRODUCT_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="M_PRODUCT" name="MPRODUCT_BTOPICTYPE">
+        <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
+      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/CM_ACCESSCONTAINER.xml b/db/ddlutils/model/CM_ACCESSCONTAINER.xml
index 0f3be0620b..2f25a0051f 100644
--- a/db/ddlutils/model/CM_ACCESSCONTAINER.xml
+++ b/db/ddlutils/model/CM_ACCESSCONTAINER.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_ACCESSCONTAINER">
-      <column name="CM_ACCESSPROFILE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="CM_CONTAINER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_ACCESSPROFILE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CM_CONTAINER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="CM_ACCESSPROFILE" name="CMACCESSPROFILE_CMACCCONTAINER">
         <reference local="CM_ACCESSPROFILE_ID" foreign="CM_ACCESSPROFILE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/CM_ACCESSLISTBPGROUP.xml b/db/ddlutils/model/CM_ACCESSLISTBPGROUP.xml
index e4d71159ed..6c46eb70dd 100644
--- a/db/ddlutils/model/CM_ACCESSLISTBPGROUP.xml
+++ b/db/ddlutils/model/CM_ACCESSLISTBPGROUP.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_ACCESSLISTBPGROUP">
-      <column name="CM_ACCESSPROFILE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BP_GROUP_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_ACCESSPROFILE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_BP_GROUP_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="CM_ACCESSPROFILE" name="CMACCESSPROFILE_CMALBPGROUP">
         <reference local="CM_ACCESSPROFILE_ID" foreign="CM_ACCESSPROFILE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/CM_ACCESSLISTROLE.xml b/db/ddlutils/model/CM_ACCESSLISTROLE.xml
index ead6e9e96e..2b5a260d2d 100644
--- a/db/ddlutils/model/CM_ACCESSLISTROLE.xml
+++ b/db/ddlutils/model/CM_ACCESSLISTROLE.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_ACCESSLISTROLE">
-      <column name="CM_ACCESSPROFILE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ROLE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_ACCESSPROFILE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ROLE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_ROLE" name="ADROLE_CMALISTROLE">
         <reference local="AD_ROLE_ID" foreign="AD_ROLE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/CM_ACCESSMEDIA.xml b/db/ddlutils/model/CM_ACCESSMEDIA.xml
index a24471d486..dd221aa588 100644
--- a/db/ddlutils/model/CM_ACCESSMEDIA.xml
+++ b/db/ddlutils/model/CM_ACCESSMEDIA.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_ACCESSMEDIA">
-      <column name="CM_MEDIA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="CM_ACCESSPROFILE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_MEDIA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CM_ACCESSPROFILE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="CM_ACCESSPROFILE" name="CMACCESSPROFILE_CMACCESSMEDIA">
         <reference local="CM_ACCESSPROFILE_ID" foreign="CM_ACCESSPROFILE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/CM_ACCESSNEWSCHANNEL.xml b/db/ddlutils/model/CM_ACCESSNEWSCHANNEL.xml
index e8dba250e7..f1e2af59b0 100644
--- a/db/ddlutils/model/CM_ACCESSNEWSCHANNEL.xml
+++ b/db/ddlutils/model/CM_ACCESSNEWSCHANNEL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_ACCESSNEWSCHANNEL">
-      <column name="CM_ACCESSPROFILE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="CM_NEWSCHANNEL_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_ACCESSPROFILE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CM_NEWSCHANNEL_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="CM_ACCESSPROFILE" name="CMACCESPROFILE_CMANEWSCHANNEL">
         <reference local="CM_ACCESSPROFILE_ID" foreign="CM_ACCESSPROFILE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/CM_ACCESSPROFILE.xml b/db/ddlutils/model/CM_ACCESSPROFILE.xml
index 273f6aeb9b..e012c7ac85 100644
--- a/db/ddlutils/model/CM_ACCESSPROFILE.xml
+++ b/db/ddlutils/model/CM_ACCESSPROFILE.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_ACCESSPROFILE">
-      <column name="CM_ACCESSPROFILE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_ACCESSPROFILE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/CM_ACCESSSTAGE.xml b/db/ddlutils/model/CM_ACCESSSTAGE.xml
index 070fac1c96..d899f85be3 100644
--- a/db/ddlutils/model/CM_ACCESSSTAGE.xml
+++ b/db/ddlutils/model/CM_ACCESSSTAGE.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_ACCESSSTAGE">
-      <column name="CM_ACCESSPROFILE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="CM_CSTAGE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_ACCESSPROFILE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CM_CSTAGE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="CM_ACCESSPROFILE" name="CMACCESSPROFILE_CMACCESSSTAGE">
         <reference local="CM_ACCESSPROFILE_ID" foreign="CM_ACCESSPROFILE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/CM_AD.xml b/db/ddlutils/model/CM_AD.xml
index 2cb38bdebb..df41c58ec1 100644
--- a/db/ddlutils/model/CM_AD.xml
+++ b/db/ddlutils/model/CM_AD.xml
@@ -2,26 +2,26 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_AD">
-      <column name="CM_AD_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_AD_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="CM_AD_CAT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CM_MEDIA_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_AD_CAT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CM_MEDIA_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="TARGETURL" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
       <column name="TARGET_FRAME" primaryKey="false" required="true" type="VARCHAR" size="20" autoIncrement="false"/>
-      <column name="ACTUALCLICK" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="MAXCLICK" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="ACTUALIMPRESSION" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="MAXIMPRESSION" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="STARTIMPRESSION" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="ACTUALCLICK" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
+      <column name="MAXCLICK" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
+      <column name="ACTUALIMPRESSION" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
+      <column name="MAXIMPRESSION" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
+      <column name="STARTIMPRESSION" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <column name="STARTDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="ENDDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="CONTENTHTML" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/CM_AD_CAT.xml b/db/ddlutils/model/CM_AD_CAT.xml
index 50d120c9f0..7a097cece5 100644
--- a/db/ddlutils/model/CM_AD_CAT.xml
+++ b/db/ddlutils/model/CM_AD_CAT.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_AD_CAT">
-      <column name="CM_AD_CAT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="CM_WEBPROJECT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_AD_CAT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CM_WEBPROJECT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/CM_BROADCASTSERVER.xml b/db/ddlutils/model/CM_BROADCASTSERVER.xml
index f48862ee6c..c03df3c864 100644
--- a/db/ddlutils/model/CM_BROADCASTSERVER.xml
+++ b/db/ddlutils/model/CM_BROADCASTSERVER.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_BROADCASTSERVER">
-      <column name="CM_BROADCASTSERVER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_BROADCASTSERVER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="IP_ADDRESS" primaryKey="false" required="true" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="LASTSYNCHRONIZED" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="CM_WEBPROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CM_WEBPROJECT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="CM_WEBPROJECT" name="CMWEBPROJECT_CMBROADCASTSERVER">
         <reference local="CM_WEBPROJECT_ID" foreign="CM_WEBPROJECT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/CM_CHAT.xml b/db/ddlutils/model/CM_CHAT.xml
index 1ce2db08b0..f1576e872e 100644
--- a/db/ddlutils/model/CM_CHAT.xml
+++ b/db/ddlutils/model/CM_CHAT.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_CHAT">
-      <column name="CM_CHAT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_CHAT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="true" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="RECORD_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="RECORD_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="CONFIDENTIALTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="CM_CHATTYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CM_CHATTYPE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="MODERATIONTYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <foreign-key foreignTable="AD_TABLE" name="ADTABLE_CMCHAT">
         <reference local="AD_TABLE_ID" foreign="AD_TABLE_ID"/>
diff --git a/db/ddlutils/model/CM_CHATENTRY.xml b/db/ddlutils/model/CM_CHATENTRY.xml
index 672b91adf9..e970b0deca 100644
--- a/db/ddlutils/model/CM_CHATENTRY.xml
+++ b/db/ddlutils/model/CM_CHATENTRY.xml
@@ -2,23 +2,23 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_CHATENTRY">
-      <column name="CM_CHATENTRY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_CHATENTRY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CM_CHAT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CM_CHAT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="CONFIDENTIALTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="CHARACTERDATA" primaryKey="false" required="false" type="CLOB" size="4000" autoIncrement="false"/>
-      <column name="CM_CHATENTRYPARENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="CM_CHATENTRYGRANDPARENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CM_CHATENTRYPARENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="CM_CHATENTRYGRANDPARENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="CHATENTRYTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="MODERATORSTATUS" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="SUBJECT" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_CMCHATENTRY">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/CM_CHATTYPE.xml b/db/ddlutils/model/CM_CHATTYPE.xml
index 31e956c045..520d4b5220 100644
--- a/db/ddlutils/model/CM_CHATTYPE.xml
+++ b/db/ddlutils/model/CM_CHATTYPE.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_CHATTYPE">
-      <column name="CM_CHATTYPE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_CHATTYPE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="MODERATIONTYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <foreign-key foreignTable="AD_TABLE" name="ADTABLE_CMCHATTYPE">
         <reference local="AD_TABLE_ID" foreign="AD_TABLE_ID"/>
diff --git a/db/ddlutils/model/CM_CHATTYPEUPDATE.xml b/db/ddlutils/model/CM_CHATTYPEUPDATE.xml
index bdbba682f3..17884251b7 100644
--- a/db/ddlutils/model/CM_CHATTYPEUPDATE.xml
+++ b/db/ddlutils/model/CM_CHATTYPEUPDATE.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_CHATTYPEUPDATE">
-      <column name="CM_CHATTYPE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_CHATTYPE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSELFSERVICE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_CMCHATTYPEUPDATE">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
diff --git a/db/ddlutils/model/CM_CHATUPDATE.xml b/db/ddlutils/model/CM_CHATUPDATE.xml
index afcb469b94..740e8e11a3 100644
--- a/db/ddlutils/model/CM_CHATUPDATE.xml
+++ b/db/ddlutils/model/CM_CHATUPDATE.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_CHATUPDATE">
-      <column name="CM_CHAT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_CHAT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSELFSERVICE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_CMCHATUPDATE">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
diff --git a/db/ddlutils/model/CM_CONTAINER.xml b/db/ddlutils/model/CM_CONTAINER.xml
index 994aa67600..bf13fac1a1 100644
--- a/db/ddlutils/model/CM_CONTAINER.xml
+++ b/db/ddlutils/model/CM_CONTAINER.xml
@@ -2,25 +2,25 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_CONTAINER">
-      <column name="CM_CONTAINER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_CONTAINER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="CM_WEBPROJECT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CM_TEMPLATE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CM_WEBPROJECT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CM_TEMPLATE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="TITLE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="NOTICE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="CONTAINERTYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="CONTAINERLINKURL" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="RELATIVEURL" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
-      <column name="PRIORITY" primaryKey="false" required="false" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="PRIORITY" primaryKey="false" required="false" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <column name="ISINDEXED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISSECURE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="META_ROBOTSTAG" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
@@ -32,7 +32,7 @@
       <column name="META_PUBLISHER" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="STRUCTUREXML" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="CONTAINERXML" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="CM_CONTAINERLINK_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CM_CONTAINERLINK_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSUMMARY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="META_LANGUAGE" primaryKey="false" required="false" type="CHAR" size="2" autoIncrement="false"/>
       <column name="ISVALID" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
diff --git a/db/ddlutils/model/CM_CONTAINERTTABLE.xml b/db/ddlutils/model/CM_CONTAINERTTABLE.xml
index 00d303455f..abefa74a93 100644
--- a/db/ddlutils/model/CM_CONTAINERTTABLE.xml
+++ b/db/ddlutils/model/CM_CONTAINERTTABLE.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_CONTAINERTTABLE">
-      <column name="CM_CONTAINERTTABLE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_CONTAINERTTABLE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="CM_CONTAINER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CM_TEMPLATETABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="RECORD_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CM_CONTAINER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CM_TEMPLATETABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="RECORD_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="WHERECLAUSE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="OTHERCLAUSE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <foreign-key foreignTable="CM_CONTAINER" name="CMCONTAINER_CMCONTAINERTTABLE">
diff --git a/db/ddlutils/model/CM_CONTAINER_ELEMENT.xml b/db/ddlutils/model/CM_CONTAINER_ELEMENT.xml
index f86fe0cc73..ee33b8a56b 100644
--- a/db/ddlutils/model/CM_CONTAINER_ELEMENT.xml
+++ b/db/ddlutils/model/CM_CONTAINER_ELEMENT.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_CONTAINER_ELEMENT">
-      <column name="CM_CONTAINER_ELEMENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_CONTAINER_ELEMENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="CM_CONTAINER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_CONTAINER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="CONTENTHTML" primaryKey="false" required="false" type="CLOB" size="4000" autoIncrement="false"/>
       <column name="ISVALID" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <foreign-key foreignTable="CM_CONTAINER" name="CMCONTAINER_CMCONTAINERELEMENT">
diff --git a/db/ddlutils/model/CM_CONTAINER_ELEMENT_TRL.xml b/db/ddlutils/model/CM_CONTAINER_ELEMENT_TRL.xml
index 93611c182f..f920085bf5 100644
--- a/db/ddlutils/model/CM_CONTAINER_ELEMENT_TRL.xml
+++ b/db/ddlutils/model/CM_CONTAINER_ELEMENT_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_CONTAINER_ELEMENT_TRL">
-      <column name="CM_CONTAINER_ELEMENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_CONTAINER_ELEMENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISTRANSLATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="CONTENTHTML" primaryKey="false" required="true" type="CLOB" size="4000" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
diff --git a/db/ddlutils/model/CM_CONTAINER_TRL.xml b/db/ddlutils/model/CM_CONTAINER_TRL.xml
index ad723343ec..bc8f1ae8b7 100644
--- a/db/ddlutils/model/CM_CONTAINER_TRL.xml
+++ b/db/ddlutils/model/CM_CONTAINER_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_CONTAINER_TRL">
-      <column name="CM_CONTAINER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_CONTAINER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISTRANSLATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="TITLE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
diff --git a/db/ddlutils/model/CM_CONTAINER_URL.xml b/db/ddlutils/model/CM_CONTAINER_URL.xml
index 3386bae5cd..835bd9705f 100644
--- a/db/ddlutils/model/CM_CONTAINER_URL.xml
+++ b/db/ddlutils/model/CM_CONTAINER_URL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_CONTAINER_URL">
-      <column name="CM_CONTAINER_URL_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_CONTAINER_URL_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CM_CONTAINER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CM_CONTAINER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="CHECKED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="STATUS" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
       <column name="LAST_RESULT" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/CM_CSTAGE.xml b/db/ddlutils/model/CM_CSTAGE.xml
index 09adc24c94..78d042f14d 100644
--- a/db/ddlutils/model/CM_CSTAGE.xml
+++ b/db/ddlutils/model/CM_CSTAGE.xml
@@ -2,25 +2,25 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_CSTAGE">
-      <column name="CM_CSTAGE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_CSTAGE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="CM_WEBPROJECT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CM_TEMPLATE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CM_WEBPROJECT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CM_TEMPLATE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="TITLE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="NOTICE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="CONTAINERTYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="CONTAINERLINKURL" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="RELATIVEURL" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
-      <column name="PRIORITY" primaryKey="false" required="false" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="PRIORITY" primaryKey="false" required="false" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <column name="ISINDEXED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISSECURE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="META_ROBOTSTAG" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
@@ -32,7 +32,7 @@
       <column name="META_PUBLISHER" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="STRUCTUREXML" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="CONTAINERXML" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="CM_CSTAGELINK_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CM_CSTAGELINK_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISMODIFIED" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="ISSUMMARY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/CM_CSTAGETTABLE.xml b/db/ddlutils/model/CM_CSTAGETTABLE.xml
index b4f4a643e7..32643bfbba 100644
--- a/db/ddlutils/model/CM_CSTAGETTABLE.xml
+++ b/db/ddlutils/model/CM_CSTAGETTABLE.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_CSTAGETTABLE">
-      <column name="CM_CSTAGETTABLE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_CSTAGETTABLE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="CM_CSTAGE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CM_TEMPLATETABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="RECORD_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CM_CSTAGE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CM_TEMPLATETABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="RECORD_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="WHERECLAUSE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="OTHERCLAUSE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <foreign-key foreignTable="CM_CSTAGE" name="CMSTAGE_CMCSTAGETTABLE">
diff --git a/db/ddlutils/model/CM_CSTAGE_ELEMENT.xml b/db/ddlutils/model/CM_CSTAGE_ELEMENT.xml
index 1715f2bcf7..9d2506b846 100644
--- a/db/ddlutils/model/CM_CSTAGE_ELEMENT.xml
+++ b/db/ddlutils/model/CM_CSTAGE_ELEMENT.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_CSTAGE_ELEMENT">
-      <column name="CM_CSTAGE_ELEMENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_CSTAGE_ELEMENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="CM_CSTAGE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_CSTAGE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="CONTENTHTML" primaryKey="false" required="false" type="CLOB" size="4000" autoIncrement="false"/>
       <column name="ISVALID" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="CM_CSTAGE" name="CMCSTAGE_CMCSTAGEELEMENT">
diff --git a/db/ddlutils/model/CM_CSTAGE_ELEMENT_TRL.xml b/db/ddlutils/model/CM_CSTAGE_ELEMENT_TRL.xml
index 4b5296d047..1b3ba03b7c 100644
--- a/db/ddlutils/model/CM_CSTAGE_ELEMENT_TRL.xml
+++ b/db/ddlutils/model/CM_CSTAGE_ELEMENT_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_CSTAGE_ELEMENT_TRL">
-      <column name="CM_CSTAGE_ELEMENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_CSTAGE_ELEMENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISTRANSLATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" 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"/>
diff --git a/db/ddlutils/model/CM_CSTAGE_TRL.xml b/db/ddlutils/model/CM_CSTAGE_TRL.xml
index e5f45440a1..5f0b7aa30b 100644
--- a/db/ddlutils/model/CM_CSTAGE_TRL.xml
+++ b/db/ddlutils/model/CM_CSTAGE_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_CSTAGE_TRL">
-      <column name="CM_CSTAGE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_CSTAGE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISTRANSLATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="TITLE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
diff --git a/db/ddlutils/model/CM_MEDIA.xml b/db/ddlutils/model/CM_MEDIA.xml
index a79ab50705..0ce0824a67 100644
--- a/db/ddlutils/model/CM_MEDIA.xml
+++ b/db/ddlutils/model/CM_MEDIA.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_MEDIA">
-      <column name="CM_MEDIA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_MEDIA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="MEDIATYPE" primaryKey="false" required="false" type="CHAR" size="3" 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="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="ISSUMMARY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="CM_WEBPROJECT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_IMAGE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CM_WEBPROJECT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_IMAGE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="CONTENTTEXT" primaryKey="false" required="false" type="CLOB" size="4000" autoIncrement="false"/>
       <column name="DIRECTDEPLOY" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <foreign-key foreignTable="CM_WEBPROJECT" name="CMWEBPROJECT_CMMEDIA">
diff --git a/db/ddlutils/model/CM_MEDIADEPLOY.xml b/db/ddlutils/model/CM_MEDIADEPLOY.xml
index 89e95f570e..e98f145169 100644
--- a/db/ddlutils/model/CM_MEDIADEPLOY.xml
+++ b/db/ddlutils/model/CM_MEDIADEPLOY.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_MEDIADEPLOY">
-      <column name="CM_MEDIADEPLOY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_MEDIADEPLOY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CM_MEDIA_SERVER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CM_MEDIA_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CM_MEDIA_SERVER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CM_MEDIA_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISDEPLOYED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="LASTSYNCHRONIZED" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
diff --git a/db/ddlutils/model/CM_MEDIA_SERVER.xml b/db/ddlutils/model/CM_MEDIA_SERVER.xml
index 955ca825bc..7d700b4832 100644
--- a/db/ddlutils/model/CM_MEDIA_SERVER.xml
+++ b/db/ddlutils/model/CM_MEDIA_SERVER.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_MEDIA_SERVER">
-      <column name="CM_MEDIA_SERVER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_MEDIA_SERVER_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="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="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="CM_WEBPROJECT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_WEBPROJECT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISPASSIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="URL" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
       <column name="IP_ADDRESS" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
diff --git a/db/ddlutils/model/CM_NEWSCHANNEL.xml b/db/ddlutils/model/CM_NEWSCHANNEL.xml
index 03f4c91908..53ad61b16a 100644
--- a/db/ddlutils/model/CM_NEWSCHANNEL.xml
+++ b/db/ddlutils/model/CM_NEWSCHANNEL.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_NEWSCHANNEL">
-      <column name="CM_NEWSCHANNEL_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_NEWSCHANNEL_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
-      <column name="CM_WEBPROJECT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_WEBPROJECT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="LINK" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <foreign-key foreignTable="CM_WEBPROJECT" name="CMWEBPROJECT_CMNEWSCHANNEL">
         <reference local="CM_WEBPROJECT_ID" foreign="CM_WEBPROJECT_ID"/>
diff --git a/db/ddlutils/model/CM_NEWSITEM.xml b/db/ddlutils/model/CM_NEWSITEM.xml
index e9b5be1e6a..8745d57748 100644
--- a/db/ddlutils/model/CM_NEWSITEM.xml
+++ b/db/ddlutils/model/CM_NEWSITEM.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_NEWSITEM">
-      <column name="CM_NEWSITEM_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_NEWSITEM_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CM_NEWSCHANNEL_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CM_NEWSCHANNEL_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="TITLE" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="AUTHOR" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
diff --git a/db/ddlutils/model/CM_TEMPLATE.xml b/db/ddlutils/model/CM_TEMPLATE.xml
index a8de357c0a..26c599ab97 100644
--- a/db/ddlutils/model/CM_TEMPLATE.xml
+++ b/db/ddlutils/model/CM_TEMPLATE.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_TEMPLATE">
-      <column name="CM_TEMPLATE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_TEMPLATE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="CM_WEBPROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CM_WEBPROJECT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="ISINCLUDE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISUSEAD" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
diff --git a/db/ddlutils/model/CM_TEMPLATETABLE.xml b/db/ddlutils/model/CM_TEMPLATETABLE.xml
index 000a8acee5..c2cfd1432b 100644
--- a/db/ddlutils/model/CM_TEMPLATETABLE.xml
+++ b/db/ddlutils/model/CM_TEMPLATETABLE.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_TEMPLATETABLE">
-      <column name="CM_TEMPLATETABLE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_TEMPLATETABLE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="CM_TEMPLATE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_TEMPLATE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="WHERECLAUSE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="OTHERCLAUSE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <foreign-key foreignTable="AD_TABLE" name="ADTABLE_CMTEMPLATETABLE">
diff --git a/db/ddlutils/model/CM_TEMPLATE_AD_CAT.xml b/db/ddlutils/model/CM_TEMPLATE_AD_CAT.xml
index 2d0c33b351..465569bbb1 100644
--- a/db/ddlutils/model/CM_TEMPLATE_AD_CAT.xml
+++ b/db/ddlutils/model/CM_TEMPLATE_AD_CAT.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_TEMPLATE_AD_CAT">
-      <column name="CM_AD_CAT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="CM_TEMPLATE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_AD_CAT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CM_TEMPLATE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <foreign-key foreignTable="CM_AD_CAT" name="CMADCAT_CMTEMPLATEADCAT">
diff --git a/db/ddlutils/model/CM_WEBACCESSLOG.xml b/db/ddlutils/model/CM_WEBACCESSLOG.xml
index 436ef8c378..3369f1b893 100644
--- a/db/ddlutils/model/CM_WEBACCESSLOG.xml
+++ b/db/ddlutils/model/CM_WEBACCESSLOG.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_WEBACCESSLOG">
-      <column name="CM_WEBACCESSLOG_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_WEBACCESSLOG_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="LOGTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="CM_WEBPROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CM_WEBPROJECT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="IP_ADDRESS" primaryKey="false" required="true" type="VARCHAR" size="20" autoIncrement="false"/>
-      <column name="CM_BROADCASTSERVER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CM_BROADCASTSERVER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="REQUESTTYPE" primaryKey="false" required="true" type="VARCHAR" size="4" autoIncrement="false"/>
       <column name="PAGEURL" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
       <column name="REFERRER" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
@@ -24,10 +24,10 @@
       <column name="WEBSESSION" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <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="INTEGER" default="0" autoIncrement="false"/>
-      <column name="FILESIZE" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="CM_MEDIA_ID" primaryKey="false" required="false" type="ID" 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="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">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/CM_WEBPROJECT.xml b/db/ddlutils/model/CM_WEBPROJECT.xml
index 6024ee4753..56a4edc097 100644
--- a/db/ddlutils/model/CM_WEBPROJECT.xml
+++ b/db/ddlutils/model/CM_WEBPROJECT.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_WEBPROJECT">
-      <column name="CM_WEBPROJECT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_WEBPROJECT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
@@ -18,21 +18,21 @@
       <column name="META_ROBOTSTAG" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="META_AUTHOR" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="META_CONTENT" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="AD_TREECMC_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TREECMS_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TREECMM_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TREECMT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TREECMC_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TREECMS_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TREECMM_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TREECMT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_TREE" name="ADTREECMC_CMWEBPROJECT">
         <reference local="AD_TREECMC_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_TREE" name="ADTREECMM_CMWEBPROJECT">
-        <reference local="AD_TREECMM_ID" foreign="AD_TREE_ID"/>
+      <foreign-key foreignTable="AD_TREE" name="ADTREECMT_CMWEBPROJECT">
+        <reference local="AD_TREECMT_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
       <foreign-key foreignTable="AD_TREE" name="ADTREECMS_CMWEBPROJECT">
         <reference local="AD_TREECMS_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_TREE" name="ADTREECMT_CMWEBPROJECT">
-        <reference local="AD_TREECMT_ID" foreign="AD_TREE_ID"/>
+      <foreign-key foreignTable="AD_TREE" name="ADTREECMM_CMWEBPROJECT">
+        <reference local="AD_TREECMM_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
diff --git a/db/ddlutils/model/CM_WEBPROJECT_DOMAIN.xml b/db/ddlutils/model/CM_WEBPROJECT_DOMAIN.xml
index f010c3f8a7..c49a999820 100644
--- a/db/ddlutils/model/CM_WEBPROJECT_DOMAIN.xml
+++ b/db/ddlutils/model/CM_WEBPROJECT_DOMAIN.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_WEBPROJECT_DOMAIN">
-      <column name="CM_WEBPROJECT_DOMAIN_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_WEBPROJECT_DOMAIN_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="CM_WEBPROJECT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CM_CONTAINER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CM_WEBPROJECT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CM_CONTAINER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="FQDN" primaryKey="false" required="true" type="VARCHAR" size="120" autoIncrement="false"/>
       <foreign-key foreignTable="CM_CONTAINER" name="CMCONTAINER_CMWEBPROJECTDOMAIN">
         <reference local="CM_CONTAINER_ID" foreign="CM_CONTAINER_ID"/>
diff --git a/db/ddlutils/model/CM_WIKITOKEN.xml b/db/ddlutils/model/CM_WIKITOKEN.xml
index 34d94fa143..a4552bf109 100644
--- a/db/ddlutils/model/CM_WIKITOKEN.xml
+++ b/db/ddlutils/model/CM_WIKITOKEN.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="CM_WIKITOKEN">
-      <column name="CM_WIKITOKEN_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CM_WIKITOKEN_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="TOKENTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="SELECTCLAUSE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="WHERECLAUSE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="MACRO" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <foreign-key foreignTable="AD_TABLE" name="ADTABLE_CMWIKITOKEN">
diff --git a/db/ddlutils/model/C_ACCTPROCESSOR.xml b/db/ddlutils/model/C_ACCTPROCESSOR.xml
index a38a823c40..3972f5df10 100644
--- a/db/ddlutils/model/C_ACCTPROCESSOR.xml
+++ b/db/ddlutils/model/C_ACCTPROCESSOR.xml
@@ -2,25 +2,25 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_ACCTPROCESSOR">
-      <column name="C_ACCTPROCESSOR_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_ACCTPROCESSOR_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="FREQUENCYTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="FREQUENCY" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="FREQUENCY" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="DATELASTRUN" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATENEXTRUN" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="SUPERVISOR_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="KEEPLOGDAYS" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="SUPERVISOR_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="KEEPLOGDAYS" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_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"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_CACCTPROCESSOR">
         <reference local="SUPERVISOR_ID" foreign="AD_USER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_ACCTPROCESSORLOG.xml b/db/ddlutils/model/C_ACCTPROCESSORLOG.xml
index c0997fa857..d30eeca622 100644
--- a/db/ddlutils/model/C_ACCTPROCESSORLOG.xml
+++ b/db/ddlutils/model/C_ACCTPROCESSORLOG.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_ACCTPROCESSORLOG">
-      <column name="C_ACCTPROCESSOR_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTPROCESSORLOG_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_ACCTPROCESSOR_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTPROCESSORLOG_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISERROR" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="SUMMARY" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="REFERENCE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_ACCTSCHEMA.xml b/db/ddlutils/model/C_ACCTSCHEMA.xml
index 7fcbf378bc..225ffb8299 100644
--- a/db/ddlutils/model/C_ACCTSCHEMA.xml
+++ b/db/ddlutils/model/C_ACCTSCHEMA.xml
@@ -2,33 +2,33 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_ACCTSCHEMA">
-      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="GAAP" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
       <column name="ISACCRUAL" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="COSTINGMETHOD" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AUTOPERIODCONTROL" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_PERIOD_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="PERIOD_OPENHISTORY" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="PERIOD_OPENFUTURE" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="C_PERIOD_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="PERIOD_OPENHISTORY" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="PERIOD_OPENFUTURE" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="SEPARATOR" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="HASALIAS" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="HASCOMBINATION" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISTRADEDISCOUNTPOSTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISDISCOUNTCORRECTSTAX" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="M_COSTTYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="M_COSTTYPE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <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" 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="COMMITMENTTYPE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_ACCTSCHEMA_DEFAULT.xml b/db/ddlutils/model/C_ACCTSCHEMA_DEFAULT.xml
index 72b6166488..eb7f2a8627 100644
--- a/db/ddlutils/model/C_ACCTSCHEMA_DEFAULT.xml
+++ b/db/ddlutils/model/C_ACCTSCHEMA_DEFAULT.xml
@@ -2,81 +2,78 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_ACCTSCHEMA_DEFAULT">
-      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="W_INVENTORY_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="W_INVACTUALADJUST_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="W_DIFFERENCES_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="W_REVALUATION_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_REVENUE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_EXPENSE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_ASSET_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_PURCHASEPRICEVARIANCE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_INVOICEPRICEVARIANCE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_TRADEDISCOUNTREC_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_TRADEDISCOUNTGRANT_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_COGS_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_RECEIVABLE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_PREPAYMENT_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="V_LIABILITY_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="V_LIABILITY_SERVICES_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="V_PREPAYMENT_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="PAYDISCOUNT_EXP_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="WRITEOFF_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="PAYDISCOUNT_REV_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="UNREALIZEDGAIN_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="UNREALIZEDLOSS_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="REALIZEDGAIN_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="REALIZEDLOSS_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="WITHHOLDING_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="E_PREPAYMENT_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="E_EXPENSE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="PJ_ASSET_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="PJ_WIP_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="T_EXPENSE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="T_LIABILITY_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="T_RECEIVABLES_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="T_DUE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="T_CREDIT_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="B_INTRANSIT_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="B_ASSET_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="B_EXPENSE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="B_INTERESTREV_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="B_INTERESTEXP_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="B_UNIDENTIFIED_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="B_UNALLOCATEDCASH_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="B_PAYMENTSELECT_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="B_SETTLEMENTGAIN_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="B_SETTLEMENTLOSS_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="B_REVALUATIONGAIN_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="B_REVALUATIONLOSS_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CH_EXPENSE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CH_REVENUE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="UNEARNEDREVENUE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="NOTINVOICEDRECEIVABLES_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="NOTINVOICEDREVENUE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="NOTINVOICEDRECEIPTS_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CB_ASSET_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CB_CASHTRANSFER_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CB_DIFFERENCES_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CB_EXPENSE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CB_RECEIPT_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="W_INVENTORY_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="W_INVACTUALADJUST_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="W_DIFFERENCES_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="W_REVALUATION_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="P_EXPENSE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="P_ASSET_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="P_PURCHASEPRICEVARIANCE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="P_INVOICEPRICEVARIANCE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="P_TRADEDISCOUNTREC_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="P_TRADEDISCOUNTGRANT_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="P_COGS_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_RECEIVABLE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_PREPAYMENT_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="V_LIABILITY_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="V_LIABILITY_SERVICES_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="V_PREPAYMENT_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="PAYDISCOUNT_EXP_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="WRITEOFF_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="PAYDISCOUNT_REV_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="UNREALIZEDGAIN_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="UNREALIZEDLOSS_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="REALIZEDGAIN_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="REALIZEDLOSS_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="WITHHOLDING_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="E_PREPAYMENT_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="E_EXPENSE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="PJ_ASSET_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="PJ_WIP_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="T_EXPENSE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="T_LIABILITY_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="T_RECEIVABLES_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="T_DUE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="T_CREDIT_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="B_INTRANSIT_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="B_ASSET_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="B_EXPENSE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="B_INTERESTREV_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="B_INTERESTEXP_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="B_UNIDENTIFIED_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="B_UNALLOCATEDCASH_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="B_PAYMENTSELECT_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="B_SETTLEMENTGAIN_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="B_SETTLEMENTLOSS_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="B_REVALUATIONGAIN_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="B_REVALUATIONLOSS_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CH_EXPENSE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CH_REVENUE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="UNEARNEDREVENUE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="NOTINVOICEDRECEIVABLES_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="NOTINVOICEDREVENUE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="NOTINVOICEDRECEIPTS_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CB_ASSET_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CB_CASHTRANSFER_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CB_DIFFERENCES_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CB_EXPENSE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CB_RECEIPT_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="C_RECEIVABLE_SERVICES_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_INVENTORYCLEARING_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_COSTADJUSTMENT_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_RECEIVABLE_SERVICES_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="P_INVENTORYCLEARING_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="P_COSTADJUSTMENT_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <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_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>
@@ -245,6 +242,9 @@
       <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 a047bff109..510e60b528 100644
--- a/db/ddlutils/model/C_ACCTSCHEMA_ELEMENT.xml
+++ b/db/ddlutils/model/C_ACCTSCHEMA_ELEMENT.xml
@@ -2,31 +2,31 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_ACCTSCHEMA_ELEMENT">
-      <column name="C_ACCTSCHEMA_ELEMENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ELEMENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ELEMENTTYPE" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="C_ELEMENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="SEQNO" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="C_ELEMENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISMANDATORY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISBALANCED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="ORG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ELEMENTVALUE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_LOCATION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_SALESREGION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_COLUMN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ELEMENTVALUE_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_BPARTNER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_LOCATION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_SALESREGION_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_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="AD_COLUMN_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="ADCLIENT_CASCHEMAELEMENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_ACCTSCHEMA_GL.xml b/db/ddlutils/model/C_ACCTSCHEMA_GL.xml
index 9942b2eea2..08baf50e10 100644
--- a/db/ddlutils/model/C_ACCTSCHEMA_GL.xml
+++ b/db/ddlutils/model/C_ACCTSCHEMA_GL.xml
@@ -2,40 +2,37 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_ACCTSCHEMA_GL">
-      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="USESUSPENSEBALANCING" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="SUSPENSEBALANCING_ACCT" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="SUSPENSEBALANCING_ACCT" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="USESUSPENSEERROR" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="SUSPENSEERROR_ACCT" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="SUSPENSEERROR_ACCT" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="USECURRENCYBALANCING" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="CURRENCYBALANCING_ACCT" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="RETAINEDEARNING_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="INCOMESUMMARY_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="INTERCOMPANYDUETO_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="INTERCOMPANYDUEFROM_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="PPVOFFSET_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="COMMITMENTOFFSET_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CURRENCYBALANCING_ACCT" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="RETAINEDEARNING_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="INCOMESUMMARY_ACCT" 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"/>
+      <column name="PPVOFFSET_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="COMMITMENTOFFSET_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <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_INTERCOMPANYDUEFROM_CSCHEMA">
-        <reference local="INTERCOMPANYDUEFROM_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_INTERCOMPANYDUETO_CSCHEMAGL">
         <reference local="INTERCOMPANYDUETO_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PPVOFFSET_CSCHEMAGL">
         <reference local="PPVOFFSET_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_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"/>
@@ -46,8 +43,11 @@
       <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_RETAINEDEARNING_CSCHEMAGL">
-        <reference local="RETAINEDEARNING_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      <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>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
diff --git a/db/ddlutils/model/C_ACTIVITY.xml b/db/ddlutils/model/C_ACTIVITY.xml
index ca4a22712f..ae1f92e3b5 100644
--- a/db/ddlutils/model/C_ACTIVITY.xml
+++ b/db/ddlutils/model/C_ACTIVITY.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_ACTIVITY">
-      <column name="C_ACTIVITY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_ACTIVITY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" 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"/>
diff --git a/db/ddlutils/model/C_ALLOCATIONHDR.xml b/db/ddlutils/model/C_ALLOCATIONHDR.xml
index 103b0c99d5..ea88e4d9bc 100644
--- a/db/ddlutils/model/C_ALLOCATIONHDR.xml
+++ b/db/ddlutils/model/C_ALLOCATIONHDR.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_ALLOCATIONHDR">
-      <column name="C_ALLOCATIONHDR_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_ALLOCATIONHDR_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DOCUMENTNO" primaryKey="false" required="true" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <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" autoIncrement="false"/>
-      <column name="APPROVALAMT" primaryKey="false" required="true" type="NUMERIC" default="0" 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="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 39248086db..145f3efe9d 100644
--- a/db/ddlutils/model/C_ALLOCATIONLINE.xml
+++ b/db/ddlutils/model/C_ALLOCATIONLINE.xml
@@ -2,28 +2,28 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_ALLOCATIONLINE">
-      <column name="C_ALLOCATIONLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_ALLOCATIONLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="ALLOCATIONNO" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="ALLOCATIONNO" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="DATETRX" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="ISMANUAL" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_INVOICE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ORDER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PAYMENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CASHLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AMOUNT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DISCOUNTAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="WRITEOFFAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="C_INVOICE_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="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="POSTED" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="OVERUNDERAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_ALLOCATIONHDR_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="OVERUNDERAMT" primaryKey="false" required="false" type="DECIMAL" size="22" 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"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_BANK.xml b/db/ddlutils/model/C_BANK.xml
index 079b576186..fabc17c54d 100644
--- a/db/ddlutils/model/C_BANK.xml
+++ b/db/ddlutils/model/C_BANK.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_BANK">
-      <column name="C_BANK_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_BANK_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ROUTINGNO" primaryKey="false" required="true" type="VARCHAR" size="20" autoIncrement="false"/>
-      <column name="C_LOCATION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_LOCATION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="SWIFTCODE" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="ISOWNBANK" 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"/>
diff --git a/db/ddlutils/model/C_BANKACCOUNT.xml b/db/ddlutils/model/C_BANKACCOUNT.xml
index 85d237b32f..cade1dd6f3 100644
--- a/db/ddlutils/model/C_BANKACCOUNT.xml
+++ b/db/ddlutils/model/C_BANKACCOUNT.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_BANKACCOUNT">
-      <column name="C_BANKACCOUNT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_BANKACCOUNT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BANK_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_BANK_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="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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="CREDITLIMIT" primaryKey="false" required="true" type="NUMERIC" default="0" 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="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_BANKACCOUNTDOC.xml b/db/ddlutils/model/C_BANKACCOUNTDOC.xml
index d9152d5ca1..c31846f01e 100644
--- a/db/ddlutils/model/C_BANKACCOUNTDOC.xml
+++ b/db/ddlutils/model/C_BANKACCOUNTDOC.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_BANKACCOUNTDOC">
-      <column name="C_BANKACCOUNTDOC_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_BANKACCOUNTDOC_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BANKACCOUNT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_BANKACCOUNT_ID" 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="PAYMENTRULE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="CURRENTNEXT" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="CHECK_PRINTFORMAT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CURRENTNEXT" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="CHECK_PRINTFORMAT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_PRINTFORMAT" name="ADPRINTFORMAT_CBANKACCOUNTDOC">
         <reference local="CHECK_PRINTFORMAT_ID" foreign="AD_PRINTFORMAT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_BANKACCOUNT_ACCT.xml b/db/ddlutils/model/C_BANKACCOUNT_ACCT.xml
index 4b943d412c..ec237d75ab 100644
--- a/db/ddlutils/model/C_BANKACCOUNT_ACCT.xml
+++ b/db/ddlutils/model/C_BANKACCOUNT_ACCT.xml
@@ -2,47 +2,41 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_BANKACCOUNT_ACCT">
-      <column name="C_BANKACCOUNT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_BANKACCOUNT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="B_INTRANSIT_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="B_ASSET_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="B_EXPENSE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="B_INTERESTREV_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="B_INTERESTEXP_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="B_UNIDENTIFIED_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="B_UNALLOCATEDCASH_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="B_PAYMENTSELECT_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="B_SETTLEMENTGAIN_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="B_SETTLEMENTLOSS_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="B_REVALUATIONGAIN_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="B_REVALUATIONLOSS_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="B_INTRANSIT_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="B_ASSET_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="B_EXPENSE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="B_INTERESTREV_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="B_INTERESTEXP_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="B_UNIDENTIFIED_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="B_UNALLOCATEDCASH_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="B_PAYMENTSELECT_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="B_SETTLEMENTGAIN_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="B_SETTLEMENTLOSS_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="B_REVALUATIONGAIN_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="B_REVALUATIONLOSS_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_CBANKACCOUNTACCT">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
       <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_BPAYMENTSELECT_CBANKACCOUNT">
-        <reference local="B_PAYMENTSELECT_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_BUNALLOCATEDCASH_CBANKACCOU">
-        <reference local="B_UNALLOCATEDCASH_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      <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_BUNIDENTIFIED_CBANKACCOUNT">
         <reference local="B_UNIDENTIFIED_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
@@ -62,8 +56,14 @@
       <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_BSETTLEMENTGAIN_CBANKACCOUN">
-        <reference local="B_SETTLEMENTGAIN_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_BREVALUATIONGAIN_CBANKACCOU">
+        <reference local="B_REVALUATIONGAIN_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
+      <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>
diff --git a/db/ddlutils/model/C_BANKSTATEMENT.xml b/db/ddlutils/model/C_BANKSTATEMENT.xml
index b91672e5d3..647494f869 100644
--- a/db/ddlutils/model/C_BANKSTATEMENT.xml
+++ b/db/ddlutils/model/C_BANKSTATEMENT.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_BANKSTATEMENT">
-      <column name="C_BANKSTATEMENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_BANKSTATEMENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BANKACCOUNT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_BANKACCOUNT_ID" 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="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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="ENDINGBALANCE" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="STATEMENTDIFFERENCE" primaryKey="false" required="false" type="NUMERIC" default="0" 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="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 7635f6e4d7..c5b68e9424 100644
--- a/db/ddlutils/model/C_BANKSTATEMENTLINE.xml
+++ b/db/ddlutils/model/C_BANKSTATEMENTLINE.xml
@@ -2,27 +2,27 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_BANKSTATEMENTLINE">
-      <column name="C_BANKSTATEMENTLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_BANKSTATEMENTLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BANKSTATEMENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_BANKSTATEMENT_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="ISREVERSAL" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_PAYMENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_PAYMENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <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" autoIncrement="false"/>
-      <column name="TRXAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="STMTAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_CHARGE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="CHARGEAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="INTERESTAMT" primaryKey="false" required="true" type="NUMERIC" default="0" 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="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="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,11 +37,11 @@
       <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="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="EFTAMT" primaryKey="false" required="false" type="DECIMAL" size="22" 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" autoIncrement="false"/>
-      <column name="C_INVOICE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_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="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="C_BANKSTATEMENT" name="CBSTATEMENT_CBSTATEMENTLINE">
         <reference local="C_BANKSTATEMENT_ID" foreign="C_BANKSTATEMENT_ID"/>
diff --git a/db/ddlutils/model/C_BANKSTATEMENTLOADER.xml b/db/ddlutils/model/C_BANKSTATEMENTLOADER.xml
index 8d8a0d0f21..951ac33f03 100644
--- a/db/ddlutils/model/C_BANKSTATEMENTLOADER.xml
+++ b/db/ddlutils/model/C_BANKSTATEMENTLOADER.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_BANKSTATEMENTLOADER">
-      <column name="C_BANKSTATEMENTLOADER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_BANKSTATEMENTLOADER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="C_BANKACCOUNT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_BANKACCOUNT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="STMTLOADERCLASS" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="FINANCIALINSTITUTIONID" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="BRANCHID" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
@@ -21,9 +21,9 @@
       <column name="PIN" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="ACCOUNTNO" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="HOSTADDRESS" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="HOSTPORT" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="HOSTPORT" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="PROXYADDRESS" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="PROXYPORT" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="PROXYPORT" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="PROXYLOGON" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="PROXYPASSWORD" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="FILENAME" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_BANKSTATEMENTMATCHER.xml b/db/ddlutils/model/C_BANKSTATEMENTMATCHER.xml
index 724a93cb01..4b08933c48 100644
--- a/db/ddlutils/model/C_BANKSTATEMENTMATCHER.xml
+++ b/db/ddlutils/model/C_BANKSTATEMENTMATCHER.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_BANKSTATEMENTMATCHER">
-      <column name="C_BANKSTATEMENTMATCHER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_BANKSTATEMENTMATCHER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="CLASSNAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="SEQNO" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/C_BPARTNER.xml b/db/ddlutils/model/C_BPARTNER.xml
index 4aabf834ba..ecf3c558c7 100644
--- a/db/ddlutils/model/C_BPARTNER.xml
+++ b/db/ddlutils/model/C_BPARTNER.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_BPARTNER">
-      <column name="C_BPARTNER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="NAME2" 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="ISSUMMARY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_BP_GROUP_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_BP_GROUP_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISONETIME" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISPROSPECT" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISVENDOR" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
@@ -28,45 +28,45 @@
       <column name="AD_LANGUAGE" primaryKey="false" required="false" type="VARCHAR" size="6" autoIncrement="false"/>
       <column name="TAXID" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="ISTAXEXEMPT" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_INVOICESCHEDULE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_INVOICESCHEDULE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="RATING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="SALESVOLUME" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="NUMBEREMPLOYEES" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="SALESVOLUME" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
+      <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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="POTENTIALLIFETIMEVALUE" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="ACTUALLIFETIMEVALUE" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="SHAREOFCUSTOMER" primaryKey="false" required="false" type="INTEGER" 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="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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="SO_CREDITUSED" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_PAYMENTTERM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_PRICELIST_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_DISCOUNTSCHEMA_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_DUNNING_ID" primaryKey="false" required="false" type="ID" 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="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"/>
+      <column name="C_DUNNING_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISDISCOUNTPRINTED" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="SO_DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="POREFERENCE" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="PAYMENTRULEPO" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="PO_PRICELIST_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="PO_DISCOUNTSCHEMA_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="PO_PAYMENTTERM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="DOCUMENTCOPIES" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="C_GREETING_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="PO_PRICELIST_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="PO_PAYMENTTERM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="DOCUMENTCOPIES" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="C_GREETING_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="INVOICERULE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="DELIVERYRULE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="FREIGHTCOSTRULE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="DELIVERYVIARULE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="SALESREP_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="SALESREP_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="SENDEMAIL" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="BPARTNER_PARENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="INVOICE_PRINTFORMAT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="BPARTNER_PARENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="INVOICE_PRINTFORMAT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="SOCREDITSTATUS" primaryKey="false" required="false" type="CHAR" size="1" default="O" autoIncrement="false"/>
-      <column name="SHELFLIFEMINPCT" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="AD_ORGBP_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="FLATDISCOUNT" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="TOTALOPENBALANCE" primaryKey="false" required="false" type="NUMERIC" 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"/>
       <foreign-key foreignTable="AD_CLIENT" name="ADCLIENT_CBPARTNER">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_BPARTNER_LOCATION.xml b/db/ddlutils/model/C_BPARTNER_LOCATION.xml
index 7c4f50d0fe..eb007718d6 100644
--- a/db/ddlutils/model/C_BPARTNER_LOCATION.xml
+++ b/db/ddlutils/model/C_BPARTNER_LOCATION.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_BPARTNER_LOCATION">
-      <column name="C_BPARTNER_LOCATION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_LOCATION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ISBILLTO" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISSHIPTO" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
@@ -19,9 +19,9 @@
       <column name="PHONE2" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="FAX" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="ISDN" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
-      <column name="C_SALESREGION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_LOCATION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_SALESREGION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_LOCATION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="C_BUSPARTNER_LOCATIONCLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_BPARTNER_PRODUCT.xml b/db/ddlutils/model/C_BPARTNER_PRODUCT.xml
index 5c8fe8de42..6040056f80 100644
--- a/db/ddlutils/model/C_BPARTNER_PRODUCT.xml
+++ b/db/ddlutils/model/C_BPARTNER_PRODUCT.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_BPARTNER_PRODUCT">
-      <column name="C_BPARTNER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <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="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="SHELFLIFEMINPCT" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="SHELFLIFEMINDAYS" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="QUALITYRATING" primaryKey="false" required="false" type="NUMERIC" 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="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_BANKACCOUNT.xml b/db/ddlutils/model/C_BP_BANKACCOUNT.xml
index f869947fc4..20262e6cd9 100644
--- a/db/ddlutils/model/C_BP_BANKACCOUNT.xml
+++ b/db/ddlutils/model/C_BP_BANKACCOUNT.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_BP_BANKACCOUNT">
-      <column name="C_BP_BANKACCOUNT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_BP_BANKACCOUNT_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="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BANK_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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_BANK_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACH" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="BANKACCOUNTTYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="ROUTINGNO" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
@@ -19,8 +19,8 @@
       <column name="CREDITCARDTYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="CREDITCARDNUMBER" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="CREDITCARDVV" primaryKey="false" required="false" type="VARCHAR" size="4" autoIncrement="false"/>
-      <column name="CREDITCARDEXPMM" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="CREDITCARDEXPYY" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="CREDITCARDEXPMM" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="CREDITCARDEXPYY" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="A_NAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="A_STREET" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="A_CITY" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
@@ -32,7 +32,7 @@
       <column name="R_AVSADDR" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="R_AVSZIP" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="A_COUNTRY" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="BPBANKACCTUSE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_CBPBANKACCOUNT">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
diff --git a/db/ddlutils/model/C_BP_CUSTOMER_ACCT.xml b/db/ddlutils/model/C_BP_CUSTOMER_ACCT.xml
index 4b75b8dbbd..ae015d3ed9 100644
--- a/db/ddlutils/model/C_BP_CUSTOMER_ACCT.xml
+++ b/db/ddlutils/model/C_BP_CUSTOMER_ACCT.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_BP_CUSTOMER_ACCT">
-      <column name="C_BPARTNER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_RECEIVABLE_ACCT" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PREPAYMENT_ACCT" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_RECEIVABLE_SERVICES_ACCT" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_RECEIVABLE_ACCT" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_PREPAYMENT_ACCT" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_RECEIVABLE_SERVICES_ACCT" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_CBPCUSTOMERACCT">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_BP_EDI.xml b/db/ddlutils/model/C_BP_EDI.xml
index e76c326cde..3fa1fc911c 100644
--- a/db/ddlutils/model/C_BP_EDI.xml
+++ b/db/ddlutils/model/C_BP_EDI.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_BP_EDI">
-      <column name="C_BP_EDI_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_BP_EDI_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_WAREHOUSE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_WAREHOUSE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="EDITYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="ISAUDITED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="CUSTOMERNO" primaryKey="false" required="true" type="VARCHAR" size="20" autoIncrement="false"/>
-      <column name="AD_SEQUENCE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_SEQUENCE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="EMAIL_TO" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="EMAIL_FROM" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="EMAIL_FROM_UID" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_BP_EMPLOYEE_ACCT.xml b/db/ddlutils/model/C_BP_EMPLOYEE_ACCT.xml
index 3d76c56c13..1b6213e7cb 100644
--- a/db/ddlutils/model/C_BP_EMPLOYEE_ACCT.xml
+++ b/db/ddlutils/model/C_BP_EMPLOYEE_ACCT.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_BP_EMPLOYEE_ACCT">
-      <column name="C_BPARTNER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="E_EXPENSE_ACCT" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="E_PREPAYMENT_ACCT" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="E_EXPENSE_ACCT" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="E_PREPAYMENT_ACCT" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_CBPEMPLOYEEACCT">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_BP_GROUP.xml b/db/ddlutils/model/C_BP_GROUP.xml
index 5da3de55ae..77473e7150 100644
--- a/db/ddlutils/model/C_BP_GROUP.xml
+++ b/db/ddlutils/model/C_BP_GROUP.xml
@@ -2,28 +2,28 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_BP_GROUP">
-      <column name="C_BP_GROUP_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_BP_GROUP_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" 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="ISDEFAULT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="AD_PRINTCOLOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_PRINTCOLOR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISCONFIDENTIALINFO" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="PRIORITYBASE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="M_PRICELIST_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="PO_PRICELIST_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_DISCOUNTSCHEMA_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="PO_DISCOUNTSCHEMA_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="CREDITWATCHPERCENT" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="PRICEMATCHTOLERANCE" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="C_DUNNING_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="M_PRICELIST_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <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="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"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_BP_GROUP_ACCT.xml b/db/ddlutils/model/C_BP_GROUP_ACCT.xml
index 0eb92269eb..6bea7a05e1 100644
--- a/db/ddlutils/model/C_BP_GROUP_ACCT.xml
+++ b/db/ddlutils/model/C_BP_GROUP_ACCT.xml
@@ -2,49 +2,43 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_BP_GROUP_ACCT">
-      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BP_GROUP_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_BP_GROUP_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_RECEIVABLE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_PREPAYMENT_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="V_LIABILITY_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="V_LIABILITY_SERVICES_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="V_PREPAYMENT_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="PAYDISCOUNT_EXP_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="PAYDISCOUNT_REV_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="WRITEOFF_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="NOTINVOICEDRECEIPTS_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="UNEARNEDREVENUE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="NOTINVOICEDREVENUE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="NOTINVOICEDRECEIVABLES_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_RECEIVABLE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_PREPAYMENT_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="V_LIABILITY_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="V_LIABILITY_SERVICES_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="V_PREPAYMENT_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="PAYDISCOUNT_EXP_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="PAYDISCOUNT_REV_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="WRITEOFF_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="NOTINVOICEDRECEIPTS_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="UNEARNEDREVENUE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="NOTINVOICEDREVENUE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="NOTINVOICEDRECEIVABLES_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="C_RECEIVABLE_SERVICES_ACCT" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_RECEIVABLE_SERVICES_ACCT" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_CBPGROUPACCT">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
       <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_NOTINVOICEDREVENUE_CBPGROUP">
-        <reference local="NOTINVOICEDREVENUE_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_VLIABILITY_CBPGROUP">
-        <reference local="V_LIABILITY_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      <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_VPREPAYMENT_CBPGROUP">
         <reference local="V_PREPAYMENT_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
@@ -64,8 +58,14 @@
       <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_UNEARNEDREVENUE_CBPGROUP">
-        <reference local="UNEARNEDREVENUE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      <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>
diff --git a/db/ddlutils/model/C_BP_RELATION.xml b/db/ddlutils/model/C_BP_RELATION.xml
index 0e8d150d60..af71b50af9 100644
--- a/db/ddlutils/model/C_BP_RELATION.xml
+++ b/db/ddlutils/model/C_BP_RELATION.xml
@@ -2,24 +2,24 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_BP_RELATION">
-      <column name="C_BP_RELATION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_BP_RELATION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="false" type="ID" 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="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSHIPTO" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISBILLTO" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISPAYFROM" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISREMITTO" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_BPARTNERRELATION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNERRELATION_LOCATION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNERRELATION_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_BPARTNERRELATION_LOCATION_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_BPARTNER" name="CBPARTNER_CBPRELATION">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_BP_VENDOR_ACCT.xml b/db/ddlutils/model/C_BP_VENDOR_ACCT.xml
index 934d78bef8..cbc94bfd20 100644
--- a/db/ddlutils/model/C_BP_VENDOR_ACCT.xml
+++ b/db/ddlutils/model/C_BP_VENDOR_ACCT.xml
@@ -2,33 +2,33 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_BP_VENDOR_ACCT">
-      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="V_LIABILITY_ACCT" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="V_LIABILITY_SERVICES_ACCT" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="V_PREPAYMENT_ACCT" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="V_LIABILITY_ACCT" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="V_LIABILITY_SERVICES_ACCT" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="V_PREPAYMENT_ACCT" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_CBPVENDORACCT">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
       <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_VLIABILITYSERVICES_CBPVENDO">
-        <reference local="V_LIABILITY_SERVICES_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_VLIABILITY_CBPVENDOR">
         <reference local="V_LIABILITY_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>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/C_BP_WITHHOLDING.xml b/db/ddlutils/model/C_BP_WITHHOLDING.xml
index 78bd0ddcf5..adfbca8317 100644
--- a/db/ddlutils/model/C_BP_WITHHOLDING.xml
+++ b/db/ddlutils/model/C_BP_WITHHOLDING.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_BP_WITHHOLDING">
-      <column name="C_BPARTNER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_WITHHOLDING_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_WITHHOLDING_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISMANDATORYWITHHOLDING" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISTEMPORARYEXEMPT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="EXEMPTREASON" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_CALENDAR.xml b/db/ddlutils/model/C_CALENDAR.xml
index b084f8d1b7..3d8e211be9 100644
--- a/db/ddlutils/model/C_CALENDAR.xml
+++ b/db/ddlutils/model/C_CALENDAR.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_CALENDAR">
-      <column name="C_CALENDAR_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CALENDAR_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="C_CALENDARCLIENT">
diff --git a/db/ddlutils/model/C_CAMPAIGN.xml b/db/ddlutils/model/C_CAMPAIGN.xml
index dd0a4ac4df..d6db4309b8 100644
--- a/db/ddlutils/model/C_CAMPAIGN.xml
+++ b/db/ddlutils/model/C_CAMPAIGN.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_CAMPAIGN">
-      <column name="C_CAMPAIGN_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CAMPAIGN_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" 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="C_CHANNEL_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <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="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="COSTS" primaryKey="false" required="true" type="DECIMAL" size="22" 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 7cfa2b1335..b7143c60c5 100644
--- a/db/ddlutils/model/C_CASH.xml
+++ b/db/ddlutils/model/C_CASH.xml
@@ -2,31 +2,31 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_CASH">
-      <column name="C_CASH_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CASH_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_CASHBOOK_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_CASHBOOK_ID" 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="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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="ENDINGBALANCE" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="STATEMENTDIFFERENCE" primaryKey="false" required="false" type="NUMERIC" default="0" 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="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"/>
-      <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER1_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER2_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_ORGTRX_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_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="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"/>
diff --git a/db/ddlutils/model/C_CASHBOOK.xml b/db/ddlutils/model/C_CASHBOOK.xml
index e2e423e929..1d7bdf53bd 100644
--- a/db/ddlutils/model/C_CASHBOOK.xml
+++ b/db/ddlutils/model/C_CASHBOOK.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_CASHBOOK">
-      <column name="C_CASHBOOK_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CASHBOOK_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_CURRENCY" name="CCURRENCY_CCASHBOOK">
         <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_CASHBOOK_ACCT.xml b/db/ddlutils/model/C_CASHBOOK_ACCT.xml
index 31de649d4c..cc5987207b 100644
--- a/db/ddlutils/model/C_CASHBOOK_ACCT.xml
+++ b/db/ddlutils/model/C_CASHBOOK_ACCT.xml
@@ -2,32 +2,26 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_CASHBOOK_ACCT">
-      <column name="C_CASHBOOK_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CASHBOOK_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CB_ASSET_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CB_CASHTRANSFER_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CB_DIFFERENCES_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CB_EXPENSE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CB_RECEIPT_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CB_ASSET_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CB_CASHTRANSFER_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CB_DIFFERENCES_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CB_EXPENSE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CB_RECEIPT_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_CCASHBOOKACCT">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
       <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_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_CBEXPENSE_CCASHBOOK">
         <reference local="CB_EXPENSE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
@@ -37,6 +31,12 @@
       <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>
       <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 32196b894f..80ae094f57 100644
--- a/db/ddlutils/model/C_CASHLINE.xml
+++ b/db/ddlutils/model/C_CASHLINE.xml
@@ -2,25 +2,25 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_CASHLINE">
-      <column name="C_CASHLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CASHLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_CASH_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_CASH_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="CASHTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="C_BANKACCOUNT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CHARGE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AMOUNT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DISCOUNTAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="WRITEOFFAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="C_BANKACCOUNT_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="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="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 245513d117..fd078dd51b 100644
--- a/db/ddlutils/model/C_CHANNEL.xml
+++ b/db/ddlutils/model/C_CHANNEL.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_CHANNEL">
-      <column name="C_CHANNEL_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CHANNEL_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="AD_PRINTCOLOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_PRINTCOLOR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <unique name="C_CHANNEL_NAME">
         <unique-column name="AD_CLIENT_ID"/>
         <unique-column name="NAME"/>
diff --git a/db/ddlutils/model/C_CHARGE.xml b/db/ddlutils/model/C_CHARGE.xml
index 7ae98fccae..d73abcda23 100644
--- a/db/ddlutils/model/C_CHARGE.xml
+++ b/db/ddlutils/model/C_CHARGE.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_CHARGE">
-      <column name="C_CHARGE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CHARGE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="CHARGEAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="CHARGEAMT" primaryKey="false" required="true" type="DECIMAL" size="22" 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" autoIncrement="false"/>
+      <column name="C_TAXCATEGORY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISTAXINCLUDED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_TAXCATEGORY" name="CTAXCATEGORY_CCHARGE">
         <reference local="C_TAXCATEGORY_ID" foreign="C_TAXCATEGORY_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_CHARGE_ACCT.xml b/db/ddlutils/model/C_CHARGE_ACCT.xml
index b9e6de80dc..d4b722778d 100644
--- a/db/ddlutils/model/C_CHARGE_ACCT.xml
+++ b/db/ddlutils/model/C_CHARGE_ACCT.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_CHARGE_ACCT">
-      <column name="C_CHARGE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CHARGE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CH_EXPENSE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CH_REVENUE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CH_EXPENSE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="CH_REVENUE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_CCHARGEACCT">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_CITY.xml b/db/ddlutils/model/C_CITY.xml
index 55ec569c81..0fd4579bd0 100644
--- a/db/ddlutils/model/C_CITY.xml
+++ b/db/ddlutils/model/C_CITY.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_CITY">
-      <column name="C_CITY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CITY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="LOCODE" primaryKey="false" required="false" type="VARCHAR" size="10" autoIncrement="false"/>
       <column name="COORDINATES" primaryKey="false" required="false" type="VARCHAR" size="15" autoIncrement="false"/>
       <column name="POSTAL" primaryKey="false" required="false" type="VARCHAR" size="10" autoIncrement="false"/>
       <column name="AREACODE" primaryKey="false" required="false" type="VARCHAR" size="10" autoIncrement="false"/>
-      <column name="C_COUNTRY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_REGION_ID" primaryKey="false" required="false" type="ID" 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"/>
       <foreign-key foreignTable="AD_CLIENT" name="C_CITYCLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_COMMISSION.xml b/db/ddlutils/model/C_COMMISSION.xml
index 3c7f5e7da6..d06097f844 100644
--- a/db/ddlutils/model/C_COMMISSION.xml
+++ b/db/ddlutils/model/C_COMMISSION.xml
@@ -2,25 +2,25 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_COMMISSION">
-      <column name="C_COMMISSION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_COMMISSION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_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="FREQUENCYTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="DOCBASISTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="LISTDETAILS" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="DATELASTRUN" primaryKey="false" required="false" type="TIMESTAMP" size="7" 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="C_CHARGE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CHARGE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_BPARTNER" name="CBPARTNER_CCOMMISSION">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_COMMISSIONAMT.xml b/db/ddlutils/model/C_COMMISSIONAMT.xml
index 53db975956..a951f9a828 100644
--- a/db/ddlutils/model/C_COMMISSIONAMT.xml
+++ b/db/ddlutils/model/C_COMMISSIONAMT.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_COMMISSIONAMT">
-      <column name="C_COMMISSIONAMT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_COMMISSIONAMT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_COMMISSIONRUN_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_COMMISSIONLINE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CONVERTEDAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="ACTUALQTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="COMMISSIONAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <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"/>
       <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 4d15a05fcf..c47867cb98 100644
--- a/db/ddlutils/model/C_COMMISSIONDETAIL.xml
+++ b/db/ddlutils/model/C_COMMISSIONDETAIL.xml
@@ -2,23 +2,23 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_COMMISSIONDETAIL">
-      <column name="C_COMMISSIONDETAIL_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_COMMISSIONDETAIL_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_COMMISSIONAMT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_COMMISSIONAMT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="REFERENCE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="C_ORDERLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICELINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_ORDERLINE_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="INFO" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="ACTUALAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="CONVERTEDAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="ACTUALQTY" primaryKey="false" required="true" type="NUMERIC" default="0" 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"/>
       <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 7069ecdf16..452889d393 100644
--- a/db/ddlutils/model/C_COMMISSIONLINE.xml
+++ b/db/ddlutils/model/C_COMMISSIONLINE.xml
@@ -2,29 +2,29 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_COMMISSIONLINE">
-      <column name="C_COMMISSIONLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_COMMISSIONLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_COMMISSION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <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="NUMERIC" autoIncrement="false"/>
-      <column name="AMTMULTIPLIER" primaryKey="false" required="true" type="NUMERIC" autoIncrement="false"/>
-      <column name="QTYSUBTRACT" primaryKey="false" required="true" type="NUMERIC" autoIncrement="false"/>
-      <column name="QTYMULTIPLIER" primaryKey="false" required="true" type="NUMERIC" 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="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" autoIncrement="false"/>
-      <column name="M_PRODUCT_CATEGORY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BP_GROUP_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_SALESREGION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="ORG_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="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_BP_GROUP_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_SALESREGION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_ORG" name="ADORGTRX_CCOMMISSIONLINE">
         <reference local="ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_COMMISSIONRUN.xml b/db/ddlutils/model/C_COMMISSIONRUN.xml
index 70f41b6c0a..9d8529fd0f 100644
--- a/db/ddlutils/model/C_COMMISSIONRUN.xml
+++ b/db/ddlutils/model/C_COMMISSIONRUN.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_COMMISSIONRUN">
-      <column name="C_COMMISSIONRUN_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_COMMISSIONRUN_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DOCUMENTNO" primaryKey="false" required="true" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="C_COMMISSION_ID" primaryKey="false" required="true" type="ID" 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="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="GRANDTOTAL" primaryKey="false" required="true" type="DECIMAL" size="22" 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_CONVERSIONTYPE.xml b/db/ddlutils/model/C_CONVERSIONTYPE.xml
index 5095762b37..675b7d8509 100644
--- a/db/ddlutils/model/C_CONVERSIONTYPE.xml
+++ b/db/ddlutils/model/C_CONVERSIONTYPE.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_CONVERSIONTYPE">
-      <column name="C_CONVERSIONTYPE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CONVERSIONTYPE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" 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"/>
diff --git a/db/ddlutils/model/C_CONVERSION_RATE.xml b/db/ddlutils/model/C_CONVERSION_RATE.xml
index 69effe1eb9..2b1787c10b 100644
--- a/db/ddlutils/model/C_CONVERSION_RATE.xml
+++ b/db/ddlutils/model/C_CONVERSION_RATE.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_CONVERSION_RATE">
-      <column name="C_CONVERSION_RATE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CONVERSION_RATE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID_TO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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_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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DIVIDERATE" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_CONVERSIONTYPE_ID" primaryKey="false" required="true" type="ID" 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="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"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_COUNTRY.xml b/db/ddlutils/model/C_COUNTRY.xml
index 8fc5565ac6..4ed7679f81 100644
--- a/db/ddlutils/model/C_COUNTRY.xml
+++ b/db/ddlutils/model/C_COUNTRY.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_COUNTRY">
-      <column name="C_COUNTRY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_COUNTRY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="COUNTRYCODE" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
@@ -21,7 +21,7 @@
       <column name="HASPOSTAL_ADD" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="EXPRESSIONPOSTAL_ADD" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="false" required="false" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DISPLAYSEQUENCELOCAL" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="ISADDRESSLINESREVERSE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISADDRESSLINESLOCALREVERSE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_COUNTRY_TRL.xml b/db/ddlutils/model/C_COUNTRY_TRL.xml
index 62974f6fe5..eec92c1305 100644
--- a/db/ddlutils/model/C_COUNTRY_TRL.xml
+++ b/db/ddlutils/model/C_COUNTRY_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_COUNTRY_TRL">
-      <column name="C_COUNTRY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_COUNTRY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISTRANSLATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" 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"/>
diff --git a/db/ddlutils/model/C_CURRENCY.xml b/db/ddlutils/model/C_CURRENCY.xml
index c0261c6521..6558021829 100644
--- a/db/ddlutils/model/C_CURRENCY.xml
+++ b/db/ddlutils/model/C_CURRENCY.xml
@@ -2,23 +2,23 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_CURRENCY">
-      <column name="C_CURRENCY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CURRENCY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISO_CODE" primaryKey="false" required="true" type="CHAR" size="3" autoIncrement="false"/>
       <column name="CURSYMBOL" primaryKey="false" required="false" type="VARCHAR" size="10" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="true" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="STDPRECISION" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="COSTINGPRECISION" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="STDPRECISION" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="COSTINGPRECISION" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <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="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="EMURATE" primaryKey="false" required="false" type="DECIMAL" size="22" 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_CURRENCY_ACCT.xml b/db/ddlutils/model/C_CURRENCY_ACCT.xml
index 1689d4df63..17e3cfdc2c 100644
--- a/db/ddlutils/model/C_CURRENCY_ACCT.xml
+++ b/db/ddlutils/model/C_CURRENCY_ACCT.xml
@@ -2,37 +2,37 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_CURRENCY_ACCT">
-      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_CURRENCY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="UNREALIZEDGAIN_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="UNREALIZEDLOSS_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="REALIZEDGAIN_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="REALIZEDLOSS_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="UNREALIZEDGAIN_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="UNREALIZEDLOSS_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="REALIZEDGAIN_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="REALIZEDLOSS_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_CCURRENCYACCT">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_CURRENCY" name="CCURRENCY_CCURRENCYACCT">
         <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_REALIZEDGAIN_CCURRENCY">
-        <reference local="REALIZEDGAIN_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_UNREALIZEDGAIN_CCURRENCY">
+        <reference local="UNREALIZEDGAIN_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_REALIZEDLOSS_CCURRENCY">
         <reference local="REALIZEDLOSS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_UNREALIZEDGAIN_CCURRENCY">
-        <reference local="UNREALIZEDGAIN_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_UNREALIZEDLOSS_CCURRENCY">
         <reference local="UNREALIZEDLOSS_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_REALIZEDGAIN_CCURRENCY">
+        <reference local="REALIZEDGAIN_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
+      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/C_CURRENCY_TRL.xml b/db/ddlutils/model/C_CURRENCY_TRL.xml
index 481e170810..8e92ad44a9 100644
--- a/db/ddlutils/model/C_CURRENCY_TRL.xml
+++ b/db/ddlutils/model/C_CURRENCY_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_CURRENCY_TRL">
-      <column name="C_CURRENCY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CURRENCY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISTRANSLATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="CURSYMBOL" primaryKey="false" required="false" type="VARCHAR" size="10" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="true" type="VARCHAR" size="255" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_CYCLE.xml b/db/ddlutils/model/C_CYCLE.xml
index bd1456782b..8d50a935ea 100644
--- a/db/ddlutils/model/C_CYCLE.xml
+++ b/db/ddlutils/model/C_CYCLE.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_CYCLE">
-      <column name="C_CYCLE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CYCLE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_CURRENCY" name="CCURRENCY_CCYCLE">
         <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_CYCLEPHASE.xml b/db/ddlutils/model/C_CYCLEPHASE.xml
index 7893abe0ba..467cd9ad83 100644
--- a/db/ddlutils/model/C_CYCLEPHASE.xml
+++ b/db/ddlutils/model/C_CYCLEPHASE.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_CYCLEPHASE">
-      <column name="C_CYCLESTEP_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_PHASE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CYCLESTEP_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_PHASE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_CYCLESTEP" name="CCYCLESTEP_CCYCLEPHASE">
         <reference local="C_CYCLESTEP_ID" foreign="C_CYCLESTEP_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_CYCLESTEP.xml b/db/ddlutils/model/C_CYCLESTEP.xml
index dd79231ce6..5899c7b141 100644
--- a/db/ddlutils/model/C_CYCLESTEP.xml
+++ b/db/ddlutils/model/C_CYCLESTEP.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_CYCLESTEP">
-      <column name="C_CYCLESTEP_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CYCLESTEP_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_CYCLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="RELATIVEWEIGHT" primaryKey="false" required="true" type="NUMERIC" autoIncrement="false"/>
+      <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="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 74587e4fb1..14d00a8747 100644
--- a/db/ddlutils/model/C_DOCTYPE.xml
+++ b/db/ddlutils/model/C_DOCTYPE.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_DOCTYPE">
-      <column name="C_DOCTYPE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_DOCTYPE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="PRINTNAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
@@ -17,23 +17,23 @@
       <column name="ISSOTRX" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="DOCSUBTYPESO" primaryKey="false" required="false" type="CHAR" size="2" autoIncrement="false"/>
       <column name="HASPROFORMA" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_DOCTYPEPROFORMA_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_DOCTYPESHIPMENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_DOCTYPEINVOICE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_DOCTYPEPROFORMA_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_DOCTYPESHIPMENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_DOCTYPEINVOICE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISDOCNOCONTROLLED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="DOCNOSEQUENCE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="GL_CATEGORY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="DOCNOSEQUENCE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="GL_CATEGORY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="HASCHARGES" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="DOCUMENTNOTE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="ISDEFAULT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="DOCUMENTCOPIES" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="AD_PRINTFORMAT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="DOCUMENTCOPIES" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="AD_PRINTFORMAT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISDEFAULTCOUNTERDOC" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISSHIPCONFIRM" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISPICKQACONFIRM" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISINTRANSIT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISSPLITWHENDIFFERENCE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_DOCTYPEDIFFERENCE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_DOCTYPEDIFFERENCE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISCREATECOUNTER" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISINDEXED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <foreign-key foreignTable="AD_PRINTFORMAT" name="ADPRINTFORMAT_CDOCTYPE">
diff --git a/db/ddlutils/model/C_DOCTYPECOUNTER.xml b/db/ddlutils/model/C_DOCTYPECOUNTER.xml
index 783fbc9506..3d605a5eda 100644
--- a/db/ddlutils/model/C_DOCTYPECOUNTER.xml
+++ b/db/ddlutils/model/C_DOCTYPECOUNTER.xml
@@ -2,28 +2,28 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_DOCTYPECOUNTER">
-      <column name="C_DOCTYPECOUNTER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_DOCTYPECOUNTER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="C_DOCTYPE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="COUNTER_C_DOCTYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_DOCTYPE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="COUNTER_C_DOCTYPE_ID" primaryKey="false" required="false" type="ID" size="10" 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="DOCACTION" primaryKey="false" required="false" type="CHAR" size="2" autoIncrement="false"/>
       <column name="ISCREATECOUNTER" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <foreign-key foreignTable="C_DOCTYPE" name="CDOCTYPECOUNT_CDOCTYPECOUNT">
-        <reference local="COUNTER_C_DOCTYPE_ID" foreign="C_DOCTYPE_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_DOCTYPE" name="CDOCTYPE_CDOCTYPECOUNTER">
         <reference local="C_DOCTYPE_ID" foreign="C_DOCTYPE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_DOCTYPE" name="CDOCTYPECOUNT_CDOCTYPECOUNT">
+        <reference local="COUNTER_C_DOCTYPE_ID" foreign="C_DOCTYPE_ID"/>
+      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/C_DOCTYPE_TRL.xml b/db/ddlutils/model/C_DOCTYPE_TRL.xml
index 62636be4e1..6b252b3b5e 100644
--- a/db/ddlutils/model/C_DOCTYPE_TRL.xml
+++ b/db/ddlutils/model/C_DOCTYPE_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_DOCTYPE_TRL">
-      <column name="C_DOCTYPE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_DOCTYPE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="PRINTNAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DOCUMENTNOTE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_DUNNING.xml b/db/ddlutils/model/C_DUNNING.xml
index 78fa2489b5..ff12b711a5 100644
--- a/db/ddlutils/model/C_DUNNING.xml
+++ b/db/ddlutils/model/C_DUNNING.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_DUNNING">
-      <column name="C_DUNNING_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_DUNNING_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="SENDDUNNINGLETTER" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_DUNNINGLEVEL.xml b/db/ddlutils/model/C_DUNNINGLEVEL.xml
index 8e38aab9be..44b7d89a84 100644
--- a/db/ddlutils/model/C_DUNNINGLEVEL.xml
+++ b/db/ddlutils/model/C_DUNNINGLEVEL.xml
@@ -2,31 +2,31 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_DUNNINGLEVEL">
-      <column name="C_DUNNINGLEVEL_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_DUNNINGLEVEL_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_DUNNING_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_DUNNING_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="PRINTNAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="DAYSAFTERDUE" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="DAYSBETWEENDUNNING" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="DAYSAFTERDUE" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <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="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="INTERESTPERCENT" primaryKey="false" required="false" type="DECIMAL" size="22" 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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DUNNING_PRINTFORMAT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="FEEAMT" primaryKey="false" required="false" type="DECIMAL" size="22" 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"/>
       <column name="ISSHOWALLDUE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISSHOWNOTDUE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISSETCREDITSTOP" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISSETPAYMENTTERM" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_PAYMENTTERM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_PAYMENTTERM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_PRINTFORMAT" name="ADPRINTFORMAT_CDUNNINGLEVEL">
         <reference local="DUNNING_PRINTFORMAT_ID" foreign="AD_PRINTFORMAT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_DUNNINGLEVEL_TRL.xml b/db/ddlutils/model/C_DUNNINGLEVEL_TRL.xml
index 44ad44859a..7f4494a0ae 100644
--- a/db/ddlutils/model/C_DUNNINGLEVEL_TRL.xml
+++ b/db/ddlutils/model/C_DUNNINGLEVEL_TRL.xml
@@ -3,14 +3,14 @@
   <database name="default" defaultIdMethod="none">
     <table name="C_DUNNINGLEVEL_TRL">
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="C_DUNNINGLEVEL_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_DUNNINGLEVEL_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="PRINTNAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="NOTE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="ISTRANSLATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_DUNNINGRUN.xml b/db/ddlutils/model/C_DUNNINGRUN.xml
index e763537154..de61fd33a9 100644
--- a/db/ddlutils/model/C_DUNNINGRUN.xml
+++ b/db/ddlutils/model/C_DUNNINGRUN.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_DUNNINGRUN">
-      <column name="C_DUNNINGRUN_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_DUNNINGRUN_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DUNNINGDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="C_DUNNINGLEVEL_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_DUNNINGLEVEL_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"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="SENDIT" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_DUNNINGRUNENTRY.xml b/db/ddlutils/model/C_DUNNINGRUNENTRY.xml
index 68355b7752..27568f9d0a 100644
--- a/db/ddlutils/model/C_DUNNINGRUNENTRY.xml
+++ b/db/ddlutils/model/C_DUNNINGRUNENTRY.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_DUNNINGRUNENTRY">
-      <column name="C_DUNNINGRUNENTRY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_DUNNINGRUNENTRY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_DUNNINGRUN_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SALESREP_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="AD_USER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <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="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 af58de2827..eddbf7505a 100644
--- a/db/ddlutils/model/C_DUNNINGRUNLINE.xml
+++ b/db/ddlutils/model/C_DUNNINGRUNLINE.xml
@@ -2,27 +2,27 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_DUNNINGRUNLINE">
-      <column name="C_DUNNINGRUNLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_DUNNINGRUNLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_DUNNINGRUNENTRY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PAYMENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="CONVERTEDAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DAYSDUE" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="TIMESDUNNED" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="INTERESTAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="FEEAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="TOTALAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <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="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="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="NUMERIC" autoIncrement="false"/>
+      <column name="OPENAMT" primaryKey="false" required="true" type="DECIMAL" size="22" 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_ELEMENT.xml b/db/ddlutils/model/C_ELEMENT.xml
index 4a660a0d95..94759882b7 100644
--- a/db/ddlutils/model/C_ELEMENT.xml
+++ b/db/ddlutils/model/C_ELEMENT.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_ELEMENT">
-      <column name="C_ELEMENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_ELEMENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="VFORMAT" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="ELEMENTTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="ISBALANCING" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISNATURALACCOUNT" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="AD_TREE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_TREE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="ADCLIENT_CELEMENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_ELEMENTVALUE.xml b/db/ddlutils/model/C_ELEMENTVALUE.xml
index a2cde0a9be..5e4187bbf3 100644
--- a/db/ddlutils/model/C_ELEMENTVALUE.xml
+++ b/db/ddlutils/model/C_ELEMENTVALUE.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_ELEMENTVALUE">
-      <column name="C_ELEMENTVALUE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_ELEMENTVALUE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" 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="ACCOUNTTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="ACCOUNTSIGN" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="ISDOCCONTROLLED" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_ELEMENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_ELEMENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSUMMARY" primaryKey="false" required="true" type="CHAR" size="1" default="N" 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"/>
@@ -25,9 +25,9 @@
       <column name="POSTENCUMBRANCE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="POSTSTATISTICAL" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISBANKACCOUNT" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_BANKACCOUNT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BANKACCOUNT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISFOREIGNCURRENCY" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="ADCLIENT_CELEMENTVALUE">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_ELEMENTVALUE_TRL.xml b/db/ddlutils/model/C_ELEMENTVALUE_TRL.xml
index feb5e94448..a5d60d1f8d 100644
--- a/db/ddlutils/model/C_ELEMENTVALUE_TRL.xml
+++ b/db/ddlutils/model/C_ELEMENTVALUE_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_ELEMENTVALUE_TRL">
-      <column name="C_ELEMENTVALUE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_ELEMENTVALUE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="ISTRANSLATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_GREETING.xml b/db/ddlutils/model/C_GREETING.xml
index 9aaf37045a..690bf760a0 100644
--- a/db/ddlutils/model/C_GREETING.xml
+++ b/db/ddlutils/model/C_GREETING.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_GREETING">
-      <column name="C_GREETING_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_GREETING_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="GREETING" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ISFIRSTNAMEONLY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_GREETING_TRL.xml b/db/ddlutils/model/C_GREETING_TRL.xml
index aca073a403..e88cd5b835 100644
--- a/db/ddlutils/model/C_GREETING_TRL.xml
+++ b/db/ddlutils/model/C_GREETING_TRL.xml
@@ -3,14 +3,14 @@
   <database name="default" defaultIdMethod="none">
     <table name="C_GREETING_TRL">
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="C_GREETING_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_GREETING_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="GREETING" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ISTRANSLATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_INTERORG_ACCT.xml b/db/ddlutils/model/C_INTERORG_ACCT.xml
index cd20138396..cd5c4f80bc 100644
--- a/db/ddlutils/model/C_INTERORG_ACCT.xml
+++ b/db/ddlutils/model/C_INTERORG_ACCT.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_INTERORG_ACCT">
-      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORGTO_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORGTO_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="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="INTERCOMPANYDUETO_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="INTERCOMPANYDUEFROM_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <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>
diff --git a/db/ddlutils/model/C_INVOICE.xml b/db/ddlutils/model/C_INVOICE.xml
index 21a8c0ab44..56a3ad4c08 100644
--- a/db/ddlutils/model/C_INVOICE.xml
+++ b/db/ddlutils/model/C_INVOICE.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_INVOICE">
-      <column name="C_INVOICE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_INVOICE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSOTRX" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="DOCUMENTNO" primaryKey="false" required="true" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="DOCSTATUS" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
@@ -17,49 +17,49 @@
       <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"/>
-      <column name="C_DOCTYPE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_DOCTYPETARGET_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ORDER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_DOCTYPE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_DOCTYPETARGET_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="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="ISAPPROVED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISTRANSFERRED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISPRINTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="SALESREP_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="SALESREP_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DATEINVOICED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATEPRINTED" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATEACCT" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="true" type="ID" 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="POREFERENCE" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="ISDISCOUNTPRINTED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="DATEORDERED" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="PAYMENTRULE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="C_PAYMENTTERM_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_CHARGE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="CHARGEAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="TOTALLINES" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="GRANDTOTAL" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="M_PRICELIST_ID" primaryKey="false" required="true" type="ID" 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="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" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_CAMPAIGN_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_ACTIVITY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISPAID" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_PAYMENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CASHLINE_ID" primaryKey="false" required="false" type="ID" 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="CREATEFROM" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="GENERATETO" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="SENDEMAIL" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_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="ISSELFSERVICE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER1_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER2_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CONVERSIONTYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_ORGTRX_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="C_CONVERSIONTYPE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISPAYSCHEDULEVALID" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="REF_INVOICE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="REF_INVOICE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISINDISPUTE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="INVOICECOLLECTIONTYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <foreign-key foreignTable="AD_ORG" name="ADORGTRX_CINVOICE">
diff --git a/db/ddlutils/model/C_INVOICEBATCH.xml b/db/ddlutils/model/C_INVOICEBATCH.xml
index 75abceb953..6c36ace508 100644
--- a/db/ddlutils/model/C_INVOICEBATCH.xml
+++ b/db/ddlutils/model/C_INVOICEBATCH.xml
@@ -2,23 +2,23 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_INVOICEBATCH">
-      <column name="C_INVOICEBATCH_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_INVOICEBATCH_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DOCUMENTNO" primaryKey="false" required="true" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="DATEDOC" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="ISSOTRX" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="SALESREP_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_CONVERSIONTYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="CONTROLAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DOCUMENTAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <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="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 e1cb07a62b..579f39a365 100644
--- a/db/ddlutils/model/C_INVOICEBATCHLINE.xml
+++ b/db/ddlutils/model/C_INVOICEBATCHLINE.xml
@@ -2,39 +2,39 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_INVOICEBATCHLINE">
-      <column name="C_INVOICEBATCHLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_INVOICEBATCHLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICEBATCH_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="C_DOCTYPE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_INVOICEBATCH_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="C_DOCTYPE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DOCUMENTNO" primaryKey="false" required="true" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="DATEINVOICED" 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_BPARTNER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CHARGE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="QTYENTERED" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PRICEENTERED" primaryKey="false" required="true" type="NUMERIC" default="0" 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="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="ISTAXINCLUDED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="LINENETAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_TAX_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="TAXAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="LINETOTALAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER1_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER2_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="LINENETAMT" primaryKey="false" required="true" type="DECIMAL" size="22" 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="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"/>
+      <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="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_INVOICE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICELINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_INVOICE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_INVOICELINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <foreign-key foreignTable="AD_ORG" name="ADORGTRX_CINVOICEBATCHLINE">
         <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
diff --git a/db/ddlutils/model/C_INVOICELINE.xml b/db/ddlutils/model/C_INVOICELINE.xml
index 9ac92af4da..c53045fa74 100644
--- a/db/ddlutils/model/C_INVOICELINE.xml
+++ b/db/ddlutils/model/C_INVOICELINE.xml
@@ -2,49 +2,49 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_INVOICELINE">
-      <column name="C_INVOICELINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_INVOICELINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ORDERLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_INOUTLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="C_ORDERLINE_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"/>
+      <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" autoIncrement="false"/>
-      <column name="QTYINVOICED" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PRICELIST" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PRICEACTUAL" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PRICELIMIT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="LINENETAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_CHARGE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_UOM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_TAX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="S_RESOURCEASSIGNMENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="A_ASSET_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="TAXAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="ID" default="0" 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="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="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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="REF_INVOICELINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="LINETOTALAMT" primaryKey="false" required="false" type="DECIMAL" size="22" 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="NUMERIC" autoIncrement="false"/>
-      <column name="PRICEENTERED" primaryKey="false" required="true" type="NUMERIC" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECTPHASE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECTTASK_ID" primaryKey="false" required="false" type="ID" 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="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="NUMERIC" autoIncrement="false"/>
-      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER1_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER2_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="RRAMT" primaryKey="false" required="false" type="DECIMAL" size="22" 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>
diff --git a/db/ddlutils/model/C_INVOICEPAYSCHEDULE.xml b/db/ddlutils/model/C_INVOICEPAYSCHEDULE.xml
index 721fd631be..94177ad28d 100644
--- a/db/ddlutils/model/C_INVOICEPAYSCHEDULE.xml
+++ b/db/ddlutils/model/C_INVOICEPAYSCHEDULE.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_INVOICEPAYSCHEDULE">
-      <column name="C_INVOICEPAYSCHEDULE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_INVOICEPAYSCHEDULE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_PAYSCHEDULE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="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="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="DUEAMT" primaryKey="false" required="true" type="DECIMAL" size="22" 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="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="DISCOUNTAMT" primaryKey="false" required="true" type="DECIMAL" size="22" 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 b506ddbf59..3a1fbeb351 100644
--- a/db/ddlutils/model/C_INVOICESCHEDULE.xml
+++ b/db/ddlutils/model/C_INVOICESCHEDULE.xml
@@ -2,24 +2,24 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_INVOICESCHEDULE">
-      <column name="C_INVOICESCHEDULE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_INVOICESCHEDULE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="AMT" primaryKey="false" required="false" type="DECIMAL" size="22" 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"/>
       <column name="EVENINVOICEWEEK" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="INVOICEDAY" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="INVOICEDAYCUTOFF" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="INVOICEDAY" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="INVOICEDAYCUTOFF" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ISDEFAULT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
diff --git a/db/ddlutils/model/C_INVOICETAX.xml b/db/ddlutils/model/C_INVOICETAX.xml
index cb0289be23..78c1408d7c 100644
--- a/db/ddlutils/model/C_INVOICETAX.xml
+++ b/db/ddlutils/model/C_INVOICETAX.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_INVOICETAX">
-      <column name="C_TAX_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_TAX_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_INVOICE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="TAXBASEAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="TAXAMT" primaryKey="false" required="true" type="NUMERIC" default="0" 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="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_JOB.xml b/db/ddlutils/model/C_JOB.xml
index af18c5aa5b..adc8dd102f 100644
--- a/db/ddlutils/model/C_JOB.xml
+++ b/db/ddlutils/model/C_JOB.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_JOB">
-      <column name="C_JOB_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_JOB_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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_JOBCATEGORY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_JOBCATEGORY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISEMPLOYEE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="C_JOBCATEGORY" name="CJOBCATEGORY_CJOB">
         <reference local="C_JOBCATEGORY_ID" foreign="C_JOBCATEGORY_ID"/>
diff --git a/db/ddlutils/model/C_JOBASSIGNMENT.xml b/db/ddlutils/model/C_JOBASSIGNMENT.xml
index 3976b182dd..e833445bff 100644
--- a/db/ddlutils/model/C_JOBASSIGNMENT.xml
+++ b/db/ddlutils/model/C_JOBASSIGNMENT.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_JOBASSIGNMENT">
-      <column name="C_JOBASSIGNMENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_JOBASSIGNMENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_JOB_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_JOB_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="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_JOBCATEGORY.xml b/db/ddlutils/model/C_JOBCATEGORY.xml
index c7cb246fd0..8eb1ee390f 100644
--- a/db/ddlutils/model/C_JOBCATEGORY.xml
+++ b/db/ddlutils/model/C_JOBCATEGORY.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_JOBCATEGORY">
-      <column name="C_JOBCATEGORY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_JOBCATEGORY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_JOBREMUNERATION.xml b/db/ddlutils/model/C_JOBREMUNERATION.xml
index 8f5c801cb7..8abaf63dec 100644
--- a/db/ddlutils/model/C_JOBREMUNERATION.xml
+++ b/db/ddlutils/model/C_JOBREMUNERATION.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_JOBREMUNERATION">
-      <column name="C_JOBREMUNERATION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_JOBREMUNERATION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_JOB_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_REMUNERATION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_JOB_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <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="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_LANDEDCOST.xml b/db/ddlutils/model/C_LANDEDCOST.xml
index 68924bbfd6..cd17720aee 100644
--- a/db/ddlutils/model/C_LANDEDCOST.xml
+++ b/db/ddlutils/model/C_LANDEDCOST.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_LANDEDCOST">
-      <column name="C_LANDEDCOST_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_LANDEDCOST_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="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="C_INVOICELINE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_COSTELEMENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_INOUTLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_INOUT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_INVOICELINE_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="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_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="LANDEDCOSTDISTRIBUTION" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <foreign-key foreignTable="C_INVOICELINE" name="CINVOICELINE_CLANDEDCOST">
diff --git a/db/ddlutils/model/C_LANDEDCOSTALLOCATION.xml b/db/ddlutils/model/C_LANDEDCOSTALLOCATION.xml
index 5004d3f177..d2802511b2 100644
--- a/db/ddlutils/model/C_LANDEDCOSTALLOCATION.xml
+++ b/db/ddlutils/model/C_LANDEDCOSTALLOCATION.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_LANDEDCOSTALLOCATION">
-      <column name="C_LANDEDCOSTALLOCATION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_LANDEDCOSTALLOCATION_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="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICELINE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_COSTELEMENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="BASE" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_INVOICELINE_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="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"/>
       <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_LOCATION.xml b/db/ddlutils/model/C_LOCATION.xml
index ac4110be64..a25adc3917 100644
--- a/db/ddlutils/model/C_LOCATION.xml
+++ b/db/ddlutils/model/C_LOCATION.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_LOCATION">
-      <column name="C_LOCATION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_LOCATION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ADDRESS1" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ADDRESS2" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="CITY" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="POSTAL" primaryKey="false" required="false" type="VARCHAR" size="10" autoIncrement="false"/>
       <column name="POSTAL_ADD" primaryKey="false" required="false" type="VARCHAR" size="10" autoIncrement="false"/>
-      <column name="C_COUNTRY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_REGION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_COUNTRY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_REGION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_CITY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="REGIONNAME" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="ADDRESS3" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ADDRESS4" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_NONBUSINESSDAY.xml b/db/ddlutils/model/C_NONBUSINESSDAY.xml
index 4692e388fa..b9644d9247 100644
--- a/db/ddlutils/model/C_NONBUSINESSDAY.xml
+++ b/db/ddlutils/model/C_NONBUSINESSDAY.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_NONBUSINESSDAY">
-      <column name="C_NONBUSINESSDAY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_NONBUSINESSDAY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DATE1" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="C_CALENDAR_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CALENDAR_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="C_NONBUSINESDAYSCLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_ORDER.xml b/db/ddlutils/model/C_ORDER.xml
index c55af67b56..9ac3e318f6 100644
--- a/db/ddlutils/model/C_ORDER.xml
+++ b/db/ddlutils/model/C_ORDER.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_ORDER">
-      <column name="C_ORDER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_ORDER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSOTRX" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="DOCUMENTNO" primaryKey="false" required="true" type="VARCHAR" size="30" 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="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="C_DOCTYPE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_DOCTYPETARGET_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_DOCTYPE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_DOCTYPETARGET_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="Y" autoIncrement="false"/>
       <column name="ISCREDITAPPROVED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
@@ -26,55 +26,55 @@
       <column name="ISPRINTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISTRANSFERRED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISSELECTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="SALESREP_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="SALESREP_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DATEORDERED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATEPROMISED" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATEPRINTED" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATEACCT" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="true" type="ID" 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="POREFERENCE" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="ISDISCOUNTPRINTED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="PAYMENTRULE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="C_PAYMENTTERM_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_PAYMENTTERM_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <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="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="FREIGHTAMT" primaryKey="false" required="false" type="DECIMAL" size="22" 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" autoIncrement="false"/>
-      <column name="C_CHARGE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="CHARGEAMT" primaryKey="false" required="false" type="NUMERIC" default="0" 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="PRIORITYRULE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="TOTALLINES" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="GRANDTOTAL" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="M_WAREHOUSE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRICELIST_ID" primaryKey="false" required="true" type="ID" 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="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"/>
-      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_CAMPAIGN_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_ACTIVITY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="POSTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_PAYMENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CASHLINE_ID" primaryKey="false" required="false" type="ID" 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="SENDEMAIL" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_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="ISSELFSERVICE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER1_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER2_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CONVERSIONTYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="BILL_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="BILL_LOCATION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="BILL_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="PAY_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="PAY_LOCATION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="REF_ORDER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_ORGTRX_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="C_CONVERSIONTYPE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="BILL_BPARTNER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="BILL_LOCATION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="BILL_USER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="PAY_BPARTNER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <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="NUMERIC" autoIncrement="false"/>
-      <column name="WEIGHT" primaryKey="false" required="false" type="NUMERIC" 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>
@@ -96,21 +96,21 @@
       <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" name="CBPARTNERPAY_CORDER">
         <reference local="PAY_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_BPARTNER" name="CBPARTNER_CORDER">
+        <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_BPARTNER_LOCATION" name="CBPARTNERLOCATION_CORDER">
         <reference local="C_BPARTNER_LOCATION_ID" foreign="C_BPARTNER_LOCATION_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="C_BPARTNER_LOCATION" name="CBPLOCATIONPAY_CORDER">
-        <reference local="PAY_LOCATION_ID" foreign="C_BPARTNER_LOCATION_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="C_BPARTNER_LOCATION" name="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_CAMPAIGN" name="CCAMPAIGN_CORDER">
         <reference local="C_CAMPAIGN_ID" foreign="C_CAMPAIGN_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_ORDERLINE.xml b/db/ddlutils/model/C_ORDERLINE.xml
index c7936b4adc..857230fdf3 100644
--- a/db/ddlutils/model/C_ORDERLINE.xml
+++ b/db/ddlutils/model/C_ORDERLINE.xml
@@ -2,59 +2,59 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_ORDERLINE">
-      <column name="C_ORDERLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_ORDERLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ORDER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ORDER_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="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DATEORDERED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATEPROMISED" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATEDELIVERED" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATEINVOICED" 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="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_WAREHOUSE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_UOM_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="QTYORDERED" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="QTYRESERVED" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="QTYDELIVERED" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="QTYINVOICED" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="M_SHIPPER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="PRICELIST" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PRICEACTUAL" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PRICELIMIT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="LINENETAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DISCOUNT" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="FREIGHTAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_CHARGE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_TAX_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="S_RESOURCEASSIGNMENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="REF_ORDERLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="ID" default="0" autoIncrement="false"/>
+      <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="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="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"/>
+      <column name="REF_ORDERLINE_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="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="NUMERIC" autoIncrement="false"/>
-      <column name="PRICEENTERED" primaryKey="false" required="true" type="NUMERIC" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="PRICECOST" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="QTYLOSTSALES" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_PROJECTPHASE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECTTASK_ID" primaryKey="false" required="false" type="ID" 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="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="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="NUMERIC" autoIncrement="false"/>
-      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER1_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER2_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="RRAMT" primaryKey="false" required="false" type="DECIMAL" size="22" 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_CORDERLINE">
         <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_ORDERTAX.xml b/db/ddlutils/model/C_ORDERTAX.xml
index 212eefcd3b..5b494729bb 100644
--- a/db/ddlutils/model/C_ORDERTAX.xml
+++ b/db/ddlutils/model/C_ORDERTAX.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_ORDERTAX">
-      <column name="C_ORDER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_TAX_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_ORDER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_TAX_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="TAXBASEAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="TAXAMT" primaryKey="false" required="true" type="NUMERIC" default="0" 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="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_ORGASSIGNMENT.xml b/db/ddlutils/model/C_ORGASSIGNMENT.xml
index 9be4a969e2..35d78b08b5 100644
--- a/db/ddlutils/model/C_ORGASSIGNMENT.xml
+++ b/db/ddlutils/model/C_ORGASSIGNMENT.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_ORGASSIGNMENT">
-      <column name="C_ORGASSIGNMENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_ORGASSIGNMENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_USER_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="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_PAYMENT.xml b/db/ddlutils/model/C_PAYMENT.xml
index 17fe98a0ac..1819728965 100644
--- a/db/ddlutils/model/C_PAYMENT.xml
+++ b/db/ddlutils/model/C_PAYMENT.xml
@@ -2,30 +2,30 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_PAYMENT">
-      <column name="C_PAYMENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_PAYMENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DOCUMENTNO" primaryKey="false" required="true" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="DATETRX" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="ISRECEIPT" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="C_DOCTYPE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_DOCTYPE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="TRXTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="C_BANKACCOUNT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BP_BANKACCOUNT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PAYMENTBATCH_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BANKACCOUNT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_BPARTNER_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_BP_BANKACCOUNT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_PAYMENTBATCH_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="TENDERTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="CREDITCARDTYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="CREDITCARDNUMBER" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="CREDITCARDVV" primaryKey="false" required="false" type="VARCHAR" size="4" autoIncrement="false"/>
-      <column name="CREDITCARDEXPMM" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="CREDITCARDEXPYY" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="CREDITCARDEXPMM" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="CREDITCARDEXPYY" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="MICR" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="ROUTINGNO" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="ACCOUNTNO" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
@@ -41,11 +41,11 @@
       <column name="VOICEAUTHCODE" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <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" autoIncrement="false"/>
-      <column name="PAYAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DISCOUNTAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="WRITEOFFAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="TAXAMT" primaryKey="false" required="false" type="NUMERIC" default="0" 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="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,28 +64,28 @@
       <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="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="OVERUNDERAMT" primaryKey="false" required="false" type="DECIMAL" size="22" 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" 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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_CHARGE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CHARGEAMT" primaryKey="false" required="false" type="DECIMAL" size="22" 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"/>
       <column name="R_CVV2MATCH" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="R_PNREF_DC" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="SWIPE" primaryKey="false" required="false" type="VARCHAR" size="80" autoIncrement="false"/>
-      <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER1_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER2_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CONVERSIONTYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_ORGTRX_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"/>
+      <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="C_CONVERSIONTYPE_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="DATEACCT" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="C_ORDER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <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" 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>
diff --git a/db/ddlutils/model/C_PAYMENTALLOCATE.xml b/db/ddlutils/model/C_PAYMENTALLOCATE.xml
index 34a3b06cba..dbfec6b0b0 100644
--- a/db/ddlutils/model/C_PAYMENTALLOCATE.xml
+++ b/db/ddlutils/model/C_PAYMENTALLOCATE.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_PAYMENTALLOCATE">
-      <column name="C_PAYMENTALLOCATE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_PAYMENTALLOCATE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_PAYMENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AMOUNT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DISCOUNTAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="WRITEOFFAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="OVERUNDERAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="INVOICEAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_ALLOCATIONLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <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="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"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_PAYMENTBATCH.xml b/db/ddlutils/model/C_PAYMENTBATCH.xml
index 0a6dc316bf..9f3177293a 100644
--- a/db/ddlutils/model/C_PAYMENTBATCH.xml
+++ b/db/ddlutils/model/C_PAYMENTBATCH.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_PAYMENTBATCH">
-      <column name="C_PAYMENTBATCH_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_PAYMENTBATCH_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="C_PAYMENTPROCESSOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_PAYMENTPROCESSOR_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="PROCESSINGDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_PAYMENTPROCESSOR.xml b/db/ddlutils/model/C_PAYMENTPROCESSOR.xml
index 652a0dd1e3..ba71ff4c84 100644
--- a/db/ddlutils/model/C_PAYMENTPROCESSOR.xml
+++ b/db/ddlutils/model/C_PAYMENTPROCESSOR.xml
@@ -2,25 +2,25 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_PAYMENTPROCESSOR">
-      <column name="C_PAYMENTPROCESSOR_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_PAYMENTPROCESSOR_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="C_BANKACCOUNT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_SEQUENCE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BANKACCOUNT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_SEQUENCE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PAYPROCESSORCLASS" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="USERID" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="PASSWORD" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="HOSTADDRESS" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="HOSTPORT" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="HOSTPORT" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="PROXYADDRESS" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="PROXYPORT" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="PROXYPORT" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="PROXYLOGON" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="PROXYPASSWORD" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ACCEPTVISA" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
@@ -32,12 +32,12 @@
       <column name="ACCEPTCHECK" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <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" autoIncrement="false"/>
-      <column name="COSTPERTRX" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="COMMISSION" primaryKey="false" required="true" type="NUMERIC" 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="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="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="MINIMUMAMT" primaryKey="false" required="false" type="DECIMAL" size="22" 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">
diff --git a/db/ddlutils/model/C_PAYMENTTERM.xml b/db/ddlutils/model/C_PAYMENTTERM.xml
index c70fe697ce..73aa372f7c 100644
--- a/db/ddlutils/model/C_PAYMENTTERM.xml
+++ b/db/ddlutils/model/C_PAYMENTTERM.xml
@@ -2,28 +2,28 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_PAYMENTTERM">
-      <column name="C_PAYMENTTERM_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_PAYMENTTERM_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="DOCUMENTNOTE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="AFTERDELIVERY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISDUEFIXED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="NETDAYS" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="GRACEDAYS" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="FIXMONTHCUTOFF" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="FIXMONTHDAY" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="FIXMONTHOFFSET" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="DISCOUNTDAYS" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="DISCOUNT" primaryKey="false" required="true" type="NUMERIC" autoIncrement="false"/>
-      <column name="DISCOUNTDAYS2" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="DISCOUNT2" primaryKey="false" required="true" type="NUMERIC" autoIncrement="false"/>
+      <column name="NETDAYS" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="GRACEDAYS" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="FIXMONTHCUTOFF" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
+      <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="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="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_PAYMENTTERM_TRL.xml b/db/ddlutils/model/C_PAYMENTTERM_TRL.xml
index ee63e35917..c1dd0a39a8 100644
--- a/db/ddlutils/model/C_PAYMENTTERM_TRL.xml
+++ b/db/ddlutils/model/C_PAYMENTTERM_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_PAYMENTTERM_TRL">
-      <column name="C_PAYMENTTERM_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_PAYMENTTERM_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="DOCUMENTNOTE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_PAYSCHEDULE.xml b/db/ddlutils/model/C_PAYSCHEDULE.xml
index 1965f0c33b..3518595586 100644
--- a/db/ddlutils/model/C_PAYSCHEDULE.xml
+++ b/db/ddlutils/model/C_PAYSCHEDULE.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_PAYSCHEDULE">
-      <column name="C_PAYSCHEDULE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_PAYSCHEDULE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_PAYMENTTERM_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="PERCENTAGE" primaryKey="false" required="true" type="NUMERIC" autoIncrement="false"/>
-      <column name="NETDAYS" primaryKey="false" required="true" type="INTEGER" 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="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="INTEGER" autoIncrement="false"/>
-      <column name="DISCOUNT" primaryKey="false" required="true" type="NUMERIC" 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="ISVALID" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="GRACEDAYS" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="GRACEDAYS" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_PAYMENTTERM" name="CPAYMENTTERM_CPAYSCHEDULE">
         <reference local="C_PAYMENTTERM_ID" foreign="C_PAYMENTTERM_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_PAYSELECTION.xml b/db/ddlutils/model/C_PAYSELECTION.xml
index 72931f07be..a0057aca22 100644
--- a/db/ddlutils/model/C_PAYSELECTION.xml
+++ b/db/ddlutils/model/C_PAYSELECTION.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_PAYSELECTION">
-      <column name="C_PAYSELECTION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_PAYSELECTION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="C_BANKACCOUNT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <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="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="TOTALAMT" primaryKey="false" required="true" type="DECIMAL" size="22" 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 88b7eee992..cf18a65659 100644
--- a/db/ddlutils/model/C_PAYSELECTIONCHECK.xml
+++ b/db/ddlutils/model/C_PAYSELECTIONCHECK.xml
@@ -2,26 +2,26 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_PAYSELECTIONCHECK">
-      <column name="C_PAYSELECTIONCHECK_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_PAYSELECTIONCHECK_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_PAYSELECTION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="PAYAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_PAYMENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <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="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="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="DISCOUNTAMT" primaryKey="false" required="true" type="DECIMAL" size="22" 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" 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">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_PAYSELECTIONLINE.xml b/db/ddlutils/model/C_PAYSELECTIONLINE.xml
index 7a7e4d8195..cf3e50391b 100644
--- a/db/ddlutils/model/C_PAYSELECTIONLINE.xml
+++ b/db/ddlutils/model/C_PAYSELECTIONLINE.xml
@@ -2,26 +2,26 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_PAYSELECTIONLINE">
-      <column name="C_PAYSELECTIONLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_PAYSELECTIONLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_PAYSELECTION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <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="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="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" autoIncrement="false"/>
-      <column name="PAYAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DIFFERENCEAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_PAYSELECTIONCHECK_ID" primaryKey="false" required="false" type="ID" 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="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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="OPENAMT" primaryKey="false" required="true" type="NUMERIC" default="0" 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="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"/>
@@ -36,10 +36,10 @@
         <index-column name="C_PAYSELECTION_ID"/>
       </index>
       <check>
-        <rule><![CDATA[IsManual in ('Y','N')]]></rule>
+        <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
       <check>
-        <rule><![CDATA[IsActive in ('Y','N')]]></rule>
+        <rule><![CDATA[IsManual in ('Y','N')]]></rule>
       </check>
     </table>
   </database>
diff --git a/db/ddlutils/model/C_PERIOD.xml b/db/ddlutils/model/C_PERIOD.xml
index b52bef17ba..f7dbcd8f19 100644
--- a/db/ddlutils/model/C_PERIOD.xml
+++ b/db/ddlutils/model/C_PERIOD.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_PERIOD">
-      <column name="C_PERIOD_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_PERIOD_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="PERIODNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="C_YEAR_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="PERIODNO" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="C_YEAR_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="ENDDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="PERIODTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_PERIODCONTROL.xml b/db/ddlutils/model/C_PERIODCONTROL.xml
index c82e016703..df25f4c47e 100644
--- a/db/ddlutils/model/C_PERIODCONTROL.xml
+++ b/db/ddlutils/model/C_PERIODCONTROL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_PERIODCONTROL">
-      <column name="C_PERIODCONTROL_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_PERIODCONTROL_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_PERIOD_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="DOCBASETYPE" primaryKey="false" required="true" type="CHAR" size="3" autoIncrement="false"/>
       <column name="PERIODSTATUS" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="PERIODACTION" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_PHASE.xml b/db/ddlutils/model/C_PHASE.xml
index 90a9ef7768..2de1d88d74 100644
--- a/db/ddlutils/model/C_PHASE.xml
+++ b/db/ddlutils/model/C_PHASE.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_PHASE">
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="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="C_PROJECTTYPE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="STANDARDQTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_PHASE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" 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="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">
         <reference local="C_PROJECTTYPE_ID" foreign="C_PROJECTTYPE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_POS.xml b/db/ddlutils/model/C_POS.xml
index 2ca2f6505e..268b1bc74d 100644
--- a/db/ddlutils/model/C_POS.xml
+++ b/db/ddlutils/model/C_POS.xml
@@ -2,26 +2,26 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_POS">
-      <column name="C_POS_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_POS_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="SALESREP_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRICELIST_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_CASHBOOK_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_WAREHOUSE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="SALESREP_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="C_CASHBOOK_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_WAREHOUSE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="PRINTERNAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="C_POSKEYLAYOUT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_POSKEYLAYOUT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISMODIFYPRICE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_BPARTNERCASHTRX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_DOCTYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNERCASHTRX_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"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_CPOS">
         <reference local="SALESREP_ID" foreign="AD_USER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_POSKEY.xml b/db/ddlutils/model/C_POSKEY.xml
index f3059b9d94..c269f3c224 100644
--- a/db/ddlutils/model/C_POSKEY.xml
+++ b/db/ddlutils/model/C_POSKEY.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_POSKEY">
-      <column name="C_POSKEY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_POSKEY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="C_POSKEYLAYOUT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="NUMERIC" autoIncrement="false"/>
-      <column name="AD_PRINTCOLOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <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="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"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_POSKEYLAYOUT.xml b/db/ddlutils/model/C_POSKEYLAYOUT.xml
index f4f0ddf574..92380cf416 100644
--- a/db/ddlutils/model/C_POSKEYLAYOUT.xml
+++ b/db/ddlutils/model/C_POSKEYLAYOUT.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_POSKEYLAYOUT">
-      <column name="C_POSKEYLAYOUT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_POSKEYLAYOUT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_PROJECT.xml b/db/ddlutils/model/C_PROJECT.xml
index 9bd35b5ce8..e3d62044de 100644
--- a/db/ddlutils/model/C_PROJECT.xml
+++ b/db/ddlutils/model/C_PROJECT.xml
@@ -2,49 +2,49 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_PROJECT">
-      <column name="C_PROJECT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_PROJECT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" 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="NOTE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="ISSUMMARY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_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="C_BPARTNER_LOCATION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="POREFERENCE" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
-      <column name="C_PAYMENTTERM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRICELIST_VERSION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_PAYMENTTERM_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="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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PLANNEDQTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PLANNEDMARGINAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="COMMITTEDAMT" primaryKey="false" required="true" type="NUMERIC" default="0" 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="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"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="SALESREP_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <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" autoIncrement="false"/>
-      <column name="COMMITTEDQTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="INVOICEDAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="INVOICEDQTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PROJECTBALANCEAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_PHASE_ID" primaryKey="false" required="false" type="ID" 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="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" autoIncrement="false"/>
+      <column name="M_WAREHOUSE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PROJECTCATEGORY" 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="C_BPARTNERSR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNERSR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PROJINVOICERULE" primaryKey="false" required="true" type="CHAR" size="1" default="-" autoIncrement="false"/>
       <column name="PROJECTLINELEVEL" primaryKey="false" required="true" type="CHAR" size="1" default="P" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="ADCLIENT_CPROJECT">
diff --git a/db/ddlutils/model/C_PROJECTISSUE.xml b/db/ddlutils/model/C_PROJECTISSUE.xml
index fc386ccdd5..3dfbe29aad 100644
--- a/db/ddlutils/model/C_PROJECTISSUE.xml
+++ b/db/ddlutils/model/C_PROJECTISSUE.xml
@@ -2,26 +2,26 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_PROJECTISSUE">
-      <column name="C_PROJECTISSUE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_PROJECTISSUE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="ID" default="0" autoIncrement="false"/>
-      <column name="M_LOCATOR_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="MOVEMENTQTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <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="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="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"/>
       <column name="MOVEMENTDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="S_TIMEEXPENSELINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_INOUTLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="S_TIMEEXPENSELINE_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"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <foreign-key foreignTable="C_PROJECT" name="CPROJECT_CPROJECTISSUE">
         <reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
diff --git a/db/ddlutils/model/C_PROJECTISSUEMA.xml b/db/ddlutils/model/C_PROJECTISSUEMA.xml
index dc0a767cb4..71d7e84a42 100644
--- a/db/ddlutils/model/C_PROJECTISSUEMA.xml
+++ b/db/ddlutils/model/C_PROJECTISSUEMA.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_PROJECTISSUEMA">
-      <column name="C_PROJECTISSUE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_PROJECTISSUE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="MOVEMENTQTY" primaryKey="false" required="true" type="NUMERIC" default="0" 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"/>
       <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 83bb80a3f4..3f59666e96 100644
--- a/db/ddlutils/model/C_PROJECTLINE.xml
+++ b/db/ddlutils/model/C_PROJECTLINE.xml
@@ -2,35 +2,35 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_PROJECTLINE">
-      <column name="C_PROJECTLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_PROJECTLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PLANNEDPRICE" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PLANNEDAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PLANNEDMARGINAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="COMMITTEDAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_CATEGORY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="INVOICEDAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="INVOICEDQTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="COMMITTEDQTY" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_PROJECTISSUE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ORDER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ORDERPO_ID" primaryKey="false" required="false" type="ID" 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="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="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"/>
       <column name="ISPRINTED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="DOPRICING" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="C_PROJECTPHASE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECTTASK_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_PROJECTPHASE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_PROJECTTASK_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_ORDER" name="CORDERPO_CPROJECTLINE">
         <reference local="C_ORDERPO_ID" foreign="C_ORDER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_PROJECTPHASE.xml b/db/ddlutils/model/C_PROJECTPHASE.xml
index d8a18a4bfc..560a6d06eb 100644
--- a/db/ddlutils/model/C_PROJECTPHASE.xml
+++ b/db/ddlutils/model/C_PROJECTPHASE.xml
@@ -2,32 +2,32 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_PROJECTPHASE">
-      <column name="C_PROJECT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_PROJECT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="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="ISCOMPLETE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="PRICEACTUAL" primaryKey="false" required="false" type="NUMERIC" default="0" 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="GENERATEORDER" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="C_ORDER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PHASE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECTPHASE_ID" primaryKey="true" required="true" type="ID" 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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="COMMITTEDAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="false" type="DECIMAL" size="22" 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="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="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="PLANNEDAMT" primaryKey="false" required="true" type="DECIMAL" size="22" 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 bb2b2f3ab4..a1a429f71c 100644
--- a/db/ddlutils/model/C_PROJECTTASK.xml
+++ b/db/ddlutils/model/C_PROJECTTASK.xml
@@ -2,25 +2,25 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_PROJECTTASK">
-      <column name="C_PROJECTTASK_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_TASK_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_PROJECTTASK_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_TASK_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="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="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECTPHASE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="false" type="NUMERIC" default="0" 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="PROJINVOICERULE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="PLANNEDAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="COMMITTEDAMT" primaryKey="false" required="true" type="NUMERIC" default="0" 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"/>
       <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_PROJECTTYPE.xml b/db/ddlutils/model/C_PROJECTTYPE.xml
index 37c9ca853e..d5d7571e24 100644
--- a/db/ddlutils/model/C_PROJECTTYPE.xml
+++ b/db/ddlutils/model/C_PROJECTTYPE.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_PROJECTTYPE">
-      <column name="C_PROJECTTYPE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_PROJECTTYPE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_PROJECT_ACCT.xml b/db/ddlutils/model/C_PROJECT_ACCT.xml
index c5a1f6a0b3..ea06528d85 100644
--- a/db/ddlutils/model/C_PROJECT_ACCT.xml
+++ b/db/ddlutils/model/C_PROJECT_ACCT.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_PROJECT_ACCT">
-      <column name="C_PROJECT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_PROJECT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="PJ_ASSET_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="PJ_WIP_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="PJ_ASSET_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="PJ_WIP_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_CPROJECTACCT">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_RECURRING.xml b/db/ddlutils/model/C_RECURRING.xml
index d99e266e2f..e589c311e0 100644
--- a/db/ddlutils/model/C_RECURRING.xml
+++ b/db/ddlutils/model/C_RECURRING.xml
@@ -2,30 +2,30 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_RECURRING">
-      <column name="C_RECURRING_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_RECURRING_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="RECURRINGTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="C_ORDER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PAYMENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="GL_JOURNALBATCH_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_ORDER_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_PAYMENT_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="GL_JOURNALBATCH_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="FREQUENCYTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="RUNSMAX" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="RUNSREMAINING" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="RUNSMAX" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="RUNSREMAINING" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="DATELASTRUN" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATENEXTRUN" 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="FREQUENCY" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="FREQUENCY" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_INVOICE" name="CINVOICE_CRECURRING">
         <reference local="C_INVOICE_ID" foreign="C_INVOICE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_RECURRING_RUN.xml b/db/ddlutils/model/C_RECURRING_RUN.xml
index 0b10e3e038..d7f86383df 100644
--- a/db/ddlutils/model/C_RECURRING_RUN.xml
+++ b/db/ddlutils/model/C_RECURRING_RUN.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_RECURRING_RUN">
-      <column name="C_RECURRING_RUN_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_RECURRING_RUN_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_PAYMENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ORDER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="GL_JOURNALBATCH_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_RECURRING_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_PAYMENT_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_INVOICE_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="GL_JOURNALBATCH_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_RECURRING_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DATEDOC" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <foreign-key foreignTable="C_INVOICE" name="CINVOICE_CRECURRINGRUN">
         <reference local="C_INVOICE_ID" foreign="C_INVOICE_ID"/>
diff --git a/db/ddlutils/model/C_REGION.xml b/db/ddlutils/model/C_REGION.xml
index f2408ac1ef..88a9dfbab0 100644
--- a/db/ddlutils/model/C_REGION.xml
+++ b/db/ddlutils/model/C_REGION.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_REGION">
-      <column name="C_REGION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_REGION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="C_COUNTRY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_COUNTRY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISDEFAULT" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="C_REGIONCLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
diff --git a/db/ddlutils/model/C_REMUNERATION.xml b/db/ddlutils/model/C_REMUNERATION.xml
index 8da415e59d..75294c5259 100644
--- a/db/ddlutils/model/C_REMUNERATION.xml
+++ b/db/ddlutils/model/C_REMUNERATION.xml
@@ -2,23 +2,23 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_REMUNERATION">
-      <column name="C_REMUNERATION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_REMUNERATION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="REMUNERATIONTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="STANDARDHOURS" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="GROSSRAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="GROSSRCOST" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="OVERTIMEAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="OVERTIMECOST" primaryKey="false" required="true" type="NUMERIC" default="0" 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"/>
       <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 277237739e..cab98e374e 100644
--- a/db/ddlutils/model/C_REVENUERECOGNITION.xml
+++ b/db/ddlutils/model/C_REVENUERECOGNITION.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_REVENUERECOGNITION">
-      <column name="C_REVENUERECOGNITION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_REVENUERECOGNITION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <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="INTEGER" autoIncrement="false"/>
+      <column name="NOMONTHS" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <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 4f6a823ea8..99d77576cc 100644
--- a/db/ddlutils/model/C_REVENUERECOGNITION_PLAN.xml
+++ b/db/ddlutils/model/C_REVENUERECOGNITION_PLAN.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_REVENUERECOGNITION_PLAN">
-      <column name="C_REVENUERECOGNITION_PLAN_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_REVENUERECOGNITION_PLAN_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_REVENUERECOGNITION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICELINE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="UNEARNEDREVENUE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_REVENUE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="TOTALAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="RECOGNIZEDAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_REVENUERECOGNITION_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_INVOICELINE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <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"/>
       <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 95ca7d0805..4d2b81000e 100644
--- a/db/ddlutils/model/C_REVENUERECOGNITION_RUN.xml
+++ b/db/ddlutils/model/C_REVENUERECOGNITION_RUN.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_REVENUERECOGNITION_RUN">
-      <column name="C_REVENUERECOGNITION_RUN_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_REVENUERECOGNITION_RUN_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_REVENUERECOGNITION_PLAN_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="GL_JOURNAL_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="RECOGNIZEDAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <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"/>
       <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 4f6c4c14de..3cd06253e7 100644
--- a/db/ddlutils/model/C_RFQ.xml
+++ b/db/ddlutils/model/C_RFQ.xml
@@ -2,38 +2,38 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_RFQ">
-      <column name="C_RFQ_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_RFQ_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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_RFQ_TOPIC_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_RFQ_TOPIC_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="DATERESPONSE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="ISRFQRESPONSEACCEPTED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="DATEWORKSTART" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="DELIVERYDAYS" primaryKey="false" required="false" type="INTEGER" default="0" 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="QUOTETYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="ISQUOTETOTALAMT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISQUOTEALLQTY" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISSELFSERVICE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISINVITEDVENDORSONLY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="SALESREP_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="MARGIN" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <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="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"/>
-      <column name="C_ORDER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_ORDER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="COPYLINES" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="RANKRFQ" 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/C_RFQLINE.xml b/db/ddlutils/model/C_RFQLINE.xml
index 550cdedf9f..9752395464 100644
--- a/db/ddlutils/model/C_RFQLINE.xml
+++ b/db/ddlutils/model/C_RFQLINE.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_RFQLINE">
-      <column name="C_RFQLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_RFQLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_RFQ_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="ID" default="0" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_RFQ_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="M_PRODUCT_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="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="DELIVERYDAYS" primaryKey="false" required="false" type="INTEGER" default="0" 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="DATEWORKSTART" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <foreign-key foreignTable="C_RFQ" name="CRFQ_CRFQLINE">
diff --git a/db/ddlutils/model/C_RFQLINEQTY.xml b/db/ddlutils/model/C_RFQLINEQTY.xml
index 817c9af5d4..4ed53fdc72 100644
--- a/db/ddlutils/model/C_RFQLINEQTY.xml
+++ b/db/ddlutils/model/C_RFQLINEQTY.xml
@@ -2,23 +2,23 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_RFQLINEQTY">
-      <column name="C_RFQLINEQTY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_RFQLINEQTY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_RFQLINE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_UOM_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="MARGIN" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
+      <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="ISPURCHASEQTY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="BESTRESPONSEAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="BESTRESPONSEAMT" primaryKey="false" required="false" type="DECIMAL" size="22" 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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="BENCHMARKPRICE" primaryKey="false" required="true" type="NUMERIC" default="0" 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="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 736546b75b..0529e2ab2e 100644
--- a/db/ddlutils/model/C_RFQRESPONSE.xml
+++ b/db/ddlutils/model/C_RFQRESPONSE.xml
@@ -2,34 +2,34 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_RFQRESPONSE">
-      <column name="C_RFQRESPONSE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_RFQRESPONSE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_RFQ_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_RFQ_ID" 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="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" 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="AD_USER_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="DATEINVITED" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATERESPONSE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATEWORKSTART" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="DELIVERYDAYS" primaryKey="false" required="false" type="INTEGER" default="0" 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="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="PRICE" primaryKey="false" required="true" type="DECIMAL" size="22" 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"/>
-      <column name="RANKING" primaryKey="false" required="false" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="RANKING" primaryKey="false" required="false" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="C_ORDER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_ORDER_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="CHECKCOMPLETE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_CRFQRESPONSE">
diff --git a/db/ddlutils/model/C_RFQRESPONSELINE.xml b/db/ddlutils/model/C_RFQRESPONSELINE.xml
index d7fc2eecf5..31ea149ede 100644
--- a/db/ddlutils/model/C_RFQRESPONSELINE.xml
+++ b/db/ddlutils/model/C_RFQRESPONSELINE.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_RFQRESPONSELINE">
-      <column name="C_RFQRESPONSELINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_RFQRESPONSELINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_RFQLINE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_RFQRESPONSE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <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_RFQRESPONSE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSELFSERVICE" 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"/>
       <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="DATEWORKSTART" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="DELIVERYDAYS" primaryKey="false" required="false" type="INTEGER" default="0" 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"/>
       <foreign-key foreignTable="C_RFQLINE" name="CRFQLINE_CRFQRESPONSELINE">
         <reference local="C_RFQLINE_ID" foreign="C_RFQLINE_ID"/>
diff --git a/db/ddlutils/model/C_RFQRESPONSELINEQTY.xml b/db/ddlutils/model/C_RFQRESPONSELINEQTY.xml
index 0ac7b5e8a5..dbe2eaccf3 100644
--- a/db/ddlutils/model/C_RFQRESPONSELINEQTY.xml
+++ b/db/ddlutils/model/C_RFQRESPONSELINEQTY.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_RFQRESPONSELINEQTY">
-      <column name="C_RFQRESPONSELINEQTY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_RFQRESPONSELINEQTY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_RFQRESPONSELINE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_RFQLINEQTY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="PRICE" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DISCOUNT" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="RANKING" primaryKey="false" required="false" type="INTEGER" default="0" autoIncrement="false"/>
+      <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="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"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_RFQ_TOPIC.xml b/db/ddlutils/model/C_RFQ_TOPIC.xml
index f61fd4ee44..919e949d44 100644
--- a/db/ddlutils/model/C_RFQ_TOPIC.xml
+++ b/db/ddlutils/model/C_RFQ_TOPIC.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_RFQ_TOPIC">
-      <column name="C_RFQ_TOPIC_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_RFQ_TOPIC_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="ISSELFSERVICE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="AD_PRINTFORMAT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_PRINTFORMAT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_PRINTFORMAT" name="ADPRINTFORMAT_ARFQTOPIC">
         <reference local="AD_PRINTFORMAT_ID" foreign="AD_PRINTFORMAT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_RFQ_TOPICSUBSCRIBER.xml b/db/ddlutils/model/C_RFQ_TOPICSUBSCRIBER.xml
index ce8a73d852..0b1e9ee19b 100644
--- a/db/ddlutils/model/C_RFQ_TOPICSUBSCRIBER.xml
+++ b/db/ddlutils/model/C_RFQ_TOPICSUBSCRIBER.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_RFQ_TOPICSUBSCRIBER">
-      <column name="C_RFQ_TOPICSUBSCRIBER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_RFQ_TOPICSUBSCRIBER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_RFQ_TOPIC_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_RFQ_TOPIC_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="AD_USER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="SUBSCRIBEDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="OPTOUTDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_ARFQTOPICSUBCR">
diff --git a/db/ddlutils/model/C_RFQ_TOPICSUBSCRIBERONLY.xml b/db/ddlutils/model/C_RFQ_TOPICSUBSCRIBERONLY.xml
index ab33f5783d..cb78514056 100644
--- a/db/ddlutils/model/C_RFQ_TOPICSUBSCRIBERONLY.xml
+++ b/db/ddlutils/model/C_RFQ_TOPICSUBSCRIBERONLY.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_RFQ_TOPICSUBSCRIBERONLY">
-      <column name="C_RFQ_TOPICSUBSCRIBERONLY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_RFQ_TOPICSUBSCRIBERONLY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_RFQ_TOPICSUBSCRIBER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_RFQ_TOPICSUBSCRIBER_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_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_CATEGORY_ID" primaryKey="false" required="false" type="ID" 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"/>
       <foreign-key foreignTable="C_RFQ_TOPICSUBSCRIBER" name="CRFQTOPICSUBSCRIBER_ONLY">
         <reference local="C_RFQ_TOPICSUBSCRIBER_ID" foreign="C_RFQ_TOPICSUBSCRIBER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_SALESREGION.xml b/db/ddlutils/model/C_SALESREGION.xml
index 984af4b4fe..ae7e222fc9 100644
--- a/db/ddlutils/model/C_SALESREGION.xml
+++ b/db/ddlutils/model/C_SALESREGION.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_SALESREGION">
-      <column name="C_SALESREGION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_SALESREGION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" 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="ISSUMMARY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="SALESREP_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="SALESREP_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISDEFAULT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <unique name="C_SALESREGION_VALUE">
         <unique-column name="AD_CLIENT_ID"/>
diff --git a/db/ddlutils/model/C_SERVICELEVEL.xml b/db/ddlutils/model/C_SERVICELEVEL.xml
index 8cbf33a982..ef87257338 100644
--- a/db/ddlutils/model/C_SERVICELEVEL.xml
+++ b/db/ddlutils/model/C_SERVICELEVEL.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_SERVICELEVEL">
-      <column name="C_SERVICELEVEL_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_SERVICELEVEL_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <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="NUMERIC" autoIncrement="false"/>
-      <column name="SERVICELEVELINVOICED" primaryKey="false" required="true" type="NUMERIC" 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="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" autoIncrement="false"/>
+      <column name="C_REVENUERECOGNITION_PLAN_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_REVENUERECOGNITION_PLAN" name="CREVRECPLAN_CSERVICELEVEL">
         <reference local="C_REVENUERECOGNITION_PLAN_ID" foreign="C_REVENUERECOGNITION_PLAN_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_SERVICELEVELLINE.xml b/db/ddlutils/model/C_SERVICELEVELLINE.xml
index f3e7e15639..cde0ee61df 100644
--- a/db/ddlutils/model/C_SERVICELEVELLINE.xml
+++ b/db/ddlutils/model/C_SERVICELEVELLINE.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_SERVICELEVELLINE">
-      <column name="C_SERVICELEVELLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_SERVICELEVELLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_SERVICELEVEL_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <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="NUMERIC" autoIncrement="false"/>
+      <column name="SERVICELEVELPROVIDED" primaryKey="false" required="true" type="DECIMAL" size="22" 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_SUBACCT.xml b/db/ddlutils/model/C_SUBACCT.xml
index a1e8537644..5716c0097a 100644
--- a/db/ddlutils/model/C_SUBACCT.xml
+++ b/db/ddlutils/model/C_SUBACCT.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_SUBACCT">
-      <column name="C_SUBACCT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_SUBACCT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" 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="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="C_ELEMENTVALUE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_ELEMENTVALUE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUE_CSUBACCT">
         <reference local="C_ELEMENTVALUE_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_SUBSCRIPTION.xml b/db/ddlutils/model/C_SUBSCRIPTION.xml
index f16a16fa56..9bb8b4ce9d 100644
--- a/db/ddlutils/model/C_SUBSCRIPTION.xml
+++ b/db/ddlutils/model/C_SUBSCRIPTION.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_SUBSCRIPTION">
-      <column name="C_SUBSCRIPTION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_SUBSCRIPTION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_SUBSCRIPTIONTYPE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_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="C_SUBSCRIPTIONTYPE_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="PAIDUNTILDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="ISDUE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_SUBSCRIPTIONTYPE.xml b/db/ddlutils/model/C_SUBSCRIPTIONTYPE.xml
index 076f8e565a..d3c218242d 100644
--- a/db/ddlutils/model/C_SUBSCRIPTIONTYPE.xml
+++ b/db/ddlutils/model/C_SUBSCRIPTIONTYPE.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_SUBSCRIPTIONTYPE">
-      <column name="C_SUBSCRIPTIONTYPE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_SUBSCRIPTIONTYPE_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="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="FREQUENCYTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="FREQUENCY" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="FREQUENCY" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
     </table>
   </database>
diff --git a/db/ddlutils/model/C_SUBSCRIPTION_DELIVERY.xml b/db/ddlutils/model/C_SUBSCRIPTION_DELIVERY.xml
index 1fee4c013a..bf75b72b4d 100644
--- a/db/ddlutils/model/C_SUBSCRIPTION_DELIVERY.xml
+++ b/db/ddlutils/model/C_SUBSCRIPTION_DELIVERY.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_SUBSCRIPTION_DELIVERY">
-      <column name="C_SUBSCRIPTION_DELIVERY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_SUBSCRIPTION_DELIVERY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_SUBSCRIPTION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_SUBSCRIPTION_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_SUBSCRIPTION" name="CSUBCRIPTION_CSUBSCRDELIVERY">
         <reference local="C_SUBSCRIPTION_ID" foreign="C_SUBSCRIPTION_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_TASK.xml b/db/ddlutils/model/C_TASK.xml
index ba32087308..5fc2c1cbd7 100644
--- a/db/ddlutils/model/C_TASK.xml
+++ b/db/ddlutils/model/C_TASK.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_TASK">
-      <column name="C_TASK_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_TASK_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="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="C_PHASE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="STANDARDQTY" primaryKey="false" required="true" type="NUMERIC" default="0" 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"/>
       <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 0d83ecc918..530691e9c0 100644
--- a/db/ddlutils/model/C_TAX.xml
+++ b/db/ddlutils/model/C_TAX.xml
@@ -2,28 +2,28 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_TAX">
-      <column name="C_TAX_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_TAX_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="TAXINDICATOR" primaryKey="false" required="false" type="VARCHAR" size="10" autoIncrement="false"/>
       <column name="ISDOCUMENTLEVEL" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <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="NUMERIC" autoIncrement="false"/>
-      <column name="PARENT_TAX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_COUNTRY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_REGION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="TO_COUNTRY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="TO_REGION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_TAXCATEGORY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="RATE" primaryKey="false" required="true" type="DECIMAL" size="22" 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"/>
+      <column name="TO_COUNTRY_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_TAXCATEGORY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISDEFAULT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISTAXEXEMPT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="SOPOTYPE" primaryKey="false" required="true" type="CHAR" size="1" default="B" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_TAXCATEGORY.xml b/db/ddlutils/model/C_TAXCATEGORY.xml
index b3550d6117..189915dbb3 100644
--- a/db/ddlutils/model/C_TAXCATEGORY.xml
+++ b/db/ddlutils/model/C_TAXCATEGORY.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_TAXCATEGORY">
-      <column name="C_TAXCATEGORY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_TAXCATEGORY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="COMMODITYCODE" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_TAXCATEGORY_TRL.xml b/db/ddlutils/model/C_TAXCATEGORY_TRL.xml
index c3205f98ae..fadd3ffa0b 100644
--- a/db/ddlutils/model/C_TAXCATEGORY_TRL.xml
+++ b/db/ddlutils/model/C_TAXCATEGORY_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_TAXCATEGORY_TRL">
-      <column name="C_TAXCATEGORY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_TAXCATEGORY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="ISTRANSLATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_TAXDECLARATION.xml b/db/ddlutils/model/C_TAXDECLARATION.xml
index d50f0b02bd..360c0961ab 100644
--- a/db/ddlutils/model/C_TAXDECLARATION.xml
+++ b/db/ddlutils/model/C_TAXDECLARATION.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_TAXDECLARATION">
-      <column name="C_TAXDECLARATION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_TAXDECLARATION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="DATETRX" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
diff --git a/db/ddlutils/model/C_TAXDECLARATIONACCT.xml b/db/ddlutils/model/C_TAXDECLARATIONACCT.xml
index 438ebc0294..c496f3f8ef 100644
--- a/db/ddlutils/model/C_TAXDECLARATIONACCT.xml
+++ b/db/ddlutils/model/C_TAXDECLARATIONACCT.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_TAXDECLARATIONACCT">
-      <column name="C_TAXDECLARATIONACCT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_TAXDECLARATIONACCT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="C_TAXDECLARATION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="FACT_ACCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="C_TAXDECLARATION_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="FACT_ACCT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="LINE" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_CTAXDECLACCT">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_TAXDECLARATIONLINE.xml b/db/ddlutils/model/C_TAXDECLARATIONLINE.xml
index 590b0a3d03..6b42aefc1f 100644
--- a/db/ddlutils/model/C_TAXDECLARATIONLINE.xml
+++ b/db/ddlutils/model/C_TAXDECLARATIONLINE.xml
@@ -2,26 +2,26 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_TAXDECLARATIONLINE">
-      <column name="C_TAXDECLARATIONLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_TAXDECLARATIONLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="ISMANUAL" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_TAXDECLARATION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_TAX_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICELINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ALLOCATIONLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="TAXBASEAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="TAXAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="C_TAXDECLARATION_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_TAX_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_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="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_TAXPOSTAL.xml b/db/ddlutils/model/C_TAXPOSTAL.xml
index b1b7a1cb7c..64691e620b 100644
--- a/db/ddlutils/model/C_TAXPOSTAL.xml
+++ b/db/ddlutils/model/C_TAXPOSTAL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_TAXPOSTAL">
-      <column name="C_TAXPOSTAL_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_TAXPOSTAL_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_TAX_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_TAX_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="POSTAL" primaryKey="false" required="true" type="VARCHAR" size="10" autoIncrement="false"/>
       <column name="POSTAL_TO" primaryKey="false" required="false" type="VARCHAR" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_TAX" name="CTAX_CTAXPOSTAL">
diff --git a/db/ddlutils/model/C_TAX_ACCT.xml b/db/ddlutils/model/C_TAX_ACCT.xml
index f8c77e1bab..6214644b6d 100644
--- a/db/ddlutils/model/C_TAX_ACCT.xml
+++ b/db/ddlutils/model/C_TAX_ACCT.xml
@@ -2,32 +2,26 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_TAX_ACCT">
-      <column name="C_TAX_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_TAX_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="T_DUE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="T_LIABILITY_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="T_CREDIT_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="T_RECEIVABLES_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="T_EXPENSE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="T_DUE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="T_LIABILITY_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="T_CREDIT_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="T_RECEIVABLES_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="T_EXPENSE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_CTAXACCT">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
       <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_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_TLIABILITY_CTAX">
         <reference local="T_LIABILITY_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
@@ -37,6 +31,12 @@
       <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>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/C_TAX_TRL.xml b/db/ddlutils/model/C_TAX_TRL.xml
index ff182daa2f..fccb2bb4b8 100644
--- a/db/ddlutils/model/C_TAX_TRL.xml
+++ b/db/ddlutils/model/C_TAX_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_TAX_TRL">
-      <column name="C_TAX_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_TAX_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISTRANSLATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" 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"/>
diff --git a/db/ddlutils/model/C_UOM.xml b/db/ddlutils/model/C_UOM.xml
index 31aafd0c72..ff7b69b326 100644
--- a/db/ddlutils/model/C_UOM.xml
+++ b/db/ddlutils/model/C_UOM.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_UOM">
-      <column name="C_UOM_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_UOM_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="X12DE355" primaryKey="false" required="true" type="VARCHAR" size="4" autoIncrement="false"/>
       <column name="UOMSYMBOL" primaryKey="false" required="false" type="VARCHAR" 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="STDPRECISION" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="COSTINGPRECISION" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="STDPRECISION" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="COSTINGPRECISION" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ISDEFAULT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="C_UOMCLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
diff --git a/db/ddlutils/model/C_UOM_CONVERSION.xml b/db/ddlutils/model/C_UOM_CONVERSION.xml
index 08fdaa39c7..ce2fec930a 100644
--- a/db/ddlutils/model/C_UOM_CONVERSION.xml
+++ b/db/ddlutils/model/C_UOM_CONVERSION.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_UOM_CONVERSION">
-      <column name="C_UOM_CONVERSION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_UOM_CONVERSION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_UOM_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_UOM_TO_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="MULTIPLYRATE" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DIVIDERATE" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <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="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"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_UOM_TRL.xml b/db/ddlutils/model/C_UOM_TRL.xml
index b96bde582d..c852f3b6b1 100644
--- a/db/ddlutils/model/C_UOM_TRL.xml
+++ b/db/ddlutils/model/C_UOM_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_UOM_TRL">
-      <column name="C_UOM_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_UOM_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UOMSYMBOL" primaryKey="false" required="false" type="VARCHAR" 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"/>
diff --git a/db/ddlutils/model/C_USERREMUNERATION.xml b/db/ddlutils/model/C_USERREMUNERATION.xml
index 9935f5e7e9..640e317bac 100644
--- a/db/ddlutils/model/C_USERREMUNERATION.xml
+++ b/db/ddlutils/model/C_USERREMUNERATION.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_USERREMUNERATION">
-      <column name="C_USERREMUNERATION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_USERREMUNERATION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_REMUNERATION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="GROSSRCOST" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="OVERTIMEAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="OVERTIMECOST" primaryKey="false" required="true" type="NUMERIC" 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="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 b9d46b653e..bd6753292d 100644
--- a/db/ddlutils/model/C_VALIDCOMBINATION.xml
+++ b/db/ddlutils/model/C_VALIDCOMBINATION.xml
@@ -2,34 +2,34 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_VALIDCOMBINATION">
-      <column name="C_VALIDCOMBINATION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_VALIDCOMBINATION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ALIAS" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="COMBINATION" 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="ISFULLYQUALIFIED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="ACCOUNT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_LOCFROM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_LOCTO_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_SALESREGION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER1_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER2_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_SUBACCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USERELEMENT1_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USERELEMENT2_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="ACCOUNT_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="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"/>
+      <column name="C_LOCFROM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_LOCTO_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_SALESREGION_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_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="C_SUBACCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="USERELEMENT1_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="USERELEMENT2_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="ADCLIENT_VC">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -54,12 +54,12 @@
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEUSER1_VC">
         <reference local="USER1_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>
       <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>
       <foreign-key foreignTable="C_LOCATION" name="MLOCATIONFROM_VC">
         <reference local="C_LOCFROM_ID" foreign="C_LOCATION_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_WITHHOLDING.xml b/db/ddlutils/model/C_WITHHOLDING.xml
index 6cf61c0ddb..f14e7780ef 100644
--- a/db/ddlutils/model/C_WITHHOLDING.xml
+++ b/db/ddlutils/model/C_WITHHOLDING.xml
@@ -2,28 +2,28 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_WITHHOLDING">
-      <column name="C_WITHHOLDING_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_WITHHOLDING_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="C_PAYMENTTERM_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_PAYMENTTERM_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISTAXWITHHOLDING" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISTAXPRORATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISPAIDTO3PARTY" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="BENEFICIARY" primaryKey="false" required="false" type="INTEGER" 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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="FIXAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="THRESHOLDMIN" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="THRESHOLDMAX" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="MINAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="MAXAMT" primaryKey="false" required="false" type="NUMERIC" default="0" 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"/>
       <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/C_WITHHOLDING_ACCT.xml b/db/ddlutils/model/C_WITHHOLDING_ACCT.xml
index cae9a8151a..d9660d9001 100644
--- a/db/ddlutils/model/C_WITHHOLDING_ACCT.xml
+++ b/db/ddlutils/model/C_WITHHOLDING_ACCT.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_WITHHOLDING_ACCT">
-      <column name="C_WITHHOLDING_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_WITHHOLDING_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="WITHHOLDING_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="WITHHOLDING_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_CWITHHOLDINGACCT">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/C_YEAR.xml b/db/ddlutils/model/C_YEAR.xml
index 6e6f0d4378..800ab89133 100644
--- a/db/ddlutils/model/C_YEAR.xml
+++ b/db/ddlutils/model/C_YEAR.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="C_YEAR">
-      <column name="C_YEAR_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_YEAR_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="FISCALYEAR" primaryKey="false" required="true" type="VARCHAR" size="10" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="C_CALENDAR_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CALENDAR_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="C_YEARCLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
diff --git a/db/ddlutils/model/FACT_ACCT.xml b/db/ddlutils/model/FACT_ACCT.xml
index 01f1a4605c..f41a829c78 100644
--- a/db/ddlutils/model/FACT_ACCT.xml
+++ b/db/ddlutils/model/FACT_ACCT.xml
@@ -2,52 +2,52 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="FACT_ACCT">
-      <column name="FACT_ACCT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="FACT_ACCT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="ACCOUNT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="ACCOUNT_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="DATEACCT" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="C_PERIOD_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="RECORD_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="LINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="GL_CATEGORY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="GL_BUDGET_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_TAX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_LOCATOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_PERIOD_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="RECORD_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="LINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="GL_CATEGORY_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="C_TAX_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <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" autoIncrement="false"/>
-      <column name="AMTSOURCEDR" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="AMTSOURCECR" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="AMTACCTDR" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="AMTACCTCR" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_UOM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_LOCFROM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_LOCTO_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_SALESREGION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER1_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER2_ID" primaryKey="false" required="false" type="ID" 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="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="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"/>
+      <column name="C_LOCFROM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_LOCTO_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_SALESREGION_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_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="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="A_ASSET_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_SUBACCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USERELEMENT1_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USERELEMENT2_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECTPHASE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECTTASK_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="A_ASSET_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_SUBACCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="USERELEMENT1_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="USERELEMENT2_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"/>
       <foreign-key foreignTable="AD_CLIENT" name="AC_CLIENT_FACT_ACCT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -78,12 +78,12 @@
       <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="CELEMENTVALUEUSER2_FACTACCT">
-        <reference local="USER2_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>
diff --git a/db/ddlutils/model/FACT_ACCT_BALANCE.xml b/db/ddlutils/model/FACT_ACCT_BALANCE.xml
index b7b09e0474..e21a7a8aeb 100644
--- a/db/ddlutils/model/FACT_ACCT_BALANCE.xml
+++ b/db/ddlutils/model/FACT_ACCT_BALANCE.xml
@@ -2,46 +2,46 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="FACT_ACCT_BALANCE">
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="true" type="ID" 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="C_ACCTSCHEMA_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DATEACCT" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="ACCOUNT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="ACCOUNT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="POSTINGTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_SALESREGION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_LOCTO_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_LOCFROM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER1_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER2_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="GL_BUDGET_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AMTACCTDR" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="AMTACCTCR" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" 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="C_PROJECT_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"/>
+      <column name="C_SALESREGION_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="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_LOCTO_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_LOCFROM_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="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="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" default="0" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" default="0" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="C_SUBACCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USERELEMENT1_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USERELEMENT2_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECTPHASE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECTTASK_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_SUBACCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="USERELEMENT1_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="USERELEMENT2_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"/>
       <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="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="AD_ORG" name="ADORG_FACTACCTBAL">
+        <reference local="AD_ORG_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,21 +54,21 @@
       <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="CELEMENTVALUEACCT_FACTACCTBAL">
-        <reference local="ACCOUNT_ID" foreign="C_ELEMENTVALUE_ID"/>
+      <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_LOCATION" name="CLOCFROM_FACTACCTBALANCE">
-        <reference local="C_LOCFROM_ID" foreign="C_LOCATION_ID"/>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUEACCT_FACTACCTBAL">
+        <reference local="ACCOUNT_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
       <foreign-key foreignTable="C_LOCATION" name="CLOCTO_FACTACCTBAL">
         <reference local="C_LOCTO_ID" foreign="C_LOCATION_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_LOCATION" name="CLOCFROM_FACTACCTBALANCE">
+        <reference local="C_LOCFROM_ID" foreign="C_LOCATION_ID"/>
+      </foreign-key>
       <foreign-key foreignTable="C_PROJECT" name="CPROJECT_FACTACCTBAL">
         <reference local="C_PROJECT_ID" foreign="C_PROJECT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/GL_BUDGET.xml b/db/ddlutils/model/GL_BUDGET.xml
index 15b51a71a9..9700803867 100644
--- a/db/ddlutils/model/GL_BUDGET.xml
+++ b/db/ddlutils/model/GL_BUDGET.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="GL_BUDGET">
-      <column name="GL_BUDGET_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="GL_BUDGET_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="ISPRIMARY" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
diff --git a/db/ddlutils/model/GL_BUDGETCONTROL.xml b/db/ddlutils/model/GL_BUDGETCONTROL.xml
index 9f4b55040f..ca2c43ff54 100644
--- a/db/ddlutils/model/GL_BUDGETCONTROL.xml
+++ b/db/ddlutils/model/GL_BUDGETCONTROL.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="GL_BUDGETCONTROL">
-      <column name="GL_BUDGETCONTROL_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="GL_BUDGETCONTROL_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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" autoIncrement="false"/>
-      <column name="GL_BUDGET_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="GL_BUDGET_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="COMMITMENTTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="ISBEFOREAPPROVAL" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="BUDGETCONTROLSCOPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
diff --git a/db/ddlutils/model/GL_CATEGORY.xml b/db/ddlutils/model/GL_CATEGORY.xml
index 158739ca0b..939d7d8805 100644
--- a/db/ddlutils/model/GL_CATEGORY.xml
+++ b/db/ddlutils/model/GL_CATEGORY.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="GL_CATEGORY">
-      <column name="GL_CATEGORY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="GL_CATEGORY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="CATEGORYTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
diff --git a/db/ddlutils/model/GL_DISTRIBUTION.xml b/db/ddlutils/model/GL_DISTRIBUTION.xml
index cfd21d2710..dc6258e7cd 100644
--- a/db/ddlutils/model/GL_DISTRIBUTION.xml
+++ b/db/ddlutils/model/GL_DISTRIBUTION.xml
@@ -2,47 +2,47 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="GL_DISTRIBUTION">
-      <column name="GL_DISTRIBUTION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="GL_DISTRIBUTION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="POSTINGTYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="C_DOCTYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_DOCTYPE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ANYORG" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="ORG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ANYACCT" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="ACCOUNT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="ACCOUNT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ANYPRODUCT" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ANYBPARTNER" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ANYPROJECT" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ANYCAMPAIGN" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ANYACTIVITY" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ANYSALESREGION" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="C_SALESREGION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_SALESREGION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ANYORGTRX" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ANYLOCTO" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="C_LOCTO_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_LOCTO_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ANYLOCFROM" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="C_LOCFROM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_LOCFROM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ANYUSER1" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="USER1_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <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" autoIncrement="false"/>
-      <column name="PERCENTTOTAL" primaryKey="false" required="true" type="NUMERIC" 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="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">
diff --git a/db/ddlutils/model/GL_DISTRIBUTIONLINE.xml b/db/ddlutils/model/GL_DISTRIBUTIONLINE.xml
index 1793cc3792..974dd3c11e 100644
--- a/db/ddlutils/model/GL_DISTRIBUTIONLINE.xml
+++ b/db/ddlutils/model/GL_DISTRIBUTIONLINE.xml
@@ -2,44 +2,44 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="GL_DISTRIBUTIONLINE">
-      <column name="GL_DISTRIBUTIONLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="GL_DISTRIBUTIONLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="GL_DISTRIBUTION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="PERCENT" primaryKey="false" required="true" type="NUMERIC" autoIncrement="false"/>
+      <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="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" autoIncrement="false"/>
+      <column name="ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="OVERWRITEACCT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="ACCOUNT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="ACCOUNT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="OVERWRITEPRODUCT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="OVERWRITEBPARTNER" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="OVERWRITEPROJECT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="OVERWRITECAMPAIGN" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="OVERWRITEACTIVITY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="OVERWRITESALESREGION" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_SALESREGION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_SALESREGION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="OVERWRITEORGTRX" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="OVERWRITELOCTO" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_LOCTO_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_LOCTO_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="OVERWRITELOCFROM" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_LOCFROM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_LOCFROM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="OVERWRITEUSER1" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="USER1_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <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" 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>
diff --git a/db/ddlutils/model/GL_FUND.xml b/db/ddlutils/model/GL_FUND.xml
index a63256acef..c50a61553a 100644
--- a/db/ddlutils/model/GL_FUND.xml
+++ b/db/ddlutils/model/GL_FUND.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="GL_FUND">
-      <column name="GL_FUND_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="GL_FUND_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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" autoIncrement="false"/>
-      <column name="AMT" primaryKey="false" required="true" type="NUMERIC" default="0" 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="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_FUNDRESTRICTION.xml b/db/ddlutils/model/GL_FUNDRESTRICTION.xml
index 39bbbc7c78..9a0c18a80c 100644
--- a/db/ddlutils/model/GL_FUNDRESTRICTION.xml
+++ b/db/ddlutils/model/GL_FUNDRESTRICTION.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="GL_FUNDRESTRICTION">
-      <column name="GL_FUNDRESTRICTION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="GL_FUNDRESTRICTION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="GL_FUND_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ELEMENTVALUE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="GL_FUND_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ELEMENTVALUE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_ELEMENTVALUE" name="CELEMENTVALUE_GLFUNDRESTR">
         <reference local="C_ELEMENTVALUE_ID" foreign="C_ELEMENTVALUE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/GL_JOURNAL.xml b/db/ddlutils/model/GL_JOURNAL.xml
index 5b06ff0440..2c5141ea78 100644
--- a/db/ddlutils/model/GL_JOURNAL.xml
+++ b/db/ddlutils/model/GL_JOURNAL.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="GL_JOURNAL">
-      <column name="GL_JOURNAL_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="GL_JOURNAL_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_DOCTYPE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_DOCTYPE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DOCUMENTNO" primaryKey="false" required="true" type="VARCHAR" size="30" 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"/>
@@ -19,21 +19,21 @@
       <column name="ISPRINTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="true" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="POSTINGTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="GL_BUDGET_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="GL_CATEGORY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="GL_BUDGET_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="GL_CATEGORY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DATEDOC" 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_PERIOD_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="CURRENCYRATE" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="GL_JOURNALBATCH_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="TOTALDR" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="TOTALCR" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="CONTROLAMT" primaryKey="false" required="false" type="NUMERIC" default="0" 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="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="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"/>
-      <column name="C_CONVERSIONTYPE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CONVERSIONTYPE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="C_ACCTSCHEMA_GL_JOURNAL">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/GL_JOURNALBATCH.xml b/db/ddlutils/model/GL_JOURNALBATCH.xml
index 405e962ce7..e6de95cd9e 100644
--- a/db/ddlutils/model/GL_JOURNALBATCH.xml
+++ b/db/ddlutils/model/GL_JOURNALBATCH.xml
@@ -2,29 +2,29 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="GL_JOURNALBATCH">
-      <column name="GL_JOURNALBATCH_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="GL_JOURNALBATCH_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DOCUMENTNO" primaryKey="false" required="true" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="true" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="POSTINGTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="GL_CATEGORY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="GL_CATEGORY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DATEDOC" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATEACCT" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="C_PERIOD_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="TOTALDR" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="TOTALCR" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="CONTROLAMT" primaryKey="false" required="false" type="NUMERIC" default="0" 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="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"/>
-      <column name="C_DOCTYPE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_DOCTYPE_ID" primaryKey="false" required="true" type="ID" size="10" 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="ISAPPROVED" 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 bb8cbed82c..52f0d686df 100644
--- a/db/ddlutils/model/GL_JOURNALLINE.xml
+++ b/db/ddlutils/model/GL_JOURNALLINE.xml
@@ -2,29 +2,29 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="GL_JOURNALLINE">
-      <column name="GL_JOURNALLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="GL_JOURNALLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="GL_JOURNAL_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="AMTSOURCECR" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CURRENCYRATE" primaryKey="false" required="true" type="NUMERIC" default="0" 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="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="DATEACCT" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="AMTACCTDR" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="AMTACCTCR" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_UOM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_VALIDCOMBINATION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_CONVERSIONTYPE_ID" primaryKey="false" required="true" type="ID" 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="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="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"/>
       <foreign-key foreignTable="AD_CLIENT" name="ADCLIENT_GLJOURNALLINE">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
diff --git a/db/ddlutils/model/I_BANKSTATEMENT.xml b/db/ddlutils/model/I_BANKSTATEMENT.xml
index 877ceb7151..2d596bd8da 100644
--- a/db/ddlutils/model/I_BANKSTATEMENT.xml
+++ b/db/ddlutils/model/I_BANKSTATEMENT.xml
@@ -2,37 +2,37 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="I_BANKSTATEMENT">
-      <column name="I_BANKSTATEMENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="I_BANKSTATEMENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="I_ISIMPORTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="I_ERRORMSG" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_BANKSTATEMENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BANKSTATEMENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="STATEMENTDATE" 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="C_BANKACCOUNT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BANKACCOUNT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ROUTINGNO" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="BANKACCOUNTNO" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
-      <column name="C_PAYMENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_PAYMENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PAYMENTDOCUMENTNO" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" 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="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="BPARTNERVALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
-      <column name="C_INVOICE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_INVOICE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="INVOICEDOCUMENTNO" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
-      <column name="C_CHARGE_ID" primaryKey="false" required="false" type="ID" 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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_BANKSTATEMENTLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="CHARGEAMT" primaryKey="false" required="false" type="DECIMAL" size="22" 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"/>
       <column name="VALUTADATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="STATEMENTLINEDATE" 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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="TRXAMT" primaryKey="false" required="false" type="NUMERIC" default="0" 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="LINEDESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="STMTAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="STMTAMT" primaryKey="false" required="false" type="DECIMAL" size="22" 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="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="EFTAMT" primaryKey="false" required="false" type="DECIMAL" size="22" 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_BPARTNER.xml b/db/ddlutils/model/I_BPARTNER.xml
index ccfb3a56ab..b73f0a99c7 100644
--- a/db/ddlutils/model/I_BPARTNER.xml
+++ b/db/ddlutils/model/I_BPARTNER.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="I_BPARTNER">
-      <column name="I_BPARTNER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="I_BPARTNER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="I_ISIMPORTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="I_ERRORMSG" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_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="NAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="NAME2" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
@@ -21,16 +21,16 @@
       <column name="TAXID" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="NAICS" primaryKey="false" required="false" type="CHAR" size="6" autoIncrement="false"/>
       <column name="GROUPVALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
-      <column name="C_BP_GROUP_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BP_GROUP_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ADDRESS1" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ADDRESS2" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="POSTAL" primaryKey="false" required="false" type="VARCHAR" size="10" autoIncrement="false"/>
       <column name="POSTAL_ADD" primaryKey="false" required="false" type="VARCHAR" size="10" autoIncrement="false"/>
       <column name="CITY" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="C_REGION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_REGION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="REGIONNAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="C_COUNTRY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_COUNTRY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="COUNTRYCODE" primaryKey="false" required="false" type="CHAR" size="2" autoIncrement="false"/>
       <column name="TITLE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="CONTACTNAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
@@ -42,12 +42,12 @@
       <column name="EMAIL" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="PASSWORD" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="BIRTHDAY" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="C_GREETING_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_GREETING_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="BPCONTACTGREETING" primaryKey="false" required="false" type="VARCHAR" size="60" 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="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="R_INTERESTAREA_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_INTERESTAREA_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="INTERESTAREANAME" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_IBPARTNER">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
diff --git a/db/ddlutils/model/I_CONVERSION_RATE.xml b/db/ddlutils/model/I_CONVERSION_RATE.xml
index 232bed5126..714e4ab656 100644
--- a/db/ddlutils/model/I_CONVERSION_RATE.xml
+++ b/db/ddlutils/model/I_CONVERSION_RATE.xml
@@ -2,25 +2,25 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="I_CONVERSION_RATE">
-      <column name="I_CONVERSION_RATE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="I_CONVERSION_RATE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CONVERSION_RATE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_CONVERSION_RATE_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" autoIncrement="false"/>
+      <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISO_CODE_TO" primaryKey="false" required="false" type="CHAR" size="3" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID_TO" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="C_CURRENCY_ID_TO" primaryKey="false" required="false" type="DECIMAL" size="10" 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" autoIncrement="false"/>
+      <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="NUMERIC" autoIncrement="false"/>
-      <column name="DIVIDERATE" primaryKey="false" required="false" type="NUMERIC" 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="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 4c9a0c750e..a069d9a99f 100644
--- a/db/ddlutils/model/I_ELEMENTVALUE.xml
+++ b/db/ddlutils/model/I_ELEMENTVALUE.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="I_ELEMENTVALUE">
-      <column name="I_ELEMENTVALUE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="I_ELEMENTVALUE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="I_ISIMPORTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="I_ERRORMSG" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="C_ELEMENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_ELEMENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ELEMENTNAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="C_ELEMENTVALUE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_ELEMENTVALUE_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="NAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
@@ -23,13 +23,13 @@
       <column name="ISDOCCONTROLLED" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISSUMMARY" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="PARENTVALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
-      <column name="PARENTELEMENTVALUE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="PARENTELEMENTVALUE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="POSTACTUAL" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="POSTBUDGET" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="POSTSTATISTICAL" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="POSTENCUMBRANCE" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="DEFAULT_ACCOUNT" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
-      <column name="AD_COLUMN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_COLUMN_ID" primaryKey="false" required="false" type="ID" 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"/>
       <foreign-key foreignTable="AD_COLUMN" name="ADCOLUMN_IELEMENTVALUE">
diff --git a/db/ddlutils/model/I_GLJOURNAL.xml b/db/ddlutils/model/I_GLJOURNAL.xml
index 0186372bda..c2f3d2c86d 100644
--- a/db/ddlutils/model/I_GLJOURNAL.xml
+++ b/db/ddlutils/model/I_GLJOURNAL.xml
@@ -2,78 +2,78 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="I_GLJOURNAL">
-      <column name="I_GLJOURNAL_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="I_GLJOURNAL_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="CLIENTVALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
-      <column name="AD_ORGDOC_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_ORGDOC_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="I_ISIMPORTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="I_ERRORMSG" primaryKey="false" required="false" type="VARCHAR" size="2000" 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="GL_JOURNALBATCH_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="GL_JOURNALBATCH_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="BATCHDOCUMENTNO" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="BATCHDESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="GL_JOURNAL_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="GL_JOURNAL_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="JOURNALDOCUMENTNO" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="POSTINGTYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ACCTSCHEMANAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="C_DOCTYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_DOCTYPE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DOCTYPENAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="GL_CATEGORY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="GL_CATEGORY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="CATEGORYNAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="C_PERIOD_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="GL_BUDGET_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="GL_JOURNALLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="C_PERIOD_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="GL_JOURNALLINE_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"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="AMTSOURCEDR" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="AMTACCTDR" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="AMTSOURCECR" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="AMTACCTCR" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" 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="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" autoIncrement="false"/>
-      <column name="CURRENCYRATE" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_UOM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_VALIDCOMBINATION_ID" primaryKey="false" required="false" type="ID" 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="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="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" autoIncrement="false"/>
-      <column name="ACCOUNT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="ACCOUNT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ACCOUNTVALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
-      <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ORGTRXVALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PRODUCTVALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="UPC" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="SKU" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="BPARTNERVALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PROJECTVALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
-      <column name="C_LOCTO_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_LOCFROM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_SALESREGION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER1_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER2_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_LOCTO_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_LOCFROM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_SALESREGION_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="C_CAMPAIGN_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="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="ADORGTRX_IGLJOURNAL">
-        <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="AD_ORG" name="ADORGDOC_IGLJOURNAL">
         <reference local="AD_ORGDOC_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
+      <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>
@@ -98,15 +98,15 @@
       <foreign-key foreignTable="C_DOCTYPE" name="CDOCTYPE_IGLJOURNAL">
         <reference local="C_DOCTYPE_ID" foreign="C_DOCTYPE_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_ELEMENTVALUE" name="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_ELEMENTVALUE" name="CEVALUEUSER1_IGLJOURNAL">
-        <reference local="USER1_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>
diff --git a/db/ddlutils/model/I_INOUTLINECONFIRM.xml b/db/ddlutils/model/I_INOUTLINECONFIRM.xml
index a820099335..4f54a38ca4 100644
--- a/db/ddlutils/model/I_INOUTLINECONFIRM.xml
+++ b/db/ddlutils/model/I_INOUTLINECONFIRM.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="I_INOUTLINECONFIRM">
-      <column name="I_INOUTLINECONFIRM_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="I_INOUTLINECONFIRM_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="I_ISIMPORTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="I_ERRORMSG" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="M_INOUTLINECONFIRM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="SCRAPPEDQTY" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DIFFERENCEQTY" primaryKey="false" required="false" type="NUMERIC" 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="DIFFERENCEQTY" primaryKey="false" required="false" type="DECIMAL" size="22" 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 b96c5cd318..dbb6f42f32 100644
--- a/db/ddlutils/model/I_INVENTORY.xml
+++ b/db/ddlutils/model/I_INVENTORY.xml
@@ -2,32 +2,32 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="I_INVENTORY">
-      <column name="I_INVENTORY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="I_INVENTORY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="I_ISIMPORTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="I_ERRORMSG" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="UPC" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="LOT" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="SERNO" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
-      <column name="M_LOCATOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_WAREHOUSE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="M_LOCATOR_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"/>
       <column name="WAREHOUSEVALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="LOCATORVALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="X" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="Y" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="Z" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="M_INVENTORY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_INVENTORYLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="QTYBOOK" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="QTYCOUNT" primaryKey="false" required="false" type="NUMERIC" default="0" 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="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 d945c2b6f1..715c2ff959 100644
--- a/db/ddlutils/model/I_INVOICE.xml
+++ b/db/ddlutils/model/I_INVOICE.xml
@@ -2,63 +2,63 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="I_INVOICE">
-      <column name="I_INVOICE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="I_INVOICE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_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"/>
       <column name="ISACTIVE" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="I_ISIMPORTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="I_ERRORMSG" primaryKey="false" required="false" type="VARCHAR" size="2000" 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="M_PRICELIST_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="SALESREP_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="M_PRICELIST_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="SALESREP_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSOTRX" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="BPARTNERVALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="C_LOCATION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_LOCATION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ADDRESS1" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ADDRESS2" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="POSTAL" primaryKey="false" required="false" type="VARCHAR" size="10" autoIncrement="false"/>
       <column name="CITY" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="C_REGION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_REGION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="REGIONNAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="EMAIL" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="CONTACTNAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="PHONE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
-      <column name="C_COUNTRY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_COUNTRY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="COUNTRYCODE" primaryKey="false" required="false" type="CHAR" size="2" autoIncrement="false"/>
-      <column name="C_DOCTYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_DOCTYPE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DOCTYPENAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="C_PAYMENTTERM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_PAYMENTTERM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PAYMENTTERMVALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICE_ID" primaryKey="false" required="false" type="ID" 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"/>
+      <column name="C_INVOICE_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="DATEINVOICED" primaryKey="false" required="false" type="TIMESTAMP" size="7" 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="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PRODUCTVALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="UPC" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="SKU" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
-      <column name="C_TAX_ID" primaryKey="false" required="false" type="ID" 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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_INVOICELINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="TAXAMT" primaryKey="false" required="false" type="DECIMAL" size="22" 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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PRICEACTUAL" primaryKey="false" required="false" type="NUMERIC" default="0" 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>
diff --git a/db/ddlutils/model/I_ORDER.xml b/db/ddlutils/model/I_ORDER.xml
index fdf387b01c..7717c8a922 100644
--- a/db/ddlutils/model/I_ORDER.xml
+++ b/db/ddlutils/model/I_ORDER.xml
@@ -2,68 +2,68 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="I_ORDER">
-      <column name="I_ORDER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="I_ORDER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_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"/>
       <column name="ISACTIVE" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="I_ISIMPORTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="I_ERRORMSG" primaryKey="false" required="false" type="VARCHAR" size="2000" 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="SALESREP_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_WAREHOUSE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_PRICELIST_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_SHIPPER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="SALESREP_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"/>
+      <column name="M_PRICELIST_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="M_SHIPPER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSOTRX" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="BPARTNERVALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="BILLTO_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_LOCATION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="BILLTO_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_LOCATION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ADDRESS1" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ADDRESS2" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="POSTAL" primaryKey="false" required="false" type="VARCHAR" size="10" autoIncrement="false"/>
       <column name="CITY" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="C_REGION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_REGION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="REGIONNAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="C_COUNTRY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_COUNTRY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="COUNTRYCODE" primaryKey="false" required="false" type="CHAR" size="2" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="CONTACTNAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="EMAIL" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="PHONE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_DOCTYPE_ID" primaryKey="false" required="false" type="ID" 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="C_DOCTYPE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DOCTYPENAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="C_PAYMENTTERM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_PAYMENTTERM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PAYMENTTERMVALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
-      <column name="C_ORDER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_ORDER_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="DATEORDERED" primaryKey="false" required="false" type="TIMESTAMP" size="7" 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="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PRODUCTVALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="UPC" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="SKU" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
-      <column name="C_TAX_ID" primaryKey="false" required="false" type="ID" 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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_ORDERLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="TAXAMT" primaryKey="false" required="false" type="DECIMAL" size="22" 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" autoIncrement="false"/>
-      <column name="QTYORDERED" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PRICEACTUAL" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="FREIGHTAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" 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="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>
diff --git a/db/ddlutils/model/I_PAYMENT.xml b/db/ddlutils/model/I_PAYMENT.xml
index ed6dd81d92..0adb927f2b 100644
--- a/db/ddlutils/model/I_PAYMENT.xml
+++ b/db/ddlutils/model/I_PAYMENT.xml
@@ -2,36 +2,36 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="I_PAYMENT">
-      <column name="I_PAYMENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="I_PAYMENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="I_ISIMPORTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="I_ERRORMSG" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_PAYMENT_ID" primaryKey="false" required="false" type="ID" 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="DATETRX" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="ISRECEIPT" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="C_DOCTYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_DOCTYPE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DOCTYPENAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="TRXTYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="C_BANKACCOUNT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BANKACCOUNT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="BANKACCOUNTNO" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="BPARTNERVALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
-      <column name="C_INVOICE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_INVOICE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="INVOICEDOCUMENTNO" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="TENDERTYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="CREDITCARDTYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="CREDITCARDNUMBER" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="CREDITCARDVV" primaryKey="false" required="false" type="VARCHAR" size="4" autoIncrement="false"/>
-      <column name="CREDITCARDEXPMM" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="CREDITCARDEXPYY" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="CREDITCARDEXPMM" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="CREDITCARDEXPYY" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="MICR" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="ROUTINGNO" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="ACCOUNTNO" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
@@ -49,16 +49,16 @@
       <column name="SWIPE" primaryKey="false" required="false" type="VARCHAR" size="80" autoIncrement="false"/>
       <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" autoIncrement="false"/>
-      <column name="PAYAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DISCOUNTAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="WRITEOFFAMT" primaryKey="false" required="false" type="NUMERIC" default="0" 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="ISOVERUNDERPAYMENT" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="OVERUNDERAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_CHARGE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="OVERUNDERAMT" primaryKey="false" required="false" type="DECIMAL" size="22" 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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="TAXAMT" primaryKey="false" required="false" type="NUMERIC" default="0" 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="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 e7b33d1219..cb0f65044a 100644
--- a/db/ddlutils/model/I_PRODUCT.xml
+++ b/db/ddlutils/model/I_PRODUCT.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="I_PRODUCT">
-      <column name="I_PRODUCT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="I_PRODUCT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="I_ISIMPORTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="I_ERRORMSG" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCT_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="NAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
@@ -21,40 +21,40 @@
       <column name="UPC" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="SKU" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="X12DE355" primaryKey="false" required="false" type="CHAR" size="2" autoIncrement="false"/>
-      <column name="C_UOM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_UOM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PRODUCTCATEGORY_VALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
-      <column name="M_PRODUCT_CATEGORY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="WEIGHT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="SHELFWIDTH" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="SHELFHEIGHT" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="SHELFDEPTH" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="UNITSPERPALLET" primaryKey="false" required="false" type="INTEGER" 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="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"/>
+      <column name="UNITSPERPALLET" primaryKey="false" required="false" type="DECIMAL" size="10" 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="IMAGEURL" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
       <column name="DESCRIPTIONURL" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
       <column name="BPARTNER_VALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <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" autoIncrement="false"/>
-      <column name="PRICELIST" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PRICEPO" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="ROYALTYAMT" primaryKey="false" required="false" type="NUMERIC" default="0" 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="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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="ORDER_PACK" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="COSTPERORDER" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DELIVERYTIME_PROMISED" primaryKey="false" required="false" type="INTEGER" 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="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="NUMERIC" autoIncrement="false"/>
-      <column name="PRICELIMIT" primaryKey="false" required="false" type="NUMERIC" 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"/>
       <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/I_REPORTLINE.xml b/db/ddlutils/model/I_REPORTLINE.xml
index bce02a52c1..8ad1a51520 100644
--- a/db/ddlutils/model/I_REPORTLINE.xml
+++ b/db/ddlutils/model/I_REPORTLINE.xml
@@ -2,30 +2,30 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="I_REPORTLINE">
-      <column name="I_REPORTLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="I_REPORTLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="false" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="I_ISIMPORTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="I_ERRORMSG" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="REPORTLINESETNAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="PA_REPORTLINESET_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="PA_REPORTLINESET_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="PA_REPORTLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="PA_REPORTLINE_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="SEQNO" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="SEQNO" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ISSUMMARY" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISPRINTED" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="LINETYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="CALCULATIONTYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="AMOUNTTYPE" primaryKey="false" required="false" type="CHAR" size="2" autoIncrement="false"/>
       <column name="POSTINGTYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="PA_REPORTSOURCE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ELEMENTVALUE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="PA_REPORTSOURCE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ELEMENTVALUE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ELEMENTVALUE" primaryKey="false" required="false" type="VARCHAR" size="40" 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"/>
diff --git a/db/ddlutils/model/K_CATEGORY.xml b/db/ddlutils/model/K_CATEGORY.xml
index f8b8dbc0d4..b5e3088025 100644
--- a/db/ddlutils/model/K_CATEGORY.xml
+++ b/db/ddlutils/model/K_CATEGORY.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="K_CATEGORY">
-      <column name="K_CATEGORY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="K_CATEGORY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/K_CATEGORYVALUE.xml b/db/ddlutils/model/K_CATEGORYVALUE.xml
index 83ae6c3594..77f7629cde 100644
--- a/db/ddlutils/model/K_CATEGORYVALUE.xml
+++ b/db/ddlutils/model/K_CATEGORYVALUE.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="K_CATEGORYVALUE">
-      <column name="K_CATEGORYVALUE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="K_CATEGORYVALUE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="K_CATEGORY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="K_CATEGORY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="K_CATEGORY" name="KCATEGORY_KCATEGORYVALUE">
         <reference local="K_CATEGORY_ID" foreign="K_CATEGORY_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/K_COMMENT.xml b/db/ddlutils/model/K_COMMENT.xml
index a2f2d07c3b..924241411a 100644
--- a/db/ddlutils/model/K_COMMENT.xml
+++ b/db/ddlutils/model/K_COMMENT.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="K_COMMENT">
-      <column name="K_COMMENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="K_COMMENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="K_ENTRY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="RATING" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="K_ENTRY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="RATING" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ISPUBLIC" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="AD_SESSION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_SESSION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="TEXTMSG" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false"/>
       <foreign-key foreignTable="AD_SESSION" name="ADSESSION_KCOMMENT">
         <reference local="AD_SESSION_ID" foreign="AD_SESSION_ID"/>
diff --git a/db/ddlutils/model/K_ENTRY.xml b/db/ddlutils/model/K_ENTRY.xml
index 9b4f97fc60..cfbedf3fa2 100644
--- a/db/ddlutils/model/K_ENTRY.xml
+++ b/db/ddlutils/model/K_ENTRY.xml
@@ -2,23 +2,23 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="K_ENTRY">
-      <column name="K_ENTRY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="K_ENTRY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="K_TOPIC_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="RATING" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="K_TOPIC_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="RATING" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ISPUBLIC" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="KEYWORDS" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="K_SOURCE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="K_SOURCE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DESCRIPTIONURL" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
       <column name="VALIDTO" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="AD_SESSION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_SESSION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="TEXTMSG" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false"/>
       <foreign-key foreignTable="AD_SESSION" name="ADSESSION_KENTRY">
         <reference local="AD_SESSION_ID" foreign="AD_SESSION_ID"/>
diff --git a/db/ddlutils/model/K_ENTRYCATEGORY.xml b/db/ddlutils/model/K_ENTRYCATEGORY.xml
index 44d8edd357..41c01b2737 100644
--- a/db/ddlutils/model/K_ENTRYCATEGORY.xml
+++ b/db/ddlutils/model/K_ENTRYCATEGORY.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="K_ENTRYCATEGORY">
-      <column name="K_CATEGORY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="K_ENTRY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="K_CATEGORY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="K_ENTRY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="K_CATEGORYVALUE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="K_CATEGORYVALUE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="K_CATEGORY" name="KCATEGORY_KENTRYCATEGORY">
         <reference local="K_CATEGORY_ID" foreign="K_CATEGORY_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/K_ENTRYRELATED.xml b/db/ddlutils/model/K_ENTRYRELATED.xml
index 23b4cf0ae3..3b20da5c06 100644
--- a/db/ddlutils/model/K_ENTRYRELATED.xml
+++ b/db/ddlutils/model/K_ENTRYRELATED.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="K_ENTRYRELATED">
-      <column name="K_ENTRY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="K_ENTRYRELATED_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="K_ENTRY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="K_ENTRYRELATED_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <foreign-key foreignTable="K_ENTRY" name="KENTRY_KENTRYRELATED">
-        <reference local="K_ENTRY_ID" foreign="K_ENTRY_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="K_ENTRY" name="KENTRY_KENTRYRELATEDID">
         <reference local="K_ENTRYRELATED_ID" foreign="K_ENTRY_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="K_ENTRY" name="KENTRY_KENTRYRELATED">
+        <reference local="K_ENTRY_ID" foreign="K_ENTRY_ID"/>
+      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/K_INDEX.xml b/db/ddlutils/model/K_INDEX.xml
index 710c15180a..07eec4a713 100644
--- a/db/ddlutils/model/K_INDEX.xml
+++ b/db/ddlutils/model/K_INDEX.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="K_INDEX">
-      <column name="K_INDEX_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="K_INDEX_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="KEYWORD" primaryKey="false" required="true" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="EXCERPT" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="RECORD_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="RECORD_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="SOURCEUPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CM_WEBPROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="R_REQUESTTYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_DOCTYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CM_WEBPROJECT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_REQUESTTYPE_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"/>
       <foreign-key foreignTable="AD_TABLE" name="ADTABLE_KINDEX">
         <reference local="AD_TABLE_ID" foreign="AD_TABLE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/K_INDEXLOG.xml b/db/ddlutils/model/K_INDEXLOG.xml
index c978149f38..f35b995dd6 100644
--- a/db/ddlutils/model/K_INDEXLOG.xml
+++ b/db/ddlutils/model/K_INDEXLOG.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="K_INDEXLOG">
-      <column name="K_INDEXLOG_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="K_INDEXLOG_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="INDEXQUERY" primaryKey="false" required="true" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="INDEXQUERYRESULT" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="INDEXQUERYRESULT" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <column name="QUERYSOURCE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
diff --git a/db/ddlutils/model/K_INDEXSTOP.xml b/db/ddlutils/model/K_INDEXSTOP.xml
index 3b49bcf0bf..d7b9399186 100644
--- a/db/ddlutils/model/K_INDEXSTOP.xml
+++ b/db/ddlutils/model/K_INDEXSTOP.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="K_INDEXSTOP">
-      <column name="K_INDEXSTOP_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="K_INDEXSTOP_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="KEYWORD" primaryKey="false" required="true" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="ISMANUAL" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="CM_WEBPROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="R_REQUESTTYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_DOCTYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="CM_WEBPROJECT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_REQUESTTYPE_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"/>
       <foreign-key foreignTable="CM_WEBPROJECT" name="CMWEBPROJECT_KINDEXSTOP">
         <reference local="CM_WEBPROJECT_ID" foreign="CM_WEBPROJECT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/K_SOURCE.xml b/db/ddlutils/model/K_SOURCE.xml
index 035143fc83..6f90004d6e 100644
--- a/db/ddlutils/model/K_SOURCE.xml
+++ b/db/ddlutils/model/K_SOURCE.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="K_SOURCE">
-      <column name="K_SOURCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="K_SOURCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTIONURL" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
       <check>
diff --git a/db/ddlutils/model/K_SYNONYM.xml b/db/ddlutils/model/K_SYNONYM.xml
index 421a112d71..839bc77261 100644
--- a/db/ddlutils/model/K_SYNONYM.xml
+++ b/db/ddlutils/model/K_SYNONYM.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="K_SYNONYM">
-      <column name="K_SYNONYM_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="K_SYNONYM_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="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="SYNONYMNAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="false" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/K_TOPIC.xml b/db/ddlutils/model/K_TOPIC.xml
index 41ef604084..56015ed49e 100644
--- a/db/ddlutils/model/K_TOPIC.xml
+++ b/db/ddlutils/model/K_TOPIC.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="K_TOPIC">
-      <column name="K_TOPIC_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="K_TOPIC_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="K_TYPE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="K_TYPE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISPUBLIC" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISPUBLICWRITE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <foreign-key foreignTable="K_TYPE" name="KTYPE_KTOPIC">
diff --git a/db/ddlutils/model/K_TYPE.xml b/db/ddlutils/model/K_TYPE.xml
index 1f218def30..aa35ea27e0 100644
--- a/db/ddlutils/model/K_TYPE.xml
+++ b/db/ddlutils/model/K_TYPE.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="K_TYPE">
-      <column name="K_TYPE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="K_TYPE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/M_ATTRIBUTE.xml b/db/ddlutils/model/M_ATTRIBUTE.xml
index a25f5f3109..a0769799da 100644
--- a/db/ddlutils/model/M_ATTRIBUTE.xml
+++ b/db/ddlutils/model/M_ATTRIBUTE.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_ATTRIBUTE">
-      <column name="M_ATTRIBUTE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_ATTRIBUTE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="ISMANDATORY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISINSTANCEATTRIBUTE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESEARCH_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="M_ATTRIBUTESEARCH_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ATTRIBUTEVALUETYPE" primaryKey="false" required="true" type="CHAR" size="1" default="S" autoIncrement="false"/>
       <foreign-key foreignTable="M_ATTRIBUTESEARCH" name="MATTRIBUTESEARCH_MATTRIBUTE">
         <reference local="M_ATTRIBUTESEARCH_ID" foreign="M_ATTRIBUTESEARCH_ID"/>
diff --git a/db/ddlutils/model/M_ATTRIBUTEINSTANCE.xml b/db/ddlutils/model/M_ATTRIBUTEINSTANCE.xml
index 2aa95ec1d8..93bfca4781 100644
--- a/db/ddlutils/model/M_ATTRIBUTEINSTANCE.xml
+++ b/db/ddlutils/model/M_ATTRIBUTEINSTANCE.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_ATTRIBUTEINSTANCE">
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="true" required="true" type="ID" default="0" autoIncrement="false"/>
-      <column name="M_ATTRIBUTE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="true" required="true" type="ID" size="10" default="0" autoIncrement="false"/>
+      <column name="M_ATTRIBUTE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_ATTRIBUTEVALUE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <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="NUMERIC" autoIncrement="false"/>
+      <column name="VALUENUMBER" primaryKey="false" required="false" type="DECIMAL" size="22" 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_ATTRIBUTESEARCH.xml b/db/ddlutils/model/M_ATTRIBUTESEARCH.xml
index e7aaef31e4..dd170ca613 100644
--- a/db/ddlutils/model/M_ATTRIBUTESEARCH.xml
+++ b/db/ddlutils/model/M_ATTRIBUTESEARCH.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_ATTRIBUTESEARCH">
-      <column name="M_ATTRIBUTESEARCH_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_ATTRIBUTESEARCH_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <check>
diff --git a/db/ddlutils/model/M_ATTRIBUTESET.xml b/db/ddlutils/model/M_ATTRIBUTESET.xml
index d3be4f7709..ed82c3af2b 100644
--- a/db/ddlutils/model/M_ATTRIBUTESET.xml
+++ b/db/ddlutils/model/M_ATTRIBUTESET.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_ATTRIBUTESET">
-      <column name="M_ATTRIBUTESET_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_ATTRIBUTESET_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="ISSERNO" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="M_SERNOCTL_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="M_SERNOCTL_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISLOT" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="M_LOTCTL_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="M_LOTCTL_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISGUARANTEEDATE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="GUARANTEEDAYS" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="GUARANTEEDAYS" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ISINSTANCEATTRIBUTE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="MANDATORYTYPE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISGUARANTEEDATEMANDATORY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/M_ATTRIBUTESETEXCLUDE.xml b/db/ddlutils/model/M_ATTRIBUTESETEXCLUDE.xml
index 4c958bc7d2..81329954fc 100644
--- a/db/ddlutils/model/M_ATTRIBUTESETEXCLUDE.xml
+++ b/db/ddlutils/model/M_ATTRIBUTESETEXCLUDE.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_ATTRIBUTESETEXCLUDE">
-      <column name="M_ATTRIBUTESETEXCLUDE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_ATTRIBUTESETEXCLUDE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESET_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_ATTRIBUTESET_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSOTRX" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <foreign-key foreignTable="AD_TABLE" name="ADTABLE_MATTRIBUTESETEXCLUDE">
         <reference local="AD_TABLE_ID" foreign="AD_TABLE_ID"/>
diff --git a/db/ddlutils/model/M_ATTRIBUTESETINSTANCE.xml b/db/ddlutils/model/M_ATTRIBUTESETINSTANCE.xml
index 6952d38e23..f35b87d134 100644
--- a/db/ddlutils/model/M_ATTRIBUTESETINSTANCE.xml
+++ b/db/ddlutils/model/M_ATTRIBUTESETINSTANCE.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_ATTRIBUTESETINSTANCE">
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESET_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_ATTRIBUTESET_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="SERNO" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="LOT" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <column name="GUARANTEEDATE" 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="M_LOT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="M_LOT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="M_ATTRIBUTESET" name="MATTRIBUTESET_MATTRIBSETINST">
         <reference local="M_ATTRIBUTESET_ID" foreign="M_ATTRIBUTESET_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_ATTRIBUTEUSE.xml b/db/ddlutils/model/M_ATTRIBUTEUSE.xml
index cdebee7426..72c3172f98 100644
--- a/db/ddlutils/model/M_ATTRIBUTEUSE.xml
+++ b/db/ddlutils/model/M_ATTRIBUTEUSE.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_ATTRIBUTEUSE">
-      <column name="M_ATTRIBUTE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESET_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_ATTRIBUTE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_ATTRIBUTESET_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="SEQNO" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="M_ATTRIBUTE" name="MATTRIBUTE_MATTRIBUTEUSE">
         <reference local="M_ATTRIBUTE_ID" foreign="M_ATTRIBUTE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_ATTRIBUTEVALUE.xml b/db/ddlutils/model/M_ATTRIBUTEVALUE.xml
index f3bc677c5d..425dbbb58f 100644
--- a/db/ddlutils/model/M_ATTRIBUTEVALUE.xml
+++ b/db/ddlutils/model/M_ATTRIBUTEVALUE.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_ATTRIBUTEVALUE">
-      <column name="M_ATTRIBUTEVALUE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_ATTRIBUTEVALUE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_ATTRIBUTE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_ATTRIBUTE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" 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"/>
diff --git a/db/ddlutils/model/M_BOM.xml b/db/ddlutils/model/M_BOM.xml
index f736bf2318..e6cb185671 100644
--- a/db/ddlutils/model/M_BOM.xml
+++ b/db/ddlutils/model/M_BOM.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_BOM">
-      <column name="M_BOM_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_BOM_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_CHANGENOTICE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <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="M_CHANGENOTICE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="BOMTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="BOMUSE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
diff --git a/db/ddlutils/model/M_BOMALTERNATIVE.xml b/db/ddlutils/model/M_BOMALTERNATIVE.xml
index f50cb60ff3..e18c228d34 100644
--- a/db/ddlutils/model/M_BOMALTERNATIVE.xml
+++ b/db/ddlutils/model/M_BOMALTERNATIVE.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_BOMALTERNATIVE">
-      <column name="M_BOMALTERNATIVE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_BOMALTERNATIVE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="M_PRODUCT" name="MPRODUCT_MBOMALTERNATIVE">
         <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_BOMPRODUCT.xml b/db/ddlutils/model/M_BOMPRODUCT.xml
index 773b373ed4..e290cb4afe 100644
--- a/db/ddlutils/model/M_BOMPRODUCT.xml
+++ b/db/ddlutils/model/M_BOMPRODUCT.xml
@@ -2,28 +2,28 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_BOMPRODUCT">
-      <column name="M_BOMPRODUCT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_BOMPRODUCT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="M_BOM_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="M_BOM_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="BOMPRODUCTTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="ISPHANTOM" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="M_PRODUCTBOM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_CHANGENOTICE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_BOMALTERNATIVE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="BOMQTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="M_PRODUCTBOM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <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="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" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="false" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="LEADTIMEOFFSET" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="M_PRODUCTOPERATION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="SEQNO" primaryKey="false" required="false" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
+      <column name="LEADTIMEOFFSET" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="M_ATTRIBUTESETINSTANCE" name="MASI_MBOMPRODUCT">
         <reference local="M_ATTRIBUTESETINSTANCE_ID" foreign="M_ATTRIBUTESETINSTANCE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_CHANGENOTICE.xml b/db/ddlutils/model/M_CHANGENOTICE.xml
index 36c0803500..ba0e23443a 100644
--- a/db/ddlutils/model/M_CHANGENOTICE.xml
+++ b/db/ddlutils/model/M_CHANGENOTICE.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_CHANGENOTICE">
-      <column name="M_CHANGENOTICE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_CHANGENOTICE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/M_CHANGEREQUEST.xml b/db/ddlutils/model/M_CHANGEREQUEST.xml
index f4f1d2d003..54d5326716 100644
--- a/db/ddlutils/model/M_CHANGEREQUEST.xml
+++ b/db/ddlutils/model/M_CHANGEREQUEST.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_CHANGEREQUEST">
-      <column name="M_CHANGEREQUEST_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_CHANGEREQUEST_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_BOM_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_CHANGENOTICE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_BOM_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_CHANGENOTICE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DOCUMENTNO" primaryKey="false" required="true" type="VARCHAR" size="30" 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="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="DETAILINFO" primaryKey="false" required="false" type="CLOB" size="4000" autoIncrement="false"/>
-      <column name="M_FIXCHANGENOTICE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="M_FIXCHANGENOTICE_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="ISAPPROVED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="M_BOM" name="MBOM_MCHANGEREQUEST">
diff --git a/db/ddlutils/model/M_COST.xml b/db/ddlutils/model/M_COST.xml
index 2abf84b95b..2b340d7361 100644
--- a/db/ddlutils/model/M_COST.xml
+++ b/db/ddlutils/model/M_COST.xml
@@ -2,25 +2,25 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_COST">
-      <column name="AD_CLIENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_COSTTYPE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_COSTELEMENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_PRODUCT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_COSTTYPE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_COSTELEMENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CURRENTCOSTPRICE" primaryKey="false" required="true" type="NUMERIC" autoIncrement="false"/>
-      <column name="CURRENTQTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="CUMULATEDAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="CUMULATEDQTY" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="FUTURECOSTPRICE" primaryKey="false" required="false" type="NUMERIC" 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="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="PERCENT" primaryKey="false" required="false" type="INTEGER" default="0" 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">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_COSTDETAIL.xml b/db/ddlutils/model/M_COSTDETAIL.xml
index 6a33805251..6252817020 100644
--- a/db/ddlutils/model/M_COSTDETAIL.xml
+++ b/db/ddlutils/model/M_COSTDETAIL.xml
@@ -2,30 +2,30 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_COSTDETAIL">
-      <column name="M_COSTDETAIL_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_COSTDETAIL_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="C_ACCTSCHEMA_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="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_COSTELEMENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ORDERLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_INOUTLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICELINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_MOVEMENTLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_INVENTORYLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCTIONLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECTISSUE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_COSTELEMENT_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="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="M_MOVEMENTLINE_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="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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DELTAAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DELTAQTY" primaryKey="false" required="false" type="NUMERIC" default="0" 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="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_COSTELEMENT.xml b/db/ddlutils/model/M_COSTELEMENT.xml
index 18ae1c274d..344a92aa1b 100644
--- a/db/ddlutils/model/M_COSTELEMENT.xml
+++ b/db/ddlutils/model/M_COSTELEMENT.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_COSTELEMENT">
-      <column name="M_COSTELEMENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_COSTELEMENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="COSTELEMENTTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
diff --git a/db/ddlutils/model/M_COSTQUEUE.xml b/db/ddlutils/model/M_COSTQUEUE.xml
index 080b08b033..921a58f028 100644
--- a/db/ddlutils/model/M_COSTQUEUE.xml
+++ b/db/ddlutils/model/M_COSTQUEUE.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_COSTQUEUE">
-      <column name="M_COSTQUEUE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_COSTQUEUE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_COSTTYPE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_COSTELEMENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CURRENTCOSTPRICE" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="CURRENTQTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_COSTTYPE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_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="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"/>
       <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_COSTTYPE.xml b/db/ddlutils/model/M_COSTTYPE.xml
index ccf6787a21..ddd7fe4fc1 100644
--- a/db/ddlutils/model/M_COSTTYPE.xml
+++ b/db/ddlutils/model/M_COSTTYPE.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_COSTTYPE">
-      <column name="M_COSTTYPE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_COSTTYPE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/M_DEMAND.xml b/db/ddlutils/model/M_DEMAND.xml
index a885ea1a33..c190b09871 100644
--- a/db/ddlutils/model/M_DEMAND.xml
+++ b/db/ddlutils/model/M_DEMAND.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_DEMAND">
-      <column name="M_DEMAND_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_DEMAND_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="ISDEFAULT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_CALENDAR_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_YEAR_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CALENDAR_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_YEAR_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <foreign-key foreignTable="C_CALENDAR" name="CCALENDAR_MDEMAND">
         <reference local="C_CALENDAR_ID" foreign="C_CALENDAR_ID"/>
diff --git a/db/ddlutils/model/M_DEMANDDETAIL.xml b/db/ddlutils/model/M_DEMANDDETAIL.xml
index d5177588e8..c3233e0b34 100644
--- a/db/ddlutils/model/M_DEMANDDETAIL.xml
+++ b/db/ddlutils/model/M_DEMANDDETAIL.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_DEMANDDETAIL">
-      <column name="M_DEMANDDETAIL_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_DEMANDDETAIL_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_DEMANDLINE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_FORECASTLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_REQUISITIONLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ORDERLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_DEMANDLINE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_FORECASTLINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_REQUISITIONLINE_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"/>
       <foreign-key foreignTable="C_ORDERLINE" name="CORDERLINE_MDEMANDDETAIL">
         <reference local="C_ORDERLINE_ID" foreign="C_ORDERLINE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_DEMANDLINE.xml b/db/ddlutils/model/M_DEMANDLINE.xml
index 8a0c988a7d..9e596119ff 100644
--- a/db/ddlutils/model/M_DEMANDLINE.xml
+++ b/db/ddlutils/model/M_DEMANDLINE.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_DEMANDLINE">
-      <column name="M_DEMANDLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_DEMANDLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_DEMAND_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_PERIOD_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="QTYCALCULATED" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <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="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"/>
       <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 8e28630a7c..884bb5cebf 100644
--- a/db/ddlutils/model/M_DISCOUNTSCHEMA.xml
+++ b/db/ddlutils/model/M_DISCOUNTSCHEMA.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_DISCOUNTSCHEMA">
-      <column name="M_DISCOUNTSCHEMA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_DISCOUNTSCHEMA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <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="NUMERIC" autoIncrement="false"/>
+      <column name="FLATDISCOUNT" primaryKey="false" required="false" type="DECIMAL" size="22" 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 0eca43bb0a..cd8ba23161 100644
--- a/db/ddlutils/model/M_DISCOUNTSCHEMABREAK.xml
+++ b/db/ddlutils/model/M_DISCOUNTSCHEMABREAK.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_DISCOUNTSCHEMABREAK">
-      <column name="M_DISCOUNTSCHEMABREAK_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_DISCOUNTSCHEMABREAK_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_DISCOUNTSCHEMA_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="BREAKVALUE" primaryKey="false" required="true" type="NUMERIC" autoIncrement="false"/>
-      <column name="BREAKDISCOUNT" primaryKey="false" required="true" type="NUMERIC" autoIncrement="false"/>
-      <column name="M_PRODUCT_CATEGORY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <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="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"/>
       <foreign-key foreignTable="M_DISCOUNTSCHEMA" name="MDISCOUNTS_MDSBREAK">
         <reference local="M_DISCOUNTSCHEMA_ID" foreign="M_DISCOUNTSCHEMA_ID"/>
diff --git a/db/ddlutils/model/M_DISCOUNTSCHEMALINE.xml b/db/ddlutils/model/M_DISCOUNTSCHEMALINE.xml
index 08a8ccbb65..10c88bc1fd 100644
--- a/db/ddlutils/model/M_DISCOUNTSCHEMALINE.xml
+++ b/db/ddlutils/model/M_DISCOUNTSCHEMALINE.xml
@@ -2,42 +2,42 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_DISCOUNTSCHEMALINE">
-      <column name="M_DISCOUNTSCHEMALINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_DISCOUNTSCHEMALINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_DISCOUNTSCHEMA_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="M_PRODUCT_CATEGORY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <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="M_PRODUCT_CATEGORY_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="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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="LIST_DISCOUNT" primaryKey="false" required="true" type="NUMERIC" 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_ROUNDING" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="LIST_MINAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="LIST_MAXAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="LIST_FIXED" primaryKey="false" required="false" type="NUMERIC" default="0" 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="STD_BASE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="STD_ADDAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="STD_DISCOUNT" primaryKey="false" required="true" type="NUMERIC" 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_ROUNDING" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="STD_MINAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="STD_MAXAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="STD_FIXED" primaryKey="false" required="false" type="NUMERIC" default="0" 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="LIMIT_BASE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="LIMIT_ADDAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="LIMIT_DISCOUNT" primaryKey="false" required="true" type="NUMERIC" 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_ROUNDING" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="LIMIT_MINAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="LIMIT_MAXAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="LIMIT_FIXED" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_CONVERSIONTYPE_ID" primaryKey="false" required="true" type="ID" 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="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"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_DISTRIBUTIONLIST.xml b/db/ddlutils/model/M_DISTRIBUTIONLIST.xml
index 5d9ac7d948..b4989ce51a 100644
--- a/db/ddlutils/model/M_DISTRIBUTIONLIST.xml
+++ b/db/ddlutils/model/M_DISTRIBUTIONLIST.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_DISTRIBUTIONLIST">
-      <column name="M_DISTRIBUTIONLIST_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_DISTRIBUTIONLIST_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="NUMERIC" autoIncrement="false"/>
+      <column name="RATIOTOTAL" primaryKey="false" required="false" type="DECIMAL" size="22" 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 10a31020ae..9908aedb56 100644
--- a/db/ddlutils/model/M_DISTRIBUTIONLISTLINE.xml
+++ b/db/ddlutils/model/M_DISTRIBUTIONLISTLINE.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_DISTRIBUTIONLISTLINE">
-      <column name="M_DISTRIBUTIONLISTLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_DISTRIBUTIONLISTLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_DISTRIBUTIONLIST_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="MINQTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="RATIO" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <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="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_DISTRIBUTIONRUN.xml b/db/ddlutils/model/M_DISTRIBUTIONRUN.xml
index d3064c04c6..06abebd1c7 100644
--- a/db/ddlutils/model/M_DISTRIBUTIONRUN.xml
+++ b/db/ddlutils/model/M_DISTRIBUTIONRUN.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_DISTRIBUTIONRUN">
-      <column name="M_DISTRIBUTIONRUN_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_DISTRIBUTIONRUN_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="ISCREATESINGLEORDER" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <foreign-key foreignTable="C_BPARTNER" name="CBPARTNER_MDISTRIBUTIONRUN">
         <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 31f06433c1..97f43c19df 100644
--- a/db/ddlutils/model/M_DISTRIBUTIONRUNLINE.xml
+++ b/db/ddlutils/model/M_DISTRIBUTIONRUNLINE.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_DISTRIBUTIONRUNLINE">
-      <column name="M_DISTRIBUTIONRUNLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_DISTRIBUTIONRUNLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_DISTRIBUTIONRUN_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_DISTRIBUTIONRUN_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="M_DISTRIBUTIONLIST_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="TOTALQTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="MINQTY" primaryKey="false" required="true" type="NUMERIC" default="0" 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"/>
       <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 b6ef9c3823..0a245a6ceb 100644
--- a/db/ddlutils/model/M_EDI.xml
+++ b/db/ddlutils/model/M_EDI.xml
@@ -2,31 +2,31 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_EDI">
-      <column name="M_EDI_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_EDI_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BP_EDI_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_BP_EDI_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DOCUMENTNO" primaryKey="false" required="true" type="VARCHAR" size="30" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="LINE" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="TRXTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="EDISTATUS" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="M_WAREHOUSE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="REQUEST_QTY" primaryKey="false" required="true" type="NUMERIC" default="0" 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_SHIPDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="REQUEST_PRICE" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="REQUEST_PRICE" primaryKey="false" required="false" type="DECIMAL" size="22" 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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="REPLY_QTYAVAILABLE" primaryKey="false" required="false" type="NUMERIC" default="0" 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_SHIPDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="REPLY_PRICE" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="REPLY_PRICE" primaryKey="false" required="false" type="DECIMAL" size="22" 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_EDI_INFO.xml b/db/ddlutils/model/M_EDI_INFO.xml
index 804764a26e..af2f809d05 100644
--- a/db/ddlutils/model/M_EDI_INFO.xml
+++ b/db/ddlutils/model/M_EDI_INFO.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_EDI_INFO">
-      <column name="M_EDI_INFO_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_EDI_INFO_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_EDI_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_EDI_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="INFO" primaryKey="false" required="true" type="CLOB" size="4000" autoIncrement="false"/>
       <foreign-key foreignTable="M_EDI" name="MEDI_EDIINFO">
         <reference local="M_EDI_ID" foreign="M_EDI_ID"/>
diff --git a/db/ddlutils/model/M_FORECAST.xml b/db/ddlutils/model/M_FORECAST.xml
index 3060d17bcc..3dc0561d67 100644
--- a/db/ddlutils/model/M_FORECAST.xml
+++ b/db/ddlutils/model/M_FORECAST.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_FORECAST">
-      <column name="M_FORECAST_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_FORECAST_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="ISDEFAULT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_CALENDAR_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_YEAR_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CALENDAR_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_YEAR_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <foreign-key foreignTable="C_CALENDAR" name="CCALENDAR_MFORECAST">
         <reference local="C_CALENDAR_ID" foreign="C_CALENDAR_ID"/>
diff --git a/db/ddlutils/model/M_FORECASTLINE.xml b/db/ddlutils/model/M_FORECASTLINE.xml
index 53f67ee283..486c46cce6 100644
--- a/db/ddlutils/model/M_FORECASTLINE.xml
+++ b/db/ddlutils/model/M_FORECASTLINE.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_FORECASTLINE">
-      <column name="M_FORECASTLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_FORECASTLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_FORECAST_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_PERIOD_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="QTYCALCULATED" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <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="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"/>
       <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 fcc9ab6017..95ee4ccded 100644
--- a/db/ddlutils/model/M_FREIGHT.xml
+++ b/db/ddlutils/model/M_FREIGHT.xml
@@ -2,23 +2,23 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_FREIGHT">
-      <column name="M_FREIGHT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_FREIGHT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_SHIPPER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_FREIGHTCATEGORY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_SHIPPER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_FREIGHTCATEGORY_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="C_COUNTRY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="TO_COUNTRY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_REGION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="TO_REGION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="FREIGHTAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="C_COUNTRY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="TO_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"/>
+      <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"/>
       <foreign-key foreignTable="C_COUNTRY" name="CCOUNTRYTO_MFREIGHT">
         <reference local="TO_COUNTRY_ID" foreign="C_COUNTRY_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_FREIGHTCATEGORY.xml b/db/ddlutils/model/M_FREIGHTCATEGORY.xml
index d943c616cc..a2ab817df1 100644
--- a/db/ddlutils/model/M_FREIGHTCATEGORY.xml
+++ b/db/ddlutils/model/M_FREIGHTCATEGORY.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_FREIGHTCATEGORY">
-      <column name="M_FREIGHTCATEGORY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_FREIGHTCATEGORY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" 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"/>
diff --git a/db/ddlutils/model/M_INOUT.xml b/db/ddlutils/model/M_INOUT.xml
index 1587223b48..5661dd2806 100644
--- a/db/ddlutils/model/M_INOUT.xml
+++ b/db/ddlutils/model/M_INOUT.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_INOUT">
-      <column name="M_INOUT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_INOUT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSOTRX" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="DOCUMENTNO" primaryKey="false" required="true" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="DOCACTION" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
@@ -17,52 +17,52 @@
       <column name="POSTED" 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"/>
-      <column name="C_DOCTYPE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_DOCTYPE_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="C_ORDER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_ORDER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DATEORDERED" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="ISPRINTED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="MOVEMENTTYPE" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
       <column name="MOVEMENTDATE" 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_BPARTNER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_WAREHOUSE_ID" primaryKey="false" required="true" type="ID" 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="M_WAREHOUSE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <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="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="FREIGHTAMT" primaryKey="false" required="false" type="DECIMAL" size="22" 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" autoIncrement="false"/>
-      <column name="C_CHARGE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="CHARGEAMT" primaryKey="false" required="false" type="NUMERIC" default="0" 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="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" autoIncrement="false"/>
+      <column name="C_INVOICE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="CREATEFROM" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="GENERATETO" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="SENDEMAIL" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="SALESREP_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="NOPACKAGES" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="SALESREP_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="NOPACKAGES" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="PICKDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="SHIPDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="TRACKINGNO" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER1_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER2_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_ORGTRX_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_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="DATERECEIVED" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="ISINTRANSIT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="REF_INOUT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="REF_INOUT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="CREATECONFIRM" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <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="NUMERIC" autoIncrement="false"/>
-      <column name="WEIGHT" primaryKey="false" required="false" type="NUMERIC" 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>
diff --git a/db/ddlutils/model/M_INOUTCONFIRM.xml b/db/ddlutils/model/M_INOUTCONFIRM.xml
index 786aa1bd2e..099249b10a 100644
--- a/db/ddlutils/model/M_INOUTCONFIRM.xml
+++ b/db/ddlutils/model/M_INOUTCONFIRM.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_INOUTCONFIRM">
-      <column name="M_INOUTCONFIRM_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_INOUTCONFIRM_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DOCUMENTNO" primaryKey="false" required="true" type="VARCHAR" size="30" autoIncrement="false"/>
-      <column name="M_INOUT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_INOUT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="CONFIRMTYPE" 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="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
@@ -22,9 +22,9 @@
       <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="ISINDISPUTE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="M_INVENTORY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="APPROVALAMT" primaryKey="false" required="false" type="NUMERIC" 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="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 06a2c32f9b..3052523bcd 100644
--- a/db/ddlutils/model/M_INOUTLINE.xml
+++ b/db/ddlutils/model/M_INOUTLINE.xml
@@ -2,41 +2,41 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_INOUTLINE">
-      <column name="M_INOUTLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_INOUTLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <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="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="M_INOUT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ORDERLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_LOCATOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_UOM_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="MOVEMENTQTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="M_INOUT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ORDERLINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <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="ISINVOICED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="ID" 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="CONFIRMEDQTY" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PICKEDQTY" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="SCRAPPEDQTY" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="TARGETQTY" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="REF_INOUTLINE_ID" primaryKey="false" required="false" type="ID" 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="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="NUMERIC" autoIncrement="false"/>
-      <column name="C_CHARGE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECTPHASE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECTTASK_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER1_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER2_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="QTYENTERED" primaryKey="false" required="true" type="DECIMAL" size="22" 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"/>
+      <column name="C_PROJECTTASK_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"/>
+      <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>
diff --git a/db/ddlutils/model/M_INOUTLINECONFIRM.xml b/db/ddlutils/model/M_INOUTLINECONFIRM.xml
index 50a783523a..a0cddc9092 100644
--- a/db/ddlutils/model/M_INOUTLINECONFIRM.xml
+++ b/db/ddlutils/model/M_INOUTLINECONFIRM.xml
@@ -2,24 +2,24 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_INOUTLINECONFIRM">
-      <column name="M_INOUTLINECONFIRM_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_INOUTLINECONFIRM_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_INOUTCONFIRM_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_INOUTLINE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="TARGETQTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="CONFIRMEDQTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <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="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="NUMERIC" autoIncrement="false"/>
-      <column name="SCRAPPEDQTY" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="M_INVENTORYLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICELINE_ID" primaryKey="false" required="false" type="ID" 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="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"/>
       <foreign-key foreignTable="M_INOUTCONFIRM" name="MINOUTCONFIRM_MINOUTLINECONF">
         <reference local="M_INOUTCONFIRM_ID" foreign="M_INOUTCONFIRM_ID"/>
diff --git a/db/ddlutils/model/M_INOUTLINEMA.xml b/db/ddlutils/model/M_INOUTLINEMA.xml
index 57b7248c51..b6ec8ecfa9 100644
--- a/db/ddlutils/model/M_INOUTLINEMA.xml
+++ b/db/ddlutils/model/M_INOUTLINEMA.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_INOUTLINEMA">
-      <column name="M_INOUTLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_INOUTLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="MOVEMENTQTY" primaryKey="false" required="true" type="NUMERIC" default="0" 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"/>
       <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 c02983a3f8..2cfa454f52 100644
--- a/db/ddlutils/model/M_INVENTORY.xml
+++ b/db/ddlutils/model/M_INVENTORY.xml
@@ -2,35 +2,35 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_INVENTORY">
-      <column name="M_INVENTORY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_INVENTORY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DOCUMENTNO" primaryKey="false" required="true" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="M_WAREHOUSE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_WAREHOUSE_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="POSTED" 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="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="UPDATEQTY" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="GENERATELIST" primaryKey="false" required="false" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="M_PERPETUALINV_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER1_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER2_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="M_PERPETUALINV_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"/>
+      <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"/>
+      <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="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="NUMERIC" autoIncrement="false"/>
-      <column name="C_DOCTYPE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="APPROVALAMT" primaryKey="false" required="false" type="DECIMAL" size="22" 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"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_INVENTORYLINE.xml b/db/ddlutils/model/M_INVENTORYLINE.xml
index 7afb9bee21..658bf16193 100644
--- a/db/ddlutils/model/M_INVENTORYLINE.xml
+++ b/db/ddlutils/model/M_INVENTORYLINE.xml
@@ -2,26 +2,26 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_INVENTORYLINE">
-      <column name="M_INVENTORYLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_INVENTORYLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_INVENTORY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_LOCATOR_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="QTYBOOK" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="QTYCOUNT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_INVENTORY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <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="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="ID" default="0" autoIncrement="false"/>
-      <column name="C_CHARGE_ID" primaryKey="false" required="false" type="ID" 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="NUMERIC" autoIncrement="false"/>
+      <column name="QTYINTERNALUSE" primaryKey="false" required="false" type="DECIMAL" size="22" 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 3a6084a6a6..50ac0537c1 100644
--- a/db/ddlutils/model/M_INVENTORYLINEMA.xml
+++ b/db/ddlutils/model/M_INVENTORYLINEMA.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_INVENTORYLINEMA">
-      <column name="M_INVENTORYLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_INVENTORYLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="MOVEMENTQTY" primaryKey="false" required="true" type="NUMERIC" default="0" 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"/>
       <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_LOCATOR.xml b/db/ddlutils/model/M_LOCATOR.xml
index af6aa54a6e..2c0b6ffc97 100644
--- a/db/ddlutils/model/M_LOCATOR.xml
+++ b/db/ddlutils/model/M_LOCATOR.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_LOCATOR">
-      <column name="M_LOCATOR_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_LOCATOR_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" autoIncrement="false"/>
-      <column name="M_WAREHOUSE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="PRIORITYNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="M_WAREHOUSE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="PRIORITYNO" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ISDEFAULT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="X" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="Y" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
diff --git a/db/ddlutils/model/M_LOT.xml b/db/ddlutils/model/M_LOT.xml
index 2106fa4c2d..7c118a33e1 100644
--- a/db/ddlutils/model/M_LOT.xml
+++ b/db/ddlutils/model/M_LOT.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_LOT">
-      <column name="M_LOT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_LOT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" 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="M_LOTCTL_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="M_LOTCTL_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="M_LOTCTL" name="MLOTCTL_MLOT">
         <reference local="M_LOTCTL_ID" foreign="M_LOTCTL_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_LOTCTL.xml b/db/ddlutils/model/M_LOTCTL.xml
index f33ebc4f49..906bec0d45 100644
--- a/db/ddlutils/model/M_LOTCTL.xml
+++ b/db/ddlutils/model/M_LOTCTL.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_LOTCTL">
-      <column name="M_LOTCTL_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_LOTCTL_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="STARTNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="INCREMENTNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="CURRENTNEXT" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="STARTNO" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="INCREMENTNO" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="CURRENTNEXT" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="PREFIX" primaryKey="false" required="false" type="VARCHAR" size="10" autoIncrement="false"/>
       <column name="SUFFIX" primaryKey="false" required="false" type="VARCHAR" size="10" autoIncrement="false"/>
       <check>
diff --git a/db/ddlutils/model/M_LOTCTLEXCLUDE.xml b/db/ddlutils/model/M_LOTCTLEXCLUDE.xml
index 0a1352a337..8af9e9f49d 100644
--- a/db/ddlutils/model/M_LOTCTLEXCLUDE.xml
+++ b/db/ddlutils/model/M_LOTCTLEXCLUDE.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_LOTCTLEXCLUDE">
-      <column name="M_LOTCTLEXCLUDE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_LOTCTLEXCLUDE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_LOTCTL_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_LOTCTL_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSOTRX" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="AD_TABLE" name="ADTABLE_MLOTCTLEXCLUDE">
         <reference local="AD_TABLE_ID" foreign="AD_TABLE_ID"/>
diff --git a/db/ddlutils/model/M_MATCHINV.xml b/db/ddlutils/model/M_MATCHINV.xml
index 4e5c8ea845..3bced5c520 100644
--- a/db/ddlutils/model/M_MATCHINV.xml
+++ b/db/ddlutils/model/M_MATCHINV.xml
@@ -2,25 +2,25 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_MATCHINV">
-      <column name="M_MATCHINV_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_MATCHINV_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_INOUTLINE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICELINE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="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="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" size="22" 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" autoIncrement="false"/>
+      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <foreign-key foreignTable="C_INVOICELINE" name="CONVOICELINE_MMATCHINV">
         <reference local="C_INVOICELINE_ID" foreign="C_INVOICELINE_ID"/>
diff --git a/db/ddlutils/model/M_MATCHPO.xml b/db/ddlutils/model/M_MATCHPO.xml
index 2ccc9da6ab..b09b34f170 100644
--- a/db/ddlutils/model/M_MATCHPO.xml
+++ b/db/ddlutils/model/M_MATCHPO.xml
@@ -2,27 +2,27 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_MATCHPO">
-      <column name="M_MATCHPO_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_MATCHPO_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ORDERLINE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_INOUTLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICELINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ORDERLINE_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="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="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" size="22" 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" autoIncrement="false"/>
-      <column name="PRICEMATCHDIFFERENCE" primaryKey="false" required="false" type="NUMERIC" 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="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 e7e38be7d1..ac4a33da94 100644
--- a/db/ddlutils/model/M_MOVEMENT.xml
+++ b/db/ddlutils/model/M_MOVEMENT.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_MOVEMENT">
-      <column name="M_MOVEMENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_MOVEMENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="DOCUMENTNO" primaryKey="false" required="true" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
@@ -16,19 +16,19 @@
       <column name="POSTED" 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="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER1_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER2_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_ORGTRX_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_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="DATERECEIVED" primaryKey="false" required="false" type="TIMESTAMP" size="7" 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="ISINTRANSIT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_DOCTYPE_ID" primaryKey="false" required="true" type="ID" 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="NUMERIC" 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>
diff --git a/db/ddlutils/model/M_MOVEMENTCONFIRM.xml b/db/ddlutils/model/M_MOVEMENTCONFIRM.xml
index dc0162e119..85e828f67b 100644
--- a/db/ddlutils/model/M_MOVEMENTCONFIRM.xml
+++ b/db/ddlutils/model/M_MOVEMENTCONFIRM.xml
@@ -2,23 +2,23 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_MOVEMENTCONFIRM">
-      <column name="M_MOVEMENTCONFIRM_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_MOVEMENTCONFIRM_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_MOVEMENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <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="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="APPROVALAMT" primaryKey="false" required="false" type="DECIMAL" size="22" 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"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="M_INVENTORY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="M_INVENTORY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DOCUMENTNO" primaryKey="false" required="true" type="VARCHAR" size="30" autoIncrement="false"/>
       <foreign-key foreignTable="M_INVENTORY" name="MINVENTORY_MMOVCONFIRM">
         <reference local="M_INVENTORY_ID" foreign="M_INVENTORY_ID"/>
diff --git a/db/ddlutils/model/M_MOVEMENTLINE.xml b/db/ddlutils/model/M_MOVEMENTLINE.xml
index 82d6883fd4..67681d41fe 100644
--- a/db/ddlutils/model/M_MOVEMENTLINE.xml
+++ b/db/ddlutils/model/M_MOVEMENTLINE.xml
@@ -2,27 +2,27 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_MOVEMENTLINE">
-      <column name="M_MOVEMENTLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_MOVEMENTLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_MOVEMENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_LOCATOR_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_LOCATORTO_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="MOVEMENTQTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_MOVEMENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_LOCATOR_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <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="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="ID" default="0" autoIncrement="false"/>
-      <column name="CONFIRMEDQTY" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="SCRAPPEDQTY" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="TARGETQTY" primaryKey="false" required="false" type="NUMERIC" default="0" 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="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCETO_ID" primaryKey="false" required="false" type="ID" 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">
         <reference local="M_ATTRIBUTESETINSTANCE_ID" foreign="M_ATTRIBUTESETINSTANCE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_MOVEMENTLINECONFIRM.xml b/db/ddlutils/model/M_MOVEMENTLINECONFIRM.xml
index f66c159181..e2f99a003a 100644
--- a/db/ddlutils/model/M_MOVEMENTLINECONFIRM.xml
+++ b/db/ddlutils/model/M_MOVEMENTLINECONFIRM.xml
@@ -2,23 +2,23 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_MOVEMENTLINECONFIRM">
-      <column name="M_MOVEMENTLINECONFIRM_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_MOVEMENTLINECONFIRM_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_MOVEMENTCONFIRM_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_MOVEMENTLINE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="CONFIRMEDQTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DIFFERENCEQTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="SCRAPPEDQTY" primaryKey="false" required="true" type="NUMERIC" default="0" 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="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="M_INVENTORYLINE_ID" primaryKey="false" required="false" type="ID" 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">
         <reference local="M_INVENTORYLINE_ID" foreign="M_INVENTORYLINE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_MOVEMENTLINEMA.xml b/db/ddlutils/model/M_MOVEMENTLINEMA.xml
index 5e44c717fb..b28a53db14 100644
--- a/db/ddlutils/model/M_MOVEMENTLINEMA.xml
+++ b/db/ddlutils/model/M_MOVEMENTLINEMA.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_MOVEMENTLINEMA">
-      <column name="M_MOVEMENTLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_MOVEMENTLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="MOVEMENTQTY" primaryKey="false" required="false" type="NUMERIC" 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"/>
       <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 994e5ee1d5..7c37cf2548 100644
--- a/db/ddlutils/model/M_OPERATIONRESOURCE.xml
+++ b/db/ddlutils/model/M_OPERATIONRESOURCE.xml
@@ -2,23 +2,23 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_OPERATIONRESOURCE">
-      <column name="M_OPERATIONRESOURCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_OPERATIONRESOURCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCTOPERATION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_PRODUCTOPERATION_ID" 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="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="A_ASSET_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_JOB_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="SETUPTIME" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="UNITRUNTIME" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="TEARDOWNTIME" primaryKey="false" required="true" type="NUMERIC" default="0" 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"/>
       <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_PACKAGE.xml b/db/ddlutils/model/M_PACKAGE.xml
index 11f06ba155..f2b78bb5b4 100644
--- a/db/ddlutils/model/M_PACKAGE.xml
+++ b/db/ddlutils/model/M_PACKAGE.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_PACKAGE">
-      <column name="M_PACKAGE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PACKAGE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DOCUMENTNO" primaryKey="false" required="true" type="VARCHAR" size="30" autoIncrement="false"/>
-      <column name="M_INOUT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_INOUT_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_SHIPPER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_SHIPPER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="TRACKINGINFO" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="DATERECEIVED" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="RECEIVEDINFO" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
diff --git a/db/ddlutils/model/M_PACKAGELINE.xml b/db/ddlutils/model/M_PACKAGELINE.xml
index 53bbaf80b6..6fe39d506d 100644
--- a/db/ddlutils/model/M_PACKAGELINE.xml
+++ b/db/ddlutils/model/M_PACKAGELINE.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_PACKAGELINE">
-      <column name="M_PACKAGELINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PACKAGELINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PACKAGE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_INOUTLINE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <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="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_PERPETUALINV.xml b/db/ddlutils/model/M_PERPETUALINV.xml
index 36b1ed2e20..ec2e07690f 100644
--- a/db/ddlutils/model/M_PERPETUALINV.xml
+++ b/db/ddlutils/model/M_PERPETUALINV.xml
@@ -2,25 +2,25 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_PERPETUALINV">
-      <column name="M_PERPETUALINV_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PERPETUALINV_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="NOINVENTORYCOUNT" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="NOPRODUCTCOUNT" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="NOINVENTORYCOUNT" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="NOPRODUCTCOUNT" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="COUNTHIGHMOVEMENT" 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="DATELASTRUN" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATENEXTRUN" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="NUMBEROFRUNS" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="M_PRODUCT_CATEGORY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_WAREHOUSE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="NUMBEROFRUNS" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="M_PRODUCT_CATEGORY_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="M_PRODUCT_CATEGORY" name="MPRODCATEGORY_MPERPETUALINV">
         <reference local="M_PRODUCT_CATEGORY_ID" foreign="M_PRODUCT_CATEGORY_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_PRICELIST.xml b/db/ddlutils/model/M_PRICELIST.xml
index 8e4c8b6958..fc33d63739 100644
--- a/db/ddlutils/model/M_PRICELIST.xml
+++ b/db/ddlutils/model/M_PRICELIST.xml
@@ -2,23 +2,23 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_PRICELIST">
-      <column name="M_PRICELIST_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PRICELIST_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="BASEPRICELIST_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="BASEPRICELIST_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISTAXINCLUDED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISSOPRICELIST" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISDEFAULT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_CURRENCY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ENFORCEPRICELIMIT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="PRICEPRECISION" primaryKey="false" required="true" type="INTEGER" default="2" autoIncrement="false"/>
+      <column name="PRICEPRECISION" primaryKey="false" required="true" type="DECIMAL" size="10" default="2" autoIncrement="false"/>
       <foreign-key foreignTable="C_CURRENCY" name="CCURRENCY_MPRICELIST">
         <reference local="C_CURRENCY_ID" foreign="C_CURRENCY_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_PRICELIST_VERSION.xml b/db/ddlutils/model/M_PRICELIST_VERSION.xml
index e2376703dd..ef9b92db6e 100644
--- a/db/ddlutils/model/M_PRICELIST_VERSION.xml
+++ b/db/ddlutils/model/M_PRICELIST_VERSION.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_PRICELIST_VERSION">
-      <column name="M_PRICELIST_VERSION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PRICELIST_VERSION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="M_PRICELIST_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_DISCOUNTSCHEMA_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PRICELIST_ID" 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="VALIDFROM" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="PROCCREATE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="M_PRICELIST_VERSION_BASE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="M_PRICELIST_VERSION_BASE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="M_DISCOUNTSCHEMA" name="MDISCOUNTS_MPLVERSION">
         <reference local="M_DISCOUNTSCHEMA_ID" foreign="M_DISCOUNTSCHEMA_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_PRODUCT.xml b/db/ddlutils/model/M_PRODUCT.xml
index b2a883df41..4c29faaec3 100644
--- a/db/ddlutils/model/M_PRODUCT.xml
+++ b/db/ddlutils/model/M_PRODUCT.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_PRODUCT">
-      <column name="M_PRODUCT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <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="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" 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"/>
@@ -17,8 +17,8 @@
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="UPC" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
       <column name="SKU" primaryKey="false" required="false" type="VARCHAR" size="30" autoIncrement="false"/>
-      <column name="C_UOM_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SALESREP_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_UOM_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="SALESREP_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSUMMARY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISSTOCKED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISPURCHASED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
@@ -27,36 +27,36 @@
       <column name="ISINVOICEPRINTDETAILS" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISPICKLISTPRINTDETAILS" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISVERIFIED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_REVENUERECOGNITION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_CATEGORY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="WEIGHT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="SHELFWIDTH" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="SHELFHEIGHT" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="SHELFDEPTH" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="UNITSPERPALLET" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="C_TAXCATEGORY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="S_RESOURCE_ID" primaryKey="false" required="false" type="ID" 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="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"/>
+      <column name="UNITSPERPALLET" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="C_TAXCATEGORY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="S_RESOURCE_ID" primaryKey="false" required="false" type="ID" size="10" 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="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="S_EXPENSETYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="S_EXPENSETYPE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PRODUCTTYPE" primaryKey="false" required="true" type="CHAR" size="1" default="I" autoIncrement="false"/>
       <column name="IMAGEURL" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
       <column name="DESCRIPTIONURL" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
-      <column name="GUARANTEEDAYS" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="R_MAILTEXT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="GUARANTEEDAYS" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="R_MAILTEXT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="VERSIONNO" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESET_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="ID" default="0" autoIncrement="false"/>
+      <column name="M_ATTRIBUTESET_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="DOWNLOADURL" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
-      <column name="M_FREIGHTCATEGORY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_LOCATOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="GUARANTEEDAYSMIN" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="M_FREIGHTCATEGORY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_LOCATOR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="GUARANTEEDAYSMIN" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ISWEBSTOREFEATURED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISSELFSERVICE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="C_SUBSCRIPTIONTYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_SUBSCRIPTIONTYPE_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="ISEXCLUDEAUTODELIVERY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="ADCLIENT_MPRODUCT">
diff --git a/db/ddlutils/model/M_PRODUCTDOWNLOAD.xml b/db/ddlutils/model/M_PRODUCTDOWNLOAD.xml
index 22ed29a408..a3e67d2d26 100644
--- a/db/ddlutils/model/M_PRODUCTDOWNLOAD.xml
+++ b/db/ddlutils/model/M_PRODUCTDOWNLOAD.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_PRODUCTDOWNLOAD">
-      <column name="M_PRODUCTDOWNLOAD_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCTDOWNLOAD_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <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="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DOWNLOADURL" primaryKey="false" required="true" type="VARCHAR" size="120" autoIncrement="false"/>
       <foreign-key foreignTable="M_PRODUCT" name="MPRODUCT_MPRODUCTDOWNLOAD">
diff --git a/db/ddlutils/model/M_PRODUCTION.xml b/db/ddlutils/model/M_PRODUCTION.xml
index d21bc2e22f..e1bb9a7c4a 100644
--- a/db/ddlutils/model/M_PRODUCTION.xml
+++ b/db/ddlutils/model/M_PRODUCTION.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_PRODUCTION">
-      <column name="M_PRODUCTION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCTION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="MOVEMENTDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
@@ -17,12 +17,12 @@
       <column name="POSTED" 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="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER1_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER2_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_ORGTRX_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_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"/>
       <foreign-key foreignTable="AD_ORG" name="ADORGTRX_MPRODUCTION">
         <reference local="AD_ORGTRX_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_PRODUCTIONLINE.xml b/db/ddlutils/model/M_PRODUCTIONLINE.xml
index d5d57649e9..805bcdc943 100644
--- a/db/ddlutils/model/M_PRODUCTIONLINE.xml
+++ b/db/ddlutils/model/M_PRODUCTIONLINE.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_PRODUCTIONLINE">
-      <column name="M_PRODUCTIONLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCTIONLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCTIONPLAN_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="MOVEMENTQTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="M_LOCATOR_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <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="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" default="0" autoIncrement="false"/>
+      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="ID" size="10" default="0" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="M_ATTRIBUTESETINSTANCE" name="MATTRSETINST_MPRODUCTIONLINE">
         <reference local="M_ATTRIBUTESETINSTANCE_ID" foreign="M_ATTRIBUTESETINSTANCE_ID"/>
diff --git a/db/ddlutils/model/M_PRODUCTIONLINEMA.xml b/db/ddlutils/model/M_PRODUCTIONLINEMA.xml
index 58b0145a09..fdaff0bf45 100644
--- a/db/ddlutils/model/M_PRODUCTIONLINEMA.xml
+++ b/db/ddlutils/model/M_PRODUCTIONLINEMA.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_PRODUCTIONLINEMA">
-      <column name="M_PRODUCTIONLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCTIONLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="MOVEMENTQTY" primaryKey="false" required="true" type="NUMERIC" default="0" 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"/>
       <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 344949fe3e..650a64f7a9 100644
--- a/db/ddlutils/model/M_PRODUCTIONPLAN.xml
+++ b/db/ddlutils/model/M_PRODUCTIONPLAN.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_PRODUCTIONPLAN">
-      <column name="M_PRODUCTIONPLAN_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCTIONPLAN_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCTION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="PRODUCTIONQTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="M_LOCATOR_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <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="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"/>
       <foreign-key foreignTable="M_LOCATOR" name="MLOCATOR_MPRODUCTIONPLAN">
diff --git a/db/ddlutils/model/M_PRODUCTOPERATION.xml b/db/ddlutils/model/M_PRODUCTOPERATION.xml
index c6aeb39594..d6e337c75b 100644
--- a/db/ddlutils/model/M_PRODUCTOPERATION.xml
+++ b/db/ddlutils/model/M_PRODUCTOPERATION.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_PRODUCTOPERATION">
-      <column name="M_PRODUCTOPERATION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCTOPERATION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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" autoIncrement="false"/>
-      <column name="SETUPTIME" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="UNITRUNTIME" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="TEARDOWNTIME" primaryKey="false" required="false" type="NUMERIC" default="0" 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"/>
       <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 8de2924822..cfc86b45e2 100644
--- a/db/ddlutils/model/M_PRODUCTPRICE.xml
+++ b/db/ddlutils/model/M_PRODUCTPRICE.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_PRODUCTPRICE">
-      <column name="M_PRICELIST_VERSION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PRICELIST_VERSION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <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="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="PRICELIST" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PRICESTD" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PRICELIMIT" primaryKey="false" required="true" type="NUMERIC" default="0" 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"/>
       <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 7b61232469..c11e25fcbd 100644
--- a/db/ddlutils/model/M_PRODUCT_ACCT.xml
+++ b/db/ddlutils/model/M_PRODUCT_ACCT.xml
@@ -2,37 +2,37 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_PRODUCT_ACCT">
-      <column name="M_PRODUCT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_REVENUE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_EXPENSE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_ASSET_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_PURCHASEPRICEVARIANCE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_INVOICEPRICEVARIANCE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_COGS_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_TRADEDISCOUNTREC_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_TRADEDISCOUNTGRANT_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_INVENTORYCLEARING_ACCT" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="P_COSTADJUSTMENT_ACCT" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="P_EXPENSE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="P_ASSET_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="P_PURCHASEPRICEVARIANCE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="P_INVOICEPRICEVARIANCE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="P_COGS_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="P_TRADEDISCOUNTREC_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="P_TRADEDISCOUNTGRANT_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="P_INVENTORYCLEARING_ACCT" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="P_COSTADJUSTMENT_ACCT" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <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>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PINVOICEPV_MPRODUCT">
         <reference local="P_INVOICEPRICEVARIANCE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_PRODUCT_BOM.xml b/db/ddlutils/model/M_PRODUCT_BOM.xml
index 857d5e97a7..dd3eb246de 100644
--- a/db/ddlutils/model/M_PRODUCT_BOM.xml
+++ b/db/ddlutils/model/M_PRODUCT_BOM.xml
@@ -2,26 +2,26 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_PRODUCT_BOM">
-      <column name="M_PRODUCT_BOM_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCT_BOM_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCTBOM_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="BOMQTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <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_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="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_BOMPRODUCT">
-        <reference local="M_PRODUCTBOM_ID" foreign="M_PRODUCT_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="M_PRODUCT" name="MPRODUCT_MPRODUCTBOM">
         <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="M_PRODUCT" name="MPRODUCT_BOMPRODUCT">
+        <reference local="M_PRODUCTBOM_ID" foreign="M_PRODUCT_ID"/>
+      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/M_PRODUCT_CATEGORY.xml b/db/ddlutils/model/M_PRODUCT_CATEGORY.xml
index 120a06b5f8..f7fde9e57a 100644
--- a/db/ddlutils/model/M_PRODUCT_CATEGORY.xml
+++ b/db/ddlutils/model/M_PRODUCT_CATEGORY.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_PRODUCT_CATEGORY">
-      <column name="M_PRODUCT_CATEGORY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCT_CATEGORY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" 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="ISDEFAULT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="PLANNEDMARGIN" primaryKey="false" required="true" type="NUMERIC" autoIncrement="false"/>
-      <column name="A_ASSET_GROUP_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="PLANNEDMARGIN" primaryKey="false" required="true" type="DECIMAL" size="22" 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" autoIncrement="false"/>
+      <column name="AD_PRINTCOLOR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="MMPOLICY" primaryKey="false" required="true" type="CHAR" size="1" default="F" autoIncrement="false"/>
       <foreign-key foreignTable="A_ASSET_GROUP" name="AASSETGROUP_MPRODUCTCATEGORY">
         <reference local="A_ASSET_GROUP_ID" foreign="A_ASSET_GROUP_ID"/>
diff --git a/db/ddlutils/model/M_PRODUCT_CATEGORY_ACCT.xml b/db/ddlutils/model/M_PRODUCT_CATEGORY_ACCT.xml
index 310548449c..aa584f176f 100644
--- a/db/ddlutils/model/M_PRODUCT_CATEGORY_ACCT.xml
+++ b/db/ddlutils/model/M_PRODUCT_CATEGORY_ACCT.xml
@@ -2,40 +2,40 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_PRODUCT_CATEGORY_ACCT">
-      <column name="M_PRODUCT_CATEGORY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCT_CATEGORY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_REVENUE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_EXPENSE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_ASSET_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_COGS_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_PURCHASEPRICEVARIANCE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_INVOICEPRICEVARIANCE_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_TRADEDISCOUNTREC_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="P_TRADEDISCOUNTGRANT_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="P_EXPENSE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="P_ASSET_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="P_COGS_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="P_PURCHASEPRICEVARIANCE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="P_INVOICEPRICEVARIANCE_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="P_TRADEDISCOUNTREC_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="P_TRADEDISCOUNTGRANT_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="COSTINGMETHOD" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="COSTINGLEVEL" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="P_INVENTORYCLEARING_ACCT" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="P_COSTADJUSTMENT_ACCT" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="P_INVENTORYCLEARING_ACCT" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="P_COSTADJUSTMENT_ACCT" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <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>
       <foreign-key foreignTable="C_VALIDCOMBINATION" name="VC_PINVOICEPV_MPRODUCTCATEGORY">
         <reference local="P_INVOICEPRICEVARIANCE_ACCT" foreign="C_VALIDCOMBINATION_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_PRODUCT_COSTING.xml b/db/ddlutils/model/M_PRODUCT_COSTING.xml
index f3add3cd32..50c0bc5bf4 100644
--- a/db/ddlutils/model/M_PRODUCT_COSTING.xml
+++ b/db/ddlutils/model/M_PRODUCT_COSTING.xml
@@ -2,29 +2,29 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_PRODUCT_COSTING">
-      <column name="M_PRODUCT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CURRENTCOSTPRICE" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="FUTURECOSTPRICE" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="COSTSTANDARD" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="COSTSTANDARDPOQTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="COSTSTANDARDPOAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="COSTSTANDARDCUMQTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="COSTSTANDARDCUMAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="COSTAVERAGE" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="COSTAVERAGECUMQTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="COSTAVERAGECUMAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PRICELASTPO" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PRICELASTINV" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="TOTALINVQTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="TOTALINVAMT" primaryKey="false" required="true" type="NUMERIC" default="0" 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"/>
       <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 9b1f8c8a2b..0a6f64bb9e 100644
--- a/db/ddlutils/model/M_PRODUCT_PO.xml
+++ b/db/ddlutils/model/M_PRODUCT_PO.xml
@@ -2,35 +2,35 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_PRODUCT_PO">
-      <column name="M_PRODUCT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <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" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="PRICELIST" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PRICEPO" primaryKey="false" required="false" type="NUMERIC" default="0" 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="PRICEEFFECTIVE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="PRICELASTPO" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PRICELASTINV" primaryKey="false" required="false" type="NUMERIC" default="0" 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="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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="ORDER_PACK" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="COSTPERORDER" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DELIVERYTIME_PROMISED" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="DELIVERYTIME_ACTUAL" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
-      <column name="QUALITYRATING" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="ROYALTYAMT" primaryKey="false" required="false" type="NUMERIC" default="0" 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="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="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_PRODUCT_TRL.xml b/db/ddlutils/model/M_PRODUCT_TRL.xml
index 33126ab738..881514362a 100644
--- a/db/ddlutils/model/M_PRODUCT_TRL.xml
+++ b/db/ddlutils/model/M_PRODUCT_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_PRODUCT_TRL">
-      <column name="M_PRODUCT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DOCUMENTNOTE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="ISTRANSLATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/M_RELATEDPRODUCT.xml b/db/ddlutils/model/M_RELATEDPRODUCT.xml
index 1d67751070..be6dcda70c 100644
--- a/db/ddlutils/model/M_RELATEDPRODUCT.xml
+++ b/db/ddlutils/model/M_RELATEDPRODUCT.xml
@@ -2,24 +2,24 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_RELATEDPRODUCT">
-      <column name="M_PRODUCT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="RELATEDPRODUCT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="RELATEDPRODUCT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="RELATEDPRODUCTTYPE" primaryKey="true" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <foreign-key foreignTable="M_PRODUCT" name="MPRODUCT_MRELATEDPRODUCT">
-        <reference local="RELATEDPRODUCT_ID" foreign="M_PRODUCT_ID"/>
-      </foreign-key>
       <foreign-key foreignTable="M_PRODUCT" name="MPRODUCT_MRELATED_PRODUCT">
         <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="M_PRODUCT" name="MPRODUCT_MRELATEDPRODUCT">
+        <reference local="RELATEDPRODUCT_ID" foreign="M_PRODUCT_ID"/>
+      </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/M_REPLENISH.xml b/db/ddlutils/model/M_REPLENISH.xml
index f9eb9bc4e4..a415751963 100644
--- a/db/ddlutils/model/M_REPLENISH.xml
+++ b/db/ddlutils/model/M_REPLENISH.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_REPLENISH">
-      <column name="M_PRODUCT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_WAREHOUSE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_WAREHOUSE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" 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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="LEVEL_MAX" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="M_WAREHOUSESOURCE_ID" primaryKey="false" required="false" type="ID" 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="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"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_REQUISITION.xml b/db/ddlutils/model/M_REQUISITION.xml
index c5e1a02ca6..2187456451 100644
--- a/db/ddlutils/model/M_REQUISITION.xml
+++ b/db/ddlutils/model/M_REQUISITION.xml
@@ -2,31 +2,31 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_REQUISITION">
-      <column name="M_REQUISITION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_REQUISITION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DOCUMENTNO" primaryKey="false" required="true" type="VARCHAR" size="30" 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="AD_USER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRICELIST_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_WAREHOUSE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_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="M_WAREHOUSE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <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="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="TOTALLINES" primaryKey="false" required="true" type="DECIMAL" size="22" 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"/>
       <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="DATEDOC" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="C_DOCTYPE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_DOCTYPE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_MREQUISITION">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_REQUISITIONLINE.xml b/db/ddlutils/model/M_REQUISITIONLINE.xml
index ce4aa46564..03fe661e47 100644
--- a/db/ddlutils/model/M_REQUISITIONLINE.xml
+++ b/db/ddlutils/model/M_REQUISITIONLINE.xml
@@ -2,24 +2,24 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_REQUISITIONLINE">
-      <column name="M_REQUISITIONLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_REQUISITIONLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="M_REQUISITION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <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="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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="LINENETAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_ORDERLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="C_CHARGE_ID" primaryKey="false" required="false" type="ID" 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="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="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"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_RMA.xml b/db/ddlutils/model/M_RMA.xml
index 9968b5dcb1..9ace82f4d1 100644
--- a/db/ddlutils/model/M_RMA.xml
+++ b/db/ddlutils/model/M_RMA.xml
@@ -2,31 +2,31 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_RMA">
-      <column name="M_RMA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_RMA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DOCUMENTNO" primaryKey="false" required="true" type="VARCHAR" size="30" 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="M_INOUT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_INOUT_ID" primaryKey="false" required="true" type="ID" size="10" 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="C_ORDER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_DOCTYPE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SALESREP_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_ORDER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_DOCTYPE_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="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="NUMERIC" autoIncrement="false"/>
-      <column name="M_RMATYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AMT" primaryKey="false" required="false" type="DECIMAL" size="22" 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" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_CURRENCY_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"/>
       <foreign-key foreignTable="M_INOUT" name="MINOUT_MRMA">
         <reference local="M_INOUT_ID" foreign="M_INOUT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_RMALINE.xml b/db/ddlutils/model/M_RMALINE.xml
index 6b1434b59b..7c57fd2964 100644
--- a/db/ddlutils/model/M_RMALINE.xml
+++ b/db/ddlutils/model/M_RMALINE.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_RMALINE">
-      <column name="M_RMALINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_RMALINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_RMA_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_INOUTLINE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <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="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_RMATYPE.xml b/db/ddlutils/model/M_RMATYPE.xml
index 1569440a8f..1823bf06fd 100644
--- a/db/ddlutils/model/M_RMATYPE.xml
+++ b/db/ddlutils/model/M_RMATYPE.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_RMATYPE">
-      <column name="M_RMATYPE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_RMATYPE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/M_SERNOCTL.xml b/db/ddlutils/model/M_SERNOCTL.xml
index 17999cd834..4b2c37aa97 100644
--- a/db/ddlutils/model/M_SERNOCTL.xml
+++ b/db/ddlutils/model/M_SERNOCTL.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_SERNOCTL">
-      <column name="M_SERNOCTL_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_SERNOCTL_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="STARTNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="INCREMENTNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="CURRENTNEXT" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="STARTNO" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="INCREMENTNO" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="CURRENTNEXT" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="PREFIX" primaryKey="false" required="false" type="VARCHAR" size="10" autoIncrement="false"/>
       <column name="SUFFIX" primaryKey="false" required="false" type="VARCHAR" size="10" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
diff --git a/db/ddlutils/model/M_SERNOCTLEXCLUDE.xml b/db/ddlutils/model/M_SERNOCTLEXCLUDE.xml
index f379aa591d..3be0e604a1 100644
--- a/db/ddlutils/model/M_SERNOCTLEXCLUDE.xml
+++ b/db/ddlutils/model/M_SERNOCTLEXCLUDE.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_SERNOCTLEXCLUDE">
-      <column name="M_SERNOCTLEXCLUDE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_SERNOCTLEXCLUDE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_SERNOCTL_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_SERNOCTL_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSOTRX" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="AD_TABLE" name="ADTABLE_MSERNOCTLEXCLUDE">
         <reference local="AD_TABLE_ID" foreign="AD_TABLE_ID"/>
diff --git a/db/ddlutils/model/M_SHIPPER.xml b/db/ddlutils/model/M_SHIPPER.xml
index cfc5fd5f0a..c736f55cee 100644
--- a/db/ddlutils/model/M_SHIPPER.xml
+++ b/db/ddlutils/model/M_SHIPPER.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_SHIPPER">
-      <column name="M_SHIPPER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_SHIPPER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="TRACKINGURL" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
       <foreign-key foreignTable="C_BPARTNER" name="CBPARTNER_MSHIPPER">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
diff --git a/db/ddlutils/model/M_STORAGE.xml b/db/ddlutils/model/M_STORAGE.xml
index 8b912543be..7a0756cf08 100644
--- a/db/ddlutils/model/M_STORAGE.xml
+++ b/db/ddlutils/model/M_STORAGE.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_STORAGE">
-      <column name="M_PRODUCT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_LOCATOR_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_LOCATOR_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="QTYONHAND" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="QTYRESERVED" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="QTYORDERED" primaryKey="false" required="true" type="NUMERIC" default="0" 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="DATELASTINVENTORY" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="true" required="true" type="ID" default="0" 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">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_SUBSTITUTE.xml b/db/ddlutils/model/M_SUBSTITUTE.xml
index 03a65faeec..bccd563994 100644
--- a/db/ddlutils/model/M_SUBSTITUTE.xml
+++ b/db/ddlutils/model/M_SUBSTITUTE.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_SUBSTITUTE">
-      <column name="M_PRODUCT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="SUBSTITUTE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="SUBSTITUTE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" 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"/>
       <foreign-key foreignTable="AD_CLIENT" name="M_SUBSTITUTE_CLIENT">
diff --git a/db/ddlutils/model/M_TRANSACTION.xml b/db/ddlutils/model/M_TRANSACTION.xml
index 668edf284d..f289b9e779 100644
--- a/db/ddlutils/model/M_TRANSACTION.xml
+++ b/db/ddlutils/model/M_TRANSACTION.xml
@@ -2,25 +2,25 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_TRANSACTION">
-      <column name="M_TRANSACTION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_TRANSACTION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="MOVEMENTTYPE" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
-      <column name="M_LOCATOR_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="M_INVENTORYLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_MOVEMENTLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_INOUTLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCTIONLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECTISSUE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="true" type="ID" default="0" autoIncrement="false"/>
+      <column name="MOVEMENTQTY" primaryKey="false" required="true" type="DECIMAL" size="22" 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"/>
+      <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="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="true" type="ID" size="10" default="0" autoIncrement="false"/>
       <foreign-key foreignTable="C_PROJECTISSUE" name="CPROJECTISSUE_MTRANSACTION">
         <reference local="C_PROJECTISSUE_ID" foreign="C_PROJECTISSUE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_TRANSACTIONALLOCATION.xml b/db/ddlutils/model/M_TRANSACTIONALLOCATION.xml
index b6c6d83617..c90161f348 100644
--- a/db/ddlutils/model/M_TRANSACTIONALLOCATION.xml
+++ b/db/ddlutils/model/M_TRANSACTIONALLOCATION.xml
@@ -2,27 +2,27 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_TRANSACTIONALLOCATION">
-      <column name="M_TRANSACTION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_TRANSACTION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ALLOCATIONSTRATEGYTYPE" primaryKey="true" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="true" type="ID" default="0" autoIncrement="false"/>
+      <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="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="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="true" type="DECIMAL" size="22" 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" autoIncrement="false"/>
-      <column name="M_PRODUCTIONLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_INVENTORYLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="OUT_M_TRANSACTION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="OUT_M_INOUTLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="OUT_M_PRODUCTIONLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="OUT_M_INVENTORYLINE_ID" primaryKey="false" required="false" type="ID" 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"/>
+      <column name="M_INVENTORYLINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="OUT_M_TRANSACTION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="OUT_M_INOUTLINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="OUT_M_PRODUCTIONLINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="OUT_M_INVENTORYLINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="M_ATTRIBUTESETINSTANCE" name="MATTRIBUTESETINST_MTRXALLOC">
         <reference local="M_ATTRIBUTESETINSTANCE_ID" foreign="M_ATTRIBUTESETINSTANCE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/M_WAREHOUSE.xml b/db/ddlutils/model/M_WAREHOUSE.xml
index 7d59f6260d..db2cb7e4fb 100644
--- a/db/ddlutils/model/M_WAREHOUSE.xml
+++ b/db/ddlutils/model/M_WAREHOUSE.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_WAREHOUSE">
-      <column name="M_WAREHOUSE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_WAREHOUSE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" 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="C_LOCATION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_LOCATION_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="SEPARATOR" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="M_WAREHOUSESOURCE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="M_WAREHOUSESOURCE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="REPLENISHMENTCLASS" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <foreign-key foreignTable="AD_CLIENT" name="M_WAREHOUSE_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
diff --git a/db/ddlutils/model/M_WAREHOUSE_ACCT.xml b/db/ddlutils/model/M_WAREHOUSE_ACCT.xml
index d1ee0ca41e..93c272b58d 100644
--- a/db/ddlutils/model/M_WAREHOUSE_ACCT.xml
+++ b/db/ddlutils/model/M_WAREHOUSE_ACCT.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="M_WAREHOUSE_ACCT">
-      <column name="M_WAREHOUSE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_WAREHOUSE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="W_INVENTORY_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="W_INVACTUALADJUST_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="W_DIFFERENCES_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="W_REVALUATION_ACCT" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="W_INVENTORY_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="W_INVACTUALADJUST_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="W_DIFFERENCES_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="W_REVALUATION_ACCT" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_MWAREHOUSEACCT">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/PA_ACHIEVEMENT.xml b/db/ddlutils/model/PA_ACHIEVEMENT.xml
index 528754fdd9..2fb14e2de4 100644
--- a/db/ddlutils/model/PA_ACHIEVEMENT.xml
+++ b/db/ddlutils/model/PA_ACHIEVEMENT.xml
@@ -2,30 +2,30 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="PA_ACHIEVEMENT">
-      <column name="PA_ACHIEVEMENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="PA_ACHIEVEMENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="NOTE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="PA_MEASURE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="MANUALACTUAL" primaryKey="false" required="true" type="NUMERIC" default="0" 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="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">
         <reference local="PA_MEASURE_ID" foreign="PA_MEASURE_ID"/>
       </foreign-key>
       <check>
-        <rule><![CDATA[IsAchieved IN ('Y','N')]]></rule>
+        <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
       <check>
-        <rule><![CDATA[IsActive in ('Y','N')]]></rule>
+        <rule><![CDATA[IsAchieved IN ('Y','N')]]></rule>
       </check>
     </table>
   </database>
diff --git a/db/ddlutils/model/PA_BENCHMARK.xml b/db/ddlutils/model/PA_BENCHMARK.xml
index f094b4f870..97898e3188 100644
--- a/db/ddlutils/model/PA_BENCHMARK.xml
+++ b/db/ddlutils/model/PA_BENCHMARK.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="PA_BENCHMARK">
-      <column name="PA_BENCHMARK_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="PA_BENCHMARK_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/PA_BENCHMARKDATA.xml b/db/ddlutils/model/PA_BENCHMARKDATA.xml
index d5bb0ede44..fe9304fe83 100644
--- a/db/ddlutils/model/PA_BENCHMARKDATA.xml
+++ b/db/ddlutils/model/PA_BENCHMARKDATA.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="PA_BENCHMARKDATA">
-      <column name="PA_BENCHMARKDATA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="PA_BENCHMARKDATA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="PA_BENCHMARK_ID" primaryKey="false" required="true" type="ID" 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="NUMERIC" autoIncrement="false"/>
+      <column name="BENCHMARKVALUE" primaryKey="false" required="true" type="DECIMAL" size="22" 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_COLORSCHEMA.xml b/db/ddlutils/model/PA_COLORSCHEMA.xml
index 5ebcb9f084..63adf95258 100644
--- a/db/ddlutils/model/PA_COLORSCHEMA.xml
+++ b/db/ddlutils/model/PA_COLORSCHEMA.xml
@@ -2,36 +2,36 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="PA_COLORSCHEMA">
-      <column name="PA_COLORSCHEMA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="PA_COLORSCHEMA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="MARK1PERCENT" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="AD_PRINTCOLOR1_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="MARK2PERCENT" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="AD_PRINTCOLOR2_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="MARK3PERCENT" primaryKey="false" required="false" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="AD_PRINTCOLOR3_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="MARK4PERCENT" primaryKey="false" required="false" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="AD_PRINTCOLOR4_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="MARK1PERCENT" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
+      <column name="AD_PRINTCOLOR1_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="MARK2PERCENT" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
+      <column name="AD_PRINTCOLOR2_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="MARK3PERCENT" primaryKey="false" required="false" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
+      <column name="AD_PRINTCOLOR3_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="MARK4PERCENT" primaryKey="false" required="false" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
+      <column name="AD_PRINTCOLOR4_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ENTITYTYPE" primaryKey="false" required="true" type="VARCHAR" size="4" autoIncrement="false"/>
       <foreign-key foreignTable="AD_PRINTCOLOR" name="ADPRINTCOLOR1_PACOLORSCHEMA">
         <reference local="AD_PRINTCOLOR1_ID" foreign="AD_PRINTCOLOR_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_PRINTCOLOR" name="ADPRINTCOLOR2_PACOLORSCHEMA">
-        <reference local="AD_PRINTCOLOR2_ID" foreign="AD_PRINTCOLOR_ID"/>
+      <foreign-key foreignTable="AD_PRINTCOLOR" name="ADPRINTCOLOR4_PACOLORSCHEMA">
+        <reference local="AD_PRINTCOLOR4_ID" foreign="AD_PRINTCOLOR_ID"/>
       </foreign-key>
       <foreign-key foreignTable="AD_PRINTCOLOR" name="ADPRINTCOLOR3_PACOLORSCHEMA">
         <reference local="AD_PRINTCOLOR3_ID" foreign="AD_PRINTCOLOR_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_PRINTCOLOR" name="ADPRINTCOLOR4_PACOLORSCHEMA">
-        <reference local="AD_PRINTCOLOR4_ID" foreign="AD_PRINTCOLOR_ID"/>
+      <foreign-key foreignTable="AD_PRINTCOLOR" name="ADPRINTCOLOR2_PACOLORSCHEMA">
+        <reference local="AD_PRINTCOLOR2_ID" foreign="AD_PRINTCOLOR_ID"/>
       </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
diff --git a/db/ddlutils/model/PA_GOAL.xml b/db/ddlutils/model/PA_GOAL.xml
index 2765f25090..1c03684e58 100644
--- a/db/ddlutils/model/PA_GOAL.xml
+++ b/db/ddlutils/model/PA_GOAL.xml
@@ -2,33 +2,33 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="PA_GOAL">
-      <column name="PA_GOAL_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="PA_GOAL_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="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="NOTE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="PA_COLORSCHEMA_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="PA_COLORSCHEMA_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <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" autoIncrement="false"/>
-      <column name="PA_MEASURE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="RELATIVEWEIGHT" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="MEASURETARGET" primaryKey="false" required="true" type="NUMERIC" default="0" 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="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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="GOALPERFORMANCE" primaryKey="false" required="false" type="NUMERIC" 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="DATELASTRUN" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="AD_ROLE_ID" primaryKey="false" required="false" type="ID" 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">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/PA_GOALRESTRICTION.xml b/db/ddlutils/model/PA_GOALRESTRICTION.xml
index a3c29d4098..c269076aa5 100644
--- a/db/ddlutils/model/PA_GOALRESTRICTION.xml
+++ b/db/ddlutils/model/PA_GOALRESTRICTION.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="PA_GOALRESTRICTION">
-      <column name="PA_GOALRESTRICTION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="PA_GOALRESTRICTION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="GOALRESTRICTIONTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="PA_GOAL_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="ORG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BP_GROUP_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_CATEGORY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="PA_GOAL_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_BPARTNER_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="ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_BP_GROUP_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_PRODUCT_CATEGORY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_ORG" name="ADORG2_PAGOALRESTRICTION">
         <reference local="ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/PA_HIERARCHY.xml b/db/ddlutils/model/PA_HIERARCHY.xml
index 37fe8084b5..fdbf3ea5d8 100644
--- a/db/ddlutils/model/PA_HIERARCHY.xml
+++ b/db/ddlutils/model/PA_HIERARCHY.xml
@@ -2,25 +2,25 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="PA_HIERARCHY">
-      <column name="PA_HIERARCHY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="PA_HIERARCHY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="AD_TREE_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TREE_BPARTNER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TREE_PROJECT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TREE_SALESREGION_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TREE_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TREE_CAMPAIGN_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TREE_ACTIVITY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_TREE_ACCOUNT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TREE_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TREE_BPARTNER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TREE_PROJECT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TREE_SALESREGION_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TREE_PRODUCT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TREE_CAMPAIGN_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TREE_ACTIVITY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_TREE_ACCOUNT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_TREE" name="ADTREEACCOUNT_PAHIERARCHY">
         <reference local="AD_TREE_ACCOUNT_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
@@ -30,8 +30,8 @@
       <foreign-key foreignTable="AD_TREE" name="ADTREEBPARTNER_PAHIERARCHY">
         <reference local="AD_TREE_BPARTNER_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_TREE" name="ADTREECAMPAIGN_PAHIERARCHY">
-        <reference local="AD_TREE_CAMPAIGN_ID" foreign="AD_TREE_ID"/>
+      <foreign-key foreignTable="AD_TREE" name="ADTREESR_PAHIERARCHY">
+        <reference local="AD_TREE_SALESREGION_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
       <foreign-key foreignTable="AD_TREE" name="ADTREEORG_PAHIERARCHY">
         <reference local="AD_TREE_ORG_ID" foreign="AD_TREE_ID"/>
@@ -42,8 +42,8 @@
       <foreign-key foreignTable="AD_TREE" name="ADTREEPROJECT_PAHIERARCHY">
         <reference local="AD_TREE_PROJECT_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
-      <foreign-key foreignTable="AD_TREE" name="ADTREESR_PAHIERARCHY">
-        <reference local="AD_TREE_SALESREGION_ID" foreign="AD_TREE_ID"/>
+      <foreign-key foreignTable="AD_TREE" name="ADTREECAMPAIGN_PAHIERARCHY">
+        <reference local="AD_TREE_CAMPAIGN_ID" foreign="AD_TREE_ID"/>
       </foreign-key>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
diff --git a/db/ddlutils/model/PA_MEASURE.xml b/db/ddlutils/model/PA_MEASURE.xml
index e661fa0e9e..b75c53208f 100644
--- a/db/ddlutils/model/PA_MEASURE.xml
+++ b/db/ddlutils/model/PA_MEASURE.xml
@@ -2,27 +2,27 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="PA_MEASURE">
-      <column name="PA_MEASURE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="PA_MEASURE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="NUMERIC" autoIncrement="false"/>
+      <column name="MANUALACTUAL" primaryKey="false" required="false" type="DECIMAL" size="22" 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" autoIncrement="false"/>
-      <column name="PA_BENCHMARK_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="PA_RATIO_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="PA_HIERARCHY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="PA_MEASURECALC_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="PA_BENCHMARK_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="PA_RATIO_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="PA_HIERARCHY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="MEASUREDATATYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="R_REQUESTTYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECTTYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="R_REQUESTTYPE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_PROJECTTYPE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="PA_BENCHMARK" name="PABENCHMARK_PAMEASURE">
         <reference local="PA_BENCHMARK_ID" foreign="PA_BENCHMARK_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/PA_MEASURECALC.xml b/db/ddlutils/model/PA_MEASURECALC.xml
index f92e8e2046..1e1d9a71a7 100644
--- a/db/ddlutils/model/PA_MEASURECALC.xml
+++ b/db/ddlutils/model/PA_MEASURECALC.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="PA_MEASURECALC">
-      <column name="PA_MEASURECALC_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="PA_MEASURECALC_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="SELECTCLAUSE" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false"/>
@@ -18,7 +18,7 @@
       <column name="ORGCOLUMN" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="BPARTNERCOLUMN" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="PRODUCTCOLUMN" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_TABLE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="KEYCOLUMN" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ENTITYTYPE" primaryKey="false" required="true" type="VARCHAR" size="4" autoIncrement="false"/>
       <check>
diff --git a/db/ddlutils/model/PA_RATIO.xml b/db/ddlutils/model/PA_RATIO.xml
index 2132ddea83..291347bb0a 100644
--- a/db/ddlutils/model/PA_RATIO.xml
+++ b/db/ddlutils/model/PA_RATIO.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="PA_RATIO">
-      <column name="PA_RATIO_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="PA_RATIO_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_ACCTSCHEMA" name="CACCTSCHEMA_PARATIO">
         <reference local="C_ACCTSCHEMA_ID" foreign="C_ACCTSCHEMA_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/PA_RATIOELEMENT.xml b/db/ddlutils/model/PA_RATIOELEMENT.xml
index 708c53865b..953c34cc3b 100644
--- a/db/ddlutils/model/PA_RATIOELEMENT.xml
+++ b/db/ddlutils/model/PA_RATIOELEMENT.xml
@@ -2,24 +2,24 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="PA_RATIOELEMENT">
-      <column name="PA_RATIOELEMENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="PA_RATIOELEMENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="PA_RATIO_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="PA_RATIO_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="RATIOOPERAND" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="RATIOELEMENTTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="ACCOUNT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="PA_RATIOUSED_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="PA_MEASURECALC_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="CONSTANTVALUE" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <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="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">
         <reference local="ACCOUNT_ID" foreign="C_ELEMENTVALUE_ID"/>
diff --git a/db/ddlutils/model/PA_REPORT.xml b/db/ddlutils/model/PA_REPORT.xml
index 229d0c6c33..f43a15a0e1 100644
--- a/db/ddlutils/model/PA_REPORT.xml
+++ b/db/ddlutils/model/PA_REPORT.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="PA_REPORT">
-      <column name="PA_REPORT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="PA_REPORT_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="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="PA_REPORTLINESET_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="PA_REPORTCOLUMNSET_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_CALENDAR_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="PA_REPORTLINESET_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="PA_REPORTCOLUMNSET_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_CALENDAR_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="AD_PRINTFORMAT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_PRINTFORMAT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="LISTSOURCES" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="LISTTRX" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="AD_ORG" name="ADORG_PAREPORT">
diff --git a/db/ddlutils/model/PA_REPORTCOLUMN.xml b/db/ddlutils/model/PA_REPORTCOLUMN.xml
index d88763079a..6c3d17e9fa 100644
--- a/db/ddlutils/model/PA_REPORTCOLUMN.xml
+++ b/db/ddlutils/model/PA_REPORTCOLUMN.xml
@@ -2,40 +2,40 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="PA_REPORTCOLUMN">
-      <column name="PA_REPORTCOLUMN_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="PA_REPORTCOLUMN_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="PA_REPORTCOLUMNSET_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="PA_REPORTCOLUMNSET_ID" 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="SEQNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="SEQNO" 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="ISPRINTED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="POSTINGTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="GL_BUDGET_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="GL_BUDGET_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="COLUMNTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="RELATIVEPERIOD" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="RELATIVEPERIOD" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="CURRENCYTYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="CALCULATIONTYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="AMOUNTTYPE" primaryKey="false" required="false" type="CHAR" size="2" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISADHOCCONVERSION" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="OPER_1_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="OPER_2_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="OPER_1_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="OPER_2_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ELEMENTTYPE" primaryKey="false" required="false" type="CHAR" size="2" autoIncrement="false"/>
-      <column name="ORG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ELEMENTVALUE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_LOCATION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_SALESREGION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ELEMENTVALUE_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_BPARTNER_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_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_LOCATION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_SALESREGION_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"/>
       <foreign-key foreignTable="AD_ORG" name="ADORG_PAREPORTCOLUMN">
         <reference local="ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/PA_REPORTCOLUMNSET.xml b/db/ddlutils/model/PA_REPORTCOLUMNSET.xml
index ea2a053a4d..445c2f5c0d 100644
--- a/db/ddlutils/model/PA_REPORTCOLUMNSET.xml
+++ b/db/ddlutils/model/PA_REPORTCOLUMNSET.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="PA_REPORTCOLUMNSET">
-      <column name="PA_REPORTCOLUMNSET_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="PA_REPORTCOLUMNSET_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
diff --git a/db/ddlutils/model/PA_REPORTLINE.xml b/db/ddlutils/model/PA_REPORTLINE.xml
index 6172cfdb79..55b279f2b5 100644
--- a/db/ddlutils/model/PA_REPORTLINE.xml
+++ b/db/ddlutils/model/PA_REPORTLINE.xml
@@ -2,27 +2,27 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="PA_REPORTLINE">
-      <column name="PA_REPORTLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="PA_REPORTLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="PA_REPORTLINESET_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="PA_REPORTLINESET_ID" 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="SEQNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="SEQNO" 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="ISPRINTED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="PARENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="PARENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSUMMARY" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="LINETYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="CALCULATIONTYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="OPER_1_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="OPER_2_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="OPER_1_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="OPER_2_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="POSTINGTYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="GL_BUDGET_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="GL_BUDGET_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="AMOUNTTYPE" primaryKey="false" required="false" type="CHAR" size="2" autoIncrement="false"/>
       <foreign-key foreignTable="GL_BUDGET" name="GLBUDGET_PAREPORTLINE">
         <reference local="GL_BUDGET_ID" foreign="GL_BUDGET_ID"/>
diff --git a/db/ddlutils/model/PA_REPORTLINESET.xml b/db/ddlutils/model/PA_REPORTLINESET.xml
index 6c8d93bcdd..f589d2c033 100644
--- a/db/ddlutils/model/PA_REPORTLINESET.xml
+++ b/db/ddlutils/model/PA_REPORTLINESET.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="PA_REPORTLINESET">
-      <column name="PA_REPORTLINESET_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="PA_REPORTLINESET_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
diff --git a/db/ddlutils/model/PA_REPORTSOURCE.xml b/db/ddlutils/model/PA_REPORTSOURCE.xml
index bc76540e8c..ddde947a7b 100644
--- a/db/ddlutils/model/PA_REPORTSOURCE.xml
+++ b/db/ddlutils/model/PA_REPORTSOURCE.xml
@@ -2,26 +2,26 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="PA_REPORTSOURCE">
-      <column name="PA_REPORTSOURCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="PA_REPORTSOURCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="PA_REPORTLINE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="PA_REPORTLINE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ELEMENTTYPE" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
-      <column name="ORG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ELEMENTVALUE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_LOCATION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_SALESREGION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ELEMENTVALUE_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_BPARTNER_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_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_LOCATION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_SALESREGION_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"/>
       <foreign-key foreignTable="AD_ORG" name="ADORG_PAREPORTSOURCE">
         <reference local="ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/PA_SLA_CRITERIA.xml b/db/ddlutils/model/PA_SLA_CRITERIA.xml
index 4fc772d4ed..920b5d33c2 100644
--- a/db/ddlutils/model/PA_SLA_CRITERIA.xml
+++ b/db/ddlutils/model/PA_SLA_CRITERIA.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="PA_SLA_CRITERIA">
-      <column name="PA_SLA_CRITERIA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="PA_SLA_CRITERIA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/PA_SLA_GOAL.xml b/db/ddlutils/model/PA_SLA_GOAL.xml
index 2065f6ec68..c68cbefc8a 100644
--- a/db/ddlutils/model/PA_SLA_GOAL.xml
+++ b/db/ddlutils/model/PA_SLA_GOAL.xml
@@ -2,23 +2,23 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="PA_SLA_GOAL">
-      <column name="PA_SLA_GOAL_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="PA_SLA_GOAL_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="PA_SLA_CRITERIA_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="PA_SLA_CRITERIA_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="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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="MEASUREACTUAL" primaryKey="false" required="true" type="NUMERIC" default="0" 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="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 e73ce8f7ce..d9da47850d 100644
--- a/db/ddlutils/model/PA_SLA_MEASURE.xml
+++ b/db/ddlutils/model/PA_SLA_MEASURE.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="PA_SLA_MEASURE">
-      <column name="PA_SLA_MEASURE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="PA_SLA_MEASURE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="PA_SLA_GOAL_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <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="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="MEASUREACTUAL" primaryKey="false" required="true" type="DECIMAL" size="22" 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" autoIncrement="false"/>
-      <column name="RECORD_ID" primaryKey="false" required="false" type="ID" 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="PROCESSED" 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_TABLE" name="ADTABLE_PASLAMEASURE">
diff --git a/db/ddlutils/model/R_CATEGORY.xml b/db/ddlutils/model/R_CATEGORY.xml
index 4e792ed539..5faf852d3c 100644
--- a/db/ddlutils/model/R_CATEGORY.xml
+++ b/db/ddlutils/model/R_CATEGORY.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_CATEGORY">
-      <column name="R_CATEGORY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="R_CATEGORY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="false" type="ID" autoIncrement="false"/>
+      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/R_CATEGORYUPDATES.xml b/db/ddlutils/model/R_CATEGORYUPDATES.xml
index 1c57d4ded0..ff6e688212 100644
--- a/db/ddlutils/model/R_CATEGORYUPDATES.xml
+++ b/db/ddlutils/model/R_CATEGORYUPDATES.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_CATEGORYUPDATES">
-      <column name="AD_USER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="R_CATEGORY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_CATEGORY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSELFSERVICE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_RCATEGORYUPDATES">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
diff --git a/db/ddlutils/model/R_CONTACTINTEREST.xml b/db/ddlutils/model/R_CONTACTINTEREST.xml
index 2334b85050..ce220851b6 100644
--- a/db/ddlutils/model/R_CONTACTINTEREST.xml
+++ b/db/ddlutils/model/R_CONTACTINTEREST.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_CONTACTINTEREST">
-      <column name="R_INTERESTAREA_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="R_INTERESTAREA_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="SUBSCRIBEDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="OPTOUTDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_RCONTACTINTEREST">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/R_GROUP.xml b/db/ddlutils/model/R_GROUP.xml
index 1acd1a943e..a78d97acc0 100644
--- a/db/ddlutils/model/R_GROUP.xml
+++ b/db/ddlutils/model/R_GROUP.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_GROUP">
-      <column name="R_GROUP_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="R_GROUP_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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_BOM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_CHANGENOTICE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="M_BOM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_CHANGENOTICE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/R_GROUPUPDATES.xml b/db/ddlutils/model/R_GROUPUPDATES.xml
index 3ba5c52b33..6514c1edd8 100644
--- a/db/ddlutils/model/R_GROUPUPDATES.xml
+++ b/db/ddlutils/model/R_GROUPUPDATES.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_GROUPUPDATES">
-      <column name="AD_USER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="R_GROUP_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_GROUP_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSELFSERVICE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_RUSERUPDATES">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
@@ -19,10 +19,10 @@
         <reference local="R_GROUP_ID" foreign="R_GROUP_ID"/>
       </foreign-key>
       <check>
-        <rule><![CDATA[IsSelfService in ('Y','N')]]></rule>
+        <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
       <check>
-        <rule><![CDATA[IsActive in ('Y','N')]]></rule>
+        <rule><![CDATA[IsSelfService in ('Y','N')]]></rule>
       </check>
     </table>
   </database>
diff --git a/db/ddlutils/model/R_INTERESTAREA.xml b/db/ddlutils/model/R_INTERESTAREA.xml
index c57311a2a9..b71e086d20 100644
--- a/db/ddlutils/model/R_INTERESTAREA.xml
+++ b/db/ddlutils/model/R_INTERESTAREA.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_INTERESTAREA">
-      <column name="R_INTERESTAREA_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="R_INTERESTAREA_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="ISSELFSERVICE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/R_ISSUEKNOWN.xml b/db/ddlutils/model/R_ISSUEKNOWN.xml
index 93729648ef..6a916b34c3 100644
--- a/db/ddlutils/model/R_ISSUEKNOWN.xml
+++ b/db/ddlutils/model/R_ISSUEKNOWN.xml
@@ -2,26 +2,26 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_ISSUEKNOWN">
-      <column name="R_ISSUEKNOWN_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="R_ISSUEKNOWN_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSUESUMMARY" primaryKey="false" required="true" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="RELEASENO" primaryKey="false" required="true" type="CHAR" size="4" autoIncrement="false"/>
       <column name="SOURCECLASSNAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="SOURCEMETHODNAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="LOGGERNAME" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="LINENO" primaryKey="false" required="false" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="LINENO" primaryKey="false" required="false" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="ISSUESTATUS" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="R_ISSUESTATUS_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="R_REQUEST_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="R_ISSUESTATUS_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_REQUEST_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="R_ISSUERECOMMENDATION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="R_ISSUERECOMMENDATION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="R_ISSUESTATUS" name="RISSUESTATUS_RISSUEKNOWN">
         <reference local="R_ISSUESTATUS_ID" foreign="R_ISSUESTATUS_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/R_ISSUEPROJECT.xml b/db/ddlutils/model/R_ISSUEPROJECT.xml
index bc56ac266c..7b6bec6910 100644
--- a/db/ddlutils/model/R_ISSUEPROJECT.xml
+++ b/db/ddlutils/model/R_ISSUEPROJECT.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_ISSUEPROJECT">
-      <column name="R_ISSUEPROJECT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="R_ISSUEPROJECT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="A_ASSET_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="A_ASSET_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="STATISTICSINFO" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="PROFILEINFO" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="SYSTEMSTATUS" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
diff --git a/db/ddlutils/model/R_ISSUERECOMMENDATION.xml b/db/ddlutils/model/R_ISSUERECOMMENDATION.xml
index 3d5b17d8cf..7587e3d41b 100644
--- a/db/ddlutils/model/R_ISSUERECOMMENDATION.xml
+++ b/db/ddlutils/model/R_ISSUERECOMMENDATION.xml
@@ -3,13 +3,13 @@
   <database name="default" defaultIdMethod="none">
     <table name="R_ISSUERECOMMENDATION">
       <column name="R_ISSUERECOMMENDATION_ID" primaryKey="true" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/R_ISSUESOURCE.xml b/db/ddlutils/model/R_ISSUESOURCE.xml
index 6c667e13de..8698f0a976 100644
--- a/db/ddlutils/model/R_ISSUESOURCE.xml
+++ b/db/ddlutils/model/R_ISSUESOURCE.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_ISSUESOURCE">
-      <column name="R_ISSUESOURCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="R_ISSUESOURCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="R_ISSUESYSTEM_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="R_ISSUEPROJECT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="R_ISSUEUSER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_ISSUESYSTEM_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_ISSUEPROJECT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_ISSUEUSER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="STATISTICSINFO" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="PROFILEINFO" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <foreign-key foreignTable="R_ISSUEPROJECT" name="RISSUEPROJECT_RISSUESOURCE">
diff --git a/db/ddlutils/model/R_ISSUESTATUS.xml b/db/ddlutils/model/R_ISSUESTATUS.xml
index 040e6a46a9..a3cfc61888 100644
--- a/db/ddlutils/model/R_ISSUESTATUS.xml
+++ b/db/ddlutils/model/R_ISSUESTATUS.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_ISSUESTATUS">
-      <column name="R_ISSUESTATUS_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="R_ISSUESTATUS_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <check>
diff --git a/db/ddlutils/model/R_ISSUESYSTEM.xml b/db/ddlutils/model/R_ISSUESYSTEM.xml
index fc91701187..217beaefce 100644
--- a/db/ddlutils/model/R_ISSUESYSTEM.xml
+++ b/db/ddlutils/model/R_ISSUESYSTEM.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_ISSUESYSTEM">
-      <column name="R_ISSUESYSTEM_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="R_ISSUESYSTEM_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DBADDRESS" primaryKey="false" required="true" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="STATISTICSINFO" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="PROFILEINFO" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="SYSTEMSTATUS" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="A_ASSET_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="A_ASSET_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <unique name="R_ISSUESYSTEM_ADDRESS">
         <unique-column name="DBADDRESS"/>
       </unique>
diff --git a/db/ddlutils/model/R_ISSUEUSER.xml b/db/ddlutils/model/R_ISSUEUSER.xml
index 135cba95d9..b4256ab66f 100644
--- a/db/ddlutils/model/R_ISSUEUSER.xml
+++ b/db/ddlutils/model/R_ISSUEUSER.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_ISSUEUSER">
-      <column name="R_ISSUEUSER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="R_ISSUEUSER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="USERNAME" 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="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_RISSUEUSER">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/R_MAILTEXT.xml b/db/ddlutils/model/R_MAILTEXT.xml
index d8524c93a7..617a924423 100644
--- a/db/ddlutils/model/R_MAILTEXT.xml
+++ b/db/ddlutils/model/R_MAILTEXT.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_MAILTEXT">
-      <column name="R_MAILTEXT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="R_MAILTEXT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ISHTML" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="MAILHEADER" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/R_MAILTEXT_TRL.xml b/db/ddlutils/model/R_MAILTEXT_TRL.xml
index 3951214da1..93cf934522 100644
--- a/db/ddlutils/model/R_MAILTEXT_TRL.xml
+++ b/db/ddlutils/model/R_MAILTEXT_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_MAILTEXT_TRL">
-      <column name="R_MAILTEXT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="R_MAILTEXT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISTRANSLATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="MAILHEADER" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/R_REQUEST.xml b/db/ddlutils/model/R_REQUEST.xml
index 0efef47126..c2ecf64ca7 100644
--- a/db/ddlutils/model/R_REQUEST.xml
+++ b/db/ddlutils/model/R_REQUEST.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_REQUEST">
-      <column name="R_REQUEST_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="R_REQUEST_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DOCUMENTNO" primaryKey="false" required="true" type="VARCHAR" size="30" autoIncrement="false"/>
-      <column name="R_REQUESTTYPE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="R_GROUP_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="R_CATEGORY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="R_STATUS_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="R_RESOLUTION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="R_REQUESTRELATED_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="R_REQUESTTYPE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_GROUP_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_CATEGORY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_STATUS_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_RESOLUTION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_REQUESTRELATED_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PRIORITY" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="PRIORITYUSER" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="DUETYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
@@ -24,48 +24,48 @@
       <column name="CONFIDENTIALTYPE" primaryKey="false" required="true" type="CHAR" size="1" default="C" autoIncrement="false"/>
       <column name="ISESCALATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISSELFSERVICE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="SALESREP_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ROLE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="SALESREP_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ROLE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DATELASTACTION" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATELASTALERT" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="LASTRESULT" 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"/>
       <column name="ISINVOICED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ORDER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PAYMENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="A_ASSET_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_INOUT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_RMA_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="RECORD_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="REQUESTAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="R_MAILTEXT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_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="C_CAMPAIGN_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_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="M_PRODUCT_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="A_ASSET_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_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="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"/>
-      <column name="R_STANDARDRESPONSE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="R_STANDARDRESPONSE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="NEXTACTION" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="QTYINVOICED" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="M_PRODUCTSPENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" 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="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"/>
       <column name="CLOSEDATE" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="C_INVOICEREQUEST_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_CHANGEREQUEST_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <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="NUMERIC" autoIncrement="false"/>
+      <column name="QTYPLAN" primaryKey="false" required="false" type="DECIMAL" size="22" 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" autoIncrement="false"/>
+      <column name="M_FIXCHANGENOTICE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_ROLE" name="ADROLE_RREQUEST">
         <reference local="AD_ROLE_ID" foreign="AD_ROLE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/R_REQUESTACTION.xml b/db/ddlutils/model/R_REQUESTACTION.xml
index 1408bb7b52..3db8cb2ada 100644
--- a/db/ddlutils/model/R_REQUESTACTION.xml
+++ b/db/ddlutils/model/R_REQUESTACTION.xml
@@ -2,51 +2,51 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_REQUESTACTION">
-      <column name="R_REQUESTACTION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="R_REQUESTACTION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="R_REQUEST_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="R_GROUP_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="R_CATEGORY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="R_STATUS_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="R_RESOLUTION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="SALESREP_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ROLE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_REQUEST_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_GROUP_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_CATEGORY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_STATUS_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_RESOLUTION_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="SALESREP_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ROLE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISESCALATED" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="ISINVOICED" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="CONFIDENTIALTYPE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="ISSELFSERVICE" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="PRIORITY" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="PRIORITYUSER" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ORDER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PAYMENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_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="C_ORDER_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_PAYMENT_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_PROJECT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="SUMMARY" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="DATENEXTACTION" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="R_REQUESTTYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="A_ASSET_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_INOUT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_RMA_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_REQUESTTYPE_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="M_INOUT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_RMA_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <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="NUMERIC" autoIncrement="false"/>
-      <column name="QTYSPENT" primaryKey="false" required="false" type="NUMERIC" 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="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="NUMERIC" autoIncrement="false"/>
-      <column name="M_PRODUCTSPENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="QTYINVOICED" primaryKey="false" required="false" type="DECIMAL" size="22" 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"/>
       </foreign-key>
diff --git a/db/ddlutils/model/R_REQUESTPROCESSOR.xml b/db/ddlutils/model/R_REQUESTPROCESSOR.xml
index e0cbf21fdb..5db4651dca 100644
--- a/db/ddlutils/model/R_REQUESTPROCESSOR.xml
+++ b/db/ddlutils/model/R_REQUESTPROCESSOR.xml
@@ -2,28 +2,28 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_REQUESTPROCESSOR">
-      <column name="R_REQUESTPROCESSOR_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="R_REQUESTPROCESSOR_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="FREQUENCY" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="FREQUENCY" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="FREQUENCYTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
       <column name="DATELASTRUN" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATENEXTRUN" 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="OVERDUEALERTDAYS" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="OVERDUEASSIGNDAYS" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="SUPERVISOR_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="KEEPLOGDAYS" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="REMINDDAYS" primaryKey="false" required="true" type="INTEGER" default="7" autoIncrement="false"/>
-      <column name="INACTIVITYALERTDAYS" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="R_REQUESTTYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="OVERDUEALERTDAYS" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="OVERDUEASSIGNDAYS" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="SUPERVISOR_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="KEEPLOGDAYS" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
+      <column name="REMINDDAYS" primaryKey="false" required="true" type="DECIMAL" size="10" default="7" autoIncrement="false"/>
+      <column name="INACTIVITYALERTDAYS" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
+      <column name="R_REQUESTTYPE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_RREQUESTPROCESSOR">
         <reference local="SUPERVISOR_ID" foreign="AD_USER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/R_REQUESTPROCESSORLOG.xml b/db/ddlutils/model/R_REQUESTPROCESSORLOG.xml
index de9df6ef6a..dd6d517c4a 100644
--- a/db/ddlutils/model/R_REQUESTPROCESSORLOG.xml
+++ b/db/ddlutils/model/R_REQUESTPROCESSORLOG.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_REQUESTPROCESSORLOG">
-      <column name="R_REQUESTPROCESSOR_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="R_REQUESTPROCESSORLOG_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="R_REQUESTPROCESSOR_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_REQUESTPROCESSORLOG_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISERROR" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="SUMMARY" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="REFERENCE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
diff --git a/db/ddlutils/model/R_REQUESTPROCESSOR_ROUTE.xml b/db/ddlutils/model/R_REQUESTPROCESSOR_ROUTE.xml
index 25f4933dcc..b185428c34 100644
--- a/db/ddlutils/model/R_REQUESTPROCESSOR_ROUTE.xml
+++ b/db/ddlutils/model/R_REQUESTPROCESSOR_ROUTE.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_REQUESTPROCESSOR_ROUTE">
-      <column name="R_REQUESTPROCESSOR_ROUTE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="R_REQUESTPROCESSOR_ROUTE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="R_REQUESTPROCESSOR_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_REQUESTPROCESSOR_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="KEYWORD" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="R_REQUESTTYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_REQUESTTYPE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_RREQUESTPROCESSORROUTE">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/R_REQUESTTYPE.xml b/db/ddlutils/model/R_REQUESTTYPE.xml
index e380dcd7e6..27ef50310a 100644
--- a/db/ddlutils/model/R_REQUESTTYPE.xml
+++ b/db/ddlutils/model/R_REQUESTTYPE.xml
@@ -2,27 +2,27 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_REQUESTTYPE">
-      <column name="R_REQUESTTYPE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="R_REQUESTTYPE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="ISSELFSERVICE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="DUEDATETOLERANCE" primaryKey="false" required="true" type="INTEGER" default="7" autoIncrement="false"/>
+      <column name="DUEDATETOLERANCE" primaryKey="false" required="true" type="DECIMAL" size="10" default="7" autoIncrement="false"/>
       <column name="ISEMAILWHENOVERDUE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISEMAILWHENDUE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISINVOICED" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="AUTODUEDATEDAYS" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="AUTODUEDATEDAYS" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="CONFIDENTIALTYPE" primaryKey="false" required="true" type="CHAR" size="1" default="C" autoIncrement="false"/>
       <column name="ISAUTOCHANGEREQUEST" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISCONFIDENTIALINFO" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="R_STATUSCATEGORY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="R_STATUSCATEGORY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISINDEXED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
diff --git a/db/ddlutils/model/R_REQUESTTYPEUPDATES.xml b/db/ddlutils/model/R_REQUESTTYPEUPDATES.xml
index bd42d228ff..623262e0a6 100644
--- a/db/ddlutils/model/R_REQUESTTYPEUPDATES.xml
+++ b/db/ddlutils/model/R_REQUESTTYPEUPDATES.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_REQUESTTYPEUPDATES">
-      <column name="AD_USER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="R_REQUESTTYPE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_REQUESTTYPE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSELFSERVICE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_RREQUESTTYPEUPDATES">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
diff --git a/db/ddlutils/model/R_REQUESTUPDATE.xml b/db/ddlutils/model/R_REQUESTUPDATE.xml
index 841245b086..d0b3c6ee98 100644
--- a/db/ddlutils/model/R_REQUESTUPDATE.xml
+++ b/db/ddlutils/model/R_REQUESTUPDATE.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_REQUESTUPDATE">
-      <column name="R_REQUESTUPDATE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="R_REQUESTUPDATE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="R_REQUEST_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_REQUEST_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="QTYINVOICED" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="M_PRODUCTSPENT_ID" primaryKey="false" required="false" type="ID" 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="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">
         <reference local="R_REQUEST_ID" foreign="R_REQUEST_ID"/>
diff --git a/db/ddlutils/model/R_REQUESTUPDATES.xml b/db/ddlutils/model/R_REQUESTUPDATES.xml
index 390c032dae..dca406dfc6 100644
--- a/db/ddlutils/model/R_REQUESTUPDATES.xml
+++ b/db/ddlutils/model/R_REQUESTUPDATES.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_REQUESTUPDATES">
-      <column name="AD_USER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="R_REQUEST_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="R_REQUEST_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISSELFSERVICE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_RREQUESTUPDATES">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
diff --git a/db/ddlutils/model/R_RESOLUTION.xml b/db/ddlutils/model/R_RESOLUTION.xml
index f156f2e384..babd70c9f2 100644
--- a/db/ddlutils/model/R_RESOLUTION.xml
+++ b/db/ddlutils/model/R_RESOLUTION.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_RESOLUTION">
-      <column name="R_RESOLUTION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="R_RESOLUTION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/R_STANDARDRESPONSE.xml b/db/ddlutils/model/R_STANDARDRESPONSE.xml
index aa68a464ab..2d9e69078b 100644
--- a/db/ddlutils/model/R_STANDARDRESPONSE.xml
+++ b/db/ddlutils/model/R_STANDARDRESPONSE.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_STANDARDRESPONSE">
-      <column name="R_STANDARDRESPONSE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="R_STANDARDRESPONSE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="RESPONSETEXT" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false"/>
       <check>
diff --git a/db/ddlutils/model/R_STATUS.xml b/db/ddlutils/model/R_STATUS.xml
index d28773cbe6..bcb329a800 100644
--- a/db/ddlutils/model/R_STATUS.xml
+++ b/db/ddlutils/model/R_STATUS.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_STATUS">
-      <column name="R_STATUS_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="R_STATUS_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
@@ -17,13 +17,13 @@
       <column name="ISOPEN" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="ISCLOSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" autoIncrement="false"/>
-      <column name="NEXT_STATUS_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="UPDATE_STATUS_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="TIMEOUTDAYS" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="NEXT_STATUS_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="UPDATE_STATUS_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="TIMEOUTDAYS" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="ISWEBCANUPDATE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ISFINALCLOSE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="true" type="INTEGER" default="0" autoIncrement="false"/>
-      <column name="R_STATUSCATEGORY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="SEQNO" primaryKey="false" required="true" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
+      <column name="R_STATUSCATEGORY_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <check>
         <rule><![CDATA[IsActive in ('Y','N')]]></rule>
       </check>
diff --git a/db/ddlutils/model/R_STATUSCATEGORY.xml b/db/ddlutils/model/R_STATUSCATEGORY.xml
index e6afff2dd1..9ea4bed947 100644
--- a/db/ddlutils/model/R_STATUSCATEGORY.xml
+++ b/db/ddlutils/model/R_STATUSCATEGORY.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="R_STATUSCATEGORY">
-      <column name="R_STATUSCATEGORY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="R_STATUSCATEGORY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/S_EXPENSETYPE.xml b/db/ddlutils/model/S_EXPENSETYPE.xml
index 941441c95a..433be3b715 100644
--- a/db/ddlutils/model/S_EXPENSETYPE.xml
+++ b/db/ddlutils/model/S_EXPENSETYPE.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="S_EXPENSETYPE">
-      <column name="S_EXPENSETYPE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="S_EXPENSETYPE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" 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="ISINVOICED" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
-      <column name="C_UOM_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_CATEGORY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_TAXCATEGORY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_UOM_ID" primaryKey="false" required="true" type="ID" size="10" 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"/>
       <foreign-key foreignTable="C_TAXCATEGORY" name="CTAXCATEGORY_SEXPENSETYPE">
         <reference local="C_TAXCATEGORY_ID" foreign="C_TAXCATEGORY_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/S_RESOURCE.xml b/db/ddlutils/model/S_RESOURCE.xml
index 1c11f85da1..53da4f0166 100644
--- a/db/ddlutils/model/S_RESOURCE.xml
+++ b/db/ddlutils/model/S_RESOURCE.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="S_RESOURCE">
-      <column name="S_RESOURCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="S_RESOURCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" 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="S_RESOURCETYPE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_WAREHOUSE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="S_RESOURCETYPE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <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" autoIncrement="false"/>
-      <column name="CHARGEABLEQTY" primaryKey="false" required="false" type="NUMERIC" default="0" 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"/>
       <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 70b8f39a04..9fb65d4313 100644
--- a/db/ddlutils/model/S_RESOURCEASSIGNMENT.xml
+++ b/db/ddlutils/model/S_RESOURCEASSIGNMENT.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="S_RESOURCEASSIGNMENT">
-      <column name="S_RESOURCEASSIGNMENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="S_RESOURCEASSIGNMENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="S_RESOURCE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="S_RESOURCE_ID" 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="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="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="QTY" primaryKey="false" required="false" type="DECIMAL" size="22" 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 7450fd7683..f0654bb570 100644
--- a/db/ddlutils/model/S_RESOURCETYPE.xml
+++ b/db/ddlutils/model/S_RESOURCETYPE.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="S_RESOURCETYPE">
-      <column name="S_RESOURCETYPE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="S_RESOURCETYPE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="VALUE" primaryKey="false" required="true" type="VARCHAR" size="40" 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="ISSINGLEASSIGNMENT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_UOM_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_UOM_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ALLOWUOMFRACTIONS" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="TIMESLOTSTART" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="TIMESLOTEND" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
@@ -27,9 +27,9 @@
       <column name="ONTHURSDAY" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="ONFRIDAY" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <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" autoIncrement="false"/>
-      <column name="C_TAXCATEGORY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="CHARGEABLEQTY" primaryKey="false" required="false" type="NUMERIC" default="0" 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"/>
       <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_RESOURCEUNAVAILABLE.xml b/db/ddlutils/model/S_RESOURCEUNAVAILABLE.xml
index dedbf363d0..45f9e03115 100644
--- a/db/ddlutils/model/S_RESOURCEUNAVAILABLE.xml
+++ b/db/ddlutils/model/S_RESOURCEUNAVAILABLE.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="S_RESOURCEUNAVAILABLE">
-      <column name="S_RESOURCEUNAVAILABLE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="S_RESOURCEUNAVAILABLE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="S_RESOURCE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="S_RESOURCE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DATEFROM" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATETO" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
diff --git a/db/ddlutils/model/S_TIMEEXPENSE.xml b/db/ddlutils/model/S_TIMEEXPENSE.xml
index cc64faf634..f58e39c126 100644
--- a/db/ddlutils/model/S_TIMEEXPENSE.xml
+++ b/db/ddlutils/model/S_TIMEEXPENSE.xml
@@ -2,26 +2,26 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="S_TIMEEXPENSE">
-      <column name="S_TIMEEXPENSE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="S_TIMEEXPENSE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DOCUMENTNO" primaryKey="false" required="true" type="VARCHAR" size="30" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="DATEREPORT" primaryKey="false" required="true" 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"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="M_PRICELIST_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_WAREHOUSE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_PRICELIST_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_WAREHOUSE_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="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="NUMERIC" autoIncrement="false"/>
+      <column name="APPROVALAMT" primaryKey="false" required="false" type="DECIMAL" size="22" 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 6420c4f868..8468ea47b8 100644
--- a/db/ddlutils/model/S_TIMEEXPENSELINE.xml
+++ b/db/ddlutils/model/S_TIMEEXPENSELINE.xml
@@ -2,43 +2,43 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="S_TIMEEXPENSELINE">
-      <column name="S_TIMEEXPENSELINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="S_TIMEEXPENSELINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="S_TIMEEXPENSE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="S_TIMEEXPENSE_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="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" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="EXPENSEAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="CONVERTEDAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="S_RESOURCEASSIGNMENT_ID" primaryKey="false" required="false" type="ID" 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="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="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"/>
       <column name="ISINVOICED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICELINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="INVOICEPRICE" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_UOM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ORDERLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECTPHASE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECTTASK_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="S_TIMETYPE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_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_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="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="NUMERIC" autoIncrement="false"/>
-      <column name="QTYREIMBURSED" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="PRICEINVOICED" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="PRICEREIMBURSED" primaryKey="false" required="false" type="NUMERIC" 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"/>
       <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/S_TIMETYPE.xml b/db/ddlutils/model/S_TIMETYPE.xml
index bf189b91e7..c7749627a4 100644
--- a/db/ddlutils/model/S_TIMETYPE.xml
+++ b/db/ddlutils/model/S_TIMETYPE.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="S_TIMETYPE">
-      <column name="S_TIMETYPE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="S_TIMETYPE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/S_TRAINING.xml b/db/ddlutils/model/S_TRAINING.xml
index 323d3a1e8f..ff2925e4ae 100644
--- a/db/ddlutils/model/S_TRAINING.xml
+++ b/db/ddlutils/model/S_TRAINING.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="S_TRAINING">
-      <column name="S_TRAINING_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="S_TRAINING_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="UPDATEDBY" 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="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
@@ -16,9 +16,9 @@
       <column name="DOCUMENTNOTE" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="IMAGEURL" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
       <column name="DESCRIPTIONURL" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
-      <column name="M_PRODUCT_CATEGORY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_TAXCATEGORY_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_UOM_ID" primaryKey="false" required="true" type="ID" 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="C_UOM_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <foreign-key foreignTable="C_TAXCATEGORY" name="CTAXCATEGORY_STRAINING">
         <reference local="C_TAXCATEGORY_ID" foreign="C_TAXCATEGORY_ID"/>
diff --git a/db/ddlutils/model/S_TRAINING_CLASS.xml b/db/ddlutils/model/S_TRAINING_CLASS.xml
index ea0d9772a5..9ad67fd3f6 100644
--- a/db/ddlutils/model/S_TRAINING_CLASS.xml
+++ b/db/ddlutils/model/S_TRAINING_CLASS.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="S_TRAINING_CLASS">
-      <column name="S_TRAINING_CLASS_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="S_TRAINING_CLASS_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="S_TRAINING_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="S_TRAINING_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="STARTDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="ENDDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <foreign-key foreignTable="M_PRODUCT" name="MPRODUCT_STRAININGCLASS">
diff --git a/db/ddlutils/model/TEST.xml b/db/ddlutils/model/TEST.xml
index 9e7a36b5c4..6496c56f6c 100644
--- a/db/ddlutils/model/TEST.xml
+++ b/db/ddlutils/model/TEST.xml
@@ -2,31 +2,31 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="TEST">
-      <column name="TEST_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="TEST_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="INTEGER" autoIncrement="false"/>
-      <column name="T_NUMBER" primaryKey="false" required="false" type="NUMERIC" default="0" 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_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" autoIncrement="false"/>
-      <column name="T_QTY" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="T_AMOUNT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_LOCATION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="ACCOUNT_ACCT" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PAYMENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_LOCATOR_ID" primaryKey="false" required="false" type="ID" 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="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="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"/>
+      <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="M_LOCATOR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <column name="BINARYDATA" primaryKey="false" required="false" type="BLOB" size="4000" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="false" type="CHAR" size="1" default="N" autoIncrement="false"/>
diff --git a/db/ddlutils/model/TIRE_STORAGE.xml b/db/ddlutils/model/TIRE_STORAGE.xml
index 6e8fc287fd..c603c9fead 100644
--- a/db/ddlutils/model/TIRE_STORAGE.xml
+++ b/db/ddlutils/model/TIRE_STORAGE.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="TIRE_STORAGE">
-      <column name="TIRE_STORAGE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="TIRE_STORAGE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="REGISTRATION" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="VEHICLE" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
@@ -25,11 +25,11 @@
       <column name="RIM_B" primaryKey="false" required="false" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="DATERECEIVED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="ISSTORED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="M_LOCATOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="M_LOCATOR_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="REMARK" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="ISRETURNED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="DATERETURNED" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_TIRESTORAGE">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/T_AGING.xml b/db/ddlutils/model/T_AGING.xml
index a36fed3049..5878b6cbd5 100644
--- a/db/ddlutils/model/T_AGING.xml
+++ b/db/ddlutils/model/T_AGING.xml
@@ -2,49 +2,49 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="T_AGING">
-      <column name="AD_PINSTANCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_CURRENCY_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICEPAYSCHEDULE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PINSTANCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_CURRENCY_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_INVOICE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_INVOICEPAYSCHEDULE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="STATEMENTDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DUEDATE" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="DAYSDUE" primaryKey="false" required="false" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="DAYSDUE" primaryKey="false" required="false" type="DECIMAL" size="10" default="0" autoIncrement="false"/>
       <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" autoIncrement="false"/>
-      <column name="INVOICEDAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="OPENAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PASTDUE91_PLUS" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PASTDUE61_90" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PASTDUE61_PLUS" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PASTDUE31_60" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PASTDUE31_PLUS" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PASTDUE1_30" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PASTDUE8_30" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PASTDUE1_7" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PASTDUEAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DUEAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DUE0" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DUE0_7" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DUE1_7" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DUE8_30" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DUE0_30" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DUE31_PLUS" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DUE31_60" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DUE61_PLUS" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DUE61_90" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="DUE91_PLUS" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" 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="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"/>
       <foreign-key foreignTable="AD_PINSTANCE" name="ADPINSTANCE_TAGING">
         <reference local="AD_PINSTANCE_ID" foreign="AD_PINSTANCE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/T_DISTRIBUTIONRUNDETAIL.xml b/db/ddlutils/model/T_DISTRIBUTIONRUNDETAIL.xml
index 98a7b07f04..e8d2ecd16d 100644
--- a/db/ddlutils/model/T_DISTRIBUTIONRUNDETAIL.xml
+++ b/db/ddlutils/model/T_DISTRIBUTIONRUNDETAIL.xml
@@ -2,23 +2,23 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="T_DISTRIBUTIONRUNDETAIL">
-      <column name="M_DISTRIBUTIONRUN_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_DISTRIBUTIONRUNLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_DISTRIBUTIONLIST_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_DISTRIBUTIONLISTLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="M_DISTRIBUTIONRUN_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_DISTRIBUTIONRUNLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_DISTRIBUTIONLIST_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_DISTRIBUTIONLISTLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="RATIO" primaryKey="false" required="true" type="NUMERIC" autoIncrement="false"/>
-      <column name="MINQTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_LOCATION_ID" primaryKey="false" required="true" type="ID" 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="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"/>
       <foreign-key foreignTable="C_BPARTNER" name="CBPARTNER_TDRDETAIL">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/T_INVENTORYVALUE.xml b/db/ddlutils/model/T_INVENTORYVALUE.xml
index d78fa8fba3..8abec438ad 100644
--- a/db/ddlutils/model/T_INVENTORYVALUE.xml
+++ b/db/ddlutils/model/T_INVENTORYVALUE.xml
@@ -2,29 +2,29 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="T_INVENTORYVALUE">
-      <column name="AD_PINSTANCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_WAREHOUSE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_PRICELIST_VERSION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_PINSTANCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_WAREHOUSE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_PRODUCT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <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" autoIncrement="false"/>
-      <column name="QTYONHAND" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PRICEPO" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PRICELIST" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PRICESTD" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PRICELIMIT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="COSTSTANDARD" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="COST" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PRICEPOAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PRICELISTAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PRICESTDAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PRICELIMITAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="COSTSTANDARDAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="COSTAMT" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="M_COSTELEMENT_ID" primaryKey="false" required="false" type="ID" 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="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"/>
       </foreign-key>
diff --git a/db/ddlutils/model/T_INVOICEGL.xml b/db/ddlutils/model/T_INVOICEGL.xml
index ead54d1cd7..7f3eb4de95 100644
--- a/db/ddlutils/model/T_INVOICEGL.xml
+++ b/db/ddlutils/model/T_INVOICEGL.xml
@@ -2,29 +2,29 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="T_INVOICEGL">
-      <column name="AD_PINSTANCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_INVOICE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="FACT_ACCT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PINSTANCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_INVOICE_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="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="GRANDTOTAL" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="OPENAMT" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PERCENT" primaryKey="false" required="false" type="NUMERIC" 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="APAR" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="AMTSOURCEBALANCE" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="AMTACCTBALANCE" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_CONVERSIONTYPEREVAL_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AMTREVALDR" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="AMTREVALCR" primaryKey="false" required="true" type="NUMERIC" default="0" 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="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="DATEREVAL" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="AMTREVALDRDIFF" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="AMTREVALCRDIFF" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_DOCTYPEREVAL_ID" primaryKey="false" required="false" type="ID" 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="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">
         <reference local="AD_PINSTANCE_ID" foreign="AD_PINSTANCE_ID"/>
diff --git a/db/ddlutils/model/T_REPLENISH.xml b/db/ddlutils/model/T_REPLENISH.xml
index fb9419fd1b..ecf55d7f25 100644
--- a/db/ddlutils/model/T_REPLENISH.xml
+++ b/db/ddlutils/model/T_REPLENISH.xml
@@ -2,24 +2,24 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="T_REPLENISH">
-      <column name="AD_PINSTANCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_WAREHOUSE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="QTYONHAND" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="QTYRESERVED" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="QTYORDERED" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <column name="AD_PINSTANCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_WAREHOUSE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <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="REPLENISHTYPE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="LEVEL_MIN" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="LEVEL_MAX" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="ORDER_MIN" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="ORDER_PACK" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="QTYTOORDER" primaryKey="false" required="true" type="NUMERIC" default="0" 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="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="REPLENISHMENTCREATE" primaryKey="false" required="false" type="CHAR" size="3" autoIncrement="false"/>
-      <column name="M_WAREHOUSESOURCE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_DOCTYPE_ID" primaryKey="false" required="false" type="ID" 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"/>
       <foreign-key foreignTable="AD_PINSTANCE" name="ADPINSTANCE_TREPLENISH">
         <reference local="AD_PINSTANCE_ID" foreign="AD_PINSTANCE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/T_REPORT.xml b/db/ddlutils/model/T_REPORT.xml
index e0d8fd8a5a..c76b61bdd2 100644
--- a/db/ddlutils/model/T_REPORT.xml
+++ b/db/ddlutils/model/T_REPORT.xml
@@ -2,35 +2,35 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="T_REPORT">
-      <column name="AD_PINSTANCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="PA_REPORTLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="RECORD_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="FACT_ACCT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="LEVELNO" primaryKey="false" required="false" type="INTEGER" default="0" autoIncrement="false"/>
+      <column name="AD_PINSTANCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <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="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="NUMERIC" autoIncrement="false"/>
-      <column name="COL_2" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="COL_1" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="COL_3" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="COL_4" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="COL_5" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="COL_6" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="COL_7" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="COL_8" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="COL_9" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="COL_10" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="COL_11" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="COL_12" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="COL_13" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="COL_14" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="COL_15" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="COL_16" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="COL_17" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="COL_18" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="COL_19" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="COL_20" primaryKey="false" required="false" type="NUMERIC" 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"/>
       <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 392e5ff57f..c9d6116672 100644
--- a/db/ddlutils/model/T_REPORTSTATEMENT.xml
+++ b/db/ddlutils/model/T_REPORTSTATEMENT.xml
@@ -2,16 +2,16 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="T_REPORTSTATEMENT">
-      <column name="AD_PINSTANCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="FACT_ACCT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="LEVELNO" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="AD_PINSTANCE_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="LEVELNO" primaryKey="false" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="AMTACCTCR" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="BALANCE" primaryKey="false" required="false" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="false" type="NUMERIC" default="0" 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"/>
       <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_SELECTION.xml b/db/ddlutils/model/T_SELECTION.xml
index 128212fb72..7f4b7514a6 100644
--- a/db/ddlutils/model/T_SELECTION.xml
+++ b/db/ddlutils/model/T_SELECTION.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="T_SELECTION">
-      <column name="AD_PINSTANCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="T_SELECTION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PINSTANCE_ID" primaryKey="true" required="true" type="ID" size="10" 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_SELECTION2.xml b/db/ddlutils/model/T_SELECTION2.xml
index 63d93fead3..73cd7f13d4 100644
--- a/db/ddlutils/model/T_SELECTION2.xml
+++ b/db/ddlutils/model/T_SELECTION2.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="T_SELECTION2">
-      <column name="AD_PINSTANCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="QUERY_ID" primaryKey="true" required="true" type="NUMERIC" autoIncrement="false"/>
-      <column name="T_SELECTION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <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="T_SELECTION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
     </table>
   </database>
diff --git a/db/ddlutils/model/T_SPOOL.xml b/db/ddlutils/model/T_SPOOL.xml
index 4e9e8ea9d7..bf68b208e8 100644
--- a/db/ddlutils/model/T_SPOOL.xml
+++ b/db/ddlutils/model/T_SPOOL.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="T_SPOOL">
-      <column name="AD_PINSTANCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="SEQNO" primaryKey="true" required="true" type="INTEGER" autoIncrement="false"/>
+      <column name="AD_PINSTANCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="SEQNO" primaryKey="true" required="true" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="MSGTEXT" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false"/>
       <foreign-key foreignTable="AD_PINSTANCE" name="ADPINSTANCE_TSPOOL">
         <reference local="AD_PINSTANCE_ID" foreign="AD_PINSTANCE_ID"/>
diff --git a/db/ddlutils/model/T_TRANSACTION.xml b/db/ddlutils/model/T_TRANSACTION.xml
index ff8d6214e5..ae16352595 100644
--- a/db/ddlutils/model/T_TRANSACTION.xml
+++ b/db/ddlutils/model/T_TRANSACTION.xml
@@ -2,34 +2,34 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="T_TRANSACTION">
-      <column name="AD_PINSTANCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_TRANSACTION_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_PINSTANCE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="M_TRANSACTION_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="MOVEMENTTYPE" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
-      <column name="M_LOCATOR_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_ATTRIBUTESETINSTANCE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <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="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="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="M_INOUTLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_INOUT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_MOVEMENTLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_MOVEMENT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_INVENTORYLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_INVENTORY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCTIONLINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_PRODUCTION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECTISSUE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="SEARCH_ORDER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="SEARCH_INVOICE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="SEARCH_INOUT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="MOVEMENTQTY" primaryKey="false" required="true" type="DECIMAL" size="22" 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"/>
+      <column name="M_MOVEMENT_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="M_INVENTORY_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"/>
+      <column name="M_PRODUCTION_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="C_PROJECT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="SEARCH_ORDER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="SEARCH_INVOICE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="SEARCH_INOUT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_PINSTANCE" name="ADPINSTANCE_TTRANSACTION">
         <reference local="AD_PINSTANCE_ID" foreign="AD_PINSTANCE_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/T_TRIALBALANCE.xml b/db/ddlutils/model/T_TRIALBALANCE.xml
index a653a8bda5..8b76a5ac13 100644
--- a/db/ddlutils/model/T_TRIALBALANCE.xml
+++ b/db/ddlutils/model/T_TRIALBALANCE.xml
@@ -2,48 +2,48 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="T_TRIALBALANCE">
-      <column name="AD_PINSTANCE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="FACT_ACCT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="AD_PINSTANCE_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="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="ACCOUNT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_ACCTSCHEMA_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="ACCOUNT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="DATETRX" primaryKey="false" required="false" type="TIMESTAMP" size="7" autoIncrement="false"/>
       <column name="DATEACCT" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false"/>
-      <column name="C_PERIOD_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_TABLE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="RECORD_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="LINE_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="GL_CATEGORY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="GL_BUDGET_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_TAX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_LOCATOR_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_PERIOD_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="LINE_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="GL_CATEGORY_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="C_TAX_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <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" autoIncrement="false"/>
-      <column name="AMTSOURCEDR" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="AMTSOURCECR" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="AMTSOURCEBALANCE" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="AMTACCTDR" primaryKey="false" required="true" type="NUMERIC" autoIncrement="false"/>
-      <column name="AMTACCTCR" primaryKey="false" required="true" type="NUMERIC" autoIncrement="false"/>
-      <column name="AMTACCTBALANCE" primaryKey="false" required="true" type="NUMERIC" autoIncrement="false"/>
-      <column name="C_UOM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="false" type="NUMERIC" autoIncrement="false"/>
-      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_ORGTRX_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_LOCFROM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_LOCTO_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_SALESREGION_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_PROJECT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_CAMPAIGN_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="C_ACTIVITY_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER1_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="USER2_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="A_ASSET_ID" primaryKey="false" required="false" type="ID" 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="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="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"/>
+      <column name="C_LOCFROM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_LOCTO_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="C_SALESREGION_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_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="A_ASSET_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="ACCOUNTVALUE" primaryKey="false" required="false" type="VARCHAR" size="40" autoIncrement="false"/>
       <foreign-key foreignTable="AD_PINSTANCE" name="AD_PINSTANCE_T_TRIALBALANCE">
diff --git a/db/ddlutils/model/W_ADVERTISEMENT.xml b/db/ddlutils/model/W_ADVERTISEMENT.xml
index a289713ef3..e1f42cf33c 100644
--- a/db/ddlutils/model/W_ADVERTISEMENT.xml
+++ b/db/ddlutils/model/W_ADVERTISEMENT.xml
@@ -2,22 +2,22 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="W_ADVERTISEMENT">
-      <column name="W_ADVERTISEMENT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="W_ADVERTISEMENT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="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="ISSELFSERVICE" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="W_CLICKCOUNT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="W_COUNTERCOUNT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_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="W_CLICKCOUNT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
+      <column name="W_COUNTERCOUNT_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="IMAGEURL" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
@@ -27,7 +27,7 @@
       <column name="WEBPARAM3" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="WEBPARAM4" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="PUBLISHSTATUS" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false"/>
-      <column name="VERSION" primaryKey="false" required="false" type="INTEGER" autoIncrement="false"/>
+      <column name="VERSION" primaryKey="false" required="false" type="DECIMAL" size="10" autoIncrement="false"/>
       <column name="PROCESSING" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_WADVERTISEMENT">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
diff --git a/db/ddlutils/model/W_BASKET.xml b/db/ddlutils/model/W_BASKET.xml
index 6e9b7038d3..133b2e0486 100644
--- a/db/ddlutils/model/W_BASKET.xml
+++ b/db/ddlutils/model/W_BASKET.xml
@@ -2,19 +2,19 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="W_BASKET">
-      <column name="W_BASKET_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="W_BASKET_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="SESSION_ID" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="EMAIL" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="M_PRICELIST_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_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="AD_USER_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_WBASKET">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/W_BASKETLINE.xml b/db/ddlutils/model/W_BASKETLINE.xml
index 1638a6ee1c..b89ed7091a 100644
--- a/db/ddlutils/model/W_BASKETLINE.xml
+++ b/db/ddlutils/model/W_BASKETLINE.xml
@@ -2,21 +2,21 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="W_BASKETLINE">
-      <column name="W_BASKETLINE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="W_BASKETLINE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="W_BASKET_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="LINE" primaryKey="false" required="true" type="INTEGER" autoIncrement="false"/>
-      <column name="QTY" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
-      <column name="PRICE" primaryKey="false" required="true" type="NUMERIC" default="0" autoIncrement="false"/>
+      <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="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" autoIncrement="false"/>
+      <column name="M_PRODUCT_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="M_PRODUCT" name="MPRODUCT_WBASKETLINE">
         <reference local="M_PRODUCT_ID" foreign="M_PRODUCT_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/W_CLICK.xml b/db/ddlutils/model/W_CLICK.xml
index 56ebdaad3e..6489b0350b 100644
--- a/db/ddlutils/model/W_CLICK.xml
+++ b/db/ddlutils/model/W_CLICK.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="W_CLICK">
-      <column name="W_CLICK_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="W_CLICK_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="TARGETURL" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
       <column name="REFERRER" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
       <column name="REMOTE_HOST" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
@@ -17,8 +17,8 @@
       <column name="USERAGENT" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="ACCEPTLANGUAGE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="W_CLICKCOUNT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="W_CLICKCOUNT_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="EMAIL" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_WCLICK">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
diff --git a/db/ddlutils/model/W_CLICKCOUNT.xml b/db/ddlutils/model/W_CLICKCOUNT.xml
index 49f70fdeea..c73869b1f5 100644
--- a/db/ddlutils/model/W_CLICKCOUNT.xml
+++ b/db/ddlutils/model/W_CLICKCOUNT.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="W_CLICKCOUNT">
-      <column name="W_CLICKCOUNT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="W_CLICKCOUNT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="TARGETURL" primaryKey="false" required="true" type="VARCHAR" size="120" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_BPARTNER" name="CBPARTNER_WCLICKCOUNT">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/W_COUNTER.xml b/db/ddlutils/model/W_COUNTER.xml
index ab57cab8ca..ea6d48af60 100644
--- a/db/ddlutils/model/W_COUNTER.xml
+++ b/db/ddlutils/model/W_COUNTER.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="W_COUNTER">
-      <column name="W_COUNTER_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="W_COUNTER_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="PAGEURL" primaryKey="false" required="true" type="VARCHAR" size="120" autoIncrement="false"/>
       <column name="REFERRER" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
       <column name="REMOTE_HOST" primaryKey="false" required="false" type="VARCHAR" size="120" autoIncrement="false"/>
@@ -17,8 +17,8 @@
       <column name="USERAGENT" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="ACCEPTLANGUAGE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="PROCESSED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
-      <column name="W_COUNTERCOUNT_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
-      <column name="AD_USER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="W_COUNTERCOUNT_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="EMAIL" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
       <foreign-key foreignTable="AD_USER" name="ADUSER_WCOUNTER">
         <reference local="AD_USER_ID" foreign="AD_USER_ID"/>
diff --git a/db/ddlutils/model/W_COUNTERCOUNT.xml b/db/ddlutils/model/W_COUNTERCOUNT.xml
index 0f402c9bc2..26c606320a 100644
--- a/db/ddlutils/model/W_COUNTERCOUNT.xml
+++ b/db/ddlutils/model/W_COUNTERCOUNT.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="W_COUNTERCOUNT">
-      <column name="W_COUNTERCOUNT_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="W_COUNTERCOUNT_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="PAGEURL" primaryKey="false" required="true" type="VARCHAR" size="120" autoIncrement="false"/>
-      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_BPARTNER_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <foreign-key foreignTable="C_BPARTNER" name="CBPARTNER_WCOUNTERCOUNT">
         <reference local="C_BPARTNER_ID" foreign="C_BPARTNER_ID"/>
       </foreign-key>
diff --git a/db/ddlutils/model/W_MAILMSG.xml b/db/ddlutils/model/W_MAILMSG.xml
index 8d9d6a4c08..4b6a1714bf 100644
--- a/db/ddlutils/model/W_MAILMSG.xml
+++ b/db/ddlutils/model/W_MAILMSG.xml
@@ -2,17 +2,17 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="W_MAILMSG">
-      <column name="W_MAILMSG_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="W_MAILMSG_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
-      <column name="W_STORE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="W_STORE_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="MAILMSGTYPE" primaryKey="false" required="true" type="CHAR" size="2" autoIncrement="false"/>
       <column name="SUBJECT" primaryKey="false" required="true" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="MESSAGE" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/W_MAILMSG_TRL.xml b/db/ddlutils/model/W_MAILMSG_TRL.xml
index 9f8d83fccd..35ec451846 100644
--- a/db/ddlutils/model/W_MAILMSG_TRL.xml
+++ b/db/ddlutils/model/W_MAILMSG_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="W_MAILMSG_TRL">
-      <column name="W_MAILMSG_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="W_MAILMSG_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISTRANSLATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="SUBJECT" primaryKey="false" required="true" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="MESSAGE" primaryKey="false" required="true" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/model/W_STORE.xml b/db/ddlutils/model/W_STORE.xml
index 46cb9be04b..98745148b2 100644
--- a/db/ddlutils/model/W_STORE.xml
+++ b/db/ddlutils/model/W_STORE.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="W_STORE">
-      <column name="W_STORE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="W_STORE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="NAME" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"/>
       <column name="DESCRIPTION" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false"/>
       <column name="HELP" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
@@ -35,12 +35,12 @@
       <column name="ISMENUCONTACT" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="EMAILHEADER" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="EMAILFOOTER" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
-      <column name="SALESREP_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_WAREHOUSE_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="M_PRICELIST_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="SALESREP_ID" primaryKey="false" required="true" type="ID" size="10" 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="WEBCONTEXT" primaryKey="false" required="true" type="VARCHAR" size="20" autoIncrement="false"/>
       <column name="WEBORDEREMAIL" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
-      <column name="C_PAYMENTTERM_ID" primaryKey="false" required="false" type="ID" autoIncrement="false"/>
+      <column name="C_PAYMENTTERM_ID" primaryKey="false" required="false" type="ID" size="10" autoIncrement="false"/>
       <column name="ISDEFAULT" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="URL" primaryKey="false" required="true" type="VARCHAR" size="120" default="http://localhost" autoIncrement="false"/>
       <column name="STYLESHEET" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"/>
@@ -50,6 +50,9 @@
       <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>
@@ -80,8 +83,5 @@
       <check>
         <rule><![CDATA[IsMenuRegistrations in ('Y','N')]]></rule>
       </check>
-      <check>
-        <rule><![CDATA[IsMenuContact in ('Y','N')]]></rule>
-      </check>
     </table>
   </database>
diff --git a/db/ddlutils/model/W_STORE_TRL.xml b/db/ddlutils/model/W_STORE_TRL.xml
index 4d98fd0e63..0899022d21 100644
--- a/db/ddlutils/model/W_STORE_TRL.xml
+++ b/db/ddlutils/model/W_STORE_TRL.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database">
   <database name="default" defaultIdMethod="none">
     <table name="W_STORE_TRL">
-      <column name="W_STORE_ID" primaryKey="true" required="true" type="ID" autoIncrement="false"/>
+      <column name="W_STORE_ID" primaryKey="true" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="AD_LANGUAGE" primaryKey="true" required="true" type="VARCHAR" size="6" autoIncrement="false"/>
-      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
-      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" default="Y" autoIncrement="false"/>
       <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" default="CURRENT_TIMESTAMP" autoIncrement="false"/>
-      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" autoIncrement="false"/>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="ID" size="10" autoIncrement="false"/>
       <column name="ISTRANSLATED" primaryKey="false" required="true" type="CHAR" size="1" default="N" autoIncrement="false"/>
       <column name="WEBINFO" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
       <column name="WEBPARAM1" primaryKey="false" required="false" type="VARCHAR" size="2000" autoIncrement="false"/>
diff --git a/db/ddlutils/postgresql/init.sql b/db/ddlutils/postgresql/init.sql
index d18bbbd224..bd34912945 100644
--- a/db/ddlutils/postgresql/init.sql
+++ b/db/ddlutils/postgresql/init.sql
@@ -1,56 +1,66 @@
-/** Change Numeric for Integer   */
-CREATE OR REPLACE FUNCTION adempiere.ID (record NUMERIC) 
-RETURNS INTEGER AS $$
-DECLARE 
-ID integer := 0;
-BEGIN
-    ID := CAST(record AS INTEGER);
-    --RAISE NOTICE 'Quantity here is %', ID;
-    RETURN ID;
-END;
-$$ LANGUAGE plpgsql VOLATILE;
-  
-CREATE OR REPLACE FUNCTION adempiere.getdate()
-RETURNS TIMESTAMP WITH TIME ZONE AS $$
-BEGIN
-    RETURN now();
-END;
-$$ LANGUAGE plpgsql VOLATILE;
-
-/**TIMESTAMP WITH TIME ZONE    **/
-CREATE OR REPLACE FUNCTION adempiere.addDays (day TIMESTAMP WITH TIME ZONE, days DECIMAL)
-RETURNS TIMESTAMP WITH TIME ZONE AS $$
-BEGIN
-    RETURN adempiere.addDays(day,adempiere.ID(days));
-END;
-$$ LANGUAGE plpgsql VOLATILE;
-
-
-CREATE OR REPLACE FUNCTION adempiere.subtractdays (day TIMESTAMP WITH TIME ZONE, days DECIMAL)
-RETURNS TIMESTAMP WITH TIME ZONE AS $$
-BEGIN
-    RETURN adempiere.addDays(day,adempiere.ID(days * -1));
-END;
-$$ LANGUAGE plpgsql VOLATILE;
-
-CREATE OR REPLACE FUNCTION adddays("day" timestamp with time zone, days integer) RETURNS timestamp with time zone
-    AS $$org.compiere.sqlj.Adempiere.addDays(java.sql.Timestamp,int)$$
-    LANGUAGE java;
-
-
-CREATE OR REPLACE FUNCTION adempiere.subtractdays (day TIMESTAMP WITH TIME ZONE, days INTEGER)
-RETURNS TIMESTAMP WITH TIME ZONE AS $$
-BEGIN
-    RETURN adempiere.addDays(day,days * -1);
-END;
-$$ LANGUAGE plpgsql VOLATILE;
-
-DROP OPERATOR adempiere.+ (timestamptz, INTEGER);
-CREATE OPERATOR adempiere.+ ( PROCEDURE = adempiere.adddays,
-LEFTARG = TIMESTAMPTZ, RIGHTARG = INTEGER,
-COMMUTATOR = +);
-
-DROP OPERATOR adempiere.- (timestamptz, INTEGER);
-CREATE OPERATOR adempiere.- ( PROCEDURE = adempiere. subtractdays,
-LEFTARG = TIMESTAMPTZ, RIGHTARG = INTEGER,
-COMMUTATOR = -);
+/** Change Numeric for Integer   */
+CREATE OR REPLACE FUNCTION adempiere.ID (record NUMERIC) 
+RETURNS INTEGER AS $$
+DECLARE 
+ID integer := 0;
+BEGIN
+    ID := CAST(record AS INTEGER);
+    --RAISE NOTICE 'Quantity here is %', ID;
+    RETURN ID;
+END;
+$$ LANGUAGE plpgsql VOLATILE;
+  
+CREATE OR REPLACE FUNCTION adempiere.getdate()
+RETURNS TIMESTAMP WITH TIME ZONE AS $$
+BEGIN
+    RETURN now();
+END;
+$$ LANGUAGE plpgsql VOLATILE;
+
+/**TIMESTAMP WITH TIME ZONE    **/
+CREATE OR REPLACE FUNCTION adempiere.addDays (day TIMESTAMP WITH TIME ZONE, days DECIMAL)
+RETURNS TIMESTAMP WITH TIME ZONE AS $$
+BEGIN
+    RETURN adempiere.addDays(day,adempiere.ID(days));
+END;
+$$ LANGUAGE plpgsql VOLATILE;
+
+
+CREATE OR REPLACE FUNCTION adempiere.subtractdays (day TIMESTAMP WITH TIME ZONE, days DECIMAL)
+RETURNS TIMESTAMP WITH TIME ZONE AS $$
+BEGIN
+    RETURN adempiere.addDays(day,adempiere.ID(days * -1));
+END;
+$$ LANGUAGE plpgsql VOLATILE;
+
+CREATE OR REPLACE FUNCTION adddays("day" timestamp with time zone, days integer) RETURNS timestamp with time zone
+    AS $$org.compiere.sqlj.Adempiere.addDays(java.sql.Timestamp,int)$$
+    LANGUAGE java;
+
+
+CREATE OR REPLACE FUNCTION adempiere.subtractdays (day TIMESTAMP WITH TIME ZONE, days INTEGER)
+RETURNS TIMESTAMP WITH TIME ZONE AS $$
+BEGIN
+    RETURN adempiere.addDays(day,days * -1);
+END;
+$$ LANGUAGE plpgsql VOLATILE;
+
+DROP OPERATOR adempiere.+ (timestamptz, INTEGER);
+CREATE OPERATOR adempiere.+ ( PROCEDURE = adempiere.adddays,
+LEFTARG = TIMESTAMPTZ, RIGHTARG = INTEGER,
+COMMUTATOR = +);
+
+DROP OPERATOR adempiere.- (timestamptz, INTEGER);
+CREATE OPERATOR adempiere.- ( PROCEDURE = adempiere.subtractdays,
+LEFTARG = TIMESTAMPTZ, RIGHTARG = INTEGER,
+COMMUTATOR = -);
+
+DROP OPERATOR adempiere.+ (timestamptz, NUMERIC);
+CREATE OPERATOR adempiere.+ ( PROCEDURE = adempiere.adddays,
+LEFTARG = TIMESTAMPTZ, RIGHTARG = NUMERIC,
+COMMUTATOR = +);
+
+DROP OPERATOR adempiere.- (timestamptz, NUMERIC);
+CREATE OPERATOR adempiere.- ( PROCEDURE = adempiere.subtractdays,
+LEFTARG = TIMESTAMPTZ, RIGHTARG = NUMERIC,
+COMMUTATOR = -);