merge with pi
authorMartin Taal <martin.taal@openbravo.com>
Wed, 10 Feb 2010 14:06:07 +0100
changeset 6231 a8c4ce2aa00f
parent 6230 3e95ff3935d1 (current diff)
parent 6106 f7ca25500950 (diff)
child 6232 333a362ef473
merge with pi
build.xml
src-db/database/lib/dbsourcemanager.jar
src-db/database/model/functions/AD_LANGUAGE_CREATE.xml
src-db/database/sourcedata/AD_AUXILIARINPUT.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_ELEMENT.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_MESSAGE.xml
src-db/database/sourcedata/AD_MODULE.xml
src-db/database/sourcedata/AD_REFERENCE.xml
src-db/database/sourcedata/AD_REF_TABLE.xml
src-db/database/sourcedata/AD_VAL_RULE.xml
src-test/org/openbravo/test/dal/IssuesTest.java
src/org/openbravo/dal/core/DalMappingGenerator.java
src/org/openbravo/dal/core/OBContext.java
src/org/openbravo/erpCommon/security/Login_F1.html
web/js/dojotoolkit/dojox/form/resources/UploadFile.php
web/js/dojotoolkit/dojox/form/resources/cLOG.php
web/js/dojotoolkit/dojox/form/resources/uploads/README
web/js/dojotoolkit/dojox/portlet.js
web/js/messages.js
web/js/utils.js
--- a/.hgsigs	Thu Feb 04 17:13:12 2010 +0100
+++ b/.hgsigs	Wed Feb 10 14:06:07 2010 +0100
@@ -10,3 +10,4 @@
 9f91fb70ebff156b6650de4e255fe723f2262fd7 0 iEYEABECAAYFAkroDJIACgkQCX/oGf+2qkOYgACdFu7ttmyClvcEKNJb4hTStIEggmkAoNOEc7lBPEfPizXiCfeRDGBOF7OF
 e7c306101389e980c1a1fb9d1bfeb3e200efaa94 0 iEYEABECAAYFAksNhdEACgkQCX/oGf+2qkNCCgCfVvVHzYDUBoPwv3mHqE+dLpz88UsAnRrvpWvUmXozxdaMD0X0IV123bH0
 0b5e5cf1aa6b85df792522ed84d9755a1563c4f6 0 iEYEABECAAYFAktQTfIACgkQCX/oGf+2qkMeKgCgxxmPlv10O2oQEIEF18iBJR5hD4AAn1VYgmnxMZUGQA7WT6/j8PtMV9je
+630f94155c011c18a4bd948239d674953ad729c4 0 iEYEABECAAYFAkthyKQACgkQCX/oGf+2qkOIwgCcCk4MJcMrnHR9WgEGfRx4HoTYfjsAn26YI0m1bCQSlyqmh+gDusmsqrNA
--- a/.hgtags	Thu Feb 04 17:13:12 2010 +0100
+++ b/.hgtags	Wed Feb 10 14:06:07 2010 +0100
@@ -20,3 +20,4 @@
 6a836f38131f9c289b9f3a838b728711ddd277fb 2.50MP8
 003090f7d33a5d408405addea4c74ca8e1d9f186 2.50MP9
 f873f7f56a657920123211550340ca358e270de7 2.50MP10
+98d31cbff884dd20581e1cafad505ed8f9b33273 2.50MP11
--- a/build.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/build.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -85,7 +85,7 @@
   <property name="build.docs" location="docs/api" />
   <property name="jakarta.home" location="${env.CATALINA_HOME}" />
   <property name="module" value="%" />
-  <property name="apply.on.create" value="false" />
+  <property name="apply.on.create" value="true" />
   <property name="obx.export.RD" value="false" />
   <property name="obx.export.DB" value="false" />
   <property name="obx.export.CS" value="false" />
@@ -592,9 +592,8 @@
   <target name="apply.modules">
     <antcall target="update.database.mod" />
     <updatesystemstatus v="RB21"/>
-    <antcall target="generate.entities" />
+    <!--<antcall target="generate.entities" />-->
 
-    <updatesystemstatus v="RB31"/>
     <antcall inheritall="true" inheritrefs="true" target="apply.module" />
 
     <condition property="apply.modules.complete.compilation.var">
@@ -624,6 +623,7 @@
   </target>
 
   <target name="apply.module">
+    <updatesystemstatus v="RB31"/>
     <java classname="org.openbravo.erpCommon.modules.ApplyModuleTask" fork="true" maxmemory="${build.maxmemory}">
       <arg line="'${base.src}'" />
       <classpath refid="project.class.path" />
--- a/config/Openbravo.properties.template	Thu Feb 04 17:13:12 2010 +0100
+++ b/config/Openbravo.properties.template	Wed Feb 10 14:06:07 2010 +0100
@@ -135,3 +135,12 @@
 # with role System Administrator
 
 safe.mode=false
+
+##############
+# Hibernate #
+##############
+
+# if this property is set then the mapping will be written to the file
+# defined by this property, note the value should be the complete path 
+# including the file name and extension.
+# hibernate.hbm.file=/tmp/hibernate.hbm.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/config/eclipse/hibernate.cfg.xml.template	Wed Feb 10 14:06:07 2010 +0100
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ *************************************************************************
+ * The contents of this file are subject to the Openbravo Public License 
+ * Version 1.1 (the "License"), being the Mozilla Public License 
+ * version 1.1  with a permitted attribution clause ; you may not use 
+ * this file except in compliance with the License. 
+ * You may obtain a copy of the License at  
+ * http://www.openbravo.com/legal/license.txt 
+ * Software distributed under the License is distributed on an 
+ * "AS IS" basis, WITHOUT WARRANTY OF  ANY KIND, either express or 
+ * implied. See the License for the specific language governing rights 
+ * and  limitations under the License. 
+ * The Original Code is Openbravo ERP. 
+ * The Initial Developer of the Original Code is Openbravo SL 
+ * All portions are Copyright (C) 2010 Openbravo SL 
+ * All Rights Reserved. 
+ * Contributor(s): Openbravo S.L.
+ ************************************************************************
+-->
+<!DOCTYPE hibernate-configuration PUBLIC
+                "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
+                "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+<hibernate-configuration>
+    <session-factory>
+    <!-- Postgress Settings -->
+        <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property>
+        <property name="hibernate.connection.driver_class">org.postgresql.Driver</property>
+        <property name="hibernate.connection.url">jdbc:postgresql://localhost:5432/obpi</property>
+        <property name="hibernate.connection.username">tad</property>
+        <property name="hibernate.connection.password">TAD</property>
+        <property name="hibernate.cache.use_second_level_cache">false</property>
+    <!-- Oracle Settings
+        <property name="hibernate.dialect">org.hibernate.dialect.OracleDialect</property>
+        <property name="hibernate.connection.driver_class">oracle.jdbc.driver.OracleDriver</property>
+        <property name="hibernate.connection.url">jdbc:oracle:thin:@localhost:1521:ob</property>
+        <property name="hibernate.connection.username">pi</property>
+        <property name="hibernate.connection.password">tad</property>
+        <property name="hibernate.default_schema">PI</property>
+        <property name="hibernate.cache.use_second_level_cache">false</property>
+         -->
+    </session-factory> 
+</hibernate-configuration>
\ No newline at end of file
--- a/src-db/database/build.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/build.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -64,7 +64,8 @@
   </taskdef>
 
   <target name="export.config.script">
-    <exportconfigscript driver="${bbdd.driver}" url="${bbdd.owner.url}" user="${bbdd.user}" filter="com.openbravo.db.OpenbravoMetadataFilter" password="${bbdd.password}" excludeobjects="com.openbravo.db.OpenbravoExcludeFilter" moduledir="${base.modules}" model="model" coreData="${base.db}/sourcedata" verbosity="${bbdd.verbosity}" industryTemplate="${industryTemplate}" userId="0" adminMode="true" propertiesFile="${base.config}/Openbravo.properties" />
+    <exportconfigscript driver="${bbdd.driver}" url="${bbdd.owner.url}" user="${bbdd.user}" filter="com.openbravo.db.OpenbravoMetadataFilter" password="${bbdd.password}" excludeobjects="com.openbravo.db.OpenbravoExcludeFilter" moduledir="${base.modules}" model="model" coreData="${base.db}/sourcedata" verbosity="${bbdd.verbosity}" industryTemplate="${industryTemplate}" />
+    <antcall target="update.dbupdate.timestamp" />
   </target>
 
   <target name="update.database">
@@ -75,7 +76,7 @@
   
   
   <target name="update.database.java">
-    <java classname="org.openbravo.ddlutils.task.AlterDatabaseJavaMP" failonerror="true" fork="true" maxmemory="${build.maxmemory}">
+    <java classname="org.openbravo.ddlutils.task.AlterDatabaseJava" failonerror="true" fork="true" maxmemory="${build.maxmemory}">
       <arg value="${bbdd.driver}"/>
       <arg value="${bbdd.owner.url}"/>
       <arg value="${bbdd.user}"/>
@@ -91,33 +92,9 @@
       <arg value="*/src-db/database/model"/>
       <arg value="${base.modules}/"/>
       <arg value="*/src-db/database/sourcedata"/>
-      <arg value="0"/>
-      <arg value="${base.config}/Openbravo.properties"/>
       <arg value="${force}"/>
       <classpath refid="runtime-classpath" />
     </java>
-    <java classname="org.openbravo.ddlutils.task.AlterDatabaseJavaMP" failonerror="true" fork="true" maxmemory="${build.maxmemory}">
-      <arg value="${bbdd.driver}"/>
-      <arg value="${bbdd.owner.url}"/>
-      <arg value="${bbdd.user}"/>
-      <arg value="${bbdd.password}"/>
-      <arg value="com.openbravo.db.OpenbravoExcludeFilter"/>
-      <arg value="model"/>
-      <arg value="com.openbravo.db.OpenbravoMetadataFilter"/>
-      <arg value="sourcedata"/>
-      <arg value="${bbdd.object}"/>
-      <arg value="false"/>
-      <arg value="${bbdd.verbosity}"/>
-      <arg value="${base.modules}/"/>
-      <arg value="*/src-db/database/model"/>
-      <arg value="${base.modules}/"/>
-      <arg value="*/src-db/database/sourcedata"/>
-      <arg value="0"/>
-      <arg value="${base.config}/Openbravo.properties"/>
-      <arg value="${force}"/>
-      <arg value="true"/>
-      <classpath refid="runtime-classpath" />
-    </java>
     <antcall target="database.postupdate.${bbdd.rdbms}" />
     <antcall target="update.dbupdate.timestamp" />
   </target>
@@ -141,8 +118,6 @@
       <arg value="${base.modules}/"/>
       <arg value="*/src-db/database/sourcedata"/>
       <arg value="${module}"/>
-      <arg value="0"/>
-      <arg value="${base.config}/Openbravo.properties"/>
       <arg value="${force}"/>
       <classpath refid="runtime-classpath" />
     </java>
@@ -166,6 +141,7 @@
 
   <target name="export.database.structure">
       <exportdatabase driver="${bbdd.driver}" url="${bbdd.owner.url}" user="${bbdd.user}" password="${bbdd.password}" excludeobjects="com.openbravo.db.OpenbravoExcludeFilter" model="model" moduledir="${base.modules}" verbosity="${bbdd.verbosity}" output="sourcedata" codeRevision="${code.revision}" userId="0" adminMode="true" propertiesFile="${base.config}/Openbravo.properties" force="${force}" validateModel="${validate.model}" testAPI="${isMinorVersion}" datasetList="AD,ADRD" rd="${rd}" />
+      <antcall target="update.dbupdate.timestamp" />
   </target>
 
   <target name="database.postupdate.ORACLE">
@@ -179,7 +155,8 @@
       <transaction>
           UPDATE AD_SYSTEM_INFO SET CODE_REVISION=SUBSTR('${code.revision}',1,60);
           CALL AD_UPDATE_ACCESS();
-          UPDATE AD_MODULE SET ISINDEVELOPMENT='N', ISDEFAULT='N', SEQNO=NULL, STATUS='P', UPDATE_AVAILABLE=NULL, ISREGISTERED='N' WHERE STATUS IS NULL OR STATUS='I';
+          UPDATE AD_MODULE SET SEQNO=NULL, STATUS='P', UPDATE_AVAILABLE=NULL WHERE STATUS IS NULL OR STATUS='I';
+          UPDATE AD_MODULE SET ISINDEVELOPMENT='N' WHERE ISINDEVELOPMENT IS NULL;
           CALL AD_LANGUAGE_CREATE(NULL);
         </transaction>
     </sql>
@@ -196,7 +173,8 @@
       <transaction>
           UPDATE AD_SYSTEM_INFO SET CODE_REVISION=SUBSTR('${code.revision}',1,60);
           SELECT AD_UPDATE_ACCESS();
-          UPDATE AD_MODULE SET ISINDEVELOPMENT='N', ISDEFAULT='N', SEQNO=NULL, STATUS='P', UPDATE_AVAILABLE=NULL, ISREGISTERED='N' WHERE STATUS IS NULL OR STATUS='I';
+          UPDATE AD_MODULE SET SEQNO=NULL, STATUS='P', UPDATE_AVAILABLE=NULL WHERE STATUS IS NULL OR STATUS='I';
+          UPDATE AD_MODULE SET ISINDEVELOPMENT='N' WHERE ISINDEVELOPMENT IS NULL;
           SELECT AD_LANGUAGE_CREATE(NULL);
         </transaction>
     </sql>
Binary file src-db/database/lib/dbsourcemanager.jar has changed
--- a/src-db/database/model/functions/AD_LANGUAGE_CREATE.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/functions/AD_LANGUAGE_CREATE.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -19,7 +19,7 @@
   * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
   * All Rights Reserved.
   * Contributor(s): Openbravo SL
-  * Contributions are Copyright (C) 2001-2008 Openbravo, S.L.
+  * Contributions are Copyright (C) 2001-2010 Openbravo, S.L.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -98,10 +98,11 @@
     WHERE AD_Language.IsActive='Y'  
       AND AD_Element.AD_Module_ID = M.AD_Module_ID
       AND AD_Language.AD_Language != M.AD_Language
-      AND AD_Language.IsSystemLanguage='Y'  
-      AND(AD_Element_ID, AD_Language.AD_Language) NOT IN
-      (SELECT AD_Element_ID, AD_Language FROM AD_Element_Trl)
-      ;
+      AND AD_Language.IsSystemLanguage='Y'
+      AND NOT EXISTS (SELECT 1 FROM AD_ELEMENT_TRL
+                       WHERE AD_ELEMENT_ID = AD_Element.AD_Element_ID 
+                         AND AD_LANGUAGE = AD_Language.AD_Language);
+
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- AD_Element ' || v_rowcount) ;
@@ -117,9 +118,9 @@
       AND AD_Language.IsSystemLanguage='Y'  
       AND M.AD_MODULE_ID = AD_FieldGroup.AD_MODULE_ID
       AND M.AD_LANGUAGE != AD_Language.AD_Language
-      AND(AD_FieldGroup_ID, AD_Language.AD_Language) NOT IN
-      (SELECT AD_FieldGroup_ID, AD_Language FROM AD_FieldGroup_Trl)
-      ;
+      AND NOT EXISTS (SELECT 1 FROM AD_FieldGroup_TRL
+                 WHERE AD_FieldGroup_ID = AD_FieldGroup.AD_FieldGroup_ID 
+                   AND AD_LANGUAGE = AD_Language.AD_Language);
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- AD_FieldGroup ' || v_rowcount) ;
@@ -134,9 +135,11 @@
     WHERE AD_Language.IsActive='Y'  
     AND AD_Field.AD_Module_ID = M.AD_Module_ID
     AND M.AD_Language != AD_Language.AD_Language
-    AND AD_Language.IsSystemLanguage='Y'  AND(AD_Field_ID, AD_Language.AD_Language) NOT IN
-      (SELECT AD_Field_ID, AD_Language FROM AD_Field_Trl)
-      ;
+    AND AD_Language.IsSystemLanguage='Y' 
+    AND NOT EXISTS (SELECT 1 FROM AD_Field_TRL
+                 WHERE AD_Field_ID = AD_Field.AD_Field_ID 
+                   AND AD_LANGUAGE = AD_Language.AD_Language);
+      
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- AD_Field ' || v_rowcount) ;
@@ -154,9 +157,10 @@
     AND M.AD_MODULE_ID = AD_Form.AD_MODULE_ID
     AND M.AD_Language != AD_Language.AD_Language
     AND AD_Language.IsSystemLanguage='Y'  
-    AND(AD_Form_ID, AD_Language.AD_Language) NOT IN
-      (SELECT AD_Form_ID, AD_Language FROM AD_Form_Trl)
-      ;
+    AND NOT EXISTS (SELECT 1 FROM AD_Form_TRL
+                 WHERE AD_Form_ID = AD_Form.AD_Form_ID 
+                   AND AD_LANGUAGE = AD_Language.AD_Language);
+
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- AD_Form ' || v_rowcount) ;
@@ -174,9 +178,10 @@
     AND AD_Language.IsSystemLanguage='Y'  
     AND AD_MENU.AD_MODULE_ID = M.AD_MODULE_ID
     AND M.AD_Language != AD_Language.AD_Language
-    AND(AD_Menu_ID, AD_Language.AD_Language) NOT IN
-      (SELECT AD_Menu_ID, AD_Language FROM AD_Menu_Trl)
-      ;
+    AND NOT EXISTS (SELECT 1 FROM AD_Menu_TRL
+                 WHERE AD_Menu_ID = AD_Menu.AD_Menu_id 
+                   AND AD_LANGUAGE = AD_Language.AD_Language);
+
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- AD_Menu ' || v_rowcount) ;
@@ -191,9 +196,9 @@
     WHERE AD_Language.IsActive='Y'  
     AND AD_Language.IsSystemLanguage='Y'  
     AND M.AD_MODULE_ID = AD_Message.AD_MODULE_ID
-    AND(AD_Message_ID, AD_Language.AD_Language) NOT IN
-      (SELECT AD_Message_ID, AD_Language FROM AD_Message_Trl)
-      ;
+    AND NOT EXISTS (SELECT 1 FROM AD_Message_trl
+                 WHERE AD_Message_ID = AD_Message.AD_Message_id
+                   AND AD_LANGUAGE = AD_Language.AD_Language);
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- AD_Message ' || v_rowcount) ;
@@ -212,9 +217,10 @@
     AND AD_Language.IsSystemLanguage='Y'  
     AND M.AD_MODULE_ID = AD_Process.AD_MODULE_ID
     AND M.AD_LANGUAGE != AD_Language.AD_Language
-    AND(AD_Process_ID, AD_Language.AD_Language) NOT IN
-      (SELECT AD_Process_ID, AD_Language FROM AD_Process_Trl)
-      ;
+    AND NOT EXISTS (SELECT 1 FROM AD_Process_trl
+                 WHERE AD_Process_ID = AD_Process.AD_Process_ID
+                   AND AD_LANGUAGE = AD_Language.AD_Language);
+
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- AD_Process ' || v_rowcount) ;
@@ -233,9 +239,10 @@
     AND P.AD_PROCESS_ID = AD_Process_Para.AD_PROCESS_ID
     AND M.AD_MODULE_ID = P.AD_MODULE_ID
     AND M.AD_Language != AD_Language.AD_Language
-    AND(AD_Process_Para_ID, AD_Language.AD_Language) NOT IN
-      (SELECT AD_Process_Para_ID, AD_Language FROM AD_Process_Para_Trl)
-      ;
+    AND NOT EXISTS (SELECT 1 FROM AD_Process_Para_Trl
+                 WHERE AD_Process_Para_id = AD_Process_Para.AD_Process_Para_id
+                   AND AD_LANGUAGE = AD_Language.AD_Language);  
+      
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- AD_Process_Para ' || v_rowcount) ;
@@ -253,9 +260,9 @@
     AND AD_Language.IsSystemLanguage='Y'  
     AND M.AD_MODULE_ID = AD_Reference.AD_MODULE_ID
     AND M.AD_Language != AD_Language.AD_Language
-    AND(AD_Reference_ID, AD_Language.AD_Language) NOT IN
-      (SELECT AD_Reference_ID, AD_Language FROM AD_Reference_Trl)
-      ;
+    AND NOT EXISTS (SELECT 1 FROM AD_Reference_TRL
+                 WHERE AD_Reference_ID = AD_Reference.AD_Reference_ID
+                   AND AD_LANGUAGE = AD_Language.AD_Language);  
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- AD_Reference ' || v_rowcount) ;
@@ -274,9 +281,10 @@
     AND R.AD_REFERENCE_ID = AD_Ref_List.AD_REFERENCE_ID
     AND R.AD_MODULE_ID = M.AD_MODULE_ID
     AND M.AD_Language != AD_Language.AD_Language
-    AND(AD_Ref_List_ID, AD_Language.AD_Language) NOT IN
-      (SELECT AD_Ref_List_ID, AD_Language FROM AD_Ref_List_Trl)
-      ;
+    AND NOT EXISTS (SELECT 1 FROM AD_Ref_List_TRL
+                 WHERE AD_Ref_List_ID = AD_Ref_List.AD_Ref_List_ID
+                   AND AD_LANGUAGE = AD_Language.AD_Language);  
+                   
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- AD_Ref_List ' || v_rowcount) ;
@@ -293,9 +301,9 @@
     AND AD_Language.IsSystemLanguage='Y'  
     AND M.AD_MODULE_ID = AD_Tab.AD_MODULE_ID
     AND M.AD_Language != AD_Language.AD_Language
-    AND(AD_Tab_ID, AD_Language.AD_Language) NOT IN
-      (SELECT AD_Tab_ID, AD_Language FROM AD_Tab_Trl)
-      ;
+    AND NOT EXISTS (SELECT 1 FROM AD_Tab_TRL
+                 WHERE AD_Tab_ID = AD_Tab.AD_Tab_ID
+                   AND AD_LANGUAGE = AD_Language.AD_Language);  
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- AD_Tab ' || v_rowcount) ;
@@ -310,9 +318,11 @@
       )
     SELECT get_uuid(), AD_Task_ID, AD_Language, AD_Task.Name, AD_Task.Description, AD_Task.Help, 'N', '0', '0', '0', '0'
     FROM AD_Task, AD_Language
-    WHERE AD_Language.IsActive='Y'  AND AD_Language.IsSystemLanguage='Y'  AND(AD_Task_ID, AD_Language) NOT IN
-      (SELECT AD_Task_ID, AD_Language FROM AD_Task_Trl)
-      ;
+    WHERE AD_Language.IsActive='Y'  AND AD_Language.IsSystemLanguage='Y'  
+    AND NOT EXISTS (SELECT 1 FROM AD_Task_TRL
+                 WHERE AD_Task_ID = AD_Task.AD_Task_ID
+                   AND AD_LANGUAGE = AD_Language.AD_Language);  
+                   
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- AD_Task ' || v_rowcount) ;
@@ -330,9 +340,10 @@
     AND AD_Language.IsSystemLanguage='Y'  
     and m.ad_module_id = AD_Workflow.ad_module_id
     AND M.AD_Language != AD_Language.AD_Language
-    AND(AD_Workflow_ID, AD_Language.AD_Language) NOT IN
-      (SELECT AD_Workflow_ID, AD_Language FROM AD_Workflow_Trl)
-      ;
+    AND NOT EXISTS (SELECT 1 FROM AD_Workflow_TRL
+                 WHERE AD_Workflow_ID = AD_Workflow.AD_Workflow_ID
+                   AND AD_LANGUAGE = AD_Language.AD_Language);  
+                   
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- AD_Workflow ' || v_rowcount) ;
@@ -350,9 +361,10 @@
     and AD_WF_Node.AD_Workflow_id = w.AD_Workflow_id
     and m.ad_module_id = w.ad_module_id
     AND M.AD_Language != AD_Language.AD_Language
-    AND(AD_WF_Node.AD_WF_Node_ID, AD_Language.AD_Language) NOT IN
-      (SELECT AD_WF_Node_ID, AD_Language FROM AD_WF_Node_Trl)
-      ;
+    AND NOT EXISTS (SELECT 1 FROM AD_WF_Node_TRL
+                 WHERE AD_WF_Node_ID = AD_WF_Node.AD_WF_Node_ID
+                   AND AD_LANGUAGE = AD_Language.AD_Language); 
+
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- AD_WF_Node ' || v_rowcount) ;
@@ -367,9 +379,10 @@
     AND AD_Language.IsSystemLanguage='Y'  
     and m.ad_module_id = AD_Window.ad_module_id
     AND M.AD_Language != AD_Language.AD_Language
-    AND(AD_Window_ID, AD_Language.AD_Language) NOT IN
-      (SELECT AD_Window_ID, AD_Language FROM AD_Window_Trl)
-      ;
+    AND NOT EXISTS (SELECT 1 FROM AD_Window_TRL
+                 WHERE AD_Window_ID = AD_Window.AD_Window_ID
+                   AND AD_LANGUAGE = AD_Language.AD_Language); 
+
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- AD_Window ' || v_rowcount) ;
@@ -385,9 +398,11 @@
       )
     SELECT get_uuid(), AD_Month_ID, AD_Language.AD_Language, AD_Month.Name, 'N', '0', '0', AD_Month.AD_Client_ID, AD_Month.AD_Org_ID
     FROM AD_Month, AD_Language
-    WHERE AD_Language.IsActive='Y'  AND AD_Language.IsSystemLanguage='Y'  AND(AD_Month_ID, AD_Language.AD_Language) NOT IN
-      (SELECT AD_Month_ID, AD_Language FROM AD_Month_Trl)
-      ;
+    WHERE AD_Language.IsActive='Y'  AND AD_Language.IsSystemLanguage='Y'  
+     AND NOT EXISTS (SELECT 1 FROM AD_Month_TRL
+                 WHERE AD_Month_ID = AD_Month.AD_Month_ID
+                   AND AD_LANGUAGE = AD_Language.AD_Language); 
+
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- AD_Month ' || v_rowcount) ;
@@ -402,9 +417,11 @@
       )
     SELECT get_uuid(), C_Country_ID, AD_Language.AD_Language, C_Country.Name, C_Country.Description, C_Country.RegionName, C_Country.DisplaySequence, 'N', '0', '0', C_Country.AD_Client_ID, C_Country.AD_Org_ID
     FROM C_Country, AD_Language
-    WHERE AD_Language.IsActive='Y'  AND AD_Language.IsSystemLanguage='Y'  AND(C_Country_ID, AD_Language.AD_Language) NOT IN
-      (SELECT C_Country_ID, AD_Language FROM C_Country_Trl)
-      ;
+    WHERE AD_Language.IsActive='Y'  AND AD_Language.IsSystemLanguage='Y'  
+    AND NOT EXISTS (SELECT 1 FROM C_Country_TRL
+                 WHERE C_Country_ID = C_Country.C_Country_ID
+                   AND AD_LANGUAGE = AD_Language.AD_Language); 
+                   
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- C_Country ' || v_rowcount) ;
@@ -419,9 +436,11 @@
       )
     SELECT get_uuid(), C_Currency_ID, AD_Language.AD_Language, C_Currency.CurSymbol, C_Currency.Description, 'N', '0', '0', C_Currency.AD_Client_ID, C_Currency.AD_Org_ID
     FROM C_Currency, AD_Language
-    WHERE AD_Language.IsActive='Y'  AND AD_Language.IsSystemLanguage='Y'  AND(C_Currency_ID, AD_Language.AD_Language) NOT IN
-      (SELECT C_Currency_ID, AD_Language FROM C_Currency_Trl)
-      ;
+    WHERE AD_Language.IsActive='Y'  AND AD_Language.IsSystemLanguage='Y'  
+    AND NOT EXISTS (SELECT 1 FROM C_Currency_TRL
+                 WHERE C_Currency_ID = C_Currency.C_Currency_ID
+                   AND AD_LANGUAGE = AD_Language.AD_Language); 
+
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- C_Currency ' || v_rowcount) ;
@@ -438,9 +457,11 @@
       )
     SELECT get_uuid(), C_DocType_ID, AD_Language, C_DocType.Name, C_DocType.PrintName, C_DocType.DocumentNote, 'N', '0', '0', C_DocType.AD_Client_ID, C_DocType.AD_Org_ID
     FROM C_DocType, AD_Language
-    WHERE AD_Language.IsActive='Y'  AND AD_Language.IsSystemLanguage='Y'  AND(C_DocType_ID, AD_Language) NOT IN
-      (SELECT C_DocType_ID, AD_Language FROM C_DocType_Trl)
-      ;
+    WHERE AD_Language.IsActive='Y'  AND AD_Language.IsSystemLanguage='Y'  
+     AND NOT EXISTS (SELECT 1 FROM C_DocType_TRL
+                 WHERE C_DocType_ID = C_DocType.C_DocType_ID
+                   AND AD_LANGUAGE = AD_Language.AD_Language); 
+
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- C_DocType ' || v_rowcount) ;
@@ -454,9 +475,11 @@
       )
     SELECT get_uuid(), C_ElementValue_ID, AD_Language, C_ElementValue.Name, C_ElementValue.Description, 'N', '0', '0', C_ElementValue.AD_Client_ID, C_ElementValue.AD_Org_ID
     FROM C_ElementValue, AD_Language
-    WHERE AD_Language.IsActive='Y'  AND AD_Language.IsSystemLanguage='Y'  AND(C_ElementValue_ID, AD_Language) NOT IN
-      (SELECT C_ElementValue_ID, AD_Language FROM C_ElementValue_Trl)
-      ;
+    WHERE AD_Language.IsActive='Y'  AND AD_Language.IsSystemLanguage='Y'  
+     AND NOT EXISTS (SELECT 1 FROM C_ElementValue_TRL
+                 WHERE C_ElementValue_ID = C_ElementValue.C_ElementValue_ID
+                   AND AD_LANGUAGE = AD_Language.AD_Language); 
+
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- C_ElementValue ' || v_rowcount) ;
@@ -469,9 +492,11 @@
       )
     SELECT get_uuid(), C_Greeting_ID, AD_Language, C_Greeting.Name, C_Greeting.Greeting, 'N', '0', '0', C_Greeting.AD_Client_ID, C_Greeting.AD_Org_ID
     FROM C_Greeting, AD_Language
-    WHERE AD_Language.IsActive='Y'  AND AD_Language.IsSystemLanguage='Y'  AND(C_Greeting_ID, AD_Language) NOT IN
-      (SELECT C_Greeting_ID, AD_Language FROM C_Greeting_Trl)
-      ;
+    WHERE AD_Language.IsActive='Y'  AND AD_Language.IsSystemLanguage='Y'  
+    AND NOT EXISTS (SELECT 1 FROM C_Greeting_TRL
+                 WHERE C_Greeting_ID = C_Greeting.C_Greeting_ID
+                   AND AD_LANGUAGE = AD_Language.AD_Language); 
+
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- C_Greeting ' || v_rowcount) ;
@@ -484,9 +509,11 @@
       )
     SELECT get_uuid(), C_PaymentTerm_ID, AD_Language, C_PaymentTerm.Name, C_PaymentTerm.Description, C_PaymentTerm.DocumentNote, 'N', '0', '0', C_PaymentTerm.AD_Client_ID, C_PaymentTerm.AD_Org_ID
     FROM C_PaymentTerm, AD_Language
-    WHERE AD_Language.IsActive='Y'  AND AD_Language.IsSystemLanguage='Y'  AND(C_PaymentTerm_ID, AD_Language) NOT IN
-      (SELECT C_PaymentTerm_ID, AD_Language FROM C_PaymentTerm_Trl)
-      ;
+    WHERE AD_Language.IsActive='Y'  AND AD_Language.IsSystemLanguage='Y'  
+    AND NOT EXISTS (SELECT 1 FROM C_PaymentTerm_TRL
+                 WHERE C_PaymentTerm_ID = C_PaymentTerm.C_PaymentTerm_ID
+                   AND AD_LANGUAGE = AD_Language.AD_Language); 
+    
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- C_PaymentTerm ' || v_rowcount) ;
@@ -499,9 +526,11 @@
       )
     SELECT get_uuid(), C_TaxCategory_ID, AD_Language, C_TaxCategory.Name, C_TaxCategory.Description, 'N', '0', '0', C_TaxCategory.AD_Client_ID, C_TaxCategory.AD_Org_ID
     FROM C_TaxCategory, AD_Language
-    WHERE AD_Language.IsActive='Y'  AND AD_Language.IsSystemLanguage='Y'  AND(C_TaxCategory_ID, AD_Language) NOT IN
-      (SELECT C_TaxCategory_ID, AD_Language FROM C_TaxCategory_Trl)
-      ;
+    WHERE AD_Language.IsActive='Y'  AND AD_Language.IsSystemLanguage='Y'  
+     AND NOT EXISTS (SELECT 1 FROM C_TaxCategory_TRL
+                 WHERE C_TaxCategory_ID = C_TaxCategory.C_TaxCategory_ID
+                   AND AD_LANGUAGE = AD_Language.AD_Language); 
+                   
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- C_TaxCategory ' || v_rowcount) ;
@@ -514,9 +543,11 @@
       )
     SELECT get_uuid(), C_UOM_ID, AD_Language, C_UOM.Name, C_UOM.Description, C_UOM.UOMSymbol, 'N', '0', '0', C_UOM.AD_Client_ID, C_UOM.AD_Org_ID
     FROM C_UOM, AD_Language
-    WHERE AD_Language.IsActive='Y'  AND AD_Language.IsSystemLanguage='Y'  AND(C_UOM_ID, AD_Language) NOT IN
-      (SELECT C_UOM_ID, AD_Language FROM C_UOM_Trl)
-      ;
+    WHERE AD_Language.IsActive='Y'  AND AD_Language.IsSystemLanguage='Y'  
+    AND NOT EXISTS (SELECT 1 FROM C_UOM_TRL
+                 WHERE C_UOM_ID = C_UOM.C_UOM_ID
+                   AND AD_LANGUAGE = AD_Language.AD_Language); 
+
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- C_UOM ' || v_rowcount) ;
@@ -529,9 +560,12 @@
       )
     SELECT get_uuid(), C_Tax_ID, AD_Language, C_Tax.Name, C_Tax.Description, C_Tax.TaxIndicator, 'N', '0', '0', C_Tax.AD_Client_ID, C_Tax.AD_Org_ID
     FROM C_Tax, AD_Language
-    WHERE AD_Language.IsActive='Y'  AND AD_Language.IsSystemLanguage='Y'  AND(C_Tax_ID, AD_Language) NOT IN
-      (SELECT C_Tax_ID, AD_Language FROM C_Tax_Trl)
-      ;
+    WHERE AD_Language.IsActive='Y'  AND AD_Language.IsSystemLanguage='Y'  
+    AND NOT EXISTS (SELECT 1 FROM C_Tax_TRL
+                 WHERE C_Tax_ID = C_Tax.C_Tax_ID
+                   AND AD_LANGUAGE = AD_Language.AD_Language); 
+
+
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- C_Tax ' || v_rowcount) ;
@@ -544,9 +578,11 @@
       )
     SELECT get_uuid(), M_Product_ID, AD_Language, M_Product.Name, M_Product.DocumentNote, 'N', '0', '0', M_Product.AD_Client_ID, M_Product.AD_Org_ID
     FROM M_Product, AD_Language
-    WHERE AD_Language.IsActive='Y'  AND AD_Language.IsSystemLanguage='Y'  AND(M_Product_ID, AD_Language) NOT IN
-      (SELECT M_Product_ID, AD_Language FROM M_Product_Trl)
-      ;
+    WHERE AD_Language.IsActive='Y'  AND AD_Language.IsSystemLanguage='Y'  
+     AND NOT EXISTS (SELECT 1 FROM M_Product_TRL
+                 WHERE M_Product_ID = M_Product.M_Product_ID
+                   AND AD_LANGUAGE = AD_Language.AD_Language); 
+    
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- M_Product ' || v_rowcount) ;
@@ -564,9 +600,10 @@
     AND AD_Language.IsSystemLanguage='Y'  
     and m.ad_module_id = AD_TextInterfaces.AD_MODULE_ID
     and m.ad_language != AD_Language.AD_Language
-    AND(AD_TextInterfaces_ID, AD_Language.AD_Language) NOT IN
-      (SELECT AD_TextInterfaces_ID, AD_Language FROM AD_TextInterfaces_Trl)
-      ;
+    AND NOT EXISTS (SELECT 1 FROM AD_TextInterfaces_TRL
+                 WHERE AD_TextInterfaces_ID = AD_TextInterfaces.AD_TextInterfaces_ID
+                   AND AD_LANGUAGE = AD_Language.AD_Language); 
+
     v_rowcount:=SQL%ROWCOUNT;
     v_Created:=v_Created + v_rowcount;
     DBMS_OUTPUT.PUT_LINE('- AD_TextInterfaces ' || v_rowcount) ;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/functions/C_INVOICELINETAX_INSERT.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -0,0 +1,132 @@
+<?xml version="1.0"?>
+  <database name="FUNCTION C_INVOICELINETAX_INSERT">
+    <function name="C_INVOICELINETAX_INSERT" type="NULL">
+      <parameter name="p_org_id" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_invoice_id" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_invoiceline_id" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_user_id" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_originaltax_id" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_tax_id" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_linenetamt" type="NUMERIC" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_alternatetaxbaseamt" type="NUMERIC" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_stdprecision" type="NUMERIC" mode="in">
+        <default/>
+      </parameter>
+      <body><![CDATA[/*************************************************************************
+* The contents of this file are subject to the Openbravo  Public  License
+* Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+* Version 1.1  with a permitted attribution clause; you may not  use this
+* file except in compliance with the License. You  may  obtain  a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License  is  distributed  on  an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific  language  governing  rights  and  limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SL
+* All portions are Copyright (C) 2010 Openbravo SL
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+  -- Logistice
+  v_ResultStr VARCHAR2(2000):='';
+  v_Message VARCHAR2(2000):='';
+  v_Result NUMBER:=1; -- 0=failure
+  v_IsSummary C_TAX.ISSUMMARY%TYPE;
+  v_Cascade C_TAX.CASCADE%TYPE;
+  v_TaxBaseAmount NUMBER;
+  v_BaseAmount C_TAX.BASEAMOUNT%TYPE;
+  v_AlreadyExists NUMBER;
+  v_C_TaxBase_ID C_TAX.C_TAXBASE_ID%TYPE;
+  v_LineNet NUMBER;
+  v_AlternateTaxBaseAmt NUMBER;
+  v_LineNo C_INVOICETAX.LINE%TYPE;
+  v_Rate C_TAX.RATE%TYPE;
+  v_Client_ID VARCHAR2(32) ;
+  TYPE RECORD IS REF CURSOR;
+    Cur_Taxes RECORD;
+    FINISH_PROCESS BOOLEAN:=false;
+  BEGIN --BODY
+    v_TaxBaseAmount:=0;
+    SELECT ISSUMMARY, CASCADE, RATE, BASEAMOUNT, AD_CLIENT_ID, C_TAXBASE_ID
+    INTO v_IsSummary, v_Cascade, v_Rate, v_BaseAmount, v_Client_ID, v_C_TaxBase_ID
+    FROM C_TAX
+    WHERE C_TAX_ID = p_tax_id;
+    IF(v_BaseAmount='LNA' OR v_BaseAmount='LNATAX') THEN
+      v_TaxBaseAmount:=p_LineNetAmt;
+    ELSIF (v_BaseAmount='TBA' OR v_BaseAmount='TBATAX') THEN
+      v_TaxBaseAmount:=p_AlternateTaxBaseAmt;
+    END IF;
+    IF (v_TaxBaseAmount IS NULL) THEN
+      v_TaxBaseAmount:=0;
+    END IF;
+    IF (v_BaseAmount='TAX' OR v_BaseAmount='LNATAX' OR v_BaseAmount='TBATAX') THEN
+      SELECT COALESCE(SUM(TAXAMT),0) + v_TaxBaseAmount
+      INTO v_TaxBaseAmount
+      FROM C_INVOICELINETAX, C_TAX
+      WHERE C_INVOICELINETAX.C_TAX_ID = C_TAX.C_TAX_ID
+      AND C_TAX_ISMEMBER(v_C_TaxBase_ID,C_TAX.C_TAX_ID) = 1
+      AND C_INVOICELINE_ID = p_invoiceline_id
+      AND C_TAX.ISSUMMARY='N';
+    END IF;
+    IF(v_Cascade='Y') THEN
+      SELECT COALESCE(SUM(TAXAMT), 0) + v_TaxBaseAmount
+      INTO v_TaxBaseAmount
+      FROM C_INVOICELINETAX
+      WHERE C_INVOICELINE_ID = p_invoiceline_id;
+    END IF;
+    IF(v_IsSummary='N') THEN
+      SELECT COALESCE(MAX(LINE),0) + 10
+      INTO v_LineNo
+      FROM C_INVOICELINETAX
+      WHERE C_INVOICELINE_ID = p_invoiceline_id;
+      IF(p_invoice_id IS NULL OR p_invoiceline_id IS NULL) THEN
+         RAISE_APPLICATION_ERROR(-20200, 'Null ORDER OR LINE ID');
+      END IF;
+      INSERT
+      INTO C_INVOICELINETAX (
+      C_InvoiceLineTax_ID, C_InvoiceLine_ID, C_Invoice_ID, C_Tax_ID, AD_Client_ID, AD_Org_ID,
+      IsActive, Created, CreatedBy, Updated,
+      UpdatedBy, TaxBaseAmt, TaxAmt, Line)
+      VALUES (
+      GET_UUID(), p_invoiceline_id, p_invoice_id, p_tax_id, v_Client_ID, p_org_id,
+      'Y', now(), p_user_id, now(),
+      p_user_id, v_TaxBaseAmount, ROUND(v_TaxBaseAmount*v_Rate / 100, p_StdPrecision), v_LineNo);
+    ELSE
+      FOR Cur_Taxes IN
+        (SELECT C_Tax_ID, RATE
+         FROM C_TAX
+        WHERE Parent_Tax_ID=p_tax_id
+        ORDER BY Line)
+      LOOP
+        C_INVOICELINETAX_INSERT(p_org_id, p_invoice_id, p_invoiceline_id, p_user_id, p_originaltax_id, Cur_Taxes.C_Tax_ID, p_LineNetAmt, p_AlternateTaxBaseAmt, p_StdPrecision);
+      END LOOP;
+    END IF;
+    RETURN;
+    --<<FINISH_PROCESS>>
+EXCEPTION
+WHEN OTHERS THEN
+  v_ResultStr:= '@ERROR=' || SQLERRM;
+  DBMS_OUTPUT.PUT_LINE(v_ResultStr) ;
+  ROLLBACK;
+  RAISE;
+END C_INVOICELINETAX_INSERT
+]]></body>
+    </function>
+  </database>
--- a/src-db/database/model/functions/C_INVOICE_POST.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/functions/C_INVOICE_POST.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -1154,6 +1154,7 @@
           xTaxBaseAmt NUMBER:=0;
           xTaxAmt NUMBER:=0;
           v_TaxNoRecalculable NUMBER:=0;
+          v_PreviousTaxAmt NUMBER:=0;
           HeaderNotAdded BOOLEAN:=TRUE;
           v_LineNo NUMBER:=0;
           v_ActualBaseAmt NUMBER;
@@ -1161,19 +1162,24 @@
           v_C_InvoiceTax_ID VARCHAR2(32);
         BEGIN
           v_ResultStr:='DeleteOldTaxes';
+          DELETE FROM C_INVOICELINETAX  WHERE C_InvoiceLine_ID IN (SELECT C_InvoiceLine_ID from C_InvoiceLine
+                                                    WHERE C_Invoice_ID = v_Record_ID);
           DELETE FROM C_INVOICETAX
            WHERE C_Invoice_ID=v_Record_ID
              AND Recalculate = 'Y';
           -- For all Tax Rates
           v_ResultStr:='InsertNewTaxes';
           FOR Cur_Tax IN
-            (SELECT l.C_Tax_ID,
+            (SELECT l.C_InvoiceLine_ID, l.C_Tax_ID,
               i.IsTaxIncluded,
-              COALESCE(SUM(l.LineNetAmt), 0) + COALESCE(SUM(l.ChargeAmt), 0) AS LineNet,
+              COALESCE(SUM(l.LineNetAmt),0) + COALESCE(SUM(l.ChargeAmt), 0) AS LineNetAmt,
+              COALESCE(SUM(l.TaxBaseAmt), 0) + COALESCE(SUM(l.ChargeAmt), 0) AS TaxBaseAmt,
               COALESCE(SUM(i.ChargeAmt), 0) AS HeaderNet,
               t.Rate,
               t.IsSummary,
-              c.StdPrecision
+              c.StdPrecision,
+              t.Cascade,
+              t.BaseAmount
             FROM C_INVOICE i,
               C_INVOICELINE l,
               C_TAX t,
@@ -1182,77 +1188,24 @@
               AND i.C_Invoice_ID=v_Record_ID -- Parameter
               AND l.C_Tax_ID=t.C_Tax_ID
               AND i.C_Currency_ID=c.C_Currency_ID
-            GROUP BY l.C_Tax_ID,
+            GROUP BY l.C_InvoiceLine_ID, 
+              l.C_Tax_ID,
               i.IsTaxIncluded,
               t.Rate,
               t.IsSummary,
-              c.StdPrecision
-            ORDER BY 3 DESC
+              c.StdPrecision,
+              t.Cascade,
+              t.BaseAmount
+            ORDER BY 4 DESC
             )
           LOOP
-            xTaxBaseAmt:=Cur_Tax.LineNet;
+            xTaxBaseAmt:=Cur_Tax.LineNetAmt;
             v_TotalLines:=v_TotalLines + xTaxBaseAmt; -- w/o Header Freight/Charge
             IF(HeaderNotAdded) THEN -- add header to first
               HeaderNotAdded:=FALSE;
               xTaxBaseAmt:=xTaxBaseAmt + Cur_Tax.HeaderNet;
             END IF;
-            IF(Cur_Tax.IsSummary='N') THEN
-              v_LineNo := v_LineNo + 10;
-              xTaxAmt:=ROUND(xTaxBaseAmt * Cur_Tax.Rate / 100, Cur_Tax.StdPrecision) ;
-              v_GrandTotal:=v_GrandTotal + xTaxBaseAmt + xTaxAmt;
-              --
-              Ad_Sequence_Next('C_InvoiceTax', v_Org_ID, v_C_InvoiceTax_ID);
-              INSERT
-              INTO C_INVOICETAX
-                (
-                  C_InvoiceTax_ID, C_Invoice_ID, C_Tax_ID, AD_Client_ID, AD_Org_ID,
-                  IsActive, Created, CreatedBy, Updated,
-                  UpdatedBy, TaxBaseAmt, TaxAmt, Line, Recalculate
-                )
-                VALUES
-                (
-                  v_C_InvoiceTax_ID, v_Record_ID, Cur_Tax.C_Tax_ID, v_Client_ID, v_Org_ID,
-                   'Y', now(), v_UpdatedBy, now(),
-                  v_UpdatedBy, xTaxBaseAmt, xTaxAmt, v_LineNo,'Y'
-                )
-                ;
-            ELSE -- Multiple Taxes
-              v_GrandTotal:=v_GrandTotal + xTaxBaseAmt;
-              v_FirstLine := TRUE;
-              FOR Cur_MultiTax IN
-                (SELECT C_Tax_ID, Rate, CASCADE
-                   FROM C_TAX
-                  WHERE Parent_Tax_ID=Cur_Tax.C_Tax_ID
-                  ORDER BY Line)
-              LOOP
-                v_LineNo := v_LineNo + 10;
-                IF ((Cur_MultiTax.CASCADE = 'Y') AND (NOT v_FirstLine)) THEN   --cannot apply cascade to the first line
-                  v_ActualBaseAmt := v_GrandTotal;
-                ELSE
-                  v_ActualBaseAmt := xTaxBaseAmt;
-                END IF;
-                v_FirstLine := FALSE;
-
-                xTaxAmt:=ROUND(v_ActualBaseAmt * Cur_MultiTax.Rate / 100, Cur_Tax.StdPrecision) ;
-                v_GrandTotal:=v_GrandTotal + xTaxAmt;
-                --
-                Ad_Sequence_Next('C_InvoiceTax', v_Org_ID, v_C_InvoiceTax_ID);
-                INSERT
-                INTO C_INVOICETAX
-                  (
-                    C_InvoiceTax_ID, C_Invoice_ID, C_Tax_ID, AD_Client_ID, AD_Org_ID,
-                    IsActive, Created, CreatedBy, Updated,
-                    UpdatedBy, TaxBaseAmt, TaxAmt, Line, Recalculate
-                  )
-                  VALUES
-                  (
-                    v_C_InvoiceTax_ID, v_Record_ID, Cur_MultiTax.C_Tax_ID, v_Client_ID, v_Org_ID,
-                     'Y', now(), v_UpdatedBy, now(),
-                    v_UpdatedBy, v_ActualBaseAmt, xTaxAmt, v_LineNo, 'Y'
-                  )
-                  ;
-              END LOOP;
-            END IF;
+            C_INVOICELINETAX_INSERT(v_Org_ID, v_Record_ID, Cur_Tax.C_InvoiceLine_ID, v_UpdatedBy, Cur_Tax.C_Tax_ID, Cur_Tax.C_Tax_ID, Cur_Tax.LineNetAmt, Cur_Tax.TaxBaseAmt, Cur_Tax.StdPrecision);
           END LOOP; -- Insert New Taxes
           -- Update Header
           SELECT COALESCE(SUM(TaxAmt),0)
@@ -1265,6 +1218,11 @@
     FROM dual;
 
           v_GrandTotal:=C_Currency_Round(v_GrandTotal+v_TaxNoRecalculable, v_Currency_ID, NULL) ;
+          SELECT COALESCE(SUM(TAXAMT), 0)
+          INTO v_GrandTotal
+          FROM C_INVOICETAX
+          WHERE C_INVOICE_ID = v_Record_ID;
+          v_GrandTotal:=v_GrandTotal+ v_TotalLines;
           UPDATE C_INVOICE
             SET TotalLines=v_TotalLines,
             GrandTotal=v_GrandTotal,
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/functions/C_ORDERLINETAX_INSERT.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -0,0 +1,132 @@
+<?xml version="1.0"?>
+  <database name="FUNCTION C_ORDERLINETAX_INSERT">
+    <function name="C_ORDERLINETAX_INSERT" type="NULL">
+      <parameter name="p_org_id" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_order_id" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_orderline_id" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_user_id" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_originaltax_id" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_tax_id" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_linenetamt" type="NUMERIC" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_alternatetaxbaseamt" type="NUMERIC" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_stdprecision" type="NUMERIC" mode="in">
+        <default/>
+      </parameter>
+      <body><![CDATA[/*************************************************************************
+* The contents of this file are subject to the Openbravo  Public  License
+* Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+* Version 1.1  with a permitted attribution clause; you may not  use this
+* file except in compliance with the License. You  may  obtain  a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License  is  distributed  on  an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific  language  governing  rights  and  limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SL
+* All portions are Copyright (C) 2010 Openbravo SL
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+  -- Logistice
+  v_ResultStr VARCHAR2(2000):='';
+  v_Message VARCHAR2(2000):='';
+  v_Result NUMBER:=1; -- 0=failure
+  v_IsSummary C_TAX.ISSUMMARY%TYPE;
+  v_Cascade C_TAX.CASCADE%TYPE;
+  v_TaxBaseAmount NUMBER;
+  v_BaseAmount C_TAX.BASEAMOUNT%TYPE;
+  v_AlreadyExists NUMBER;
+  v_C_TaxBase_ID C_TAX.C_TAXBASE_ID%TYPE;
+  v_LineNet NUMBER;
+  v_AlternateTaxBaseAmt NUMBER;
+  v_LineNo C_INVOICETAX.LINE%TYPE;
+  v_Rate C_TAX.RATE%TYPE;
+  v_Client_ID VARCHAR2(32) ;
+  TYPE RECORD IS REF CURSOR;
+    Cur_Taxes RECORD;
+    FINISH_PROCESS BOOLEAN:=false;
+  BEGIN --BODY
+    v_TaxBaseAmount:=0;
+    SELECT ISSUMMARY, CASCADE, RATE, BASEAMOUNT, AD_CLIENT_ID, C_TAXBASE_ID
+    INTO v_IsSummary, v_Cascade, v_Rate, v_BaseAmount, v_Client_ID, v_C_TaxBase_ID
+    FROM C_TAX
+    WHERE C_TAX_ID = p_tax_id;
+    IF(v_BaseAmount='LNA' OR v_BaseAmount='LNATAX') THEN
+      v_TaxBaseAmount:=p_LineNetAmt;
+    ELSIF (v_BaseAmount='TBA' OR v_BaseAmount='TBATAX') THEN
+      v_TaxBaseAmount:=p_AlternateTaxBaseAmt;
+    END IF;
+    IF (v_TaxBaseAmount IS NULL) THEN
+      v_TaxBaseAmount:=0;
+    END IF;
+    IF (v_BaseAmount='TAX' OR v_BaseAmount='LNATAX' OR v_BaseAmount='TBATAX') THEN
+      SELECT COALESCE(SUM(TAXAMT),0) + v_TaxBaseAmount
+      INTO v_TaxBaseAmount
+      FROM C_ORDERLINETAX, C_TAX
+      WHERE C_ORDERLINETAX.C_TAX_ID = C_TAX.C_TAX_ID
+      AND C_TAX_ISMEMBER(v_C_TaxBase_ID,C_TAX.C_TAX_ID) = 1
+      AND C_ORDERLINE_ID = p_orderline_id
+      AND C_TAX.ISSUMMARY='N';
+    END IF;
+    IF(v_Cascade='Y') THEN
+      SELECT COALESCE(SUM(TAXAMT), 0) + v_TaxBaseAmount
+      INTO v_TaxBaseAmount
+      FROM C_ORDERLINETAX
+      WHERE C_ORDERLINE_ID = p_orderline_id;
+    END IF;
+    IF(v_IsSummary='N') THEN
+      SELECT COALESCE(MAX(LINE),0) + 10
+      INTO v_LineNo
+      FROM C_ORDERLINETAX
+      WHERE C_ORDERLINE_ID = p_orderline_id;
+      IF(p_order_id IS NULL OR p_orderline_id IS NULL) THEN
+         RAISE_APPLICATION_ERROR(-20200, 'Null ORDER OR LINE ID');
+      END IF;
+      INSERT
+      INTO C_ORDERLINETAX (
+      C_OrderLineTax_ID, C_OrderLine_ID, C_Order_ID, C_Tax_ID, AD_Client_ID, AD_Org_ID,
+      IsActive, Created, CreatedBy, Updated,
+      UpdatedBy, TaxBaseAmt, TaxAmt, Line)
+      VALUES (
+      GET_UUID(), p_orderline_id, p_order_id, p_tax_id, v_Client_ID, p_org_id,
+      'Y', now(), p_user_id, now(),
+      p_user_id, v_TaxBaseAmount, ROUND(v_TaxBaseAmount*v_Rate / 100, p_StdPrecision), v_LineNo);
+    ELSE
+      FOR Cur_Taxes IN
+        (SELECT C_Tax_ID, RATE
+         FROM C_TAX
+        WHERE Parent_Tax_ID=p_tax_id
+        ORDER BY Line)
+      LOOP
+        C_ORDERLINETAX_INSERT(p_org_id, p_order_id, p_orderline_id, p_user_id, p_originaltax_id, Cur_Taxes.C_Tax_ID, p_LineNetAmt, p_AlternateTaxBaseAmt, p_StdPrecision);
+      END LOOP;
+    END IF;
+    RETURN;
+    --<<FINISH_PROCESS>>
+EXCEPTION
+WHEN OTHERS THEN
+  v_ResultStr:= '@ERROR=' || SQLERRM;
+  DBMS_OUTPUT.PUT_LINE(v_ResultStr) ;
+  --ROLLBACK;
+  RAISE;
+END C_ORDERLINETAX_INSERT
+]]></body>
+    </function>
+  </database>
--- a/src-db/database/model/functions/C_ORDER_POST1.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/functions/C_ORDER_POST1.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -991,7 +991,7 @@
     Cur_Tax RECORD;
     Cur_MultiTax RECORD;
     xTotalLines NUMBER:=0;
-    v_TaxBaseAmt NUMBER:=0;
+    v_LineNetAmt NUMBER:=0;
     xTaxAmt NUMBER:=0;
     xGrandTotal NUMBER:=0;
     HeaderNotAdded BOOLEAN:=TRUE;
@@ -1000,88 +1000,46 @@
     v_lineNo NUMBER:= 0;
   BEGIN
     v_ResultStr:='DeleteOldTaxes';
+    DELETE FROM C_ORDERLINETAX  WHERE C_OrderLine_ID IN (SELECT C_OrderLine_ID from C_OrderLine
+                                                        WHERE C_Order_ID = v_Record_ID);
     DELETE FROM C_ORDERTAX  WHERE C_Order_ID=v_Record_ID;
     -- For all Tax Rates
     v_ResultStr:='InsertNewTaxes';
     FOR Cur_Tax IN
-      (SELECT l.C_Tax_ID, o.IsTaxIncluded,
-        SUM(l.LineNetAmt) + SUM(l.FreightAmt) + SUM(coalesce(l.ChargeAmt,0)) AS LineNet,
+      (SELECT l.C_OrderLine_ID, l.C_Tax_ID, o.IsTaxIncluded,
+        SUM(l.LineNetAmt) + SUM(l.FreightAmt) + SUM(coalesce(l.ChargeAmt,0)) AS LineNetAmt,
+        SUM(l.TaxBaseAmt) + SUM(l.FreightAmt) + SUM(coalesce(l.ChargeAmt,0)) AS TaxBaseAmt,
         SUM(o.FreightAmt) + SUM(coalesce(o.ChargeAmt,0)) AS HeaderNet,
-        t.Rate, t.IsSummary, c.StdPrecision
+        t.Rate, t.IsSummary, c.StdPrecision, t.BaseAmount, o.C_Order_ID
       FROM C_ORDER o,  C_ORDERLINE l,
            C_TAX t, C_CURRENCY c
       WHERE o.C_Order_ID=l.C_Order_ID
         AND o.C_Order_ID=v_Record_ID -- Parameter
         AND l.C_Tax_ID=t.C_Tax_ID
         AND o.C_Currency_ID=c.C_Currency_ID
-      GROUP BY l.C_Tax_ID,
+      GROUP BY l.C_OrderLine_ID, l.C_Tax_ID,
         o.IsTaxIncluded,
         t.Rate,
         t.IsSummary,
-        c.StdPrecision
-      ORDER BY 3 DESC
+        c.StdPrecision,
+        t.BaseAmount, 
+        o.C_Order_ID
+      ORDER BY 4 DESC
       )
     LOOP
-      v_TaxBaseAmt:=Cur_Tax.LineNet;
-      xTotalLines:=xTotalLines + v_TaxBaseAmt; -- w/o Header Freight/Charge
-
+      v_LineNetAmt:=Cur_Tax.LineNetAmt;
+      xTotalLines:=xTotalLines + v_LineNetAmt; -- w/o Header Freight/Charge
       IF(HeaderNotAdded) THEN --  add header net to first tax
         HeaderNotAdded:=FALSE;
-        v_TaxBaseAmt:=v_TaxBaseAmt + Cur_Tax.HeaderNet;
+        v_LineNetAmt:=v_LineNetAmt + Cur_Tax.HeaderNet;
       END IF;
-      IF(Cur_Tax.IsSummary='N') THEN
-        v_LineNo := v_LineNo + 10;
-        xTaxAmt:=ROUND(v_TaxBaseAmt * Cur_Tax.Rate / 100, Cur_Tax.StdPrecision) ;
-        xGrandTotal:=xGrandTotal + v_TaxBaseAmt + xTaxAmt;
-        --
-        INSERT
-        INTO C_ORDERTAX
-          (
-            C_OrderTax_ID, C_Order_ID, C_Tax_ID, AD_Client_ID, AD_Org_ID,
-            IsActive, Created, CreatedBy, Updated,
-            UpdatedBy, TaxBaseAmt, TaxAmt, Line
-          )
-          VALUES
-          (
-            get_uuid(), v_Record_ID, Cur_Tax.C_Tax_ID, v_Client_ID, v_Org_ID,
-             'Y', now(), v_UpdatedBy, now(),
-            v_UpdatedBy, v_TaxBaseAmt, xTaxAmt, v_LineNo
-          )
-          ;
-      ELSE -- Multiple Taxes
-        xGrandTotal:=xGrandTotal + v_TaxBaseAmt;
-        v_FirstLine := TRUE;
-        FOR Cur_MultiTax IN
-                          (SELECT C_Tax_ID, Rate, CASCADE
-                             FROM C_TAX
-                            WHERE Parent_Tax_ID=Cur_Tax.C_Tax_ID
-                            ORDER BY Line)
-        LOOP
-          v_LineNo := v_LineNo + 10;
-          IF ((Cur_MultiTax.CASCADE = 'Y') AND (NOT v_FirstLine)) THEN   --cannot apply cascade to the first line
-            v_ActualBaseAmt := xGrandTotal;
-          ELSE
-            v_ActualBaseAmt := v_TaxBaseAmt;
-          END IF;
-          xTaxAmt:=ROUND(v_ActualBaseAmt * Cur_MultiTax.Rate / 100, Cur_Tax.StdPrecision) ;
-          v_FirstLine := FALSE;
-          xGrandTotal:=xGrandTotal + xTaxAmt;
-          --
-          INSERT INTO C_ORDERTAX
-            (
-              C_OrderTax_ID, C_Order_ID, C_Tax_ID, AD_Client_ID, AD_Org_ID,
-              IsActive, Created, CreatedBy, Updated,
-              UpdatedBy, TaxBaseAmt, TaxAmt, Line
-            )
-            VALUES
-            (
-              get_uuid(), v_Record_ID, Cur_MultiTax.C_Tax_ID, v_Client_ID, v_Org_ID,
-               'Y', now(), v_UpdatedBy, now(),
-              v_UpdatedBy, v_ActualBaseAmt, xTaxAmt, v_LineNo
-            );
-        END LOOP;
-      END IF;
+      C_ORDERLINETAX_INSERT(v_Org_ID, Cur_Tax.C_Order_ID, Cur_Tax.C_OrderLine_ID, v_UpdatedBy, Cur_Tax.C_Tax_ID, Cur_Tax.C_Tax_ID, Cur_Tax.LineNetAmt, Cur_Tax.TaxBaseAmt, Cur_Tax.StdPrecision);
     END LOOP; -- Insert New Taxes
+    SELECT COALESCE(SUM(TAXAMT), 0)
+    INTO xGrandTotal
+    FROM C_ORDERTAX
+    WHERE C_ORDER_ID = v_Record_ID;
+    xGrandTotal:=xGrandTotal+ xTotalLines;    
     -- Update Header
     UPDATE C_ORDER
       SET TotalLines=xTotalLines,
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/functions/C_TAX_GET_LEVEL.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+  <database name="FUNCTION C_TAX_GET_LEVEL">
+    <function name="C_TAX_GET_LEVEL" type="NUMERIC">
+      <parameter name="p_parenttax" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_targettax" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_level" type="NUMERIC" mode="in">
+        <default/>
+      </parameter>
+      <body><![CDATA[/*************************************************************************
+* The contents of this file are subject to the Openbravo  Public  License
+* Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+* Version 1.1  with a permitted attribution clause; you may not  use this
+* file except in compliance with the License. You  may  obtain  a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License  is  distributed  on  an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific  language  governing  rights  and  limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SL
+* All portions are Copyright (C) 2010 Openbravo SL
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+
+/*
+* For the given target tax, it returns level. Level indicates the sequence NUMBER for the calculation of the given tax in its tree
+*/
+v_ParentTax C_TAX.C_TAX_ID%TYPE;
+TYPE RECORD IS REF CURSOR;
+      Cur_taxes RECORD;
+v_Level NUMBER;
+v_Count NUMBER;
+BEGIN
+  v_Level:=p_Level;
+    FOR Cur_taxes IN
+      (  SELECT C_Tax_ID, IsSummary
+          FROM C_TAX
+          WHERE Parent_Tax_ID=p_ParentTax
+          ORDER BY Line
+      )
+    LOOP
+      IF (Cur_taxes.IsSummary='Y') THEN
+        v_Level:=C_TAX_GET_LEVEL(Cur_taxes.C_Tax_ID, p_TargetTax, v_Level);
+        SELECT COUNT(C_TAX_ID)
+        INTO v_Count
+        FROM C_TAX 
+        WHERE C_TAX_ISMEMBER(Cur_taxes.C_Tax_ID, p_TargetTax)=1
+        AND C_TAX_ID=p_TargetTax;
+        IF(v_Count=1) THEN
+          RETURN v_Level;
+        END IF;
+        --v_Level:=v_Level + 1;
+      END IF;
+      IF (Cur_taxes.IsSummary='N') THEN
+        v_Level:=v_Level + 1;
+      END IF;
+      IF (Cur_taxes.C_Tax_ID=p_TargetTax) THEN
+        RETURN v_Level;
+      END IF;
+    END LOOP;
+  RETURN v_Level;
+END C_TAX_GET_LEVEL
+]]></body>
+    </function>
+  </database>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/functions/C_TAX_GET_ROOT.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+  <database name="FUNCTION C_TAX_GET_ROOT">
+    <function name="C_TAX_GET_ROOT" type="VARCHAR">
+      <parameter name="p_tax" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <body><![CDATA[/*************************************************************************
+* The contents of this file are subject to the Openbravo  Public  License
+* Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+* Version 1.1  with a permitted attribution clause; you may not  use this
+* file except in compliance with the License. You  may  obtain  a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License  is  distributed  on  an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific  language  governing  rights  and  limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SL
+* All portions are Copyright (C) 2010 Openbravo SL
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+
+/*
+* For the given tax, it returns its top ancestor, which parent is null
+*/
+v_ParentTax C_TAX.C_TAX_ID%TYPE;
+
+BEGIN
+  SELECT Parent_Tax_ID
+  INTO v_ParentTax
+  FROM C_TAX
+  WHERE C_TAX_ID=p_Tax;
+  
+  IF (v_ParentTax IS NULL) THEN
+    RETURN p_Tax;
+  ELSE
+    RETURN C_TAX_GET_ROOT(v_ParentTax);
+  END IF;
+END C_TAX_GET_ROOT
+]]></body>
+    </function>
+  </database>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/functions/C_TAX_ISMEMBER.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+  <database name="FUNCTION C_TAX_ISMEMBER">
+    <function name="C_TAX_ISMEMBER" type="NUMERIC">
+      <parameter name="p_parenttax" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <parameter name="p_targettax" type="VARCHAR" mode="in">
+        <default/>
+      </parameter>
+      <body><![CDATA[/*************************************************************************
+* The contents of this file are subject to the Openbravo  Public  License
+* Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+* Version 1.1  with a permitted attribution clause; you may not  use this
+* file except in compliance with the License. You  may  obtain  a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License  is  distributed  on  an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific  language  governing  rights  and  limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SL
+* All portions are Copyright (C) 2010 Openbravo SL
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+***********************************************************************
+* For the given target tax, it returns 1 if target tax es included in its tree
+*/
+v_Result NUMBER;
+TYPE RECORD IS REF CURSOR;
+      Cur_taxes RECORD;
+BEGIN
+  IF (p_ParentTax = p_TargetTax) THEN
+    RETURN 1;
+  END IF;
+  FOR Cur_taxes IN
+    (  SELECT C_Tax_ID, IsSummary
+        FROM C_TAX
+        WHERE Parent_Tax_ID=p_ParentTax
+        ORDER BY Line
+    )
+  LOOP
+    IF (Cur_taxes.C_Tax_ID = p_TargetTax) THEN
+      RETURN 1;
+    END IF;
+    v_Result:=C_TAX_ISMEMBER(Cur_taxes.C_Tax_ID, p_TargetTax);
+    IF(v_Result=1) THEN
+      RETURN v_Result;
+    END IF;
+  END LOOP;
+  RETURN v_Result;
+END C_TAX_ISMEMBER
+]]></body>
+    </function>
+  </database>
--- a/src-db/database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/functions/MA_PRODUCTIONRUN_STANDARD.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -16,7 +16,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SL
-* All portions are Copyright (C) 2001-2006 Openbravo SL
+* All portions are Copyright (C) 2001-2010 Openbravo SL
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -271,7 +271,9 @@
                           MA_GlobalUse_ID, M_Production_ID, AD_Client_ID, AD_Org_ID,
                           IsActive, Created, CreatedBy, Updated,
                           UpdatedBy, M_Product_ID, C_UOM_ID, MovementQty,
-                          M_Locator_ID, M_AttributeSetInstance_ID, M_Product_UOM_ID,
+                          M_Locator_ID, 
+                          M_AttributeSetInstance_ID, 
+                          M_Product_UOM_ID,
                           QuantityOrder
                         )
                         VALUES
@@ -279,7 +281,9 @@
                           v_GlobalUse_ID, Cur_WRPUsed.M_Production_ID, Cur_WRPUsed.Client_ID, Cur_WRPUsed.Org_ID,
                            'Y', now(), '0', now(),
                           '0', Cur_WRPUsed.M_Product_ID, Cur_WRPUsed.C_UOM_ID, 0,
-                          v_storage.M_Locator_ID, v_storage.M_AttributeSetInstance_ID, v_storage.M_Product_UOM_ID,
+                          v_storage.M_Locator_ID, 
+                          (CASE WHEN (SELECT ATTRSETVALUETYPE FROM M_PRODUCT WHERE M_PRODUCT_ID=Cur_WRPUsed.M_Product_ID)<>'F' THEN v_storage.M_AttributeSetInstance_ID ELSE NULL END), 
+                          v_storage.M_Product_UOM_ID,
                           (CASE
                              WHEN v_QtyOrder is null THEN null
                              ELSE 0
@@ -297,7 +301,8 @@
                         M_ProductionLine_ID, M_ProductionPlan_ID, Line, AD_Client_ID,
                         AD_Org_ID, IsActive, Created, CreatedBy,
                         Updated, UpdatedBy, M_Product_ID, C_UOM_ID,
-                        MovementQty, ProductionType, M_Locator_ID, M_AttributeSetInstance_ID,
+                        MovementQty, ProductionType, M_Locator_ID, 
+                        M_AttributeSetInstance_ID,
                         M_Product_UOM_ID, QuantityOrder
                       )
                       VALUES
@@ -305,7 +310,8 @@
                         v_ProductionLine_ID, v_Record_ID, v_Line, Cur_WRPUsed.Client_ID,
                         Cur_WRPUsed.Org_ID, 'Y', now(), 0,
                         now(), 0, Cur_WRPUsed.M_Product_ID, Cur_WRPUsed.C_UOM_ID,
-                        (CASE v_NoQty WHEN 'Y' THEN 0 ELSE v_Qty END), '-', v_storage.M_Locator_ID, v_storage.M_AttributeSetInstance_ID,
+                        (CASE v_NoQty WHEN 'Y' THEN 0 ELSE v_Qty END), '-', v_storage.M_Locator_ID, 
+                        (CASE WHEN (SELECT ATTRSETVALUETYPE FROM M_PRODUCT WHERE M_PRODUCT_ID=Cur_WRPUsed.M_Product_ID)<>'F' THEN v_storage.M_AttributeSetInstance_ID ELSE NULL END),
                         v_storage.M_Product_UOM_ID,
                         (CASE v_NoQty
                           WHEN 'Y' THEN (CASE
--- a/src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/functions/MA_WORKEFFORT_VALIDATE.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -16,7 +16,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SL
-* All portions are Copyright (C) 2001-2009 Openbravo SL
+* All portions are Copyright (C) 2001-2010 Openbravo SL
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -65,6 +65,8 @@
     v_isacctle AD_OrgType.IsAcctLegalEntity%TYPE;
     v_org_bule_id AD_Org.AD_Org_ID%TYPE;
     v_AD_Org_ID VARCHAR2(32);
+    v_prodline NUMBER;
+    v_line NUMBER;
   BEGIN
     -- Process Parameters
     IF(p_PInstance_ID IS NOT NULL) THEN
@@ -234,18 +236,18 @@
       END IF;
     END IF; --FINISH_PROCESS
     IF (NOT FINISH_PROCESS) THEN
-      SELECT COUNT(*)
-      INTO v_Count
+      SELECT COUNT(*), MAX(pp.line), MAX(PL.LINE)
+      INTO v_Count, v_prodline, v_line
       FROM M_PRODUCTIONPLAN PP, M_PRODUCTIONLINE PL, M_PRODUCT P
       WHERE PL.M_PRODUCT_ID=P.M_PRODUCT_ID
         AND P.M_ATTRIBUTESET_ID IS NOT NULL
-        AND P.M_ATTRIBUTESETINSTANCE_ID IS NULL
+        AND (P.ATTRSETVALUETYPE IS NULL OR P.ATTRSETVALUETYPE <> 'F')
+        AND (SELECT ISONEATTRSETVALREQUIRED FROM M_ATTRIBUTESET WHERE M_ATTRIBUTESET_ID = P.M_ATTRIBUTESET_ID) = 'Y'
         AND COALESCE(PL.M_ATTRIBUTESETINSTANCE_ID, '0') = '0'
         AND PL.M_ProductionPlan_ID=pp.M_ProductionPlan_ID
         AND pp.M_Production_ID=v_Record_ID;
       IF v_Count<>0 THEN
-        v_Message:='@LinesWithoutAttributeSet@';
-        RAISE_APPLICATION_ERROR(-20000, v_Message);
+        RAISE_APPLICATION_ERROR(-20000, '@inProductionPlan@'||' '||'@line@'||' '||v_prodline||', '||'@Inline@'||' '||v_line||' '||'@productWithoutAttributeSet@') ;
         FINISH_PROCESS:=TRUE;
       END IF;
     END IF;
--- a/src-db/database/model/functions/M_INOUT_POST.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/functions/M_INOUT_POST.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -169,11 +169,12 @@
           M_Product P
         WHERE M.M_PRODUCT_ID=P.M_PRODUCT_ID
           AND P.M_ATTRIBUTESET_ID IS NOT NULL
-          AND P.M_ATTRIBUTESETINSTANCE_ID IS NULL
+          AND (P.ATTRSETVALUETYPE IS NULL OR P.ATTRSETVALUETYPE <> 'F')
+          AND (SELECT ISONEATTRSETVALREQUIRED FROM M_ATTRIBUTESET WHERE M_ATTRIBUTESET_ID = P.M_ATTRIBUTESET_ID) = 'Y'
           AND COALESCE(M.M_ATTRIBUTESETINSTANCE_ID, '0') = '0'
           AND M.M_INOUT_ID=v_Record_ID;
         IF v_Count<>0 THEN
-          RAISE_APPLICATION_ERROR(-20000, '@Inline@ '||v_line||' '||'@productWithoutAttributeSet@') ;
+          RAISE_APPLICATION_ERROR(-20000, '@Inline@'||' '||v_line||' '||'@productWithoutAttributeSet@') ;
         END IF;
         SELECT COUNT(*), MAX(M.line)
         INTO v_Count, v_Line
--- a/src-db/database/model/functions/M_INTERNAL_CONSUMPTION_POST.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/functions/M_INTERNAL_CONSUMPTION_POST.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -16,7 +16,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SL
-* All portions are Copyright (C) 2001-2009 Openbravo SL
+* All portions are Copyright (C) 2001-2010 Openbravo SL
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -92,11 +92,12 @@
         M_Product P
       WHERE M.M_PRODUCT_ID=P.M_PRODUCT_ID
         AND P.M_ATTRIBUTESET_ID IS NOT NULL
-        AND P.M_ATTRIBUTESETINSTANCE_ID IS NULL
+        AND (P.ATTRSETVALUETYPE IS NULL OR P.ATTRSETVALUETYPE <> 'F')
+        AND (SELECT ISONEATTRSETVALREQUIRED FROM M_ATTRIBUTESET WHERE M_ATTRIBUTESET_ID = P.M_ATTRIBUTESET_ID) = 'Y'
         AND COALESCE(M.M_ATTRIBUTESETINSTANCE_ID, '0') = '0'
         AND M.M_Internal_Consumption_ID=Record_ID;
       IF v_Count<>0 THEN
-       RAISE_APPLICATION_ERROR(-20000, '@Inline@ '||v_line||' '||'@productWithoutAttributeSet@') ;
+       RAISE_APPLICATION_ERROR(-20000, '@Inline@'||' '||v_line||' '||'@productWithoutAttributeSet@') ;
       END IF;
     END IF;--END_PROCESS
     IF(NOT END_PROCESS) THEN
--- a/src-db/database/model/functions/M_INVENTORY_POST.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/functions/M_INVENTORY_POST.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -19,7 +19,7 @@
   * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
   * All Rights Reserved.
   * Contributor(s): Openbravo SL
-  * Contributions are Copyright (C) 2001-2009 Openbravo, S.L.
+  * Contributions are Copyright (C) 2001-2010 Openbravo, S.L.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -125,11 +125,12 @@
       M_Product P
     WHERE M.M_PRODUCT_ID=P.M_PRODUCT_ID
       AND P.M_ATTRIBUTESET_ID IS NOT NULL
-      AND P.M_ATTRIBUTESETINSTANCE_ID IS NULL
+      AND (P.ATTRSETVALUETYPE IS NULL OR P.ATTRSETVALUETYPE <> 'F')
+      AND (SELECT ISONEATTRSETVALREQUIRED FROM M_ATTRIBUTESET WHERE M_ATTRIBUTESET_ID = P.M_ATTRIBUTESET_ID) = 'Y'
       AND COALESCE(M.M_ATTRIBUTESETINSTANCE_ID, '0') = '0'
       AND M.M_Inventory_ID=v_Record_ID;
     IF v_Count<>0 THEN
-      RAISE_APPLICATION_ERROR(-20000, '@Inline@ '||v_line||' '||'@productWithoutAttributeSet@') ;
+      RAISE_APPLICATION_ERROR(-20000, '@Inline@'||' '||v_line||' '||'@productWithoutAttributeSet@') ;
     END IF;
   END IF;--PROCESS_ERROR
   IF(NOT PROCESS_ERROR AND NOT END_PROCESS AND NOT END_PROCESSING) THEN
--- a/src-db/database/model/functions/M_MOVEMENT_POST.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/functions/M_MOVEMENT_POST.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -19,7 +19,7 @@
   * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
   * All Rights Reserved.
   * Contributor(s): Openbravo SL
-  * Contributions are Copyright (C) 2001-2009 Openbravo, S.L.
+  * Contributions are Copyright (C) 2001-2010 Openbravo, S.L.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -110,11 +110,12 @@
         M_Product P
       WHERE M.M_PRODUCT_ID=P.M_PRODUCT_ID
         AND P.M_ATTRIBUTESET_ID IS NOT NULL
-        AND P.M_ATTRIBUTESETINSTANCE_ID IS NULL
+        AND (P.ATTRSETVALUETYPE IS NULL OR P.ATTRSETVALUETYPE <> 'F')
+        AND (SELECT ISONEATTRSETVALREQUIRED FROM M_ATTRIBUTESET WHERE M_ATTRIBUTESET_ID = P.M_ATTRIBUTESET_ID) = 'Y'
         AND COALESCE(M.M_ATTRIBUTESETINSTANCE_ID, '0') = '0'
         AND M.M_Movement_ID=v_Record_ID;
       IF v_Count<>0 THEN
-       RAISE_APPLICATION_ERROR(-20000, '@Inline@ '||v_line||' '||'@productWithoutAttributeSet@') ;
+       RAISE_APPLICATION_ERROR(-20000, '@Inline@'||' '||v_line||' '||'@productWithoutAttributeSet@') ;
       END IF;
     END IF;--END_PROCESS
     IF(NOT END_PROCESS) THEN
--- a/src-db/database/model/functions/M_PRODUCTION_RUN.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/functions/M_PRODUCTION_RUN.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -19,7 +19,7 @@
   * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
   * All Rights Reserved.
   * Contributor(s): Openbravo SL
-  * Contributions are Copyright (C) 2001-2009 Openbravo, S.L.
+  * Contributions are Copyright (C) 2001-2010 Openbravo, S.L.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -218,7 +218,8 @@
           -- For every Production Plan
           FOR CUR_PP IN
             (SELECT M_PRODUCTIONPLAN.*,
-              M_PRODUCT.C_UOM_ID,  M_PRODUCT.M_AttributeSetInstance_ID 
+              M_PRODUCT.C_UOM_ID,  
+              (CASE WHEN M_PRODUCT.ATTRSETVALUETYPE<>'D' THEN NULL ELSE M_PRODUCT.M_AttributeSetInstance_ID END) AS M_AttributeSetInstance_ID
             FROM M_PRODUCTIONPLAN,
               M_PRODUCT
             WHERE M_PRODUCTIONPLAN.M_Product_ID=M_PRODUCT.M_Product_ID
@@ -325,7 +326,9 @@
                         M_ProductionLine_ID, M_ProductionPlan_ID, Line, AD_Client_ID,
                         AD_Org_ID, IsActive, Created, CreatedBy,
                         Updated, UpdatedBy, M_Product_ID, C_UOM_ID,
-                        MovementQty, M_Locator_ID, M_AttributeSetInstance_ID, M_Product_UOM_ID,
+                        MovementQty, M_Locator_ID, 
+                        M_AttributeSetInstance_ID, 
+                        M_Product_UOM_ID,
                         QuantityOrder
                       )
                       VALUES
@@ -333,7 +336,9 @@
                         NextNo, CUR_BOM.M_ProductionPlan_ID, v_Line, CUR_BOM.Client_ID,
                         CUR_BOM.Org_ID, 'Y', now(), '0',
                         now(), '0', CUR_BOM.M_ProductBOM_ID, CUR_BOM.C_UOM_ID,
-                        -v_Qty, v_storage.M_Locator_ID, v_storage.M_AttributeSetInstance_ID, v_storage.M_Product_UOM_ID,
+                        -v_Qty, v_storage.M_Locator_ID, 
+                        (CASE WHEN (SELECT ATTRSETVALUETYPE FROM M_PRODUCT WHERE M_PRODUCT_ID=CUR_BOM.M_ProductBOM_ID)<>'F' THEN v_storage.M_AttributeSetInstance_ID ELSE NULL END), 
+                        v_storage.M_Product_UOM_ID,
                         -v_QtyOrder
                       )
                       ;
@@ -484,7 +489,8 @@
             M_PRODUCT P
           WHERE PL.M_PRODUCT_ID=P.M_PRODUCT_ID
             AND P.M_ATTRIBUTESET_ID IS NOT NULL
-            AND P.M_ATTRIBUTESETINSTANCE_ID IS NULL
+            AND (P.ATTRSETVALUETYPE IS NULL OR P.ATTRSETVALUETYPE <> 'F')
+            AND (SELECT ISONEATTRSETVALREQUIRED FROM M_ATTRIBUTESET WHERE M_ATTRIBUTESET_ID = P.M_ATTRIBUTESET_ID) = 'Y'
             AND COALESCE(PL.M_ATTRIBUTESETINSTANCE_ID, '0') = '0'
             AND PL.M_ProductionPlan_ID=pp.M_ProductionPlan_ID
             AND pp.M_Production_ID=v_Record_ID;
@@ -495,7 +501,8 @@
             M_PRODUCT P
           WHERE PL.M_PRODUCT_ID=P.M_PRODUCT_ID
             AND P.M_ATTRIBUTESET_ID IS NOT NULL
-            AND P.M_ATTRIBUTESETINSTANCE_ID IS NULL
+            AND (P.ATTRSETVALUETYPE IS NULL OR P.ATTRSETVALUETYPE <> 'F')
+            AND (SELECT ISONEATTRSETVALREQUIRED FROM M_ATTRIBUTESET WHERE M_ATTRIBUTESET_ID = P.M_ATTRIBUTESET_ID) = 'Y'
             AND COALESCE(PL.M_ATTRIBUTESETINSTANCE_ID, '0') = '0'
             AND PL.M_ProductionPlan_ID=pp.M_ProductionPlan_ID
             AND pp.M_Production_ID=v_Record_ID;
--- a/src-db/database/model/tables/C_INVOICELINE.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/tables/C_INVOICELINE.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -141,6 +141,10 @@
         <default><![CDATA[N]]></default>
         <onCreateDefault/>
       </column>
+      <column name="TAXBASEAMT" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault><![CDATA[LINENETAMT]]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="C_INVOICELINE_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/tables/C_INVOICELINETAX.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+  <database name="TABLE C_INVOICELINETAX">
+    <table name="C_INVOICELINETAX" primaryKey="C_INVOICELINETAX_KEY">
+      <column name="C_INVOICELINETAX_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="C_TAX_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="C_INVOICE_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="C_INVOICELINE_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="TAXBASEAMT" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false">
+        <default><![CDATA[0]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="TAXAMT" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false">
+        <default><![CDATA[0]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="LINE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="RECALCULATE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="AD_CLIENT" name="C_INVOICELINETAX_AD_CLIENT">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="C_INVOICELINETAX_AD_ORG">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_INVOICE" name="C_INVOICELINETAX_C_INVOICE">
+        <reference local="C_INVOICE_ID" foreign="C_INVOICE_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_INVOICELINE" name="C_INVOICELINETAX_C_INVOICELINE" onDelete="cascade">
+        <reference local="C_INVOICELINE_ID" foreign="C_INVOICELINE_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_TAX" name="C_INVOICELINETAX_C_TAX" onDelete="cascade">
+        <reference local="C_TAX_ID" foreign="C_TAX_ID"/>
+      </foreign-key>
+      <index name="C_INVOICELINETAX_INVOICEID" unique="false">
+        <index-column name="C_INVOICE_ID"/>
+      </index>
+      <check name="C_INVOICELINETA_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+    </table>
+  </database>
--- a/src-db/database/model/tables/C_ORDERLINE.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/tables/C_ORDERLINE.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -189,6 +189,10 @@
         <default><![CDATA[N]]></default>
         <onCreateDefault/>
       </column>
+      <column name="TAXBASEAMT" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault><![CDATA[LINENETAMT]]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="C_ORDERLINE_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/tables/C_ORDERLINETAX.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+  <database name="TABLE C_ORDERLINETAX">
+    <table name="C_ORDERLINETAX" primaryKey="C_ORDERLINETAX_KEY">
+      <column name="C_ORDERLINETAX_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault><![CDATA[get_uuid()]]></onCreateDefault>
+      </column>
+      <column name="C_ORDERLINE_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="C_TAX_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_CLIENT_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="AD_ORG_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="ISACTIVE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="CREATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATED" primaryKey="false" required="true" type="TIMESTAMP" size="7" autoIncrement="false">
+        <default><![CDATA[SYSDATE]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="UPDATEDBY" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="TAXBASEAMT" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false">
+        <default><![CDATA[0]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="TAXAMT" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false">
+        <default><![CDATA[0]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="LINE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="C_ORDER_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <foreign-key foreignTable="AD_CLIENT" name="C_ORDERLINETAX_AD_CLIENT">
+        <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="AD_ORG" name="C_ORDERLINETAX_AD_ORG">
+        <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_ORDER" name="C_ORDERLINETAX_C_ORDER" onDelete="cascade">
+        <reference local="C_ORDER_ID" foreign="C_ORDER_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_ORDERLINE" name="C_ORDERLINETAX_C_ORDERLINE" onDelete="cascade">
+        <reference local="C_ORDERLINE_ID" foreign="C_ORDERLINE_ID"/>
+      </foreign-key>
+      <foreign-key foreignTable="C_TAX" name="C_ORDERLINETAX_C_TAX">
+        <reference local="C_TAX_ID" foreign="C_TAX_ID"/>
+      </foreign-key>
+      <unique name="C_ORDERLINETAX_DERLINE_TAX_UN">
+        <unique-column name="C_ORDERLINE_ID"/>
+        <unique-column name="C_TAX_ID"/>
+      </unique>
+      <check name="C_ORDERLINETAX_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+    </table>
+  </database>
--- a/src-db/database/model/tables/C_TAX.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/tables/C_TAX.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -129,6 +129,18 @@
         <default><![CDATA[N]]></default>
         <onCreateDefault><![CDATA['N']]></onCreateDefault>
       </column>
+      <column name="BASEAMOUNT" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false">
+        <default><![CDATA[LNA]]></default>
+        <onCreateDefault><![CDATA['LNA']]></onCreateDefault>
+      </column>
+      <column name="C_TAXBASE_ID" primaryKey="false" required="false" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
+      <column name="DOCTAXAMOUNT" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false">
+        <default><![CDATA[D]]></default>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="C_COUNTRY" name="C_COUNTRY_C_TAX">
         <reference local="C_COUNTRY_ID" foreign="C_COUNTRY_ID"/>
       </foreign-key>
@@ -156,6 +168,9 @@
       <foreign-key foreignTable="C_TAX" name="C_TAX_PARENT_TAX">
         <reference local="PARENT_TAX_ID" foreign="C_TAX_ID"/>
       </foreign-key>
+      <foreign-key foreignTable="C_TAX" name="C_TAX_TAXBASE">
+        <reference local="C_TAXBASE_ID" foreign="C_TAX_ID"/>
+      </foreign-key>
       <unique name="C_TAX_NAME1">
         <unique-column name="AD_CLIENT_ID"/>
         <unique-column name="AD_ORG_ID"/>
--- a/src-db/database/model/tables/M_ATTRIBUTESET.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/tables/M_ATTRIBUTESET.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -69,6 +69,10 @@
         <default><![CDATA[N]]></default>
         <onCreateDefault/>
       </column>
+      <column name="ISONEATTRSETVALREQUIRED" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[Y]]></default>
+        <onCreateDefault><![CDATA['Y']]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="M_ATTRIBUTESET_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -82,6 +86,7 @@
         <reference local="M_SERNOCTL_ID" foreign="M_SERNOCTL_ID"/>
       </foreign-key>
       <check name="M_ATTRIBUTESET_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+      <check name="M_ATTRIBUTESET_ISATSETVAL_CHK"><![CDATA[ISONEATTRSETVALREQUIRED IN ('Y', 'N')]]></check>
       <check name="M_ATTRIBUTESET_ISGUARANTEE_CHK"><![CDATA[ISGUARANTEEDATE IN ('Y', 'N')]]></check>
       <check name="M_ATTRIBUTESET_ISLOCKABLE_CHK"><![CDATA[ISLOCKABLE IN ('Y', 'N')]]></check>
       <check name="M_ATTRIBUTESET_ISLOT_CHECK"><![CDATA[ISLOT IN ('Y', 'N')]]></check>
--- a/src-db/database/model/tables/M_PRODUCT.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/tables/M_PRODUCT.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -277,6 +277,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="ATTRSETVALUETYPE" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false">
+        <default/>
+        <onCreateDefault><![CDATA[CASE WHEN M_ATTRIBUTESETINSTANCE_ID IS NOT NULL THEN 'D' ELSE NULL END]]></onCreateDefault>
+      </column>
       <foreign-key foreignTable="AD_ORG" name="AD_ORG_MPRODUCT">
         <reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
       </foreign-key>
@@ -350,6 +354,7 @@
         <unique-column name="AD_CLIENT_ID"/>
         <unique-column name="VALUE"/>
       </unique>
+      <check name="M_PRODUCT_ATSETVALTYPE_CHK"><![CDATA[(M_ATTRIBUTESETINSTANCE_ID IS NULL) OR (ATTRSETVALUETYPE IS NOT NULL)]]></check>
       <check name="M_PRODUCT_DISCONTINUED_CHECK"><![CDATA[DISCONTINUED IN ('Y', 'N')]]></check>
       <check name="M_PRODUCT_ENFORCE_ATTRIBUT_CHK"><![CDATA[ENFORCE_ATTRIBUTE IN ('Y', 'N')]]></check>
       <check name="M_PRODUCT_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
--- a/src-db/database/model/triggers/A_ASSET_TRG.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/triggers/A_ASSET_TRG.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -14,7 +14,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SL
-* All portions are Copyright (C) 2001-2008 Openbravo SL
+* All portions are Copyright (C) 2001-2010 Openbravo SL
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -22,6 +22,7 @@
   TYPE RECORD IS REF CURSOR;
   v_Acct_ID VARCHAR2(32);
   Cur_Defaults RECORD;
+  v_AttrSetValueType M_Product.AttrSetValueType%TYPE;
 
 BEGIN
 
@@ -71,6 +72,19 @@
     UPDATE A_ASSET_ACCT SET AD_ORG_ID = :new.AD_ORG_ID
     WHERE A_ASSET_ID = :new.A_ASSET_ID;
   END IF;
+  IF (INSERTING OR UPDATING) THEN
+   --Does not allow to change the attribute set value
+   -- for products which attribute set value type is Fixed
+   IF (:NEW.M_PRODUCT_ID IS NOT NULL AND COALESCE(:new.M_AttributeSetInstance_ID,'0')!='0') THEN
+    SELECT ATTRSETVALUETYPE 
+    INTO v_AttrSetValueType
+    FROM M_PRODUCT 
+    WHERE M_PRODUCT_ID=:NEW.M_PRODUCT_ID;
+    IF (v_AttrSetValueType='F') THEN
+     RAISE_APPLICATION_ERROR(-20000, '@AttrSetValueFixed@');
+    END IF;
+   END IF;
+  END IF;
 EXCEPTION
 WHEN NO_DATA_FOUND THEN
   RAISE_APPLICATION_ERROR(-20008, 'The asset group for this asset has no accounts') ;
--- a/src-db/database/model/triggers/C_ELEMENTVALUE_TRG.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/triggers/C_ELEMENTVALUE_TRG.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -26,6 +26,7 @@
   v_xParent_ID VARCHAR2(32);
   v_NextNo     VARCHAR2(32);
   v_orgName    VARCHAR2(32);
+  v_Cont NUMBER;
     
 BEGIN
     
@@ -106,11 +107,17 @@
       OR    User1_ID=:new.C_ElementValue_ID OR User2_ID=:new.C_ElementValue_ID;
       **/
     END IF;
+    SELECT COUNT(1)
+    INTO v_Cont
+    FROM C_VALIDCOMBINATION
+    WHERE ACCOUNT_ID=:NEW.C_ELEMENTVALUE_ID;
+    IF (v_Cont>0) THEN
      SELECT name INTO v_orgName FROM ad_org WHERE ad_org_id in (SELECT ad_org_id FROM c_validcombination WHERE account_id=:new.C_ElementValue_ID);
      UPDATE    C_ValidCombination
        SET    Updated=now(),combination=v_orgName||'-'||:new.VALUE||'-_-_-_',description=v_orgName||'-'||:new.DESCRIPTION||'-_-_-_'  
        WHERE    Account_ID=:new.C_ElementValue_ID
        OR    User1_ID=:new.C_ElementValue_ID OR User2_ID=:new.C_ElementValue_ID;
+    END IF;
      UPDATE Fact_Acct SET AcctValue=:new.VALUE,AcctDescription=:new.DESCRIPTION WHERE Account_ID=:new.C_ElementValue_ID;
   END IF;
   -- Updating
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/triggers/C_INVOICELINETAX_TRG.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -0,0 +1,96 @@
+<?xml version="1.0"?>
+  <database name="TRIGGER C_INVOICELINETAX_TRG">
+    <trigger name="C_INVOICELINETAX_TRG" table="C_INVOICELINETAX" fires="after" insert="true" update="true" delete="true" foreach="row">
+      <body><![CDATA[
+/*************************************************************************
+  * The contents of this file are subject to the Compiere Public
+  * License 1.1 ("License"); You may not use this file except in
+  * compliance with the License. You may obtain a copy of the License in
+  * the legal folder of your Openbravo installation.
+  * Software distributed under the License is distributed on an
+  * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  * implied. See the License for the specific language governing rights
+  * and limitations under the License.
+  * The Original Code is  Compiere  ERP  Solution
+  * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc.
+  * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
+  * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
+  * All Rights Reserved.
+  * Contributor(s): Openbravo SL
+  * Contributions are Copyright (C) 2010 Openbravo, S.L.
+  *
+  * Specifically, this derivative work is based upon the following Compiere
+  * file and version.
+  *************************************************************************/
+
+v_Count NUMBER;
+v_LineNo  NUMBER;
+v_C_Invoice_ID C_INVOICELINETAX.C_INVOICE_ID%TYPE;
+v_C_Tax_ID C_INVOICELINETAX.C_TAX_ID%TYPE;
+v_Prec C_CURRENCY.STDPRECISION%TYPE;
+v_DocTaxAmount C_TAX.DOCTAXAMOUNT%TYPE;
+v_Rate  C_TAX.RATE%TYPE;
+    
+BEGIN
+    
+    IF AD_isTriggerEnabled()='N' THEN RETURN;
+    END IF;
+    
+    IF(INSERTING OR UPDATING) THEN
+      v_C_Tax_ID:=:NEW.C_Tax_ID;
+      v_C_Invoice_ID:=:NEW.C_INVOICE_ID;
+    ELSE
+      v_C_Tax_ID:=:OLD.C_Tax_ID;
+      v_C_Invoice_ID:=:OLD.C_INVOICE_ID;
+    END IF;
+
+    SELECT C_CURRENCY.STDPRECISION
+    INTO v_Prec
+    FROM C_INVOICE, C_CURRENCY
+    WHERE C_INVOICE.C_CURRENCY_ID = C_CURRENCY.C_CURRENCY_ID
+    AND C_INVOICE_ID = v_C_Invoice_ID;
+    
+    SELECT DOCTAXAMOUNT, RATE
+    INTO v_DocTaxAmount, v_Rate
+    FROM C_TAX
+    WHERE C_TAX_ID = v_C_Tax_ID;
+
+  IF (INSERTING OR UPDATING) THEN
+    SELECT COUNT(C_TAX_ID) INTO v_Count
+    FROM C_INVOICETAX
+    WHERE C_INVOICE_ID = :NEW.C_Invoice_ID
+    AND C_TAX_ID = :NEW.C_TAX_ID;
+    IF(v_Count>0) THEN
+      UPDATE C_INVOICETAX SET TAXAMT = (CASE WHEN v_DocTaxAmount='D' THEN ROUND((TAXBASEAMT + :NEW.TAXBASEAMT) * v_Rate/100, v_Prec) ELSE (TAXAMT + :NEW.TAXAMT) END), TAXBASEAMT=TAXBASEAMT + :NEW.TAXBASEAMT
+      WHERE C_INVOICE_ID = :NEW.C_Invoice_ID
+      AND C_TAX_ID = :NEW.C_TAX_ID;
+    ELSE
+      SELECT COALESCE(MAX(LINE),0) + 10
+      INTO v_LineNo
+      FROM C_INVOICETAX
+      WHERE C_INVOICE_ID = :NEW.C_Invoice_ID;
+      INSERT
+      INTO C_INVOICETAX (
+      C_InvoiceTax_ID, C_Invoice_ID, C_Tax_ID, AD_Client_ID, AD_Org_ID,
+      IsActive, Created, CreatedBy, Updated,
+      UpdatedBy, TaxBaseAmt, TaxAmt, Line)
+      VALUES (
+      GET_UUID(), :NEW.C_Invoice_ID, :NEW.C_TAX_ID, :NEW.AD_CLIENT_ID, :NEW.AD_ORG_ID,
+      'Y', now(), :NEW.UPDATEDBY, now(),
+      :NEW.UPDATEDBY, :NEW.TAXBASEAMT, :NEW.TAXAMT, v_LineNo);
+    END IF;
+  ELSE
+    
+    UPDATE C_INVOICETAX SET TAXAMT = (CASE WHEN v_DocTaxAmount='D' THEN ROUND((TAXBASEAMT - :OLD.TAXBASEAMT) * v_Rate/100, v_Prec) ELSE (TAXAMT - :OLD.TAXAMT) END), TAXBASEAMT=TAXBASEAMT - :OLD.TAXBASEAMT
+    WHERE C_INVOICE_ID = :OLD.C_Invoice_ID
+    AND C_TAX_ID = :OLD.C_TAX_ID;
+    
+    DELETE FROM C_INVOICETAX 
+    WHERE C_INVOICE_ID = :OLD.C_Invoice_ID
+    AND C_TAX_ID = :OLD.C_TAX_ID
+    AND TAXAMT=0 AND TAXBASEAMT=0;
+  END IF;
+END C_INVOICELINETAX_TRG
+]]></body>
+    </trigger>
+  </database>
--- a/src-db/database/model/triggers/C_INVOICELINE_TRG.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/triggers/C_INVOICELINE_TRG.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -14,7 +14,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SL
-* All portions are Copyright (C) 2001-2009 Openbravo SL
+* All portions are Copyright (C) 2001-2010 Openbravo SL
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -37,7 +37,7 @@
  v_ChargeAmt   NUMBER;
  v_LineNetAmt  NUMBER;
  v_CinvoiceTaxID varchar2(32);
-
+ v_AttrSetValueType M_Product.AttrSetValueType%TYPE;
     
 BEGIN
     
@@ -80,134 +80,19 @@
  ELSE
   v_ID := :OLD.C_Invoice_ID;
  END IF;
-
- -- ReadOnly Check
- SELECT  processed
-   INTO v_Processed
- FROM C_INVOICE
- WHERE C_Invoice_ID=v_ID;
-
-
-  -- Round Base - Should do Rounding here
-  IF (INSERTING OR UPDATING) THEN
-   SELECT C_CURRENCY_ID INTO v_Currency FROM C_INVOICE WHERE C_INVOICE_ID = :NEW.C_Invoice_ID;
-  ELSE
-   SELECT C_CURRENCY_ID INTO v_Currency FROM C_INVOICE WHERE C_INVOICE_ID = :OLD.C_Invoice_ID;
-  END IF;
-  SELECT STDPRECISION INTO v_Prec FROM C_CURRENCY WHERE C_CURRENCY_ID = v_Currency;
-
  IF (INSERTING OR UPDATING) THEN
-  v_LineNetAmt := ROUND(:NEW.LineNetAmt, v_Prec);
-  v_ChargeAmt := ROUND(:NEW.ChargeAmt, v_Prec);
- END IF;
-
-
- IF(v_Processed = 'N') THEN
-
-  -- Subtract old Amount
-  IF (DELETING OR UPDATING) THEN
-   -- Get old Tax Info
-   SELECT  SUM(TaxBaseAmt)
-     INTO v_oldTaxBaseAmt
-   FROM  C_INVOICETAX
-   WHERE C_Invoice_ID = :OLD.C_Invoice_ID
-     AND C_Tax_ID = :OLD.C_Tax_ID
-     AND Recalculate='Y';
-   DBMS_OUTPUT.PUT_LINE('Old TaxBaseAmt=' || v_oldTaxBaseAmt);
-   --
-   v_oldLine := COALESCE(:OLD.LineNetAmt,0) + COALESCE(:OLD.ChargeAmt,0);
-   IF (v_oldTaxBaseAmt IS NOT NULL) THEN
-    DBMS_OUTPUT.PUT_LINE('Update NewLineAmt -= ' || v_oldLine);
-    UPDATE  C_INVOICETAX
-      SET TaxBaseAmt = TaxBaseAmt - v_oldLine
-    WHERE C_Invoice_ID = :OLD.C_Invoice_ID
-        AND C_Tax_ID = :OLD.C_Tax_ID;
+  --Does not allow to change the attribute set value
+  -- for products which attribute set value type is Fixed
+  IF (:NEW.M_PRODUCT_ID IS NOT NULL AND COALESCE(:new.M_AttributeSetInstance_ID,'0')!='0') THEN
+   SELECT ATTRSETVALUETYPE 
+   INTO v_AttrSetValueType
+   FROM M_PRODUCT 
+   WHERE M_PRODUCT_ID=:NEW.M_PRODUCT_ID;
+   IF (v_AttrSetValueType='F') THEN
+    RAISE_APPLICATION_ERROR(-20000, '@AttrSetValueFixed@');
    END IF;
-   -- Calculate old tax with 2 digits precision
-   UPDATE C_INVOICETAX
-     SET TaxAmt = (SELECT ROUND(C_INVOICETAX.TaxBaseAmt * t.Rate / 100, 2)
-         FROM C_TAX t WHERE C_INVOICETAX.C_Tax_ID=t.C_Tax_ID),
-        Updated = now(),
-     UpdatedBy = '0'
-   WHERE C_Invoice_ID = :OLD.C_Invoice_ID
-     AND C_Tax_ID = :OLD.C_Tax_ID
-     AND Recalculate='Y';
-  END IF;
-
-  -- Add new Amount
-  IF (INSERTING OR UPDATING) THEN
-   -- Get new Tax Info
-   SELECT  SUM(TaxBaseAmt)
-     INTO v_newTaxBaseAmt
-   FROM  C_INVOICETAX
-   WHERE C_Invoice_ID = :NEW.C_Invoice_ID
-     AND C_Tax_ID = :NEW.C_Tax_ID
-     AND Recalculate='Y';
-   DBMS_OUTPUT.PUT_LINE('New TaxBaseAmt=' || v_newTaxBaseAmt);
-   --
-   v_newLine := COALESCE(v_LineNetAmt,0) + COALESCE(v_ChargeAmt,0);
-   IF (v_newTaxBaseAmt IS NULL) THEN
-    IF (:NEW.C_Tax_ID IS NOT NULL) THEN  -- comment line has tax == null
-     DBMS_OUTPUT.PUT_LINE('Insert NewLineAmt = ' || v_newLine);
-     Ad_Sequence_Next('C_InvoiceTax', :new.AD_Org_ID, v_CinvoiceTaxID);
-     INSERT INTO C_INVOICETAX
-      (C_InvoiceTax_ID, AD_Client_ID, AD_Org_ID, IsActive, Created, CreatedBy, Updated, UpdatedBy,
-      C_Invoice_ID, C_Tax_ID, TaxBaseAmt, TaxAmt, Recalculate)
-     VALUES
-      (v_CinvoiceTaxID, :NEW.AD_Client_ID, :NEW.AD_Org_ID, 'Y', now(), :NEW.UpdatedBy, now(), :NEW.UpdatedBy,
-      :NEW.C_Invoice_ID, :NEW.C_Tax_ID, v_newLine, 0, 'Y');
-     END IF;
-   ELSE
-    DBMS_OUTPUT.PUT_LINE('Update NewLineAmt += ' || v_newLine);
-    UPDATE  C_INVOICETAX
-      SET TaxBaseAmt = TaxBaseAmt + v_newLine
-    WHERE C_Invoice_ID=:NEW.C_Invoice_ID
-        AND C_Tax_ID=:NEW.C_Tax_ID
-        AND Recalculate='Y';
-   END IF;
-   -- Calculate new tax with 2 digits precision
-   UPDATE C_INVOICETAX
-     SET TaxAmt = (SELECT ROUND(C_INVOICETAX.TaxBaseAmt * t.Rate / 100, 2)
-         FROM C_TAX t WHERE C_INVOICETAX.C_Tax_ID=t.C_Tax_ID),
-        Updated = now(),
-     UpdatedBy = :NEW.UpdatedBy
-   WHERE C_Invoice_ID=:NEW.C_Invoice_ID
-     AND C_Tax_ID=:NEW.C_Tax_ID
-     AND Recalculate='Y';
-  END IF;
-
-  -- Get Total Tax
-  IF (INSERTING OR UPDATING) THEN
-   SELECT  SUM(TaxAmt)  -- might be null
-     INTO v_taxAmt
-   FROM C_INVOICETAX
-   WHERE C_Invoice_ID = :NEW.C_Invoice_ID
-   AND Recalculate='Y';
-   DBMS_OUTPUT.PUT_LINE('TaxAmt = ' || v_taxAmt);
-
-   -- Update Header
-   UPDATE  C_INVOICE
-     SET TotalLines = TotalLines - v_oldLine + v_newLine,
-     GrandTotal = TotalLines - v_oldLine + v_newLine + COALESCE(v_taxAmt, 0)
-   --  Updated = SysDate -- Don't update as otherwise it does not save changes
-   WHERE C_Invoice_ID = :NEW.C_Invoice_ID;
-  ELSE -- DELETING
-   SELECT  SUM(TaxAmt)  -- might be null
-     INTO v_taxAmt
-   FROM C_INVOICETAX
-   WHERE C_Invoice_ID = :OLD.C_Invoice_ID
-   AND Recalculate='Y';
-   DBMS_OUTPUT.PUT_LINE('TaxAmt = ' || v_taxAmt);
-
-   -- Update Header
-   UPDATE  C_INVOICE
-     SET TotalLines = TotalLines - v_oldLine + v_newLine,
-     GrandTotal = TotalLines - v_oldLine + v_newLine + COALESCE(v_taxAmt, 0)
-   --  Updated = SysDate -- Don't update as otherwise it does not save changes
-   WHERE C_Invoice_ID = :OLD.C_Invoice_ID;
   END IF;
  END IF;
-
 END C_INVOICELINE_TRG
 ]]></body>
     </trigger>
--- a/src-db/database/model/triggers/C_INVOICELINE_TRG2.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/triggers/C_INVOICELINE_TRG2.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -37,6 +37,14 @@
   v_DateInvoiced DATE;
   v_Precision NUMBER;
   v_PriceList_ID VARCHAR2(32);
+  v_Processed C_ORDER.PROCESSED%TYPE;
+  v_ID VARCHAR2(32);
+  v_oldLine NUMBER;
+  v_newLineNetAmt NUMBER;
+  v_newLineAlternate NUMBER;
+  v_taxAmt NUMBER;
+  v_Prec C_CURRENCY.STDPRECISION%TYPE;
+  v_BaseAmount C_TAX.BASEAMOUNT%TYPE;
     
 BEGIN
     
@@ -46,6 +54,11 @@
 
 -- This trigger is used for calculate the applied offers f0r the invoice
 
+IF (DELETING) THEN
+  v_ID:=:OLD.C_INVOICE_ID;
+ELSE
+  v_ID:=:NEW.C_INVOICE_ID;
+END IF;
 
  IF UPDATING THEN
   IF (    (COALESCE(:NEW.M_Product_ID,'0') != COALESCE(:OLD.M_Product_ID,'0'))
@@ -170,6 +183,59 @@
   END LOOP;
  END IF;
 
+  /**************************************************************************
+   * Calculate Tax, etc.
+   */
+ SELECT processed, stdPrecision
+   INTO v_Processed, v_Prec
+ FROM C_Invoice, C_Currency
+ WHERE C_Invoice.C_Currency_ID = C_Currency.C_Currency_ID
+ AND C_Invoice_ID=v_ID;
+ v_oldLine:=0;
+ v_newLineNetAmt:=0;
+ IF(v_Processed='N') THEN
+  -- Calculate taxes
+  IF(UPDATING) THEN
+  v_oldLine:= COALESCE(:old.LineNetAmt,0);
+  END IF;  
+  IF (INSERTING OR UPDATING) THEN
+   DELETE FROM C_INVOICELINETAX WHERE C_INVOICELINE_ID = :new.C_InvoiceLine_ID;
+   v_newLineNetAmt := COALESCE(:new.LineNetAmt,0);
+   v_newLineAlternate := COALESCE(:new.TaxBaseAmt,0);
+   IF(:new.C_Tax_ID IS NOT NULL) THEN
+     SELECT BaseAmount INTO v_BaseAmount
+     FROM C_TAX
+     WHERE C_TAX_ID = :new.C_Tax_ID;
+     C_INVOICELINETAX_INSERT(:new.AD_Org_ID, :new.C_Invoice_ID, :new.C_InvoiceLine_ID, :new.UpdatedBy, :new.C_Tax_ID, :new.C_Tax_ID, v_newLineNetAmt, v_newLineAlternate, v_Prec);
+   END IF;
+  -- Get Total Tax Amt
+   SELECT SUM(TaxAmt)
+     INTO v_taxAmt
+   FROM C_InvoiceTax
+   WHERE C_Invoice_ID=:new.C_Invoice_ID;
+  -- DBMS_OUTPUT.PUT_LINE('TaxAmt = ' || v_taxAmt);
+   -- Update Header
+   UPDATE C_Invoice
+     SET TotalLines = TotalLines - v_oldLine + v_newLineNetAmt,
+     GrandTotal = TotalLines - v_oldLine + v_newLineNetAmt + COALESCE(v_taxAmt, 0)
+   --  Updated = SysDate -- Don't update as otherwise it does not save changes
+   WHERE C_Invoice_ID = :new.C_Invoice_ID;
+  ELSE -- DELETING
+   SELECT SUM(TaxAmt)
+     INTO v_taxAmt
+   FROM C_InvoiceTax
+   WHERE C_Invoice_ID=:old.C_Invoice_ID;
+  -- DBMS_OUTPUT.PUT_LINE('TaxAmt = ' || v_taxAmt);
+   -- Update Header
+   UPDATE C_Invoice
+     SET TotalLines = TotalLines - v_oldLine + v_newLineNetAmt,
+     GrandTotal = TotalLines - v_oldLine + v_newLineNetAmt + COALESCE(v_taxAmt, 0)
+   --  Updated = SysDate -- Don't update as otherwise it does not save changes
+   WHERE C_Invoice_ID=:old.C_Invoice_ID;
+  END IF;
+ END IF;
+
+
 END C_INVOICELINE_TRG2
 ]]></body>
     </trigger>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/triggers/C_ORDERLINETAX_TRG.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -0,0 +1,96 @@
+<?xml version="1.0"?>
+  <database name="TRIGGER C_ORDERLINETAX_TRG">
+    <trigger name="C_ORDERLINETAX_TRG" table="C_ORDERLINETAX" fires="after" insert="true" update="true" delete="true" foreach="row">
+      <body><![CDATA[
+/*************************************************************************
+  * The contents of this file are subject to the Compiere Public
+  * License 1.1 ("License"); You may not use this file except in
+  * compliance with the License. You may obtain a copy of the License in
+  * the legal folder of your Openbravo installation.
+  * Software distributed under the License is distributed on an
+  * "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+  * implied. See the License for the specific language governing rights
+  * and limitations under the License.
+  * The Original Code is  Compiere  ERP &  Business Solution
+  * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc.
+  * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke,
+  * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
+  * All Rights Reserved.
+  * Contributor(s): Openbravo SL
+  * Contributions are Copyright (C) 2010 Openbravo, S.L.
+  *
+  * Specifically, this derivative work is based upon the following Compiere
+  * file and version.
+  *************************************************************************/
+
+v_Count NUMBER;
+v_LineNo  NUMBER;
+v_C_Order_ID C_ORDERLINETAX.C_ORDER_ID%TYPE;
+v_C_Tax_ID C_ORDERLINETAX.C_TAX_ID%TYPE;
+v_Prec C_CURRENCY.STDPRECISION%TYPE;
+v_DocTaxAmount C_TAX.DOCTAXAMOUNT%TYPE;
+v_Rate  C_TAX.RATE%TYPE;
+    
+BEGIN
+    
+    IF AD_isTriggerEnabled()='N' THEN RETURN;
+    END IF;
+
+    IF(INSERTING OR UPDATING) THEN
+      v_C_Tax_ID:=:NEW.C_Tax_ID;
+      v_C_Order_ID:=:NEW.C_ORDER_ID;
+    ELSE
+      v_C_Tax_ID:=:OLD.C_Tax_ID;
+      v_C_Order_ID:=:OLD.C_ORDER_ID;
+    END IF;
+
+    SELECT C_CURRENCY.STDPRECISION
+    INTO v_Prec
+    FROM C_ORDER, C_CURRENCY
+    WHERE C_ORDER.C_CURRENCY_ID = C_CURRENCY.C_CURRENCY_ID
+    AND C_ORDER_ID = v_C_Order_ID;
+    
+    SELECT DOCTAXAMOUNT, RATE
+    INTO v_DocTaxAmount, v_Rate
+    FROM C_TAX
+    WHERE C_TAX_ID = v_C_Tax_ID;
+    
+  IF (INSERTING OR UPDATING) THEN
+    SELECT COUNT(C_TAX_ID) INTO v_Count
+    FROM C_ORDERTAX
+    WHERE C_ORDER_ID = :NEW.C_Order_ID
+    AND C_TAX_ID = :NEW.C_TAX_ID;
+    IF(v_Count>0) THEN
+      UPDATE C_ORDERTAX SET TAXAMT = (CASE WHEN v_DocTaxAmount='D' THEN ROUND((TAXBASEAMT + :NEW.TAXBASEAMT) * v_Rate/100, v_Prec) ELSE (TAXAMT + :NEW.TAXAMT) END), TAXBASEAMT=TAXBASEAMT + :NEW.TAXBASEAMT
+      WHERE C_ORDER_ID = :NEW.C_Order_ID
+      AND C_TAX_ID = :NEW.C_TAX_ID;
+    ELSE
+      SELECT COALESCE(MAX(LINE),0) + 10
+      INTO v_LineNo
+      FROM C_ORDERTAX
+      WHERE C_ORDER_ID = :NEW.C_Order_ID;
+      INSERT
+      INTO C_ORDERTAX (
+      C_OrderTax_ID, C_Order_ID, C_Tax_ID, AD_Client_ID, AD_Org_ID,
+      IsActive, Created, CreatedBy, Updated,
+      UpdatedBy, TaxBaseAmt, TaxAmt, Line)
+      VALUES (
+      GET_UUID(), :NEW.C_Order_ID, :NEW.C_TAX_ID, :NEW.AD_CLIENT_ID, :NEW.AD_ORG_ID,
+      'Y', now(), :NEW.UPDATEDBY, now(),
+      :NEW.UPDATEDBY, :NEW.TAXBASEAMT, :NEW.TAXAMT, v_LineNo);
+    END IF;
+  ELSE
+    
+    UPDATE C_ORDERTAX SET TAXAMT = (CASE WHEN v_DocTaxAmount='D' THEN ROUND((TAXBASEAMT - :OLD.TAXBASEAMT) * v_Rate/100, v_Prec) ELSE (TAXAMT - :OLD.TAXAMT) END), TAXBASEAMT=TAXBASEAMT - :OLD.TAXBASEAMT
+    WHERE C_ORDER_ID = :OLD.C_Order_ID
+    AND C_TAX_ID = :OLD.C_TAX_ID;
+    
+    DELETE FROM C_ORDERTAX 
+    WHERE C_ORDER_ID = :OLD.C_Order_ID
+    AND C_TAX_ID = :OLD.C_TAX_ID
+    AND TAXAMT=0 AND TAXBASEAMT=0;
+  END IF;
+END C_ORDERLINETAX_TRG
+]]></body>
+    </trigger>
+  </database>
--- a/src-db/database/model/triggers/C_ORDERLINE_TRG.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/triggers/C_ORDERLINE_TRG.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -23,13 +23,13 @@
   * file and version.
   *************************************************************************/
 
-  TYPE RECORD IS REF CURSOR;
-
   v_newTaxBaseAmt NUMBER;
   v_oldTaxBaseAmt NUMBER;
   v_oldLine NUMBER:= 0;
-  v_newLine NUMBER:= 0;
+  v_newLineNetAmt NUMBER:= 0;
+  v_newLineAlternate NUMBER:= 0;
   v_taxAmt NUMBER:= 0;
+  v_BaseAmount C_TAX.BASEAMOUNT%TYPE;
   v_HasTaxLine  BOOLEAN := FALSE;
   v_Prec   NUMBER;
   v_ID   VARCHAR2(32);
@@ -40,7 +40,6 @@
   v_taxBaseAmt NUMBER;
   v_rate NUMBER;
   v_isSummary CHAR(1);
-  Cur_MultiTax RECORD;
   xTaxAmt NUMBER:=0;
   
     
@@ -109,16 +108,15 @@
   v_ID := :old.C_Order_ID;
  END IF;
 
- SELECT processed
-   INTO v_Processed
- FROM C_Order
- WHERE C_Order_ID=v_ID;
-
-
+ SELECT StdPrecision
+ INTO v_Prec
+ FROM C_Currency, C_Order
+ WHERE C_Currency.C_Currency_ID = C_Order.C_Currency_ID
+ AND C_Order_ID = v_ID;
  /**
   * Round Base
   */
- v_Prec := 2;
+ --v_Prec := 2;
  IF (INSERTING OR UPDATING) THEN
      -- Modified by I.Ciordia. Sometimes js fails calculting lineNet
   :new.LineNetAmt := ROUND(:new.QtyOrdered*:new.PriceActual, v_Prec);-- Modified by I.Ciordia
@@ -127,174 +125,6 @@
  END IF;
 
 
-  /**************************************************************************
-   * Calculate Tax, etc.
-   */
- IF(v_Processed='N') THEN
-  -- Subtract old Amount
-  IF (DELETING OR UPDATING) THEN
-   -- Get old Tax Info
-   SELECT SUM(TaxBaseAmt)
-     INTO v_oldTaxBaseAmt
-   FROM C_OrderTax
-   WHERE C_Order_ID=:old.C_Order_ID
-     AND C_Tax_ID=:old.C_Tax_ID;
-  -- DBMS_OUTPUT.PUT_LINE('Old TaxBaseAmt=' || v_oldTaxBaseAmt);
-   --
-   v_oldLine := COALESCE(:old.LineNetAmt,0) + COALESCE(:old.FreightAmt,0) + COALESCE(:old.ChargeAmt,0);
-   IF (v_oldTaxBaseAmt IS NOT NULL) THEN
-   -- DBMS_OUTPUT.PUT_LINE('Update NewLineAmt -= ' || v_oldLine);
-    UPDATE C_OrderTax
-      SET TaxBaseAmt = TaxBaseAmt - v_oldLine
-    WHERE C_Order_ID=:old.C_Order_ID
-      AND C_Tax_ID=:old.C_Tax_ID;
-   END IF;
-
-   SELECT TaxBaseAmt 
-     INTO v_taxBaseAmt 
-   FROM C_OrderTax 
-   WHERE C_Order_ID=:old.C_Order_ID 
-     AND C_Tax_ID=:old.C_Tax_ID;
-
-   SELECT Rate 
-     INTO v_rate 
-   FROM C_Tax 
-   WHERE C_Tax_ID=:old.C_Tax_ID;
-
-   SELECT IsSummary 
-     INTO v_isSummary 
-   FROM C_TAX t 
-   WHERE C_Tax_ID=(SELECT C_Tax_ID 
-		   FROM C_OrderTax 
-		   WHERE C_Order_ID=:old.C_Order_ID 
-		     AND C_Tax_ID=:old.C_Tax_ID);
-	
-   IF(v_isSummary='N') THEN
-     UPDATE C_OrderTax
-     SET TaxAmt = ROUND(v_taxBaseAmt * v_rate / 100, v_Prec),
-	 Updated = now(),
-	 UpdatedBy = '0'
-     WHERE C_Order_ID=:old.C_Order_ID
-     AND C_Tax_ID=:old.C_Tax_ID;
-   ELSE
-     FOR Cur_MultiTax IN
-        (SELECT C_Tax_ID, Rate, CASCADE
-	 FROM C_TAX
-	 WHERE Parent_Tax_ID=:old.C_Tax_ID
-	 ORDER BY Line)
-     LOOP
-       xTaxAmt:=xTaxAmt + ROUND(v_taxBaseAmt * Cur_MultiTax.Rate / 100, v_Prec);
-     END LOOP;
-
-     UPDATE C_OrderTax
-     SET TaxAmt = xTaxAmt,
-	 Updated = now(),
-	 UpdatedBy = '0'
-     WHERE C_Order_ID=:old.C_Order_ID
-     AND C_Tax_ID=:old.C_Tax_ID;
-   END IF;
-  END IF;
-
-  -- Add new Amount
-  IF (INSERTING OR UPDATING) THEN
-   -- Get new Tax Info
-   SELECT SUM(TaxBaseAmt)
-     INTO v_newTaxBaseAmt
-   FROM C_OrderTax
-   WHERE C_Order_ID=:new.C_Order_ID
-     AND C_Tax_ID=:new.C_Tax_ID;
-  -- DBMS_OUTPUT.PUT_LINE('New TaxBaseAmt=' || v_newTaxBaseAmt);
-   --
-   v_newLine := COALESCE(:new.LineNetAmt,0) + COALESCE(:new.FreightAmt,0) + COALESCE(:new.ChargeAmt,0);
-   IF (v_newTaxBaseAmt IS NULL) THEN
-   -- DBMS_OUTPUT.PUT_LINE('Insert NewLineAmt = ' || v_newLine);
-    INSERT INTO C_OrderTax
-     (c_OrderTax_ID, AD_Client_ID, AD_Org_ID, IsActive, Created, CreatedBy, Updated, UpdatedBy,
-     C_Order_ID, C_Tax_ID, TaxBaseAmt, taxAmt)
-    VALUES
-     (get_uuid(), :new.AD_Client_ID, :new.AD_Org_ID, 'Y', now(), :new.UpdatedBy, now(), :new.UpdatedBy,
-     :new.C_Order_ID, :new.C_Tax_ID, v_newLine, 0);
-   ELSE
-   -- DBMS_OUTPUT.PUT_LINE('Update NewLineAmt += ' || v_newLine);
-    UPDATE C_OrderTax
-      SET TaxBaseAmt = TaxBaseAmt + v_newLine
-    WHERE C_Order_ID=:new.C_Order_ID
-      AND C_Tax_ID=:new.C_Tax_ID;
-   END IF;
-
-   SELECT TaxBaseAmt 
-     INTO v_taxBaseAmt 
-   FROM C_OrderTax 
-   WHERE C_Order_ID=:new.C_Order_ID 
-     AND C_Tax_ID=:new.C_Tax_ID;
-
-   SELECT Rate 
-     INTO v_rate 
-   FROM C_Tax 
-   WHERE C_Tax_ID=:new.C_Tax_ID;
-
-   SELECT IsSummary 
-     INTO v_isSummary 
-   FROM C_TAX t 
-   WHERE C_Tax_ID=(SELECT C_Tax_ID 
-		   FROM C_OrderTax 
-		   WHERE C_Order_ID=:new.C_Order_ID 
-		     AND C_Tax_ID=:new.C_Tax_ID);
-	
-   IF(v_isSummary='N') THEN
-     UPDATE C_OrderTax
-     SET TaxAmt = ROUND(v_taxBaseAmt * v_rate / 100, v_Prec),
-	 Updated = now(),
-	 UpdatedBy = '0'
-     WHERE C_Order_ID=:new.C_Order_ID
-     AND C_Tax_ID=:new.C_Tax_ID;
-   ELSE
-     FOR Cur_MultiTax IN
-        (SELECT C_Tax_ID, Rate, CASCADE
-	 FROM C_TAX
-	 WHERE Parent_Tax_ID=:new.C_Tax_ID
-	 ORDER BY Line)
-     LOOP
-       xTaxAmt:=xTaxAmt + ROUND(v_taxBaseAmt * Cur_MultiTax.Rate / 100, v_Prec);
-     END LOOP;
-
-     UPDATE C_OrderTax
-     SET TaxAmt = xTaxAmt,
-	 Updated = now(),
-	 UpdatedBy = '0'
-     WHERE C_Order_ID=:new.C_Order_ID
-     AND C_Tax_ID=:new.C_Tax_ID;
-   END IF;
-  END IF;
-
-  -- Get Total Tax Amt
-  IF (INSERTING OR UPDATING) THEN
-   SELECT SUM(TaxAmt)
-     INTO v_taxAmt
-   FROM C_OrderTax
-   WHERE C_Order_ID=:new.C_Order_ID;
-  -- DBMS_OUTPUT.PUT_LINE('TaxAmt = ' || v_taxAmt);
-   -- Update Header
-   UPDATE C_Order
-     SET TotalLines = TotalLines - v_oldLine + v_newLine,
-     GrandTotal = TotalLines - v_oldLine + v_newLine + COALESCE(v_taxAmt, 0)
-   --  Updated = SysDate -- Don't update as otherwise it does not save changes
-   WHERE C_Order_ID = :new.C_Order_ID;
-  ELSE -- DELETING
-   SELECT SUM(TaxAmt)
-     INTO v_taxAmt
-   FROM C_OrderTax
-   WHERE C_Order_ID=:old.C_Order_ID;
-  -- DBMS_OUTPUT.PUT_LINE('TaxAmt = ' || v_taxAmt);
-   -- Update Header
-   UPDATE C_Order
-     SET TotalLines = TotalLines - v_oldLine + v_newLine,
-     GrandTotal = TotalLines - v_oldLine + v_newLine + COALESCE(v_taxAmt, 0)
-   --  Updated = SysDate -- Don't update as otherwise it does not save changes
-   WHERE C_Order_ID=:old.C_Order_ID;
-  END IF;
- END IF;
-
 END C_ORDERLINE_TRG
 ]]></body>
     </trigger>
--- a/src-db/database/model/triggers/C_ORDERLINE_TRG2.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/triggers/C_ORDERLINE_TRG2.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -19,7 +19,7 @@
     * under the License.
     * The Original Code is Openbravo ERP.
     * The Initial Developer of the Original Code is Openbravo SL
-    * All portions are Copyright (C) 2001-2006 Openbravo SL
+    * All portions are Copyright (C) 2001-2010 Openbravo SL
     * All Rights Reserved.
     * Contributor(s):  ______________________________________.
     ************************************************************************/
@@ -37,13 +37,26 @@
   v_Insert BOOLEAN :=FALSE;
   v_Precision NUMBER;
   v_PriceList_ID VARCHAR2(32);
+  v_Processed C_ORDER.PROCESSED%TYPE;
+  v_ID VARCHAR2(32);
+  v_oldLine NUMBER;
+  v_newLineNetAmt NUMBER;
+  v_newLineAlternate NUMBER;
+  v_taxAmt NUMBER;
+  v_Prec C_CURRENCY.STDPRECISION%TYPE;
+  v_BaseAmount C_TAX.BASEAMOUNT%TYPE;
+  v_AttrSetValueType M_Product.AttrSetValueType%TYPE;
     
 BEGIN
     
     IF AD_isTriggerEnabled()='N' THEN RETURN;
     END IF;
 
-
+IF (DELETING) THEN
+  v_ID:=:OLD.C_ORDER_ID;
+ELSE
+  v_ID:=:NEW.C_ORDER_ID;
+END IF;
 
  IF UPDATING THEN
   IF ((:NEW.DateOrdered != :OLD.DateOrdered)
@@ -177,6 +190,71 @@
   END LOOP;
  END IF;
 
+
+  /**************************************************************************
+   * Calculate Tax, etc.
+   */
+ SELECT processed, stdPrecision
+   INTO v_Processed, v_Prec
+ FROM C_Order, C_Currency
+ WHERE C_Order.C_Currency_ID = C_Currency.C_Currency_ID
+ AND C_Order_ID=v_ID;
+ v_oldLine:=0;
+ v_newLineNetAmt:=0;
+ IF(v_Processed='N') THEN
+  -- Calculate taxes
+  IF(UPDATING) THEN
+  v_oldLine:= COALESCE(:old.LineNetAmt,0) + COALESCE(:old.FreightAmt,0) + COALESCE(:old.ChargeAmt,0);
+  END IF;  
+  IF (INSERTING OR UPDATING) THEN
+   DELETE FROM C_ORDERLINETAX WHERE C_ORDERLINE_ID = :new.C_OrderLine_ID;
+   v_newLineNetAmt := COALESCE(:new.LineNetAmt,0) + COALESCE(:new.FreightAmt,0) + COALESCE(:new.ChargeAmt,0);
+   v_newLineAlternate := COALESCE(:new.TaxBaseAmt,0) + COALESCE(:new.FreightAmt,0) + COALESCE(:new.ChargeAmt,0);
+   SELECT BaseAmount INTO v_BaseAmount
+   FROM C_TAX
+   WHERE C_TAX_ID = :new.C_Tax_ID;
+   C_ORDERLINETAX_INSERT(:new.AD_Org_ID, :new.C_Order_ID, :new.C_OrderLine_ID, :new.UpdatedBy, :new.C_Tax_ID, :new.C_Tax_ID, v_newLineNetAmt, v_newLineAlternate, v_Prec);
+  -- Get Total Tax Amt
+   SELECT SUM(TaxAmt)
+     INTO v_taxAmt
+   FROM C_OrderTax
+   WHERE C_Order_ID=:new.C_Order_ID;
+  -- DBMS_OUTPUT.PUT_LINE('TaxAmt = ' || v_taxAmt);
+   -- Update Header
+   UPDATE C_Order
+     SET TotalLines = TotalLines - v_oldLine + v_newLineNetAmt,
+     GrandTotal = TotalLines - v_oldLine + v_newLineNetAmt + COALESCE(v_taxAmt, 0)
+   --  Updated = SysDate -- Don't update as otherwise it does not save changes
+   WHERE C_Order_ID = :new.C_Order_ID;
+  ELSE -- DELETING
+   SELECT SUM(TaxAmt)
+     INTO v_taxAmt
+   FROM C_OrderTax
+   WHERE C_Order_ID=:old.C_Order_ID;
+  -- DBMS_OUTPUT.PUT_LINE('TaxAmt = ' || v_taxAmt);
+   -- Update Header
+   UPDATE C_Order
+     SET TotalLines = TotalLines - v_oldLine + v_newLineNetAmt,
+     GrandTotal = TotalLines - v_oldLine + v_newLineNetAmt + COALESCE(v_taxAmt, 0)
+   --  Updated = SysDate -- Don't update as otherwise it does not save changes
+   WHERE C_Order_ID=:old.C_Order_ID;
+  END IF;
+ END IF;
+
+ IF (INSERTING OR UPDATING) THEN
+  --Does not allow to change the attribute set value
+  -- for products which attribute set value type is Fixed
+  IF (:NEW.M_PRODUCT_ID IS NOT NULL AND COALESCE(:new.M_AttributeSetInstance_ID,'0')!='0') THEN
+   SELECT ATTRSETVALUETYPE 
+   INTO v_AttrSetValueType
+   FROM M_PRODUCT 
+   WHERE M_PRODUCT_ID=:NEW.M_PRODUCT_ID;
+   IF (v_AttrSetValueType='F') THEN
+    RAISE_APPLICATION_ERROR(-20000, '@AttrSetValueFixed@');
+   END IF;
+  END IF;
+ END IF;
+
 END C_ORDERLINE_TRG2
 ]]></body>
     </trigger>
--- a/src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/triggers/C_ORDLINE_CHK_RESTRICTIONS_TRG.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -67,7 +67,7 @@
         ) THEN
         IF (v_Processed='Y' AND v_Docaction <> 'CL') THEN
           RAISE_APPLICATION_ERROR(-20501, 'Document processed/posted') ;
-        ELSIF (v_IsSOTrx ='Y' AND v_DocStatus = 'DR' AND (:OLD.QTYDELIVERED <> 0 OR :OLD.QTYINVOICED <> 0)) THEN
+        ELSIF (v_IsSOTrx ='Y' AND v_DocStatus = 'DR' AND (:OLD.QTYDELIVERED <> 0 OR :OLD.QTYINVOICED <> 0) AND (COALESCE(:OLD.PRICEACTUAL, 0) = COALESCE(:NEW.PRICEACTUAL, 0) OR :OLD.QTYINVOICED <> 0)) THEN
           RAISE_APPLICATION_ERROR(-20000, '@DeliveredInvoicedOrderline@');
         END IF;
       ELSIF (v_IsSOTrx = 'Y' AND ABS(:new.QtyInvoiced) > ABS(:new.QtyOrdered)) THEN
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/triggers/MA_GLOBALUSE_TRG.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+  <database name="TRIGGER MA_GLOBALUSE_TRG">
+    <trigger name="MA_GLOBALUSE_TRG" table="MA_GLOBALUSE" fires="after" insert="true" update="true" delete="false" foreach="row">
+      <body><![CDATA[
+
+/*************************************************************************
+* The contents of this file are subject to the Openbravo  Public  License
+* Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+* Version 1.1  with a permitted attribution clause; you may not  use this
+* file except in compliance with the License. You  may  obtain  a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License  is  distributed  on  an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific  language  governing  rights  and  limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SL
+* All portions are Copyright (C) 2010 Openbravo SL
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+
+  v_AttrSetValueType M_Product.AttrSetValueType%TYPE;
+
+BEGIN
+  IF AD_isTriggerEnabled()='N' THEN RETURN;
+  END IF;
+  IF (INSERTING OR UPDATING) THEN
+   --Does not allow to change the attribute set value
+   -- for products which attribute set value type is Fixed
+   IF (:NEW.M_PRODUCT_ID IS NOT NULL AND COALESCE(:new.M_AttributeSetInstance_ID,'0')!='0') THEN
+    SELECT ATTRSETVALUETYPE 
+    INTO v_AttrSetValueType
+    FROM M_PRODUCT 
+    WHERE M_PRODUCT_ID=:NEW.M_PRODUCT_ID;
+    IF (v_AttrSetValueType='F') THEN
+     RAISE_APPLICATION_ERROR(-20000, '@AttrSetValueFixed@');
+    END IF;
+   END IF;
+  END IF;
+END MA_GLOBALUSE_TRG
+]]></body>
+    </trigger>
+  </database>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/triggers/MA_PC_CASE_TRG.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+  <database name="TRIGGER MA_PC_CASE_TRG">
+    <trigger name="MA_PC_CASE_TRG" table="MA_PC_CASE" fires="after" insert="true" update="true" delete="false" foreach="row">
+      <body><![CDATA[
+
+/*************************************************************************
+* The contents of this file are subject to the Openbravo  Public  License
+* Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+* Version 1.1  with a permitted attribution clause; you may not  use this
+* file except in compliance with the License. You  may  obtain  a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License  is  distributed  on  an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific  language  governing  rights  and  limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SL
+* All portions are Copyright (C) 2010 Openbravo SL
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+
+  v_AttrSetValueType M_Product.AttrSetValueType%TYPE;
+
+BEGIN
+  IF AD_isTriggerEnabled()='N' THEN RETURN;
+  END IF;
+  IF (INSERTING OR UPDATING) THEN
+   --Does not allow to change the attribute set value
+   -- for products which attribute set value type is Fixed
+   IF (:NEW.M_PRODUCT_ID IS NOT NULL AND COALESCE(:new.M_AttributeSetInstance_ID,'0')!='0') THEN
+    SELECT ATTRSETVALUETYPE 
+    INTO v_AttrSetValueType
+    FROM M_PRODUCT 
+    WHERE M_PRODUCT_ID=:NEW.M_PRODUCT_ID;
+    IF (v_AttrSetValueType='F') THEN
+     RAISE_APPLICATION_ERROR(-20000, '@AttrSetValueFixed@');
+    END IF;
+   END IF;
+  END IF;
+END MA_PC_CASE_TRG
+]]></body>
+    </trigger>
+  </database>
--- a/src-db/database/model/triggers/M_INOUTLINE_TRG.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/triggers/M_INOUTLINE_TRG.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -15,6 +15,8 @@
   v_qtyorderold  NUMBER;
   v_STOCKED   NUMBER;
   v_UOM_ID    varchar2(32);
+  v_AttrSetValueType M_Product.AttrSetValueType%TYPE;
+  V_COUNT  NUMBER;
 /******************************************************************************
  * The contents of this file are subject to the   Compiere License  Version 1.1
  * ("License"); You may not use this file except in compliance with the License
@@ -27,7 +29,7 @@
  * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
  * created by ComPiere are Copyright (C) ComPiere, Inc.;   All Rights Reserved.
  * Contributor(s): Openbravo SL
- * Contributions are Copyright (C) 2001-2006 Openbravo S.L.
+ * Contributions are Copyright (C) 2001-2010 Openbravo S.L.
  ******************************************************************************/
      
 BEGIN
@@ -64,6 +66,14 @@
         v_qtyorder := :NEW.QUANTITYORDER;
     END IF;
  END IF;
+ IF (:NEW.C_ORDERLINE_ID IS NOT NULL) THEN
+    SELECT COUNT(*) INTO V_COUNT FROM C_ORDERLINE ol,M_INOUTLINE il WHERE ol.C_ORDERLINE_ID = il.C_ORDERLINE_ID 
+    AND il.M_INOUTLINE_ID = :NEW.M_INOUTLINE_ID 
+    AND il.MOVEMENTQTY > ol.QTYORDERED;
+          IF(V_COUNT <> 0) THEN
+            RAISE_APPLICATION_ERROR(-20000, '@MovementQtyCheck@');
+          END IF;
+  END IF;
  IF (UPDATING) THEN
   IF (COALESCE(:OLD.C_UOM_ID, '0') <> COALESCE(:NEW.C_UOM_ID, '0')) THEN
     IF (:NEW.M_PRODUCT_ID IS NOT NULL) THEN
@@ -153,6 +163,19 @@
    END IF;
     END IF;
   END IF;
+  IF (INSERTING OR UPDATING) THEN
+   --Does not allow to change the attribute set value
+   -- for products which attribute set value type is Fixed
+   IF (:NEW.M_PRODUCT_ID IS NOT NULL AND COALESCE(:new.M_AttributeSetInstance_ID,'0')!='0') THEN
+    SELECT ATTRSETVALUETYPE 
+    INTO v_AttrSetValueType
+    FROM M_PRODUCT 
+    WHERE M_PRODUCT_ID=:NEW.M_PRODUCT_ID;
+    IF (v_AttrSetValueType='F') THEN
+     RAISE_APPLICATION_ERROR(-20000, '@AttrSetValueFixed@');
+    END IF;
+   END IF;
+  END IF;
 END M_INOUTLINE_TRG
 ]]></body>
     </trigger>
--- a/src-db/database/model/triggers/M_INTERNAL_CONSUMPTIONLINE_TRG.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/triggers/M_INTERNAL_CONSUMPTIONLINE_TRG.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -11,6 +11,7 @@
   V_STOCKED       NUMBER;
   v_MOVEMENTQTY   NUMBER;
   v_QUANTITYORDER NUMBER;
+  v_AttrSetValueType M_Product.AttrSetValueType%TYPE;
 /*************************************************************************
 * The contents of this file are subject to the Openbravo  Public  License
 * Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
@@ -23,7 +24,7 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SL
-* All portions are Copyright (C) 2001-2006 Openbravo SL
+* All portions are Copyright (C) 2001-2010 Openbravo SL
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
@@ -76,6 +77,20 @@
       M_UPDATE_INVENTORY(:NEW.AD_CLIENT_ID, :NEW.AD_ORG_ID, :NEW.UPDATEDBY, :NEW.M_PRODUCT_ID, :NEW.M_LOCATOR_ID, :NEW.M_ATTRIBUTESETINSTANCE_ID, :NEW.C_UOM_ID, :NEW.M_PRODUCT_UOM_ID, NULL, NULL, NULL, -v_MOVEMENTQTY, -v_QUANTITYORDER) ;
     END IF;
   END IF;
+  IF (INSERTING OR UPDATING) THEN
+   --Does not allow to change the attribute set value
+   -- for products which attribute set value type is Fixed
+   IF (:NEW.M_PRODUCT_ID IS NOT NULL AND COALESCE(:new.M_AttributeSetInstance_ID,'0')!='0') THEN
+    SELECT ATTRSETVALUETYPE 
+    INTO v_AttrSetValueType
+    FROM M_PRODUCT 
+    WHERE M_PRODUCT_ID=:NEW.M_PRODUCT_ID;
+    IF (v_AttrSetValueType='F') THEN
+     RAISE_APPLICATION_ERROR(-20000, '@AttrSetValueFixed@');
+    END IF;
+   END IF;
+  END IF;
+
 END M_INTERNAL_CONSUMPTIONLINE_TRG
 ]]></body>
     </trigger>
--- a/src-db/database/model/triggers/M_INVENTORYLINE_TRG.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/triggers/M_INVENTORYLINE_TRG.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -9,6 +9,7 @@
   v_ID VARCHAR2(32);
   v_RO      NUMBER;
   V_STOCKED NUMBER;
+  v_AttrSetValueType M_Product.AttrSetValueType%TYPE;
   /******************************************************************************
   * The contents of this file are subject to the   Compiere License  Version 1.1
   * ("License"); You may not use this file except in compliance with the License
@@ -21,7 +22,7 @@
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
   * created by ComPiere are Copyright (C) ComPiere, Inc.;   All Rights Reserved.
   * Contributor(s): Openbravo SL
-  * Contributions are Copyright (C) 2001-2006 Openbravo S.L.
+  * Contributions are Copyright (C) 2001-2010 Openbravo S.L.
   ******************************************************************************/
     
 BEGIN
@@ -69,6 +70,19 @@
       M_UPDATE_INVENTORY(:NEW.AD_CLIENT_ID, :NEW.AD_ORG_ID, :NEW.UPDATEDBY, :NEW.M_PRODUCT_ID, :NEW.M_LOCATOR_ID, :NEW.M_ATTRIBUTESETINSTANCE_ID, :NEW.C_UOM_ID, :NEW.M_PRODUCT_UOM_ID, NULL, NULL, NULL,(:NEW.QTYCOUNT-:NEW.QTYBOOK),(:NEW.QUANTITYORDER-:NEW.QUANTITYORDERBOOK)) ;
     END IF;
   END IF;
+  IF (INSERTING OR UPDATING) THEN
+   --Does not allow to change the attribute set value
+   -- for products which attribute set value type is Fixed
+   IF (:NEW.M_PRODUCT_ID IS NOT NULL AND COALESCE(:new.M_AttributeSetInstance_ID,'0')!='0') THEN
+    SELECT ATTRSETVALUETYPE 
+    INTO v_AttrSetValueType
+    FROM M_PRODUCT 
+    WHERE M_PRODUCT_ID=:NEW.M_PRODUCT_ID;
+    IF (v_AttrSetValueType='F') THEN
+     RAISE_APPLICATION_ERROR(-20000, '@AttrSetValueFixed@');
+    END IF;
+   END IF;
+  END IF;
 END M_INVENTORYLINE_TRG
 ]]></body>
     </trigger>
--- a/src-db/database/model/triggers/M_MOVEMENTLINE_TRG.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/triggers/M_MOVEMENTLINE_TRG.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -9,6 +9,7 @@
   v_ID VARCHAR2(32);
   v_RO      NUMBER;
   V_STOCKED NUMBER;
+  v_AttrSetValueType M_Product.AttrSetValueType%TYPE;
   /******************************************************************************
   * The contents of this file are subject to the   Compiere License  Version 1.1
   * ("License"); You may not use this file except in compliance with the License
@@ -21,7 +22,7 @@
   * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts
   * created by ComPiere are Copyright (C) ComPiere, Inc.;   All Rights Reserved.
   * Contributor(s): Openbravo SL
-  * Contributions are Copyright (C) 2001-2006 Openbravo S.L.
+  * Contributions are Copyright (C) 2001-2010 Openbravo S.L.
   ******************************************************************************/
     
 BEGIN
@@ -71,6 +72,19 @@
       M_UPDATE_INVENTORY(:NEW.AD_CLIENT_ID, :NEW.AD_ORG_ID, :NEW.UPDATEDBY, :NEW.M_PRODUCT_ID, :NEW.M_LOCATORTO_ID, :NEW.M_ATTRIBUTESETINSTANCE_ID, :NEW.C_UOM_ID, :NEW.M_PRODUCT_UOM_ID, NULL, NULL, NULL, :NEW.MOVEMENTQTY, :NEW.QUANTITYORDER) ;
     END IF;
   END IF;
+  IF (INSERTING OR UPDATING) THEN
+   --Does not allow to change the attribute set value
+   -- for products which attribute set value type is Fixed
+   IF (:NEW.M_PRODUCT_ID IS NOT NULL AND COALESCE(:new.M_AttributeSetInstance_ID,'0')!='0') THEN
+    SELECT ATTRSETVALUETYPE 
+    INTO v_AttrSetValueType
+    FROM M_PRODUCT 
+    WHERE M_PRODUCT_ID=:NEW.M_PRODUCT_ID;
+    IF (v_AttrSetValueType='F') THEN
+     RAISE_APPLICATION_ERROR(-20000, '@AttrSetValueFixed@');
+    END IF;
+   END IF;
+  END IF;
 END M_MOVEMENTLINE_TRG
 ]]></body>
     </trigger>
--- a/src-db/database/model/triggers/M_PRODUCTIONLINE_TRG.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/triggers/M_PRODUCTIONLINE_TRG.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -11,6 +11,7 @@
   V_STOCKED       NUMBER;
   v_MOVEMENTQTY   NUMBER;
   v_QUANTITYORDER NUMBER;
+  v_AttrSetValueType M_Product.AttrSetValueType%TYPE;
   /*************************************************************************
   * The contents of this file are subject to the Compiere Public
   * License 1.1 ("License"); You may not use this file except in
@@ -26,7 +27,7 @@
   * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
   * All Rights Reserved.
   * Contributor(s): Openbravo SL
-  * Contributions are Copyright (C) 2001-2008 Openbravo, S.L.
+  * Contributions are Copyright (C) 2001-2010 Openbravo, S.L.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -108,6 +109,19 @@
       END IF;
     END IF;
   END IF;
+  IF (INSERTING OR UPDATING) THEN
+   --Does not allow to change the attribute set value
+   -- for products which attribute set value type is Fixed
+   IF (:NEW.M_PRODUCT_ID IS NOT NULL AND COALESCE(:new.M_AttributeSetInstance_ID,'0')!='0') THEN
+    SELECT ATTRSETVALUETYPE 
+    INTO v_AttrSetValueType
+    FROM M_PRODUCT 
+    WHERE M_PRODUCT_ID=:NEW.M_PRODUCT_ID;
+    IF (v_AttrSetValueType='F') THEN
+     RAISE_APPLICATION_ERROR(-20000, '@AttrSetValueFixed@');
+    END IF;
+   END IF;
+  END IF;
 END M_PRODUCTIONLINE_TRG
 ]]></body>
     </trigger>
--- a/src-db/database/model/triggers/M_PRODUCT_TRG.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/triggers/M_PRODUCT_TRG.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -17,7 +17,7 @@
   * parts created by ComPiere are Copyright (C) ComPiere, Inc.;
   * All Rights Reserved.
   * Contributor(s): Openbravo SL
-  * Contributions are Copyright (C) 2001-2008 Openbravo, S.L.
+  * Contributions are Copyright (C) 2001-2010 Openbravo, S.L.
   *
   * Specifically, this derivative work is based upon the following Compiere
   * file and version.
@@ -41,6 +41,7 @@
     v_seq_name				             VARCHAR2(32);
     v_Sequence_No			             VARCHAR2(32);
     v_C_AcctSchema_ID			         VARCHAR2(32);
+    v_Count 	 	               NUMBER;
   			
 BEGIN
     IF AD_isTriggerEnabled()='N' THEN RETURN;
@@ -72,7 +73,6 @@
     WHERE M_PRODUCT_ID=:new.M_PRODUCT_ID;
   END IF;
 
-  RETURN;
  ELSIF (INSERTING) THEN
   v_C_AcctSchema_ID:=null;
   --   For all AcctSchema create ...
@@ -194,6 +194,27 @@
  ELSIF (DELETING) THEN
     DELETE FROM AD_TreeNodePR WHERE AD_Client_ID = :old.AD_Client_ID AND Node_ID = :old.M_Product_ID;
  END IF;
+ IF (INSERTING OR UPDATING) THEN
+    -- Checks on the attribute set value
+    IF (COALESCE(:new.M_AttributeSetInstance_ID, '0') != '0') THEN
+       IF (:new.M_AttributeSet_ID IS NULL) THEN
+          RAISE_APPLICATION_ERROR(-20000, '@SelectAttrSetDeleteAttrSetValue@');
+       ELSE
+          SELECT COUNT(*)
+	  INTO v_Count
+	  FROM M_ATTRIBUTESETINSTANCE
+	  WHERE M_ATTRIBUTESETINSTANCE_ID = :new.M_AttributeSetInstance_ID
+	  AND M_ATTRIBUTESET_ID = :new.M_AttributeSet_ID;
+          IF (v_Count = 0) THEN
+             RAISE_APPLICATION_ERROR(-20000, '@MismatchAttrSetAttrSetValue@');
+          END IF;
+       END IF;
+    ELSE
+       IF (:new.AttrSetValueType IS NOT NULL) THEN
+          RAISE_APPLICATION_ERROR(-20000, '@DeleteAttrSetValueType@');
+       END IF;
+    END IF;
+ END IF;
 EXCEPTION
  WHEN NO_DATA_FOUND THEN
   RAISE_APPLICATION_ERROR(-20009, 'M_Product InsertTrigger Error: No ClientInfo or parent TreeNode');
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/triggers/M_REQUISITIONLINE_TRG2.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+  <database name="TRIGGER M_REQUISITIONLINE_TRG2">
+    <trigger name="M_REQUISITIONLINE_TRG2" table="M_REQUISITIONLINE" fires="after" insert="true" update="true" delete="false" foreach="row">
+      <body><![CDATA[
+
+/*************************************************************************
+* The contents of this file are subject to the Openbravo  Public  License
+* Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+* Version 1.1  with a permitted attribution clause; you may not  use this
+* file except in compliance with the License. You  may  obtain  a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License  is  distributed  on  an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific  language  governing  rights  and  limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SL
+* All portions are Copyright (C) 2010 Openbravo SL
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+
+  v_AttrSetValueType M_Product.AttrSetValueType%TYPE;
+
+BEGIN
+  IF AD_isTriggerEnabled()='N' THEN RETURN;
+  END IF;
+  IF (INSERTING OR UPDATING) THEN
+   --Does not allow to change the attribute set value
+   -- for products which attribute set value type is Fixed
+   IF (:NEW.M_PRODUCT_ID IS NOT NULL AND COALESCE(:new.M_AttributeSetInstance_ID,'0')!='0') THEN
+    SELECT ATTRSETVALUETYPE 
+    INTO v_AttrSetValueType
+    FROM M_PRODUCT 
+    WHERE M_PRODUCT_ID=:NEW.M_PRODUCT_ID;
+    IF (v_AttrSetValueType='F') THEN
+     RAISE_APPLICATION_ERROR(-20000, '@AttrSetValueFixed@');
+    END IF;
+   END IF;
+  END IF;
+END M_REQUISITIONLINE_TRG2
+]]></body>
+    </trigger>
+  </database>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src-db/database/model/triggers/M_STORAGE_DETAIL_TRG.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+  <database name="TRIGGER M_STORAGE_DETAIL_TRG">
+    <trigger name="M_STORAGE_DETAIL_TRG" table="M_STORAGE_DETAIL" fires="after" insert="true" update="true" delete="false" foreach="row">
+      <body><![CDATA[
+
+/*************************************************************************
+* The contents of this file are subject to the Openbravo  Public  License
+* Version  1.0  (the  "License"),  being   the  Mozilla   Public  License
+* Version 1.1  with a permitted attribution clause; you may not  use this
+* file except in compliance with the License. You  may  obtain  a copy of
+* the License at http://www.openbravo.com/legal/license.html
+* Software distributed under the License  is  distributed  on  an "AS IS"
+* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+* License for the specific  language  governing  rights  and  limitations
+* under the License.
+* The Original Code is Openbravo ERP.
+* The Initial Developer of the Original Code is Openbravo SL
+* All portions are Copyright (C) 2010 Openbravo SL
+* All Rights Reserved.
+* Contributor(s):  ______________________________________.
+************************************************************************/
+
+  v_AttrSetValueType M_Product.AttrSetValueType%TYPE;
+
+BEGIN
+  IF AD_isTriggerEnabled()='N' THEN RETURN;
+  END IF;
+  IF (INSERTING OR UPDATING) THEN
+   --Does not allow to change the attribute set value
+   -- for products which attribute set value type is Fixed
+   IF (:NEW.M_PRODUCT_ID IS NOT NULL AND COALESCE(:new.M_AttributeSetInstance_ID,'0')!='0') THEN
+    SELECT ATTRSETVALUETYPE 
+    INTO v_AttrSetValueType
+    FROM M_PRODUCT 
+    WHERE M_PRODUCT_ID=:NEW.M_PRODUCT_ID;
+    IF (v_AttrSetValueType='F') THEN
+     RAISE_APPLICATION_ERROR(-20000, '@AttrSetValueFixed@');
+    END IF;
+   END IF;
+  END IF;
+END M_STORAGE_DETAIL_TRG
+]]></body>
+    </trigger>
+  </database>
--- a/src-db/database/model/triggers/M_TRANSACTION_TRG.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/model/triggers/M_TRANSACTION_TRG.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -18,15 +18,16 @@
 * under the License.
 * The Original Code is Openbravo ERP.
 * The Initial Developer of the Original Code is Openbravo SL
-* All portions are Copyright (C) 2001-2006 Openbravo SL
+* All portions are Copyright (C) 2001-2010 Openbravo SL
 * All Rights Reserved.
 * Contributor(s):  ______________________________________.
 ************************************************************************/
   v_DATEINVENTORY DATE;
   v_UOM_ID VARCHAR2(32) ;
   v_ATTRIBUTESET_ID VARCHAR2(32);
-  v_ATTRIBUTESETINSTANCE_ID VARCHAR2(32);
+  v_AttrSetValueType M_Product.AttrSetValueType%TYPE;
   v_Name NVARCHAR2(60);
+  v_IsOneAtSetValReq M_Attributeset.Isoneattrsetvalrequired%TYPE;
     
 BEGIN
     
@@ -35,14 +36,15 @@
 
 
   IF INSERTING OR UPDATING THEN
-    SELECT C_UOM_ID, M_ATTRIBUTESET_ID, M_ATTRIBUTESETINSTANCE_ID, name
-    INTO v_UOM_ID, v_attributeset_id, v_ATTRIBUTESETINSTANCE_ID, v_name
-    FROM M_PRODUCT
-    WHERE M_PRODUCT_ID=:NEW.M_PRODUCT_ID;
+    SELECT P.NAME, P.C_UOM_ID, P.M_ATTRIBUTESET_ID, A.ISONEATTRSETVALREQUIRED, P.ATTRSETVALUETYPE
+    INTO v_name, v_UOM_ID, v_attributeset_id, v_IsOneAtSetValReq, v_AttrSetValueType 
+    FROM M_PRODUCT P LEFT JOIN M_ATTRIBUTESET A
+    ON A.M_ATTRIBUTESET_ID = P.M_ATTRIBUTESET_ID
+    WHERE P.M_PRODUCT_ID=:NEW.M_PRODUCT_ID;
     IF(COALESCE(v_UOM_ID, '0') <> COALESCE(:NEW.C_UOM_ID, '0')) THEN
       RAISE_APPLICATION_ERROR(-20111, 'Unit of Measure mismatch (product/transaction)') ;
     END IF;
-    IF(v_attributeset_id IS NOT NULL AND v_ATTRIBUTESETINSTANCE_ID IS NULL AND COALESCE(:NEW.M_ATTRIBUTESETINSTANCE_ID, '0') = '0') THEN
+    IF(v_attributeset_id IS NOT NULL AND (v_AttrSetValueType IS NULL OR v_AttrSetValueType <> 'F') AND v_IsOneAtSetValReq = 'Y' AND COALESCE(:NEW.M_ATTRIBUTESETINSTANCE_ID, '0') = '0') THEN
       RAISE_APPLICATION_ERROR(-20112, 'There are some products without attribute: ' || v_Name) ;
     END IF;
     SELECT MAX(MOVEMENTDATE)
@@ -59,6 +61,19 @@
   IF INSERTING OR UPDATING THEN
     M_UPDATE_INVENTORY(:NEW.AD_CLIENT_ID, :NEW.AD_ORG_ID, :NEW.UPDATEDBY, :NEW.M_PRODUCT_ID, :NEW.M_LOCATOR_ID, :NEW.M_ATTRIBUTESETINSTANCE_ID, :NEW.C_UOM_ID, :NEW.M_PRODUCT_UOM_ID, :NEW.MOVEMENTQTY, :NEW.QUANTITYORDER, v_DATEINVENTORY, -:NEW.MOVEMENTQTY, -:NEW.QUANTITYORDER) ;
   END IF;
+  IF (INSERTING OR UPDATING) THEN
+   --Does not allow to change the attribute set value
+   -- for products which attribute set value type is Fixed
+   IF (:NEW.M_PRODUCT_ID IS NOT NULL AND COALESCE(:new.M_AttributeSetInstance_ID,'0')!='0') THEN
+    SELECT ATTRSETVALUETYPE 
+    INTO v_AttrSetValueType
+    FROM M_PRODUCT 
+    WHERE M_PRODUCT_ID=:NEW.M_PRODUCT_ID;
+    IF (v_AttrSetValueType='F') THEN
+     RAISE_APPLICATION_ERROR(-20000, '@AttrSetValueFixed@');
+    END IF;
+   END IF;
+  END IF;
 END M_TRANSACTION_TRG
 ]]></body>
     </trigger>
--- a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -683,6 +683,39 @@
 <!--01379E71C9E342A28AD3A60B5D499362-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--01379E71C9E342A28AD3A60B5D499362--></AD_AUXILIARINPUT>
 
+<!--02C232776AB84E3A9E37F823074A1534--><AD_AUXILIARINPUT>
+<!--02C232776AB84E3A9E37F823074A1534-->  <AD_AUXILIARINPUT_ID><![CDATA[02C232776AB84E3A9E37F823074A1534]]></AD_AUXILIARINPUT_ID>
+<!--02C232776AB84E3A9E37F823074A1534-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--02C232776AB84E3A9E37F823074A1534-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--02C232776AB84E3A9E37F823074A1534-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--02C232776AB84E3A9E37F823074A1534-->  <AD_TAB_ID><![CDATA[800203]]></AD_TAB_ID>
+<!--02C232776AB84E3A9E37F823074A1534-->  <NAME><![CDATA[ATTRSETVALUETYPE]]></NAME>
+<!--02C232776AB84E3A9E37F823074A1534-->  <CODE><![CDATA[@SQL=SELECT ATTRSETVALUETYPE FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--02C232776AB84E3A9E37F823074A1534-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--02C232776AB84E3A9E37F823074A1534--></AD_AUXILIARINPUT>
+
+<!--02E05081036040C282E16EC828378E87--><AD_AUXILIARINPUT>
+<!--02E05081036040C282E16EC828378E87-->  <AD_AUXILIARINPUT_ID><![CDATA[02E05081036040C282E16EC828378E87]]></AD_AUXILIARINPUT_ID>
+<!--02E05081036040C282E16EC828378E87-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--02E05081036040C282E16EC828378E87-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--02E05081036040C282E16EC828378E87-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--02E05081036040C282E16EC828378E87-->  <AD_TAB_ID><![CDATA[800119]]></AD_TAB_ID>
+<!--02E05081036040C282E16EC828378E87-->  <NAME><![CDATA[ATTRIBUTESET]]></NAME>
+<!--02E05081036040C282E16EC828378E87-->  <CODE><![CDATA[@SQL=SELECT M_ATTRIBUTESET_ID FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--02E05081036040C282E16EC828378E87-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--02E05081036040C282E16EC828378E87--></AD_AUXILIARINPUT>
+
+<!--05B7C05F0CEE469583B5199E137420B4--><AD_AUXILIARINPUT>
+<!--05B7C05F0CEE469583B5199E137420B4-->  <AD_AUXILIARINPUT_ID><![CDATA[05B7C05F0CEE469583B5199E137420B4]]></AD_AUXILIARINPUT_ID>
+<!--05B7C05F0CEE469583B5199E137420B4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--05B7C05F0CEE469583B5199E137420B4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--05B7C05F0CEE469583B5199E137420B4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--05B7C05F0CEE469583B5199E137420B4-->  <AD_TAB_ID><![CDATA[800049]]></AD_TAB_ID>
+<!--05B7C05F0CEE469583B5199E137420B4-->  <NAME><![CDATA[ATTRSETVALUETYPE]]></NAME>
+<!--05B7C05F0CEE469583B5199E137420B4-->  <CODE><![CDATA[@SQL=SELECT ATTRSETVALUETYPE FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--05B7C05F0CEE469583B5199E137420B4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--05B7C05F0CEE469583B5199E137420B4--></AD_AUXILIARINPUT>
+
 <!--07F4F6379C2F4FFFB18F3FCB00257C87--><AD_AUXILIARINPUT>
 <!--07F4F6379C2F4FFFB18F3FCB00257C87-->  <AD_AUXILIARINPUT_ID><![CDATA[07F4F6379C2F4FFFB18F3FCB00257C87]]></AD_AUXILIARINPUT_ID>
 <!--07F4F6379C2F4FFFB18F3FCB00257C87-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -705,6 +738,17 @@
 <!--0A07CF6956004B47AA61B23C80D582DF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--0A07CF6956004B47AA61B23C80D582DF--></AD_AUXILIARINPUT>
 
+<!--0A17DEEA6AE34D0AAF8D7D789BBEB16A--><AD_AUXILIARINPUT>
+<!--0A17DEEA6AE34D0AAF8D7D789BBEB16A-->  <AD_AUXILIARINPUT_ID><![CDATA[0A17DEEA6AE34D0AAF8D7D789BBEB16A]]></AD_AUXILIARINPUT_ID>
+<!--0A17DEEA6AE34D0AAF8D7D789BBEB16A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0A17DEEA6AE34D0AAF8D7D789BBEB16A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0A17DEEA6AE34D0AAF8D7D789BBEB16A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0A17DEEA6AE34D0AAF8D7D789BBEB16A-->  <AD_TAB_ID><![CDATA[187]]></AD_TAB_ID>
+<!--0A17DEEA6AE34D0AAF8D7D789BBEB16A-->  <NAME><![CDATA[ATTRIBUTESET]]></NAME>
+<!--0A17DEEA6AE34D0AAF8D7D789BBEB16A-->  <CODE><![CDATA[@SQL=SELECT M_ATTRIBUTESET_ID FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--0A17DEEA6AE34D0AAF8D7D789BBEB16A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0A17DEEA6AE34D0AAF8D7D789BBEB16A--></AD_AUXILIARINPUT>
+
 <!--0C25BF7F893543FA83EFC6F36FF3DA5C--><AD_AUXILIARINPUT>
 <!--0C25BF7F893543FA83EFC6F36FF3DA5C-->  <AD_AUXILIARINPUT_ID><![CDATA[0C25BF7F893543FA83EFC6F36FF3DA5C]]></AD_AUXILIARINPUT_ID>
 <!--0C25BF7F893543FA83EFC6F36FF3DA5C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -716,6 +760,28 @@
 <!--0C25BF7F893543FA83EFC6F36FF3DA5C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--0C25BF7F893543FA83EFC6F36FF3DA5C--></AD_AUXILIARINPUT>
 
+<!--0C9EAE5805B14C159CE74DAF015A12C9--><AD_AUXILIARINPUT>
+<!--0C9EAE5805B14C159CE74DAF015A12C9-->  <AD_AUXILIARINPUT_ID><![CDATA[0C9EAE5805B14C159CE74DAF015A12C9]]></AD_AUXILIARINPUT_ID>
+<!--0C9EAE5805B14C159CE74DAF015A12C9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0C9EAE5805B14C159CE74DAF015A12C9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0C9EAE5805B14C159CE74DAF015A12C9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0C9EAE5805B14C159CE74DAF015A12C9-->  <AD_TAB_ID><![CDATA[800078]]></AD_TAB_ID>
+<!--0C9EAE5805B14C159CE74DAF015A12C9-->  <NAME><![CDATA[ATTRIBUTESET]]></NAME>
+<!--0C9EAE5805B14C159CE74DAF015A12C9-->  <CODE><![CDATA[@SQL=SELECT M_ATTRIBUTESET_ID FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--0C9EAE5805B14C159CE74DAF015A12C9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0C9EAE5805B14C159CE74DAF015A12C9--></AD_AUXILIARINPUT>
+
+<!--0E03F64542694568B5C08A0E088A67F0--><AD_AUXILIARINPUT>
+<!--0E03F64542694568B5C08A0E088A67F0-->  <AD_AUXILIARINPUT_ID><![CDATA[0E03F64542694568B5C08A0E088A67F0]]></AD_AUXILIARINPUT_ID>
+<!--0E03F64542694568B5C08A0E088A67F0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0E03F64542694568B5C08A0E088A67F0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0E03F64542694568B5C08A0E088A67F0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0E03F64542694568B5C08A0E088A67F0-->  <AD_TAB_ID><![CDATA[260]]></AD_TAB_ID>
+<!--0E03F64542694568B5C08A0E088A67F0-->  <NAME><![CDATA[ATTRSETVALUETYPE]]></NAME>
+<!--0E03F64542694568B5C08A0E088A67F0-->  <CODE><![CDATA[@SQL=SELECT ATTRSETVALUETYPE FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--0E03F64542694568B5C08A0E088A67F0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0E03F64542694568B5C08A0E088A67F0--></AD_AUXILIARINPUT>
+
 <!--0FBA548D909C4F80A7028583A4A5BE45--><AD_AUXILIARINPUT>
 <!--0FBA548D909C4F80A7028583A4A5BE45-->  <AD_AUXILIARINPUT_ID><![CDATA[0FBA548D909C4F80A7028583A4A5BE45]]></AD_AUXILIARINPUT_ID>
 <!--0FBA548D909C4F80A7028583A4A5BE45-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -738,6 +804,39 @@
 <!--0FFA9E5DB5C24B7BBBB191108B2C1312-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--0FFA9E5DB5C24B7BBBB191108B2C1312--></AD_AUXILIARINPUT>
 
+<!--10444AA4DB1D49D7A621F1EF47787122--><AD_AUXILIARINPUT>
+<!--10444AA4DB1D49D7A621F1EF47787122-->  <AD_AUXILIARINPUT_ID><![CDATA[10444AA4DB1D49D7A621F1EF47787122]]></AD_AUXILIARINPUT_ID>
+<!--10444AA4DB1D49D7A621F1EF47787122-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--10444AA4DB1D49D7A621F1EF47787122-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--10444AA4DB1D49D7A621F1EF47787122-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--10444AA4DB1D49D7A621F1EF47787122-->  <AD_TAB_ID><![CDATA[293]]></AD_TAB_ID>
+<!--10444AA4DB1D49D7A621F1EF47787122-->  <NAME><![CDATA[ATTRSETVALUETYPE]]></NAME>
+<!--10444AA4DB1D49D7A621F1EF47787122-->  <CODE><![CDATA[@SQL=SELECT ATTRSETVALUETYPE FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--10444AA4DB1D49D7A621F1EF47787122-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--10444AA4DB1D49D7A621F1EF47787122--></AD_AUXILIARINPUT>
+
+<!--1C970FF3B6D74C7AB018305EFE3868A8--><AD_AUXILIARINPUT>
+<!--1C970FF3B6D74C7AB018305EFE3868A8-->  <AD_AUXILIARINPUT_ID><![CDATA[1C970FF3B6D74C7AB018305EFE3868A8]]></AD_AUXILIARINPUT_ID>
+<!--1C970FF3B6D74C7AB018305EFE3868A8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1C970FF3B6D74C7AB018305EFE3868A8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1C970FF3B6D74C7AB018305EFE3868A8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1C970FF3B6D74C7AB018305EFE3868A8-->  <AD_TAB_ID><![CDATA[321]]></AD_TAB_ID>
+<!--1C970FF3B6D74C7AB018305EFE3868A8-->  <NAME><![CDATA[ATTRSETVALUETYPE]]></NAME>
+<!--1C970FF3B6D74C7AB018305EFE3868A8-->  <CODE><![CDATA[@SQL=SELECT ATTRSETVALUETYPE FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--1C970FF3B6D74C7AB018305EFE3868A8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1C970FF3B6D74C7AB018305EFE3868A8--></AD_AUXILIARINPUT>
+
+<!--1F06154C94734F81A968E51738CC7B62--><AD_AUXILIARINPUT>
+<!--1F06154C94734F81A968E51738CC7B62-->  <AD_AUXILIARINPUT_ID><![CDATA[1F06154C94734F81A968E51738CC7B62]]></AD_AUXILIARINPUT_ID>
+<!--1F06154C94734F81A968E51738CC7B62-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1F06154C94734F81A968E51738CC7B62-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1F06154C94734F81A968E51738CC7B62-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1F06154C94734F81A968E51738CC7B62-->  <AD_TAB_ID><![CDATA[270]]></AD_TAB_ID>
+<!--1F06154C94734F81A968E51738CC7B62-->  <NAME><![CDATA[UsesAlternate]]></NAME>
+<!--1F06154C94734F81A968E51738CC7B62-->  <CODE><![CDATA[@SQL=SELECT CASE WHEN COUNT(C_TAX_ID)>0 THEN 'Y' ELSE 'N' END AS ISUSED FROM C_TAX WHERE C_TAX_ISMEMBER(@C_TAX_ID@, C_TAX_ID)=1 AND BASEAMOUNT IN ('TBA', 'TBATAX')]]></CODE>
+<!--1F06154C94734F81A968E51738CC7B62-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1F06154C94734F81A968E51738CC7B62--></AD_AUXILIARINPUT>
+
 <!--1F6072F3CE0F43F6AF71874398914072--><AD_AUXILIARINPUT>
 <!--1F6072F3CE0F43F6AF71874398914072-->  <AD_AUXILIARINPUT_ID><![CDATA[1F6072F3CE0F43F6AF71874398914072]]></AD_AUXILIARINPUT_ID>
 <!--1F6072F3CE0F43F6AF71874398914072-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -749,6 +848,61 @@
 <!--1F6072F3CE0F43F6AF71874398914072-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1F6072F3CE0F43F6AF71874398914072--></AD_AUXILIARINPUT>
 
+<!--1FEA6AF375714E1A962C67E094001342--><AD_AUXILIARINPUT>
+<!--1FEA6AF375714E1A962C67E094001342-->  <AD_AUXILIARINPUT_ID><![CDATA[1FEA6AF375714E1A962C67E094001342]]></AD_AUXILIARINPUT_ID>
+<!--1FEA6AF375714E1A962C67E094001342-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1FEA6AF375714E1A962C67E094001342-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1FEA6AF375714E1A962C67E094001342-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1FEA6AF375714E1A962C67E094001342-->  <AD_TAB_ID><![CDATA[256]]></AD_TAB_ID>
+<!--1FEA6AF375714E1A962C67E094001342-->  <NAME><![CDATA[ATTRSETVALUETYPE]]></NAME>
+<!--1FEA6AF375714E1A962C67E094001342-->  <CODE><![CDATA[@SQL=SELECT ATTRSETVALUETYPE FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--1FEA6AF375714E1A962C67E094001342-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--1FEA6AF375714E1A962C67E094001342--></AD_AUXILIARINPUT>
+
+<!--22AB3CC7FC16488795A2B228ED39EAC9--><AD_AUXILIARINPUT>
+<!--22AB3CC7FC16488795A2B228ED39EAC9-->  <AD_AUXILIARINPUT_ID><![CDATA[22AB3CC7FC16488795A2B228ED39EAC9]]></AD_AUXILIARINPUT_ID>
+<!--22AB3CC7FC16488795A2B228ED39EAC9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--22AB3CC7FC16488795A2B228ED39EAC9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--22AB3CC7FC16488795A2B228ED39EAC9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--22AB3CC7FC16488795A2B228ED39EAC9-->  <AD_TAB_ID><![CDATA[800119]]></AD_TAB_ID>
+<!--22AB3CC7FC16488795A2B228ED39EAC9-->  <NAME><![CDATA[ATTRSETVALUETYPE]]></NAME>
+<!--22AB3CC7FC16488795A2B228ED39EAC9-->  <CODE><![CDATA[@SQL=SELECT ATTRSETVALUETYPE FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--22AB3CC7FC16488795A2B228ED39EAC9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--22AB3CC7FC16488795A2B228ED39EAC9--></AD_AUXILIARINPUT>
+
+<!--2527595792D6435A991BD8C9B841C3AC--><AD_AUXILIARINPUT>
+<!--2527595792D6435A991BD8C9B841C3AC-->  <AD_AUXILIARINPUT_ID><![CDATA[2527595792D6435A991BD8C9B841C3AC]]></AD_AUXILIARINPUT_ID>
+<!--2527595792D6435A991BD8C9B841C3AC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2527595792D6435A991BD8C9B841C3AC-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2527595792D6435A991BD8C9B841C3AC-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2527595792D6435A991BD8C9B841C3AC-->  <AD_TAB_ID><![CDATA[384]]></AD_TAB_ID>
+<!--2527595792D6435A991BD8C9B841C3AC-->  <NAME><![CDATA[ATTRSETVALUETYPE]]></NAME>
+<!--2527595792D6435A991BD8C9B841C3AC-->  <CODE><![CDATA[@SQL=SELECT ATTRSETVALUETYPE FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--2527595792D6435A991BD8C9B841C3AC-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2527595792D6435A991BD8C9B841C3AC--></AD_AUXILIARINPUT>
+
+<!--2B0D9093C42A41E3AB05FEF0A64DBEA5--><AD_AUXILIARINPUT>
+<!--2B0D9093C42A41E3AB05FEF0A64DBEA5-->  <AD_AUXILIARINPUT_ID><![CDATA[2B0D9093C42A41E3AB05FEF0A64DBEA5]]></AD_AUXILIARINPUT_ID>
+<!--2B0D9093C42A41E3AB05FEF0A64DBEA5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2B0D9093C42A41E3AB05FEF0A64DBEA5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2B0D9093C42A41E3AB05FEF0A64DBEA5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2B0D9093C42A41E3AB05FEF0A64DBEA5-->  <AD_TAB_ID><![CDATA[293]]></AD_TAB_ID>
+<!--2B0D9093C42A41E3AB05FEF0A64DBEA5-->  <NAME><![CDATA[ATTRIBUTESET]]></NAME>
+<!--2B0D9093C42A41E3AB05FEF0A64DBEA5-->  <CODE><![CDATA[@SQL=SELECT M_ATTRIBUTESET_ID FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--2B0D9093C42A41E3AB05FEF0A64DBEA5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2B0D9093C42A41E3AB05FEF0A64DBEA5--></AD_AUXILIARINPUT>
+
+<!--2E5B825F8A2F4430B33B083D89B23618--><AD_AUXILIARINPUT>
+<!--2E5B825F8A2F4430B33B083D89B23618-->  <AD_AUXILIARINPUT_ID><![CDATA[2E5B825F8A2F4430B33B083D89B23618]]></AD_AUXILIARINPUT_ID>
+<!--2E5B825F8A2F4430B33B083D89B23618-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--2E5B825F8A2F4430B33B083D89B23618-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--2E5B825F8A2F4430B33B083D89B23618-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--2E5B825F8A2F4430B33B083D89B23618-->  <AD_TAB_ID><![CDATA[260]]></AD_TAB_ID>
+<!--2E5B825F8A2F4430B33B083D89B23618-->  <NAME><![CDATA[ATTRIBUTESET]]></NAME>
+<!--2E5B825F8A2F4430B33B083D89B23618-->  <CODE><![CDATA[@SQL=SELECT M_ATTRIBUTESET_ID FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--2E5B825F8A2F4430B33B083D89B23618-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--2E5B825F8A2F4430B33B083D89B23618--></AD_AUXILIARINPUT>
+
 <!--2E7ABBEDFBE946A69963B66C2FA17AB1--><AD_AUXILIARINPUT>
 <!--2E7ABBEDFBE946A69963B66C2FA17AB1-->  <AD_AUXILIARINPUT_ID><![CDATA[2E7ABBEDFBE946A69963B66C2FA17AB1]]></AD_AUXILIARINPUT_ID>
 <!--2E7ABBEDFBE946A69963B66C2FA17AB1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -771,6 +925,28 @@
 <!--35586436B2FB4809B66D519BC02230F4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--35586436B2FB4809B66D519BC02230F4--></AD_AUXILIARINPUT>
 
+<!--3648B8ACFDE44EF4A649B7933D9DBD97--><AD_AUXILIARINPUT>
+<!--3648B8ACFDE44EF4A649B7933D9DBD97-->  <AD_AUXILIARINPUT_ID><![CDATA[3648B8ACFDE44EF4A649B7933D9DBD97]]></AD_AUXILIARINPUT_ID>
+<!--3648B8ACFDE44EF4A649B7933D9DBD97-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3648B8ACFDE44EF4A649B7933D9DBD97-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3648B8ACFDE44EF4A649B7933D9DBD97-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3648B8ACFDE44EF4A649B7933D9DBD97-->  <AD_TAB_ID><![CDATA[293]]></AD_TAB_ID>
+<!--3648B8ACFDE44EF4A649B7933D9DBD97-->  <NAME><![CDATA[UsesAlternate]]></NAME>
+<!--3648B8ACFDE44EF4A649B7933D9DBD97-->  <CODE><![CDATA[@SQL=SELECT CASE WHEN COUNT(C_TAX_ID)>0 THEN 'Y' ELSE 'N' END AS ISUSED FROM C_TAX WHERE C_TAX_ISMEMBER(@C_TAX_ID@, C_TAX_ID)=1 AND BASEAMOUNT IN ('TBA', 'TBATAX')]]></CODE>
+<!--3648B8ACFDE44EF4A649B7933D9DBD97-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3648B8ACFDE44EF4A649B7933D9DBD97--></AD_AUXILIARINPUT>
+
+<!--38FA2581642644948132767B5CE448A4--><AD_AUXILIARINPUT>
+<!--38FA2581642644948132767B5CE448A4-->  <AD_AUXILIARINPUT_ID><![CDATA[38FA2581642644948132767B5CE448A4]]></AD_AUXILIARINPUT_ID>
+<!--38FA2581642644948132767B5CE448A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--38FA2581642644948132767B5CE448A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--38FA2581642644948132767B5CE448A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--38FA2581642644948132767B5CE448A4-->  <AD_TAB_ID><![CDATA[800251]]></AD_TAB_ID>
+<!--38FA2581642644948132767B5CE448A4-->  <NAME><![CDATA[ATTRIBUTESET]]></NAME>
+<!--38FA2581642644948132767B5CE448A4-->  <CODE><![CDATA[@SQL=SELECT M_ATTRIBUTESET_ID FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--38FA2581642644948132767B5CE448A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--38FA2581642644948132767B5CE448A4--></AD_AUXILIARINPUT>
+
 <!--3ACE8CFB656847998D9236DAA1D66E49--><AD_AUXILIARINPUT>
 <!--3ACE8CFB656847998D9236DAA1D66E49-->  <AD_AUXILIARINPUT_ID><![CDATA[3ACE8CFB656847998D9236DAA1D66E49]]></AD_AUXILIARINPUT_ID>
 <!--3ACE8CFB656847998D9236DAA1D66E49-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -793,6 +969,50 @@
 <!--3C0056E8C25843C387DFB2896D83FEE3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--3C0056E8C25843C387DFB2896D83FEE3--></AD_AUXILIARINPUT>
 
+<!--3CACB17421CB46A097666FF3425CD138--><AD_AUXILIARINPUT>
+<!--3CACB17421CB46A097666FF3425CD138-->  <AD_AUXILIARINPUT_ID><![CDATA[3CACB17421CB46A097666FF3425CD138]]></AD_AUXILIARINPUT_ID>
+<!--3CACB17421CB46A097666FF3425CD138-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3CACB17421CB46A097666FF3425CD138-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3CACB17421CB46A097666FF3425CD138-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3CACB17421CB46A097666FF3425CD138-->  <AD_TAB_ID><![CDATA[800251]]></AD_TAB_ID>
+<!--3CACB17421CB46A097666FF3425CD138-->  <NAME><![CDATA[ATTRSETVALUETYPE]]></NAME>
+<!--3CACB17421CB46A097666FF3425CD138-->  <CODE><![CDATA[@SQL=SELECT ATTRSETVALUETYPE FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--3CACB17421CB46A097666FF3425CD138-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3CACB17421CB46A097666FF3425CD138--></AD_AUXILIARINPUT>
+
+<!--42236E76CCB2491B8B2E5BCDA4E83624--><AD_AUXILIARINPUT>
+<!--42236E76CCB2491B8B2E5BCDA4E83624-->  <AD_AUXILIARINPUT_ID><![CDATA[42236E76CCB2491B8B2E5BCDA4E83624]]></AD_AUXILIARINPUT_ID>
+<!--42236E76CCB2491B8B2E5BCDA4E83624-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--42236E76CCB2491B8B2E5BCDA4E83624-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--42236E76CCB2491B8B2E5BCDA4E83624-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--42236E76CCB2491B8B2E5BCDA4E83624-->  <AD_TAB_ID><![CDATA[800078]]></AD_TAB_ID>
+<!--42236E76CCB2491B8B2E5BCDA4E83624-->  <NAME><![CDATA[ATTRSETVALUETYPE]]></NAME>
+<!--42236E76CCB2491B8B2E5BCDA4E83624-->  <CODE><![CDATA[@SQL=SELECT ATTRSETVALUETYPE FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--42236E76CCB2491B8B2E5BCDA4E83624-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--42236E76CCB2491B8B2E5BCDA4E83624--></AD_AUXILIARINPUT>
+
+<!--44F6BC232F6F4BFAB71F80A00D0AA15C--><AD_AUXILIARINPUT>
+<!--44F6BC232F6F4BFAB71F80A00D0AA15C-->  <AD_AUXILIARINPUT_ID><![CDATA[44F6BC232F6F4BFAB71F80A00D0AA15C]]></AD_AUXILIARINPUT_ID>
+<!--44F6BC232F6F4BFAB71F80A00D0AA15C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--44F6BC232F6F4BFAB71F80A00D0AA15C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--44F6BC232F6F4BFAB71F80A00D0AA15C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--44F6BC232F6F4BFAB71F80A00D0AA15C-->  <AD_TAB_ID><![CDATA[471]]></AD_TAB_ID>
+<!--44F6BC232F6F4BFAB71F80A00D0AA15C-->  <NAME><![CDATA[UsesAlternate]]></NAME>
+<!--44F6BC232F6F4BFAB71F80A00D0AA15C-->  <CODE><![CDATA[@SQL=SELECT CASE WHEN COUNT(C_TAX_ID)>0 THEN 'Y' ELSE 'N' END AS ISUSED FROM C_TAX WHERE C_TAX_ISMEMBER(@C_TAX_ID@, C_TAX_ID)=1 AND BASEAMOUNT IN ('TBA', 'TBATAX')]]></CODE>
+<!--44F6BC232F6F4BFAB71F80A00D0AA15C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--44F6BC232F6F4BFAB71F80A00D0AA15C--></AD_AUXILIARINPUT>
+
+<!--485726718FCD47AFB101C59FC1BD365E--><AD_AUXILIARINPUT>
+<!--485726718FCD47AFB101C59FC1BD365E-->  <AD_AUXILIARINPUT_ID><![CDATA[485726718FCD47AFB101C59FC1BD365E]]></AD_AUXILIARINPUT_ID>
+<!--485726718FCD47AFB101C59FC1BD365E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--485726718FCD47AFB101C59FC1BD365E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--485726718FCD47AFB101C59FC1BD365E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--485726718FCD47AFB101C59FC1BD365E-->  <AD_TAB_ID><![CDATA[1004400002]]></AD_TAB_ID>
+<!--485726718FCD47AFB101C59FC1BD365E-->  <NAME><![CDATA[ATTRIBUTESET]]></NAME>
+<!--485726718FCD47AFB101C59FC1BD365E-->  <CODE><![CDATA[@SQL=SELECT M_ATTRIBUTESET_ID FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--485726718FCD47AFB101C59FC1BD365E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--485726718FCD47AFB101C59FC1BD365E--></AD_AUXILIARINPUT>
+
 <!--48C5086F3E974459A39D5D5A882E8FAE--><AD_AUXILIARINPUT>
 <!--48C5086F3E974459A39D5D5A882E8FAE-->  <AD_AUXILIARINPUT_ID><![CDATA[48C5086F3E974459A39D5D5A882E8FAE]]></AD_AUXILIARINPUT_ID>
 <!--48C5086F3E974459A39D5D5A882E8FAE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -804,6 +1024,28 @@
 <!--48C5086F3E974459A39D5D5A882E8FAE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--48C5086F3E974459A39D5D5A882E8FAE--></AD_AUXILIARINPUT>
 
+<!--4A1A7FE8161F4322ABAF5748334CA25E--><AD_AUXILIARINPUT>
+<!--4A1A7FE8161F4322ABAF5748334CA25E-->  <AD_AUXILIARINPUT_ID><![CDATA[4A1A7FE8161F4322ABAF5748334CA25E]]></AD_AUXILIARINPUT_ID>
+<!--4A1A7FE8161F4322ABAF5748334CA25E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4A1A7FE8161F4322ABAF5748334CA25E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4A1A7FE8161F4322ABAF5748334CA25E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4A1A7FE8161F4322ABAF5748334CA25E-->  <AD_TAB_ID><![CDATA[800049]]></AD_TAB_ID>
+<!--4A1A7FE8161F4322ABAF5748334CA25E-->  <NAME><![CDATA[ATTRIBUTESET]]></NAME>
+<!--4A1A7FE8161F4322ABAF5748334CA25E-->  <CODE><![CDATA[@SQL=SELECT M_ATTRIBUTESET_ID FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--4A1A7FE8161F4322ABAF5748334CA25E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4A1A7FE8161F4322ABAF5748334CA25E--></AD_AUXILIARINPUT>
+
+<!--4B4FADE3E6AC41F0827B3120AD6C3FAA--><AD_AUXILIARINPUT>
+<!--4B4FADE3E6AC41F0827B3120AD6C3FAA-->  <AD_AUXILIARINPUT_ID><![CDATA[4B4FADE3E6AC41F0827B3120AD6C3FAA]]></AD_AUXILIARINPUT_ID>
+<!--4B4FADE3E6AC41F0827B3120AD6C3FAA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4B4FADE3E6AC41F0827B3120AD6C3FAA-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4B4FADE3E6AC41F0827B3120AD6C3FAA-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4B4FADE3E6AC41F0827B3120AD6C3FAA-->  <AD_TAB_ID><![CDATA[187]]></AD_TAB_ID>
+<!--4B4FADE3E6AC41F0827B3120AD6C3FAA-->  <NAME><![CDATA[ATTRSETVALUETYPE]]></NAME>
+<!--4B4FADE3E6AC41F0827B3120AD6C3FAA-->  <CODE><![CDATA[@SQL=SELECT ATTRSETVALUETYPE FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--4B4FADE3E6AC41F0827B3120AD6C3FAA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--4B4FADE3E6AC41F0827B3120AD6C3FAA--></AD_AUXILIARINPUT>
+
 <!--4D9613116EAA46A585AEDB75237D5140--><AD_AUXILIARINPUT>
 <!--4D9613116EAA46A585AEDB75237D5140-->  <AD_AUXILIARINPUT_ID><![CDATA[4D9613116EAA46A585AEDB75237D5140]]></AD_AUXILIARINPUT_ID>
 <!--4D9613116EAA46A585AEDB75237D5140-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -815,6 +1057,39 @@
 <!--4D9613116EAA46A585AEDB75237D5140-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--4D9613116EAA46A585AEDB75237D5140--></AD_AUXILIARINPUT>
 
+<!--51568B79156646C8966F49F82EE51CB7--><AD_AUXILIARINPUT>
+<!--51568B79156646C8966F49F82EE51CB7-->  <AD_AUXILIARINPUT_ID><![CDATA[51568B79156646C8966F49F82EE51CB7]]></AD_AUXILIARINPUT_ID>
+<!--51568B79156646C8966F49F82EE51CB7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--51568B79156646C8966F49F82EE51CB7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--51568B79156646C8966F49F82EE51CB7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--51568B79156646C8966F49F82EE51CB7-->  <AD_TAB_ID><![CDATA[270]]></AD_TAB_ID>
+<!--51568B79156646C8966F49F82EE51CB7-->  <NAME><![CDATA[ATTRSETVALUETYPE]]></NAME>
+<!--51568B79156646C8966F49F82EE51CB7-->  <CODE><![CDATA[@SQL=SELECT ATTRSETVALUETYPE FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--51568B79156646C8966F49F82EE51CB7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--51568B79156646C8966F49F82EE51CB7--></AD_AUXILIARINPUT>
+
+<!--52BCE83D589C498B9803D32847553A8D--><AD_AUXILIARINPUT>
+<!--52BCE83D589C498B9803D32847553A8D-->  <AD_AUXILIARINPUT_ID><![CDATA[52BCE83D589C498B9803D32847553A8D]]></AD_AUXILIARINPUT_ID>
+<!--52BCE83D589C498B9803D32847553A8D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--52BCE83D589C498B9803D32847553A8D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--52BCE83D589C498B9803D32847553A8D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--52BCE83D589C498B9803D32847553A8D-->  <AD_TAB_ID><![CDATA[297]]></AD_TAB_ID>
+<!--52BCE83D589C498B9803D32847553A8D-->  <NAME><![CDATA[ATTRIBUTESET]]></NAME>
+<!--52BCE83D589C498B9803D32847553A8D-->  <CODE><![CDATA[@SQL=SELECT M_ATTRIBUTESET_ID FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--52BCE83D589C498B9803D32847553A8D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--52BCE83D589C498B9803D32847553A8D--></AD_AUXILIARINPUT>
+
+<!--55C64821BB34410DBB653100E922895D--><AD_AUXILIARINPUT>
+<!--55C64821BB34410DBB653100E922895D-->  <AD_AUXILIARINPUT_ID><![CDATA[55C64821BB34410DBB653100E922895D]]></AD_AUXILIARINPUT_ID>
+<!--55C64821BB34410DBB653100E922895D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--55C64821BB34410DBB653100E922895D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--55C64821BB34410DBB653100E922895D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--55C64821BB34410DBB653100E922895D-->  <AD_TAB_ID><![CDATA[800161]]></AD_TAB_ID>
+<!--55C64821BB34410DBB653100E922895D-->  <NAME><![CDATA[ATTRSETVALUETYPE]]></NAME>
+<!--55C64821BB34410DBB653100E922895D-->  <CODE><![CDATA[@SQL=SELECT ATTRSETVALUETYPE FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--55C64821BB34410DBB653100E922895D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--55C64821BB34410DBB653100E922895D--></AD_AUXILIARINPUT>
+
 <!--56653DE396CD4C2DBF54D7FA526656D3--><AD_AUXILIARINPUT>
 <!--56653DE396CD4C2DBF54D7FA526656D3-->  <AD_AUXILIARINPUT_ID><![CDATA[56653DE396CD4C2DBF54D7FA526656D3]]></AD_AUXILIARINPUT_ID>
 <!--56653DE396CD4C2DBF54D7FA526656D3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -826,6 +1101,17 @@
 <!--56653DE396CD4C2DBF54D7FA526656D3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--56653DE396CD4C2DBF54D7FA526656D3--></AD_AUXILIARINPUT>
 
+<!--59A80385C31048AEBFED1D3B8E90DB62--><AD_AUXILIARINPUT>
+<!--59A80385C31048AEBFED1D3B8E90DB62-->  <AD_AUXILIARINPUT_ID><![CDATA[59A80385C31048AEBFED1D3B8E90DB62]]></AD_AUXILIARINPUT_ID>
+<!--59A80385C31048AEBFED1D3B8E90DB62-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--59A80385C31048AEBFED1D3B8E90DB62-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--59A80385C31048AEBFED1D3B8E90DB62-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--59A80385C31048AEBFED1D3B8E90DB62-->  <AD_TAB_ID><![CDATA[262]]></AD_TAB_ID>
+<!--59A80385C31048AEBFED1D3B8E90DB62-->  <NAME><![CDATA[ATTRIBUTESET]]></NAME>
+<!--59A80385C31048AEBFED1D3B8E90DB62-->  <CODE><![CDATA[@SQL=SELECT M_ATTRIBUTESET_ID FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--59A80385C31048AEBFED1D3B8E90DB62-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--59A80385C31048AEBFED1D3B8E90DB62--></AD_AUXILIARINPUT>
+
 <!--5BAAD3A90DD249B1ACCFAD81E03144C3--><AD_AUXILIARINPUT>
 <!--5BAAD3A90DD249B1ACCFAD81E03144C3-->  <AD_AUXILIARINPUT_ID><![CDATA[5BAAD3A90DD249B1ACCFAD81E03144C3]]></AD_AUXILIARINPUT_ID>
 <!--5BAAD3A90DD249B1ACCFAD81E03144C3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -848,6 +1134,28 @@
 <!--60A4A6C6CCCD4101A1FF072BEEB624A3-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--60A4A6C6CCCD4101A1FF072BEEB624A3--></AD_AUXILIARINPUT>
 
+<!--637CCFE37ADD45B5810D3490DF33CF2E--><AD_AUXILIARINPUT>
+<!--637CCFE37ADD45B5810D3490DF33CF2E-->  <AD_AUXILIARINPUT_ID><![CDATA[637CCFE37ADD45B5810D3490DF33CF2E]]></AD_AUXILIARINPUT_ID>
+<!--637CCFE37ADD45B5810D3490DF33CF2E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--637CCFE37ADD45B5810D3490DF33CF2E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--637CCFE37ADD45B5810D3490DF33CF2E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--637CCFE37ADD45B5810D3490DF33CF2E-->  <AD_TAB_ID><![CDATA[270]]></AD_TAB_ID>
+<!--637CCFE37ADD45B5810D3490DF33CF2E-->  <NAME><![CDATA[ATTRIBUTESET]]></NAME>
+<!--637CCFE37ADD45B5810D3490DF33CF2E-->  <CODE><![CDATA[@SQL=SELECT M_ATTRIBUTESET_ID FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--637CCFE37ADD45B5810D3490DF33CF2E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--637CCFE37ADD45B5810D3490DF33CF2E--></AD_AUXILIARINPUT>
+
+<!--64921EA8DD7E49ACA5D4023E1BCA8AB9--><AD_AUXILIARINPUT>
+<!--64921EA8DD7E49ACA5D4023E1BCA8AB9-->  <AD_AUXILIARINPUT_ID><![CDATA[64921EA8DD7E49ACA5D4023E1BCA8AB9]]></AD_AUXILIARINPUT_ID>
+<!--64921EA8DD7E49ACA5D4023E1BCA8AB9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--64921EA8DD7E49ACA5D4023E1BCA8AB9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--64921EA8DD7E49ACA5D4023E1BCA8AB9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--64921EA8DD7E49ACA5D4023E1BCA8AB9-->  <AD_TAB_ID><![CDATA[800163]]></AD_TAB_ID>
+<!--64921EA8DD7E49ACA5D4023E1BCA8AB9-->  <NAME><![CDATA[ATTRSETVALUETYPE]]></NAME>
+<!--64921EA8DD7E49ACA5D4023E1BCA8AB9-->  <CODE><![CDATA[@SQL=SELECT ATTRSETVALUETYPE FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--64921EA8DD7E49ACA5D4023E1BCA8AB9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--64921EA8DD7E49ACA5D4023E1BCA8AB9--></AD_AUXILIARINPUT>
+
 <!--69B122EAEF3B42398D27D5FF0F44AD40--><AD_AUXILIARINPUT>
 <!--69B122EAEF3B42398D27D5FF0F44AD40-->  <AD_AUXILIARINPUT_ID><![CDATA[69B122EAEF3B42398D27D5FF0F44AD40]]></AD_AUXILIARINPUT_ID>
 <!--69B122EAEF3B42398D27D5FF0F44AD40-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -870,6 +1178,17 @@
 <!--80BB79DBFEAA45CAB10F60A9DD388780-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--80BB79DBFEAA45CAB10F60A9DD388780--></AD_AUXILIARINPUT>
 
+<!--81E735D7FA45476498395FDD9AB982ED--><AD_AUXILIARINPUT>
+<!--81E735D7FA45476498395FDD9AB982ED-->  <AD_AUXILIARINPUT_ID><![CDATA[81E735D7FA45476498395FDD9AB982ED]]></AD_AUXILIARINPUT_ID>
+<!--81E735D7FA45476498395FDD9AB982ED-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--81E735D7FA45476498395FDD9AB982ED-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--81E735D7FA45476498395FDD9AB982ED-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--81E735D7FA45476498395FDD9AB982ED-->  <AD_TAB_ID><![CDATA[187]]></AD_TAB_ID>
+<!--81E735D7FA45476498395FDD9AB982ED-->  <NAME><![CDATA[UsesAlternate]]></NAME>
+<!--81E735D7FA45476498395FDD9AB982ED-->  <CODE><![CDATA[@SQL=SELECT CASE WHEN COUNT(C_TAX_ID)>0 THEN 'Y' ELSE 'N' END AS ISUSED FROM C_TAX WHERE C_TAX_ISMEMBER(@C_TAX_ID@, C_TAX_ID)=1 AND BASEAMOUNT IN ('TBA', 'TBATAX')]]></CODE>
+<!--81E735D7FA45476498395FDD9AB982ED-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--81E735D7FA45476498395FDD9AB982ED--></AD_AUXILIARINPUT>
+
 <!--87EA26BD00A04638B556D52621D46131--><AD_AUXILIARINPUT>
 <!--87EA26BD00A04638B556D52621D46131-->  <AD_AUXILIARINPUT_ID><![CDATA[87EA26BD00A04638B556D52621D46131]]></AD_AUXILIARINPUT_ID>
 <!--87EA26BD00A04638B556D52621D46131-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -903,6 +1222,28 @@
 <!--8EABF3F382CD41B5B5E459A771F0E9C5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8EABF3F382CD41B5B5E459A771F0E9C5--></AD_AUXILIARINPUT>
 
+<!--8EE1AE595E1E462BBFE568C0C27BEAC0--><AD_AUXILIARINPUT>
+<!--8EE1AE595E1E462BBFE568C0C27BEAC0-->  <AD_AUXILIARINPUT_ID><![CDATA[8EE1AE595E1E462BBFE568C0C27BEAC0]]></AD_AUXILIARINPUT_ID>
+<!--8EE1AE595E1E462BBFE568C0C27BEAC0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8EE1AE595E1E462BBFE568C0C27BEAC0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8EE1AE595E1E462BBFE568C0C27BEAC0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8EE1AE595E1E462BBFE568C0C27BEAC0-->  <AD_TAB_ID><![CDATA[258]]></AD_TAB_ID>
+<!--8EE1AE595E1E462BBFE568C0C27BEAC0-->  <NAME><![CDATA[ATTRSETVALUETYPE]]></NAME>
+<!--8EE1AE595E1E462BBFE568C0C27BEAC0-->  <CODE><![CDATA[@SQL=SELECT ATTRSETVALUETYPE FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--8EE1AE595E1E462BBFE568C0C27BEAC0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8EE1AE595E1E462BBFE568C0C27BEAC0--></AD_AUXILIARINPUT>
+
+<!--9452A73B80BF4AD8AE1BCBC04D196000--><AD_AUXILIARINPUT>
+<!--9452A73B80BF4AD8AE1BCBC04D196000-->  <AD_AUXILIARINPUT_ID><![CDATA[9452A73B80BF4AD8AE1BCBC04D196000]]></AD_AUXILIARINPUT_ID>
+<!--9452A73B80BF4AD8AE1BCBC04D196000-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9452A73B80BF4AD8AE1BCBC04D196000-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9452A73B80BF4AD8AE1BCBC04D196000-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9452A73B80BF4AD8AE1BCBC04D196000-->  <AD_TAB_ID><![CDATA[256]]></AD_TAB_ID>
+<!--9452A73B80BF4AD8AE1BCBC04D196000-->  <NAME><![CDATA[ATTRIBUTESET]]></NAME>
+<!--9452A73B80BF4AD8AE1BCBC04D196000-->  <CODE><![CDATA[@SQL=SELECT M_ATTRIBUTESET_ID FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--9452A73B80BF4AD8AE1BCBC04D196000-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9452A73B80BF4AD8AE1BCBC04D196000--></AD_AUXILIARINPUT>
+
 <!--9B8DEEF369014E938A73D766890AE941--><AD_AUXILIARINPUT>
 <!--9B8DEEF369014E938A73D766890AE941-->  <AD_AUXILIARINPUT_ID><![CDATA[9B8DEEF369014E938A73D766890AE941]]></AD_AUXILIARINPUT_ID>
 <!--9B8DEEF369014E938A73D766890AE941-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -914,6 +1255,28 @@
 <!--9B8DEEF369014E938A73D766890AE941-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--9B8DEEF369014E938A73D766890AE941--></AD_AUXILIARINPUT>
 
+<!--9D4E828236844F559BA70E02BD07DED0--><AD_AUXILIARINPUT>
+<!--9D4E828236844F559BA70E02BD07DED0-->  <AD_AUXILIARINPUT_ID><![CDATA[9D4E828236844F559BA70E02BD07DED0]]></AD_AUXILIARINPUT_ID>
+<!--9D4E828236844F559BA70E02BD07DED0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9D4E828236844F559BA70E02BD07DED0-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9D4E828236844F559BA70E02BD07DED0-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9D4E828236844F559BA70E02BD07DED0-->  <AD_TAB_ID><![CDATA[291]]></AD_TAB_ID>
+<!--9D4E828236844F559BA70E02BD07DED0-->  <NAME><![CDATA[UsesAlternate]]></NAME>
+<!--9D4E828236844F559BA70E02BD07DED0-->  <CODE><![CDATA[@SQL=SELECT CASE WHEN COUNT(C_TAX_ID)>0 THEN 'Y' ELSE 'N' END AS ISUSED FROM C_TAX WHERE C_TAX_ISMEMBER(@C_TAX_ID@, C_TAX_ID)=1 AND BASEAMOUNT IN ('TBA', 'TBATAX')]]></CODE>
+<!--9D4E828236844F559BA70E02BD07DED0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9D4E828236844F559BA70E02BD07DED0--></AD_AUXILIARINPUT>
+
+<!--9EC3A191A6D84253A26520E4849B73EF--><AD_AUXILIARINPUT>
+<!--9EC3A191A6D84253A26520E4849B73EF-->  <AD_AUXILIARINPUT_ID><![CDATA[9EC3A191A6D84253A26520E4849B73EF]]></AD_AUXILIARINPUT_ID>
+<!--9EC3A191A6D84253A26520E4849B73EF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9EC3A191A6D84253A26520E4849B73EF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9EC3A191A6D84253A26520E4849B73EF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9EC3A191A6D84253A26520E4849B73EF-->  <AD_TAB_ID><![CDATA[179]]></AD_TAB_ID>
+<!--9EC3A191A6D84253A26520E4849B73EF-->  <NAME><![CDATA[ATTRIBUTESET]]></NAME>
+<!--9EC3A191A6D84253A26520E4849B73EF-->  <CODE><![CDATA[@SQL=SELECT M_ATTRIBUTESET_ID FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--9EC3A191A6D84253A26520E4849B73EF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9EC3A191A6D84253A26520E4849B73EF--></AD_AUXILIARINPUT>
+
 <!--A0BD1D62278F4068AEA07E1CBF0D840E--><AD_AUXILIARINPUT>
 <!--A0BD1D62278F4068AEA07E1CBF0D840E-->  <AD_AUXILIARINPUT_ID><![CDATA[A0BD1D62278F4068AEA07E1CBF0D840E]]></AD_AUXILIARINPUT_ID>
 <!--A0BD1D62278F4068AEA07E1CBF0D840E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -925,6 +1288,17 @@
 <!--A0BD1D62278F4068AEA07E1CBF0D840E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--A0BD1D62278F4068AEA07E1CBF0D840E--></AD_AUXILIARINPUT>
 
+<!--A241041B0E6E402EB8D22417AFA623B9--><AD_AUXILIARINPUT>
+<!--A241041B0E6E402EB8D22417AFA623B9-->  <AD_AUXILIARINPUT_ID><![CDATA[A241041B0E6E402EB8D22417AFA623B9]]></AD_AUXILIARINPUT_ID>
+<!--A241041B0E6E402EB8D22417AFA623B9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A241041B0E6E402EB8D22417AFA623B9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A241041B0E6E402EB8D22417AFA623B9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A241041B0E6E402EB8D22417AFA623B9-->  <AD_TAB_ID><![CDATA[179]]></AD_TAB_ID>
+<!--A241041B0E6E402EB8D22417AFA623B9-->  <NAME><![CDATA[ATTRSETVALUETYPE]]></NAME>
+<!--A241041B0E6E402EB8D22417AFA623B9-->  <CODE><![CDATA[@SQL=SELECT ATTRSETVALUETYPE FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--A241041B0E6E402EB8D22417AFA623B9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--A241041B0E6E402EB8D22417AFA623B9--></AD_AUXILIARINPUT>
+
 <!--A34C13AD479544949B45481A3FD0E578--><AD_AUXILIARINPUT>
 <!--A34C13AD479544949B45481A3FD0E578-->  <AD_AUXILIARINPUT_ID><![CDATA[A34C13AD479544949B45481A3FD0E578]]></AD_AUXILIARINPUT_ID>
 <!--A34C13AD479544949B45481A3FD0E578-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -980,6 +1354,39 @@
 <!--A937C82DEBEF4A5A998C89372C02915A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--A937C82DEBEF4A5A998C89372C02915A--></AD_AUXILIARINPUT>
 
+<!--ABF388A018954C4BAF851DCA371167E5--><AD_AUXILIARINPUT>
+<!--ABF388A018954C4BAF851DCA371167E5-->  <AD_AUXILIARINPUT_ID><![CDATA[ABF388A018954C4BAF851DCA371167E5]]></AD_AUXILIARINPUT_ID>
+<!--ABF388A018954C4BAF851DCA371167E5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ABF388A018954C4BAF851DCA371167E5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ABF388A018954C4BAF851DCA371167E5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ABF388A018954C4BAF851DCA371167E5-->  <AD_TAB_ID><![CDATA[289]]></AD_TAB_ID>
+<!--ABF388A018954C4BAF851DCA371167E5-->  <NAME><![CDATA[ATTRIBUTESET]]></NAME>
+<!--ABF388A018954C4BAF851DCA371167E5-->  <CODE><![CDATA[@SQL=SELECT M_ATTRIBUTESET_ID FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--ABF388A018954C4BAF851DCA371167E5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ABF388A018954C4BAF851DCA371167E5--></AD_AUXILIARINPUT>
+
+<!--ACA00D8708854C3E80E50FE99724C4E8--><AD_AUXILIARINPUT>
+<!--ACA00D8708854C3E80E50FE99724C4E8-->  <AD_AUXILIARINPUT_ID><![CDATA[ACA00D8708854C3E80E50FE99724C4E8]]></AD_AUXILIARINPUT_ID>
+<!--ACA00D8708854C3E80E50FE99724C4E8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ACA00D8708854C3E80E50FE99724C4E8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ACA00D8708854C3E80E50FE99724C4E8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ACA00D8708854C3E80E50FE99724C4E8-->  <AD_TAB_ID><![CDATA[1004400002]]></AD_TAB_ID>
+<!--ACA00D8708854C3E80E50FE99724C4E8-->  <NAME><![CDATA[ATTRSETVALUETYPE]]></NAME>
+<!--ACA00D8708854C3E80E50FE99724C4E8-->  <CODE><![CDATA[@SQL=SELECT ATTRSETVALUETYPE FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--ACA00D8708854C3E80E50FE99724C4E8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ACA00D8708854C3E80E50FE99724C4E8--></AD_AUXILIARINPUT>
+
+<!--B1CA1E7F4D9547F7B0317146C1742F88--><AD_AUXILIARINPUT>
+<!--B1CA1E7F4D9547F7B0317146C1742F88-->  <AD_AUXILIARINPUT_ID><![CDATA[B1CA1E7F4D9547F7B0317146C1742F88]]></AD_AUXILIARINPUT_ID>
+<!--B1CA1E7F4D9547F7B0317146C1742F88-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B1CA1E7F4D9547F7B0317146C1742F88-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B1CA1E7F4D9547F7B0317146C1742F88-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B1CA1E7F4D9547F7B0317146C1742F88-->  <AD_TAB_ID><![CDATA[297]]></AD_TAB_ID>
+<!--B1CA1E7F4D9547F7B0317146C1742F88-->  <NAME><![CDATA[ATTRSETVALUETYPE]]></NAME>
+<!--B1CA1E7F4D9547F7B0317146C1742F88-->  <CODE><![CDATA[@SQL=SELECT ATTRSETVALUETYPE FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--B1CA1E7F4D9547F7B0317146C1742F88-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B1CA1E7F4D9547F7B0317146C1742F88--></AD_AUXILIARINPUT>
+
 <!--B4A64414F61A4901A24A5B968FEE309A--><AD_AUXILIARINPUT>
 <!--B4A64414F61A4901A24A5B968FEE309A-->  <AD_AUXILIARINPUT_ID><![CDATA[B4A64414F61A4901A24A5B968FEE309A]]></AD_AUXILIARINPUT_ID>
 <!--B4A64414F61A4901A24A5B968FEE309A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -991,6 +1398,28 @@
 <!--B4A64414F61A4901A24A5B968FEE309A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--B4A64414F61A4901A24A5B968FEE309A--></AD_AUXILIARINPUT>
 
+<!--B6286BA3CA2C46399621277A75BA7569--><AD_AUXILIARINPUT>
+<!--B6286BA3CA2C46399621277A75BA7569-->  <AD_AUXILIARINPUT_ID><![CDATA[B6286BA3CA2C46399621277A75BA7569]]></AD_AUXILIARINPUT_ID>
+<!--B6286BA3CA2C46399621277A75BA7569-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B6286BA3CA2C46399621277A75BA7569-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B6286BA3CA2C46399621277A75BA7569-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B6286BA3CA2C46399621277A75BA7569-->  <AD_TAB_ID><![CDATA[800203]]></AD_TAB_ID>
+<!--B6286BA3CA2C46399621277A75BA7569-->  <NAME><![CDATA[ATTRIBUTESET]]></NAME>
+<!--B6286BA3CA2C46399621277A75BA7569-->  <CODE><![CDATA[@SQL=SELECT M_ATTRIBUTESET_ID FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--B6286BA3CA2C46399621277A75BA7569-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--B6286BA3CA2C46399621277A75BA7569--></AD_AUXILIARINPUT>
+
+<!--BB7571E667114EB3A5FCB3425B6007F4--><AD_AUXILIARINPUT>
+<!--BB7571E667114EB3A5FCB3425B6007F4-->  <AD_AUXILIARINPUT_ID><![CDATA[BB7571E667114EB3A5FCB3425B6007F4]]></AD_AUXILIARINPUT_ID>
+<!--BB7571E667114EB3A5FCB3425B6007F4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--BB7571E667114EB3A5FCB3425B6007F4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--BB7571E667114EB3A5FCB3425B6007F4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--BB7571E667114EB3A5FCB3425B6007F4-->  <AD_TAB_ID><![CDATA[289]]></AD_TAB_ID>
+<!--BB7571E667114EB3A5FCB3425B6007F4-->  <NAME><![CDATA[ATTRSETVALUETYPE]]></NAME>
+<!--BB7571E667114EB3A5FCB3425B6007F4-->  <CODE><![CDATA[@SQL=SELECT ATTRSETVALUETYPE FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--BB7571E667114EB3A5FCB3425B6007F4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--BB7571E667114EB3A5FCB3425B6007F4--></AD_AUXILIARINPUT>
+
 <!--CA8005C0F23945E89C4AD3C7899E5E89--><AD_AUXILIARINPUT>
 <!--CA8005C0F23945E89C4AD3C7899E5E89-->  <AD_AUXILIARINPUT_ID><![CDATA[CA8005C0F23945E89C4AD3C7899E5E89]]></AD_AUXILIARINPUT_ID>
 <!--CA8005C0F23945E89C4AD3C7899E5E89-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1013,6 +1442,61 @@
 <!--CD8A66ED2EDB465B8772C87D936D6831-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--CD8A66ED2EDB465B8772C87D936D6831--></AD_AUXILIARINPUT>
 
+<!--CDA655BBB96A4C4C8BC12AF53DA3E50B--><AD_AUXILIARINPUT>
+<!--CDA655BBB96A4C4C8BC12AF53DA3E50B-->  <AD_AUXILIARINPUT_ID><![CDATA[CDA655BBB96A4C4C8BC12AF53DA3E50B]]></AD_AUXILIARINPUT_ID>
+<!--CDA655BBB96A4C4C8BC12AF53DA3E50B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CDA655BBB96A4C4C8BC12AF53DA3E50B-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CDA655BBB96A4C4C8BC12AF53DA3E50B-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CDA655BBB96A4C4C8BC12AF53DA3E50B-->  <AD_TAB_ID><![CDATA[384]]></AD_TAB_ID>
+<!--CDA655BBB96A4C4C8BC12AF53DA3E50B-->  <NAME><![CDATA[ATTRIBUTESET]]></NAME>
+<!--CDA655BBB96A4C4C8BC12AF53DA3E50B-->  <CODE><![CDATA[@SQL=SELECT M_ATTRIBUTESET_ID FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--CDA655BBB96A4C4C8BC12AF53DA3E50B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--CDA655BBB96A4C4C8BC12AF53DA3E50B--></AD_AUXILIARINPUT>
+
+<!--D396FE4E1B664890ADC02CECCB56D645--><AD_AUXILIARINPUT>
+<!--D396FE4E1B664890ADC02CECCB56D645-->  <AD_AUXILIARINPUT_ID><![CDATA[D396FE4E1B664890ADC02CECCB56D645]]></AD_AUXILIARINPUT_ID>
+<!--D396FE4E1B664890ADC02CECCB56D645-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D396FE4E1B664890ADC02CECCB56D645-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D396FE4E1B664890ADC02CECCB56D645-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D396FE4E1B664890ADC02CECCB56D645-->  <AD_TAB_ID><![CDATA[321]]></AD_TAB_ID>
+<!--D396FE4E1B664890ADC02CECCB56D645-->  <NAME><![CDATA[ATTRIBUTESET]]></NAME>
+<!--D396FE4E1B664890ADC02CECCB56D645-->  <CODE><![CDATA[@SQL=SELECT M_ATTRIBUTESET_ID FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--D396FE4E1B664890ADC02CECCB56D645-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D396FE4E1B664890ADC02CECCB56D645--></AD_AUXILIARINPUT>
+
+<!--DE561A006F4247DFA68E13C955437EF5--><AD_AUXILIARINPUT>
+<!--DE561A006F4247DFA68E13C955437EF5-->  <AD_AUXILIARINPUT_ID><![CDATA[DE561A006F4247DFA68E13C955437EF5]]></AD_AUXILIARINPUT_ID>
+<!--DE561A006F4247DFA68E13C955437EF5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DE561A006F4247DFA68E13C955437EF5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DE561A006F4247DFA68E13C955437EF5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DE561A006F4247DFA68E13C955437EF5-->  <AD_TAB_ID><![CDATA[258]]></AD_TAB_ID>
+<!--DE561A006F4247DFA68E13C955437EF5-->  <NAME><![CDATA[ATTRIBUTESET]]></NAME>
+<!--DE561A006F4247DFA68E13C955437EF5-->  <CODE><![CDATA[@SQL=SELECT M_ATTRIBUTESET_ID FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--DE561A006F4247DFA68E13C955437EF5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--DE561A006F4247DFA68E13C955437EF5--></AD_AUXILIARINPUT>
+
+<!--DED3B62543C447A3865DBC5EDB43FAA4--><AD_AUXILIARINPUT>
+<!--DED3B62543C447A3865DBC5EDB43FAA4-->  <AD_AUXILIARINPUT_ID><![CDATA[DED3B62543C447A3865DBC5EDB43FAA4]]></AD_AUXILIARINPUT_ID>
+<!--DED3B62543C447A3865DBC5EDB43FAA4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--DED3B62543C447A3865DBC5EDB43FAA4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--DED3B62543C447A3865DBC5EDB43FAA4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--DED3B62543C447A3865DBC5EDB43FAA4-->  <AD_TAB_ID><![CDATA[800163]]></AD_TAB_ID>
+<!--DED3B62543C447A3865DBC5EDB43FAA4-->  <NAME><![CDATA[ATTRIBUTESET]]></NAME>
+<!--DED3B62543C447A3865DBC5EDB43FAA4-->  <CODE><![CDATA[@SQL=SELECT M_ATTRIBUTESET_ID FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--DED3B62543C447A3865DBC5EDB43FAA4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--DED3B62543C447A3865DBC5EDB43FAA4--></AD_AUXILIARINPUT>
+
+<!--E1DE8CDF77324033B2C21CE99DCB7A59--><AD_AUXILIARINPUT>
+<!--E1DE8CDF77324033B2C21CE99DCB7A59-->  <AD_AUXILIARINPUT_ID><![CDATA[E1DE8CDF77324033B2C21CE99DCB7A59]]></AD_AUXILIARINPUT_ID>
+<!--E1DE8CDF77324033B2C21CE99DCB7A59-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E1DE8CDF77324033B2C21CE99DCB7A59-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E1DE8CDF77324033B2C21CE99DCB7A59-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E1DE8CDF77324033B2C21CE99DCB7A59-->  <AD_TAB_ID><![CDATA[262]]></AD_TAB_ID>
+<!--E1DE8CDF77324033B2C21CE99DCB7A59-->  <NAME><![CDATA[ATTRSETVALUETYPE]]></NAME>
+<!--E1DE8CDF77324033B2C21CE99DCB7A59-->  <CODE><![CDATA[@SQL=SELECT ATTRSETVALUETYPE FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--E1DE8CDF77324033B2C21CE99DCB7A59-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E1DE8CDF77324033B2C21CE99DCB7A59--></AD_AUXILIARINPUT>
+
 <!--F5D52BE5281A4969946A5332D641DE93--><AD_AUXILIARINPUT>
 <!--F5D52BE5281A4969946A5332D641DE93-->  <AD_AUXILIARINPUT_ID><![CDATA[F5D52BE5281A4969946A5332D641DE93]]></AD_AUXILIARINPUT_ID>
 <!--F5D52BE5281A4969946A5332D641DE93-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1024,6 +1508,17 @@
 <!--F5D52BE5281A4969946A5332D641DE93-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--F5D52BE5281A4969946A5332D641DE93--></AD_AUXILIARINPUT>
 
+<!--F9791769E32D4523B39311E64E38C55F--><AD_AUXILIARINPUT>
+<!--F9791769E32D4523B39311E64E38C55F-->  <AD_AUXILIARINPUT_ID><![CDATA[F9791769E32D4523B39311E64E38C55F]]></AD_AUXILIARINPUT_ID>
+<!--F9791769E32D4523B39311E64E38C55F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F9791769E32D4523B39311E64E38C55F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F9791769E32D4523B39311E64E38C55F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F9791769E32D4523B39311E64E38C55F-->  <AD_TAB_ID><![CDATA[800161]]></AD_TAB_ID>
+<!--F9791769E32D4523B39311E64E38C55F-->  <NAME><![CDATA[ATTRIBUTESET]]></NAME>
+<!--F9791769E32D4523B39311E64E38C55F-->  <CODE><![CDATA[@SQL=SELECT M_ATTRIBUTESET_ID FROM M_PRODUCT WHERE M_PRODUCT_ID=@M_Product_ID@]]></CODE>
+<!--F9791769E32D4523B39311E64E38C55F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F9791769E32D4523B39311E64E38C55F--></AD_AUXILIARINPUT>
+
 <!--FB4C3FF138DD4B2AB582E7BFBEF5CA7F--><AD_AUXILIARINPUT>
 <!--FB4C3FF138DD4B2AB582E7BFBEF5CA7F-->  <AD_AUXILIARINPUT_ID><![CDATA[FB4C3FF138DD4B2AB582E7BFBEF5CA7F]]></AD_AUXILIARINPUT_ID>
 <!--FB4C3FF138DD4B2AB582E7BFBEF5CA7F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_CALLOUT.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/sourcedata/AD_CALLOUT.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -748,6 +748,15 @@
 <!--0F4F8BFFABAC45AB8D6BEC89C0D20127-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--0F4F8BFFABAC45AB8D6BEC89C0D20127--></AD_CALLOUT>
 
+<!--13A9833CA5D84AEBB8CBCBB05BF5DD33--><AD_CALLOUT>
+<!--13A9833CA5D84AEBB8CBCBB05BF5DD33-->  <AD_CALLOUT_ID><![CDATA[13A9833CA5D84AEBB8CBCBB05BF5DD33]]></AD_CALLOUT_ID>
+<!--13A9833CA5D84AEBB8CBCBB05BF5DD33-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--13A9833CA5D84AEBB8CBCBB05BF5DD33-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--13A9833CA5D84AEBB8CBCBB05BF5DD33-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--13A9833CA5D84AEBB8CBCBB05BF5DD33-->  <NAME><![CDATA[SL_PC_Case_Product]]></NAME>
+<!--13A9833CA5D84AEBB8CBCBB05BF5DD33-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--13A9833CA5D84AEBB8CBCBB05BF5DD33--></AD_CALLOUT>
+
 <!--20FE1F365075451E95AE901650183CC7--><AD_CALLOUT>
 <!--20FE1F365075451E95AE901650183CC7-->  <AD_CALLOUT_ID><![CDATA[20FE1F365075451E95AE901650183CC7]]></AD_CALLOUT_ID>
 <!--20FE1F365075451E95AE901650183CC7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -776,6 +785,16 @@
 <!--52415CD3A31640B8906555725299FED7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--52415CD3A31640B8906555725299FED7--></AD_CALLOUT>
 
+<!--6C7A1DC738044D2880CF60856508FC81--><AD_CALLOUT>
+<!--6C7A1DC738044D2880CF60856508FC81-->  <AD_CALLOUT_ID><![CDATA[6C7A1DC738044D2880CF60856508FC81]]></AD_CALLOUT_ID>
+<!--6C7A1DC738044D2880CF60856508FC81-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6C7A1DC738044D2880CF60856508FC81-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6C7A1DC738044D2880CF60856508FC81-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6C7A1DC738044D2880CF60856508FC81-->  <NAME><![CDATA[SE_Calendar_For_Org]]></NAME>
+<!--6C7A1DC738044D2880CF60856508FC81-->  <DESCRIPTION><![CDATA[List of calendar for chosen organization]]></DESCRIPTION>
+<!--6C7A1DC738044D2880CF60856508FC81-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6C7A1DC738044D2880CF60856508FC81--></AD_CALLOUT>
+
 <!--775917C69E0A45FFB22AEDD232C9D464--><AD_CALLOUT>
 <!--775917C69E0A45FFB22AEDD232C9D464-->  <AD_CALLOUT_ID><![CDATA[775917C69E0A45FFB22AEDD232C9D464]]></AD_CALLOUT_ID>
 <!--775917C69E0A45FFB22AEDD232C9D464-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -794,6 +813,16 @@
 <!--80DD3736B9EE42C5A0A793009F35C55A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--80DD3736B9EE42C5A0A793009F35C55A--></AD_CALLOUT>
 
+<!--8D5A298D3BEF4E14BB9B9C2A7D0CFA18--><AD_CALLOUT>
+<!--8D5A298D3BEF4E14BB9B9C2A7D0CFA18-->  <AD_CALLOUT_ID><![CDATA[8D5A298D3BEF4E14BB9B9C2A7D0CFA18]]></AD_CALLOUT_ID>
+<!--8D5A298D3BEF4E14BB9B9C2A7D0CFA18-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8D5A298D3BEF4E14BB9B9C2A7D0CFA18-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8D5A298D3BEF4E14BB9B9C2A7D0CFA18-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8D5A298D3BEF4E14BB9B9C2A7D0CFA18-->  <NAME><![CDATA[SE_Years_For_Calendar]]></NAME>
+<!--8D5A298D3BEF4E14BB9B9C2A7D0CFA18-->  <DESCRIPTION><![CDATA[List of years for chosen calendar]]></DESCRIPTION>
+<!--8D5A298D3BEF4E14BB9B9C2A7D0CFA18-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8D5A298D3BEF4E14BB9B9C2A7D0CFA18--></AD_CALLOUT>
+
 <!--C252244131684EE28DB86DDFD278DB85--><AD_CALLOUT>
 <!--C252244131684EE28DB86DDFD278DB85-->  <AD_CALLOUT_ID><![CDATA[C252244131684EE28DB86DDFD278DB85]]></AD_CALLOUT_ID>
 <!--C252244131684EE28DB86DDFD278DB85-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -822,6 +851,15 @@
 <!--D58885C504EC46ED8B77C4DEC1F59CA1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--D58885C504EC46ED8B77C4DEC1F59CA1--></AD_CALLOUT>
 
+<!--E533C48595374A57885EF3761173F235--><AD_CALLOUT>
+<!--E533C48595374A57885EF3761173F235-->  <AD_CALLOUT_ID><![CDATA[E533C48595374A57885EF3761173F235]]></AD_CALLOUT_ID>
+<!--E533C48595374A57885EF3761173F235-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E533C48595374A57885EF3761173F235-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E533C48595374A57885EF3761173F235-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E533C48595374A57885EF3761173F235-->  <NAME><![CDATA[SL_Organization_Info]]></NAME>
+<!--E533C48595374A57885EF3761173F235-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E533C48595374A57885EF3761173F235--></AD_CALLOUT>
+
 <!--E8DC21736F8749E9A48551FD3E4D4EB0--><AD_CALLOUT>
 <!--E8DC21736F8749E9A48551FD3E4D4EB0-->  <AD_CALLOUT_ID><![CDATA[E8DC21736F8749E9A48551FD3E4D4EB0]]></AD_CALLOUT_ID>
 <!--E8DC21736F8749E9A48551FD3E4D4EB0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -840,4 +878,13 @@
 <!--EA987600B6274A139FC6E72169DBC2D2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--EA987600B6274A139FC6E72169DBC2D2--></AD_CALLOUT>
 
+<!--F6E343E77DA249559AEF8651D595E880--><AD_CALLOUT>
+<!--F6E343E77DA249559AEF8651D595E880-->  <AD_CALLOUT_ID><![CDATA[F6E343E77DA249559AEF8651D595E880]]></AD_CALLOUT_ID>
+<!--F6E343E77DA249559AEF8651D595E880-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F6E343E77DA249559AEF8651D595E880-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F6E343E77DA249559AEF8651D595E880-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F6E343E77DA249559AEF8651D595E880-->  <NAME><![CDATA[SL_Asset_Product]]></NAME>
+<!--F6E343E77DA249559AEF8651D595E880-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F6E343E77DA249559AEF8651D595E880--></AD_CALLOUT>
+
 </data>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -581,7 +581,7 @@
 <!--126-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--126-->  <NAME><![CDATA[Identifier]]></NAME>
 <!--126-->  <DESCRIPTION><![CDATA[This column is part of the record identifier]]></DESCRIPTION>
-<!--126-->  <HELP><![CDATA[The Identifier checkbox indicates that this column is part of the identifier or key for this table.]]></HELP>
+<!--126-->  <HELP><![CDATA[The Identifier checkbox indicates that this column is part of the identifier or key for this table]]></HELP>
 <!--126-->  <COLUMNNAME><![CDATA[IsIdentifier]]></COLUMNNAME>
 <!--126-->  <AD_TABLE_ID><![CDATA[101]]></AD_TABLE_ID>
 <!--126-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
@@ -28324,6 +28324,7 @@
 <!--2045-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--2045-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--2045-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--2045-->  <AD_CALLOUT_ID><![CDATA[E533C48595374A57885EF3761173F235]]></AD_CALLOUT_ID>
 <!--2045-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--2045-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2045-->  <POSITION><![CDATA[8]]></POSITION>
@@ -31271,7 +31272,7 @@
 <!--2200-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2200-->  <NAME><![CDATA[Summed Line Amount]]></NAME>
 <!--2200-->  <DESCRIPTION><![CDATA[The final sum of all line totals made to a specified document or transaction (not including taxes).]]></DESCRIPTION>
-<!--2200-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency.]]></HELP>
+<!--2200-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency]]></HELP>
 <!--2200-->  <COLUMNNAME><![CDATA[TotalLines]]></COLUMNNAME>
 <!--2200-->  <AD_TABLE_ID><![CDATA[259]]></AD_TABLE_ID>
 <!--2200-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
@@ -31284,7 +31285,7 @@
 <!--2200-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--2200-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--2200-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--2200-->  <AD_ELEMENT_ID><![CDATA[F3BF680089754BAC858ECFF2D5D0F232]]></AD_ELEMENT_ID>
+<!--2200-->  <AD_ELEMENT_ID><![CDATA[598]]></AD_ELEMENT_ID>
 <!--2200-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--2200-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--2200-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -31315,7 +31316,7 @@
 <!--2201-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--2201-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--2201-->  <ISSELECTIONCOLUMN><![CDATA[Y]]></ISSELECTIONCOLUMN>
-<!--2201-->  <AD_ELEMENT_ID><![CDATA[E46619B0FD944516A50C9B18E0E4E727]]></AD_ELEMENT_ID>
+<!--2201-->  <AD_ELEMENT_ID><![CDATA[316]]></AD_ELEMENT_ID>
 <!--2201-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--2201-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--2201-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -31880,7 +31881,7 @@
 <!--2221-->  <CALLOUT><![CDATA[SL_Order_Product]]></CALLOUT>
 <!--2221-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
 <!--2221-->  <AD_ELEMENT_ID><![CDATA[454]]></AD_ELEMENT_ID>
-<!--2221-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--2221-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--2221-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--2221-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--2221-->  <AD_CALLOUT_ID><![CDATA[143]]></AD_CALLOUT_ID>
@@ -32162,7 +32163,7 @@
 <!--2231-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--2231-->  <CALLOUT><![CDATA[SL_Order_Amt]]></CALLOUT>
 <!--2231-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--2231-->  <AD_ELEMENT_ID><![CDATA[3C8963BA09134DA48BF3B762216A6FFB]]></AD_ELEMENT_ID>
+<!--2231-->  <AD_ELEMENT_ID><![CDATA[520]]></AD_ELEMENT_ID>
 <!--2231-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--2231-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--2231-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -32196,7 +32197,7 @@
 <!--2232-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--2232-->  <CALLOUT><![CDATA[SL_Order_Amt]]></CALLOUT>
 <!--2232-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--2232-->  <AD_ELEMENT_ID><![CDATA[9F815073C39E4506A1C74BB3667C6B57]]></AD_ELEMENT_ID>
+<!--2232-->  <AD_ELEMENT_ID><![CDATA[519]]></AD_ELEMENT_ID>
 <!--2232-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--2232-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--2232-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -41427,7 +41428,7 @@
 <!--2813-->  <COLUMNNAME><![CDATA[ProcedureName]]></COLUMNNAME>
 <!--2813-->  <AD_TABLE_ID><![CDATA[284]]></AD_TABLE_ID>
 <!--2813-->  <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
-<!--2813-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--2813-->  <FIELDLENGTH><![CDATA[30]]></FIELDLENGTH>
 <!--2813-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--2813-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--2813-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
@@ -53580,7 +53581,7 @@
 <!--3506-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3506-->  <NAME><![CDATA[Summed Line Amount]]></NAME>
 <!--3506-->  <DESCRIPTION><![CDATA[The final sum of all line totals made to a specified document or transaction (not including taxes).]]></DESCRIPTION>
-<!--3506-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency.]]></HELP>
+<!--3506-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency]]></HELP>
 <!--3506-->  <COLUMNNAME><![CDATA[TotalLines]]></COLUMNNAME>
 <!--3506-->  <AD_TABLE_ID><![CDATA[318]]></AD_TABLE_ID>
 <!--3506-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
@@ -53593,7 +53594,7 @@
 <!--3506-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--3506-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--3506-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--3506-->  <AD_ELEMENT_ID><![CDATA[F3BF680089754BAC858ECFF2D5D0F232]]></AD_ELEMENT_ID>
+<!--3506-->  <AD_ELEMENT_ID><![CDATA[598]]></AD_ELEMENT_ID>
 <!--3506-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--3506-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--3506-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -53624,7 +53625,7 @@
 <!--3507-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--3507-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--3507-->  <ISSELECTIONCOLUMN><![CDATA[Y]]></ISSELECTIONCOLUMN>
-<!--3507-->  <AD_ELEMENT_ID><![CDATA[E46619B0FD944516A50C9B18E0E4E727]]></AD_ELEMENT_ID>
+<!--3507-->  <AD_ELEMENT_ID><![CDATA[316]]></AD_ELEMENT_ID>
 <!--3507-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--3507-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--3507-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -55380,7 +55381,7 @@
 <!--3565-->  <CALLOUT><![CDATA[SL_Inventory_Product]]></CALLOUT>
 <!--3565-->  <ISSELECTIONCOLUMN><![CDATA[Y]]></ISSELECTIONCOLUMN>
 <!--3565-->  <AD_ELEMENT_ID><![CDATA[454]]></AD_ELEMENT_ID>
-<!--3565-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--3565-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--3565-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--3565-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--3565-->  <AD_CALLOUT_ID><![CDATA[126]]></AD_CALLOUT_ID>
@@ -56255,7 +56256,7 @@
 <!--3593-->  <CALLOUT><![CDATA[SL_Movement_Product]]></CALLOUT>
 <!--3593-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
 <!--3593-->  <AD_ELEMENT_ID><![CDATA[454]]></AD_ELEMENT_ID>
-<!--3593-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--3593-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--3593-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--3593-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--3593-->  <AD_CALLOUT_ID><![CDATA[137]]></AD_CALLOUT_ID>
@@ -57027,7 +57028,7 @@
 <!--3620-->  <CALLOUT><![CDATA[SL_Production_Product]]></CALLOUT>
 <!--3620-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
 <!--3620-->  <AD_ELEMENT_ID><![CDATA[454]]></AD_ELEMENT_ID>
-<!--3620-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--3620-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--3620-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--3620-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--3620-->  <AD_CALLOUT_ID><![CDATA[148]]></AD_CALLOUT_ID>
@@ -57911,11 +57912,11 @@
 <!--3723-->  <AD_TABLE_ID><![CDATA[260]]></AD_TABLE_ID>
 <!--3723-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
 <!--3723-->  <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
+<!--3723-->  <DEFAULTVALUE><![CDATA[@Iseditlinenetamt@='N']]></DEFAULTVALUE>
 <!--3723-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--3723-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--3723-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--3723-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--3723-->  <READONLYLOGIC><![CDATA[@Iseditlinenetamt@='N']]></READONLYLOGIC>
+<!--3723-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
 <!--3723-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
 <!--3723-->  <SEQNO><![CDATA[3]]></SEQNO>
 <!--3723-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -59489,7 +59490,7 @@
 <!--3815-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--3815-->  <ISSELECTIONCOLUMN><![CDATA[Y]]></ISSELECTIONCOLUMN>
 <!--3815-->  <AD_ELEMENT_ID><![CDATA[459]]></AD_ELEMENT_ID>
-<!--3815-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--3815-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--3815-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--3815-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--3815-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
@@ -60053,7 +60054,7 @@
 <!--3840-->  <CALLOUT><![CDATA[SL_Invoice_Product]]></CALLOUT>
 <!--3840-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
 <!--3840-->  <AD_ELEMENT_ID><![CDATA[454]]></AD_ELEMENT_ID>
-<!--3840-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--3840-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--3840-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--3840-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--3840-->  <AD_CALLOUT_ID><![CDATA[132]]></AD_CALLOUT_ID>
@@ -60119,7 +60120,7 @@
 <!--3842-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--3842-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--3842-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--3842-->  <AD_ELEMENT_ID><![CDATA[3C8963BA09134DA48BF3B762216A6FFB]]></AD_ELEMENT_ID>
+<!--3842-->  <AD_ELEMENT_ID><![CDATA[520]]></AD_ELEMENT_ID>
 <!--3842-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--3842-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--3842-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -60151,7 +60152,7 @@
 <!--3843-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--3843-->  <CALLOUT><![CDATA[SL_Invoice_Amt]]></CALLOUT>
 <!--3843-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--3843-->  <AD_ELEMENT_ID><![CDATA[9F815073C39E4506A1C74BB3667C6B57]]></AD_ELEMENT_ID>
+<!--3843-->  <AD_ELEMENT_ID><![CDATA[519]]></AD_ELEMENT_ID>
 <!--3843-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--3843-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--3843-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -60177,7 +60178,7 @@
 <!--3844-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--3844-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--3844-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--3844-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--3844-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
 <!--3844-->  <READONLYLOGIC><![CDATA[@Iseditlinenetamt@='N']]></READONLYLOGIC>
 <!--3844-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
 <!--3844-->  <SEQNO><![CDATA[3]]></SEQNO>
@@ -96544,7 +96545,8 @@
 <!--6244-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--6244-->  <NAME><![CDATA[Filter Column]]></NAME>
 <!--6244-->  <DESCRIPTION><![CDATA[Is this column used for finding rows in windows]]></DESCRIPTION>
-<!--6244-->  <HELP><![CDATA[If selected, the column is listed in the first find window tab and in the selection part of the window]]></HELP>
+<!--6244-->  <HELP><![CDATA[
+If selected, this column will be used in the Search Window as an available filter criteria.]]></HELP>
 <!--6244-->  <COLUMNNAME><![CDATA[IsSelectionColumn]]></COLUMNNAME>
 <!--6244-->  <AD_TABLE_ID><![CDATA[101]]></AD_TABLE_ID>
 <!--6244-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
@@ -119887,9 +119889,10 @@
 <!--8047-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--8047-->  <ISSELECTIONCOLUMN><![CDATA[Y]]></ISSELECTIONCOLUMN>
 <!--8047-->  <AD_ELEMENT_ID><![CDATA[454]]></AD_ELEMENT_ID>
-<!--8047-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--8047-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--8047-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--8047-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--8047-->  <AD_CALLOUT_ID><![CDATA[F6E343E77DA249559AEF8651D595E880]]></AD_CALLOUT_ID>
 <!--8047-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--8047-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8047-->  <POSITION><![CDATA[14]]></POSITION>
@@ -122711,7 +122714,7 @@
 <!--8417-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--8417-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
 <!--8417-->  <AD_ELEMENT_ID><![CDATA[2017]]></AD_ELEMENT_ID>
-<!--8417-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--8417-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--8417-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--8417-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--8417-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
@@ -122727,8 +122730,7 @@
 <!--8418-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8418-->  <NAME><![CDATA[Attribute Set Value]]></NAME>
 <!--8418-->  <DESCRIPTION><![CDATA[An attribute associated with a product as part of an attribute set.]]></DESCRIPTION>
-<!--8418-->  <HELP><![CDATA[
-The values of the actual Product Attributes]]></HELP>
+<!--8418-->  <HELP><![CDATA[The values of the actual Product Attributes]]></HELP>
 <!--8418-->  <COLUMNNAME><![CDATA[M_AttributeSetInstance_ID]]></COLUMNNAME>
 <!--8418-->  <AD_TABLE_ID><![CDATA[208]]></AD_TABLE_ID>
 <!--8418-->  <AD_REFERENCE_ID><![CDATA[35]]></AD_REFERENCE_ID>
@@ -122743,7 +122745,7 @@
 <!--8418-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--8418-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
 <!--8418-->  <AD_ELEMENT_ID><![CDATA[2019]]></AD_ELEMENT_ID>
-<!--8418-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--8418-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--8418-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--8418-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--8418-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
@@ -124426,8 +124428,7 @@
 <!--8472-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8472-->  <NAME><![CDATA[Attribute Set Value]]></NAME>
 <!--8472-->  <DESCRIPTION><![CDATA[An attribute associated with a product as part of an attribute set.]]></DESCRIPTION>
-<!--8472-->  <HELP><![CDATA[
-The values of the actual Product Attributes]]></HELP>
+<!--8472-->  <HELP><![CDATA[The values of the actual Product Attributes]]></HELP>
 <!--8472-->  <COLUMNNAME><![CDATA[M_AttributeSetInstance_ID]]></COLUMNNAME>
 <!--8472-->  <AD_TABLE_ID><![CDATA[559]]></AD_TABLE_ID>
 <!--8472-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
@@ -125272,8 +125273,7 @@
 <!--8499-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8499-->  <NAME><![CDATA[Attribute Set Value]]></NAME>
 <!--8499-->  <DESCRIPTION><![CDATA[An attribute associated with a product as part of an attribute set.]]></DESCRIPTION>
-<!--8499-->  <HELP><![CDATA[
-The values of the actual Product Attributes]]></HELP>
+<!--8499-->  <HELP><![CDATA[The values of the actual Product Attributes]]></HELP>
 <!--8499-->  <COLUMNNAME><![CDATA[M_AttributeSetInstance_ID]]></COLUMNNAME>
 <!--8499-->  <AD_TABLE_ID><![CDATA[561]]></AD_TABLE_ID>
 <!--8499-->  <AD_REFERENCE_ID><![CDATA[35]]></AD_REFERENCE_ID>
@@ -126470,8 +126470,7 @@
 <!--8550-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8550-->  <NAME><![CDATA[Attribute Set Value]]></NAME>
 <!--8550-->  <DESCRIPTION><![CDATA[An attribute associated with a product as part of an attribute set.]]></DESCRIPTION>
-<!--8550-->  <HELP><![CDATA[
-The values of the actual Product Attributes]]></HELP>
+<!--8550-->  <HELP><![CDATA[The values of the actual Product Attributes]]></HELP>
 <!--8550-->  <COLUMNNAME><![CDATA[M_AttributeSetInstance_ID]]></COLUMNNAME>
 <!--8550-->  <AD_TABLE_ID><![CDATA[322]]></AD_TABLE_ID>
 <!--8550-->  <AD_REFERENCE_ID><![CDATA[35]]></AD_REFERENCE_ID>
@@ -126504,8 +126503,7 @@
 <!--8551-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8551-->  <NAME><![CDATA[Attribute Set Value]]></NAME>
 <!--8551-->  <DESCRIPTION><![CDATA[An attribute associated with a product as part of an attribute set.]]></DESCRIPTION>
-<!--8551-->  <HELP><![CDATA[
-The values of the actual Product Attributes]]></HELP>
+<!--8551-->  <HELP><![CDATA[The values of the actual Product Attributes]]></HELP>
 <!--8551-->  <COLUMNNAME><![CDATA[M_AttributeSetInstance_ID]]></COLUMNNAME>
 <!--8551-->  <AD_TABLE_ID><![CDATA[324]]></AD_TABLE_ID>
 <!--8551-->  <AD_REFERENCE_ID><![CDATA[35]]></AD_REFERENCE_ID>
@@ -126537,8 +126535,7 @@
 <!--8552-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8552-->  <NAME><![CDATA[Attribute Set Value]]></NAME>
 <!--8552-->  <DESCRIPTION><![CDATA[An attribute associated with a product as part of an attribute set.]]></DESCRIPTION>
-<!--8552-->  <HELP><![CDATA[
-The values of the actual Product Attributes]]></HELP>
+<!--8552-->  <HELP><![CDATA[The values of the actual Product Attributes]]></HELP>
 <!--8552-->  <COLUMNNAME><![CDATA[M_AttributeSetInstance_ID]]></COLUMNNAME>
 <!--8552-->  <AD_TABLE_ID><![CDATA[326]]></AD_TABLE_ID>
 <!--8552-->  <AD_REFERENCE_ID><![CDATA[35]]></AD_REFERENCE_ID>
@@ -126569,8 +126566,7 @@
 <!--8553-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8553-->  <NAME><![CDATA[Attribute Set Value]]></NAME>
 <!--8553-->  <DESCRIPTION><![CDATA[An attribute associated with a product as part of an attribute set.]]></DESCRIPTION>
-<!--8553-->  <HELP><![CDATA[
-The values of the actual Product Attributes]]></HELP>
+<!--8553-->  <HELP><![CDATA[The values of the actual Product Attributes]]></HELP>
 <!--8553-->  <COLUMNNAME><![CDATA[M_AttributeSetInstance_ID]]></COLUMNNAME>
 <!--8553-->  <AD_TABLE_ID><![CDATA[333]]></AD_TABLE_ID>
 <!--8553-->  <AD_REFERENCE_ID><![CDATA[35]]></AD_REFERENCE_ID>
@@ -130509,8 +130505,7 @@
 <!--8767-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8767-->  <NAME><![CDATA[Attribute Set Value]]></NAME>
 <!--8767-->  <DESCRIPTION><![CDATA[An attribute associated with a product as part of an attribute set.]]></DESCRIPTION>
-<!--8767-->  <HELP><![CDATA[
-The values of the actual Product Attributes]]></HELP>
+<!--8767-->  <HELP><![CDATA[The values of the actual Product Attributes]]></HELP>
 <!--8767-->  <COLUMNNAME><![CDATA[M_AttributeSetInstance_ID]]></COLUMNNAME>
 <!--8767-->  <AD_TABLE_ID><![CDATA[260]]></AD_TABLE_ID>
 <!--8767-->  <AD_REFERENCE_ID><![CDATA[35]]></AD_REFERENCE_ID>
@@ -130671,8 +130666,7 @@
 <!--8772-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--8772-->  <NAME><![CDATA[Attribute Set Value]]></NAME>
 <!--8772-->  <DESCRIPTION><![CDATA[An attribute associated with a product as part of an attribute set.]]></DESCRIPTION>
-<!--8772-->  <HELP><![CDATA[
-The values of the actual Product Attributes]]></HELP>
+<!--8772-->  <HELP><![CDATA[The values of the actual Product Attributes]]></HELP>
 <!--8772-->  <COLUMNNAME><![CDATA[M_AttributeSetInstance_ID]]></COLUMNNAME>
 <!--8772-->  <AD_TABLE_ID><![CDATA[320]]></AD_TABLE_ID>
 <!--8772-->  <AD_REFERENCE_ID><![CDATA[35]]></AD_REFERENCE_ID>
@@ -147790,8 +147784,7 @@
 <!--9844-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9844-->  <NAME><![CDATA[Attribute Set Value]]></NAME>
 <!--9844-->  <DESCRIPTION><![CDATA[An attribute associated with a product as part of an attribute set.]]></DESCRIPTION>
-<!--9844-->  <HELP><![CDATA[
-The values of the actual Product Attributes]]></HELP>
+<!--9844-->  <HELP><![CDATA[The values of the actual Product Attributes]]></HELP>
 <!--9844-->  <COLUMNNAME><![CDATA[M_AttributeSetInstance_ID]]></COLUMNNAME>
 <!--9844-->  <AD_TABLE_ID><![CDATA[623]]></AD_TABLE_ID>
 <!--9844-->  <AD_REFERENCE_ID><![CDATA[35]]></AD_REFERENCE_ID>
@@ -148489,8 +148482,7 @@
 <!--9867-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9867-->  <NAME><![CDATA[Attribute Set Value]]></NAME>
 <!--9867-->  <DESCRIPTION><![CDATA[An attribute associated with a product as part of an attribute set.]]></DESCRIPTION>
-<!--9867-->  <HELP><![CDATA[
-The values of the actual Product Attributes]]></HELP>
+<!--9867-->  <HELP><![CDATA[The values of the actual Product Attributes]]></HELP>
 <!--9867-->  <COLUMNNAME><![CDATA[M_AttributeSetInstance_ID]]></COLUMNNAME>
 <!--9867-->  <AD_TABLE_ID><![CDATA[329]]></AD_TABLE_ID>
 <!--9867-->  <AD_REFERENCE_ID><![CDATA[35]]></AD_REFERENCE_ID>
@@ -164425,7 +164417,7 @@
 <!--800633-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--800633-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
 <!--800633-->  <AD_ELEMENT_ID><![CDATA[454]]></AD_ELEMENT_ID>
-<!--800633-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--800633-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--800633-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--800633-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--800633-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
@@ -164473,8 +164465,7 @@
 <!--800635-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--800635-->  <NAME><![CDATA[Attribute Set Value]]></NAME>
 <!--800635-->  <DESCRIPTION><![CDATA[An attribute associated with a product as part of an attribute set.]]></DESCRIPTION>
-<!--800635-->  <HELP><![CDATA[
-The values of the actual Product Attributes]]></HELP>
+<!--800635-->  <HELP><![CDATA[The values of the actual Product Attributes]]></HELP>
 <!--800635-->  <COLUMNNAME><![CDATA[M_AttributeSetInstance_ID]]></COLUMNNAME>
 <!--800635-->  <AD_TABLE_ID><![CDATA[800036]]></AD_TABLE_ID>
 <!--800635-->  <AD_REFERENCE_ID><![CDATA[35]]></AD_REFERENCE_ID>
@@ -165036,8 +165027,7 @@
 <!--800653-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--800653-->  <NAME><![CDATA[Attribute Set Value]]></NAME>
 <!--800653-->  <DESCRIPTION><![CDATA[An attribute associated with a product as part of an attribute set.]]></DESCRIPTION>
-<!--800653-->  <HELP><![CDATA[
-The values of the actual Product Attributes]]></HELP>
+<!--800653-->  <HELP><![CDATA[The values of the actual Product Attributes]]></HELP>
 <!--800653-->  <COLUMNNAME><![CDATA[M_AttributeSetInstance_ID]]></COLUMNNAME>
 <!--800653-->  <AD_TABLE_ID><![CDATA[800037]]></AD_TABLE_ID>
 <!--800653-->  <AD_REFERENCE_ID><![CDATA[35]]></AD_REFERENCE_ID>
@@ -177460,8 +177450,7 @@
 <!--801068-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--801068-->  <NAME><![CDATA[Attribute Set Value]]></NAME>
 <!--801068-->  <DESCRIPTION><![CDATA[An attribute associated with a product as part of an attribute set.]]></DESCRIPTION>
-<!--801068-->  <HELP><![CDATA[
-The values of the actual Product Attributes]]></HELP>
+<!--801068-->  <HELP><![CDATA[The values of the actual Product Attributes]]></HELP>
 <!--801068-->  <COLUMNNAME><![CDATA[M_AttributeSetInstance_ID]]></COLUMNNAME>
 <!--801068-->  <AD_TABLE_ID><![CDATA[539]]></AD_TABLE_ID>
 <!--801068-->  <AD_REFERENCE_ID><![CDATA[35]]></AD_REFERENCE_ID>
@@ -180600,7 +180589,7 @@
 <!--801166-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--801166-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--801166-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--801166-->  <AD_ELEMENT_ID><![CDATA[CD57A1DBADD440EC9551AE6BC51E8643]]></AD_ELEMENT_ID>
+<!--801166-->  <AD_ELEMENT_ID><![CDATA[957]]></AD_ELEMENT_ID>
 <!--801166-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--801166-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--801166-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -193500,9 +193489,10 @@
 <!--802348-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--802348-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
 <!--802348-->  <AD_ELEMENT_ID><![CDATA[454]]></AD_ELEMENT_ID>
-<!--802348-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--802348-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--802348-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--802348-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--802348-->  <AD_CALLOUT_ID><![CDATA[13A9833CA5D84AEBB8CBCBB05BF5DD33]]></AD_CALLOUT_ID>
 <!--802348-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--802348-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--802348-->  <POSITION><![CDATA[10]]></POSITION>
@@ -193516,8 +193506,7 @@
 <!--802349-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--802349-->  <NAME><![CDATA[Attribute Set Value]]></NAME>
 <!--802349-->  <DESCRIPTION><![CDATA[An attribute associated with a product as part of an attribute set.]]></DESCRIPTION>
-<!--802349-->  <HELP><![CDATA[
-The values of the actual Product Attributes]]></HELP>
+<!--802349-->  <HELP><![CDATA[The values of the actual Product Attributes]]></HELP>
 <!--802349-->  <COLUMNNAME><![CDATA[M_AttributeSetInstance_ID]]></COLUMNNAME>
 <!--802349-->  <AD_TABLE_ID><![CDATA[800141]]></AD_TABLE_ID>
 <!--802349-->  <AD_REFERENCE_ID><![CDATA[35]]></AD_REFERENCE_ID>
@@ -194506,7 +194495,7 @@
 <!--802389-->  <CALLOUT><![CDATA[SL_GlobalUse_Product]]></CALLOUT>
 <!--802389-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
 <!--802389-->  <AD_ELEMENT_ID><![CDATA[454]]></AD_ELEMENT_ID>
-<!--802389-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--802389-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--802389-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--802389-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--802389-->  <AD_CALLOUT_ID><![CDATA[121]]></AD_CALLOUT_ID>
@@ -194685,8 +194674,7 @@
 <!--802395-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--802395-->  <NAME><![CDATA[Attribute Set Value]]></NAME>
 <!--802395-->  <DESCRIPTION><![CDATA[An attribute associated with a product as part of an attribute set.]]></DESCRIPTION>
-<!--802395-->  <HELP><![CDATA[
-The values of the actual Product Attributes]]></HELP>
+<!--802395-->  <HELP><![CDATA[The values of the actual Product Attributes]]></HELP>
 <!--802395-->  <COLUMNNAME><![CDATA[M_AttributeSetInstance_ID]]></COLUMNNAME>
 <!--802395-->  <AD_TABLE_ID><![CDATA[800143]]></AD_TABLE_ID>
 <!--802395-->  <AD_REFERENCE_ID><![CDATA[35]]></AD_REFERENCE_ID>
@@ -204747,7 +204735,7 @@
 <!--802772-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--802772-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
 <!--802772-->  <AD_ELEMENT_ID><![CDATA[454]]></AD_ELEMENT_ID>
-<!--802772-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--802772-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
 <!--802772-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--802772-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--802772-->  <AD_CALLOUT_ID><![CDATA[800002]]></AD_CALLOUT_ID>
@@ -204859,8 +204847,7 @@
 <!--802776-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--802776-->  <NAME><![CDATA[Attribute Set Value]]></NAME>
 <!--802776-->  <DESCRIPTION><![CDATA[An attribute associated with a product as part of an attribute set.]]></DESCRIPTION>
-<!--802776-->  <HELP><![CDATA[
-The values of the actual Product Attributes]]></HELP>
+<!--802776-->  <HELP><![CDATA[The values of the actual Product Attributes]]></HELP>
 <!--802776-->  <COLUMNNAME><![CDATA[M_AttributeSetInstance_ID]]></COLUMNNAME>
 <!--802776-->  <AD_TABLE_ID><![CDATA[800169]]></AD_TABLE_ID>
 <!--802776-->  <AD_REFERENCE_ID><![CDATA[35]]></AD_REFERENCE_ID>
@@ -241603,8 +241590,7 @@
 <!--1004400004-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1004400004-->  <NAME><![CDATA[Attribute Set Value]]></NAME>
 <!--1004400004-->  <DESCRIPTION><![CDATA[An attribute associated with a product as part of an attribute set.]]></DESCRIPTION>
-<!--1004400004-->  <HELP><![CDATA[
-The values of the actual Product Attributes]]></HELP>
+<!--1004400004-->  <HELP><![CDATA[The values of the actual Product Attributes]]></HELP>
 <!--1004400004-->  <COLUMNNAME><![CDATA[M_AttributeSetInstance_ID]]></COLUMNNAME>
 <!--1004400004-->  <AD_TABLE_ID><![CDATA[800214]]></AD_TABLE_ID>
 <!--1004400004-->  <AD_REFERENCE_ID><![CDATA[35]]></AD_REFERENCE_ID>
@@ -246129,7 +246115,8 @@
 <!--1006100000-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1006100000-->  <NAME><![CDATA[Is First Focused Field]]></NAME>
 <!--1006100000-->  <DESCRIPTION><![CDATA[Is First Focused Field]]></DESCRIPTION>
-<!--1006100000-->  <HELP><![CDATA[When it is active this field will be focused by default when the tab is opened.]]></HELP>
+<!--1006100000-->  <HELP><![CDATA[
+When it is active this field will be focused by default when the tab is opened.]]></HELP>
 <!--1006100000-->  <COLUMNNAME><![CDATA[Isfirstfocusedfield]]></COLUMNNAME>
 <!--1006100000-->  <AD_TABLE_ID><![CDATA[107]]></AD_TABLE_ID>
 <!--1006100000-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
@@ -267530,6 +267517,103 @@
 <!--7E011D1981B2E366E040007F01013030-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--7E011D1981B2E366E040007F01013030--></AD_COLUMN>
 
+<!--7E28A3F0EA09F997E040007F01006F15--><AD_COLUMN>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <AD_COLUMN_ID><![CDATA[7E28A3F0EA09F997E040007F01006F15]]></AD_COLUMN_ID>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <NAME><![CDATA[Taxable Amount]]></NAME>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <DESCRIPTION><![CDATA[The total sum on which taxes are added.]]></DESCRIPTION>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <HELP><![CDATA[The Tax Base Amount indicates the base amount used for calculating the tax amount.]]></HELP>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <COLUMNNAME><![CDATA[Taxbaseamt]]></COLUMNNAME>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <AD_TABLE_ID><![CDATA[260]]></AD_TABLE_ID>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <SEQNO><![CDATA[63]]></SEQNO>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <AD_ELEMENT_ID><![CDATA[1134]]></AD_ELEMENT_ID>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <POSITION><![CDATA[47]]></POSITION>
+<!--7E28A3F0EA09F997E040007F01006F15-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E28A3F0EA09F997E040007F01006F15--></AD_COLUMN>
+
+<!--7E28A3F0EA0AF997E040007F01006F15--><AD_COLUMN>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <AD_COLUMN_ID><![CDATA[7E28A3F0EA0AF997E040007F01006F15]]></AD_COLUMN_ID>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <NAME><![CDATA[Taxable Amount]]></NAME>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <DESCRIPTION><![CDATA[The total sum on which taxes are added.]]></DESCRIPTION>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <HELP><![CDATA[The Tax Base Amount indicates the base amount used for calculating the tax amount.]]></HELP>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <COLUMNNAME><![CDATA[Taxbaseamt]]></COLUMNNAME>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <AD_TABLE_ID><![CDATA[333]]></AD_TABLE_ID>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <SEQNO><![CDATA[63]]></SEQNO>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <AD_ELEMENT_ID><![CDATA[1134]]></AD_ELEMENT_ID>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <POSITION><![CDATA[35]]></POSITION>
+<!--7E28A3F0EA0AF997E040007F01006F15-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E28A3F0EA0AF997E040007F01006F15--></AD_COLUMN>
+
+<!--7E28A3F0EA0DF997E040007F01006F15--><AD_COLUMN>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <AD_COLUMN_ID><![CDATA[7E28A3F0EA0DF997E040007F01006F15]]></AD_COLUMN_ID>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <NAME><![CDATA[Base Amount]]></NAME>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <DESCRIPTION><![CDATA[Base Amount to be used for the calculation of the tax amount.]]></DESCRIPTION>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <HELP><![CDATA[Base Amount to be used as base for the calculation. Line net amount or alternate line net amount can be selected as base for the tax calculation.]]></HELP>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <COLUMNNAME><![CDATA[BaseAmount]]></COLUMNNAME>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <AD_TABLE_ID><![CDATA[261]]></AD_TABLE_ID>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <AD_REFERENCE_VALUE_ID><![CDATA[2969F07308CB43ECBCDAE151C12F03E0]]></AD_REFERENCE_VALUE_ID>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <DEFAULTVALUE><![CDATA[LNA]]></DEFAULTVALUE>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <SEQNO><![CDATA[121]]></SEQNO>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <AD_ELEMENT_ID><![CDATA[7E35F16BB0F6C186E040007F010014C7]]></AD_ELEMENT_ID>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <POSITION><![CDATA[33]]></POSITION>
+<!--7E28A3F0EA0DF997E040007F01006F15-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E28A3F0EA0DF997E040007F01006F15--></AD_COLUMN>
+
 <!--7E32BAEA996311DDA0B6001D09C4A2FE--><AD_COLUMN>
 <!--7E32BAEA996311DDA0B6001D09C4A2FE-->  <AD_COLUMN_ID><![CDATA[7E32BAEA996311DDA0B6001D09C4A2FE]]></AD_COLUMN_ID>
 <!--7E32BAEA996311DDA0B6001D09C4A2FE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -267594,6 +267678,38 @@
 <!--7E34E720996311DDA310001D09C4A2FE-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--7E34E720996311DDA310001D09C4A2FE--></AD_COLUMN>
 
+<!--7E36B60C210830F0E040007F01016399--><AD_COLUMN>
+<!--7E36B60C210830F0E040007F01016399-->  <AD_COLUMN_ID><![CDATA[7E36B60C210830F0E040007F01016399]]></AD_COLUMN_ID>
+<!--7E36B60C210830F0E040007F01016399-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E36B60C210830F0E040007F01016399-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E36B60C210830F0E040007F01016399-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E36B60C210830F0E040007F01016399-->  <NAME><![CDATA[Use Attribute Set Value As]]></NAME>
+<!--7E36B60C210830F0E040007F01016399-->  <DESCRIPTION><![CDATA[A distinct Attribute Set Value characteristic.]]></DESCRIPTION>
+<!--7E36B60C210830F0E040007F01016399-->  <HELP><![CDATA[Permits to define different types of Attribute Set Values, depending on their usage.]]></HELP>
+<!--7E36B60C210830F0E040007F01016399-->  <COLUMNNAME><![CDATA[Attrsetvaluetype]]></COLUMNNAME>
+<!--7E36B60C210830F0E040007F01016399-->  <AD_TABLE_ID><![CDATA[208]]></AD_TABLE_ID>
+<!--7E36B60C210830F0E040007F01016399-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--7E36B60C210830F0E040007F01016399-->  <AD_REFERENCE_VALUE_ID><![CDATA[5AD08D5DF85549E0BCC0DEBDE4C0D340]]></AD_REFERENCE_VALUE_ID>
+<!--7E36B60C210830F0E040007F01016399-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--7E36B60C210830F0E040007F01016399-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E36B60C210830F0E040007F01016399-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E36B60C210830F0E040007F01016399-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--7E36B60C210830F0E040007F01016399-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7E36B60C210830F0E040007F01016399-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E36B60C210830F0E040007F01016399-->  <SEQNO><![CDATA[310]]></SEQNO>
+<!--7E36B60C210830F0E040007F01016399-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E36B60C210830F0E040007F01016399-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E36B60C210830F0E040007F01016399-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E36B60C210830F0E040007F01016399-->  <AD_ELEMENT_ID><![CDATA[7E36B60C210930F0E040007F01016399]]></AD_ELEMENT_ID>
+<!--7E36B60C210830F0E040007F01016399-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E36B60C210830F0E040007F01016399-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E36B60C210830F0E040007F01016399-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E36B60C210830F0E040007F01016399-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E36B60C210830F0E040007F01016399-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E36B60C210830F0E040007F01016399-->  <POSITION><![CDATA[70]]></POSITION>
+<!--7E36B60C210830F0E040007F01016399-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E36B60C210830F0E040007F01016399--></AD_COLUMN>
+
 <!--7E36F614996311DDA0BA001D09C4A2FE--><AD_COLUMN>
 <!--7E36F614996311DDA0BA001D09C4A2FE-->  <AD_COLUMN_ID><![CDATA[7E36F614996311DDA0BA001D09C4A2FE]]></AD_COLUMN_ID>
 <!--7E36F614996311DDA0BA001D09C4A2FE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -267723,6 +267839,39 @@
 <!--7E3BF3D0996311DD9410001D09C4A2FE-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--7E3BF3D0996311DD9410001D09C4A2FE--></AD_COLUMN>
 
+<!--7E3C2453261A31A7E040007F0100680C--><AD_COLUMN>
+<!--7E3C2453261A31A7E040007F0100680C-->  <AD_COLUMN_ID><![CDATA[7E3C2453261A31A7E040007F0100680C]]></AD_COLUMN_ID>
+<!--7E3C2453261A31A7E040007F0100680C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E3C2453261A31A7E040007F0100680C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E3C2453261A31A7E040007F0100680C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E3C2453261A31A7E040007F0100680C-->  <NAME><![CDATA[Tax Base]]></NAME>
+<!--7E3C2453261A31A7E040007F0100680C-->  <DESCRIPTION><![CDATA[Tax rate used as tax base amount for tax calculation]]></DESCRIPTION>
+<!--7E3C2453261A31A7E040007F0100680C-->  <HELP><![CDATA[The amount of the tax selected here will be used as tax base amount for the tax calculation.]]></HELP>
+<!--7E3C2453261A31A7E040007F0100680C-->  <COLUMNNAME><![CDATA[C_TaxBase_ID]]></COLUMNNAME>
+<!--7E3C2453261A31A7E040007F0100680C-->  <AD_TABLE_ID><![CDATA[261]]></AD_TABLE_ID>
+<!--7E3C2453261A31A7E040007F0100680C-->  <AD_REFERENCE_ID><![CDATA[18]]></AD_REFERENCE_ID>
+<!--7E3C2453261A31A7E040007F0100680C-->  <AD_REFERENCE_VALUE_ID><![CDATA[F3455CBD6B69470396BE1FF35EC8CEDA]]></AD_REFERENCE_VALUE_ID>
+<!--7E3C2453261A31A7E040007F0100680C-->  <AD_VAL_RULE_ID><![CDATA[988E8605A37D465D8D0AEA968ABCB2AE]]></AD_VAL_RULE_ID>
+<!--7E3C2453261A31A7E040007F0100680C-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--7E3C2453261A31A7E040007F0100680C-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E3C2453261A31A7E040007F0100680C-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E3C2453261A31A7E040007F0100680C-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--7E3C2453261A31A7E040007F0100680C-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7E3C2453261A31A7E040007F0100680C-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E3C2453261A31A7E040007F0100680C-->  <SEQNO><![CDATA[131]]></SEQNO>
+<!--7E3C2453261A31A7E040007F0100680C-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E3C2453261A31A7E040007F0100680C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E3C2453261A31A7E040007F0100680C-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E3C2453261A31A7E040007F0100680C-->  <AD_ELEMENT_ID><![CDATA[7E3C2453261B31A7E040007F0100680C]]></AD_ELEMENT_ID>
+<!--7E3C2453261A31A7E040007F0100680C-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E3C2453261A31A7E040007F0100680C-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E3C2453261A31A7E040007F0100680C-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E3C2453261A31A7E040007F0100680C-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E3C2453261A31A7E040007F0100680C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E3C2453261A31A7E040007F0100680C-->  <POSITION><![CDATA[34]]></POSITION>
+<!--7E3C2453261A31A7E040007F0100680C-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E3C2453261A31A7E040007F0100680C--></AD_COLUMN>
+
 <!--7E3EF62A996311DD88AB001D09C4A2FE--><AD_COLUMN>
 <!--7E3EF62A996311DD88AB001D09C4A2FE-->  <AD_COLUMN_ID><![CDATA[7E3EF62A996311DD88AB001D09C4A2FE]]></AD_COLUMN_ID>
 <!--7E3EF62A996311DD88AB001D09C4A2FE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -267915,6 +268064,452 @@
 <!--7E5398FA996311DD8ABB001D09C4A2FE-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--7E5398FA996311DD8ABB001D09C4A2FE--></AD_COLUMN>
 
+<!--7E55E529C694721EE040007F01002C65--><AD_COLUMN>
+<!--7E55E529C694721EE040007F01002C65-->  <AD_COLUMN_ID><![CDATA[7E55E529C694721EE040007F01002C65]]></AD_COLUMN_ID>
+<!--7E55E529C694721EE040007F01002C65-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E55E529C694721EE040007F01002C65-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E55E529C694721EE040007F01002C65-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E55E529C694721EE040007F01002C65-->  <NAME><![CDATA[Sales Order]]></NAME>
+<!--7E55E529C694721EE040007F01002C65-->  <DESCRIPTION><![CDATA[A unique and often automatically generated identifier for a sales order.]]></DESCRIPTION>
+<!--7E55E529C694721EE040007F01002C65-->  <HELP><![CDATA[Unique identifier and a reference to a Sales Order originating from the document sequence defined for this document type.]]></HELP>
+<!--7E55E529C694721EE040007F01002C65-->  <COLUMNNAME><![CDATA[C_Order_ID]]></COLUMNNAME>
+<!--7E55E529C694721EE040007F01002C65-->  <AD_TABLE_ID><![CDATA[E42DDB42FF0B4F82B1CF3C711B3F0DC0]]></AD_TABLE_ID>
+<!--7E55E529C694721EE040007F01002C65-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--7E55E529C694721EE040007F01002C65-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--7E55E529C694721EE040007F01002C65-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E55E529C694721EE040007F01002C65-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E55E529C694721EE040007F01002C65-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E55E529C694721EE040007F01002C65-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--7E55E529C694721EE040007F01002C65-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E55E529C694721EE040007F01002C65-->  <SEQNO><![CDATA[140]]></SEQNO>
+<!--7E55E529C694721EE040007F01002C65-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E55E529C694721EE040007F01002C65-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E55E529C694721EE040007F01002C65-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E55E529C694721EE040007F01002C65-->  <AD_ELEMENT_ID><![CDATA[558]]></AD_ELEMENT_ID>
+<!--7E55E529C694721EE040007F01002C65-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E55E529C694721EE040007F01002C65-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E55E529C694721EE040007F01002C65-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E55E529C694721EE040007F01002C65-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E55E529C694721EE040007F01002C65-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E55E529C694721EE040007F01002C65-->  <POSITION><![CDATA[14]]></POSITION>
+<!--7E55E529C694721EE040007F01002C65-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E55E529C694721EE040007F01002C65--></AD_COLUMN>
+
+<!--7E562C34A0496EB2E040007F01001D67--><AD_COLUMN>
+<!--7E562C34A0496EB2E040007F01001D67-->  <AD_COLUMN_ID><![CDATA[7E562C34A0496EB2E040007F01001D67]]></AD_COLUMN_ID>
+<!--7E562C34A0496EB2E040007F01001D67-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E562C34A0496EB2E040007F01001D67-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E562C34A0496EB2E040007F01001D67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E562C34A0496EB2E040007F01001D67-->  <NAME><![CDATA[C_Orderlinetax_ID]]></NAME>
+<!--7E562C34A0496EB2E040007F01001D67-->  <DESCRIPTION><![CDATA[A unique and often automatically generated identifier for a sales order line tax.]]></DESCRIPTION>
+<!--7E562C34A0496EB2E040007F01001D67-->  <HELP><![CDATA[A unique identifier and a reference to a sales order line tax.]]></HELP>
+<!--7E562C34A0496EB2E040007F01001D67-->  <COLUMNNAME><![CDATA[C_Orderlinetax_ID]]></COLUMNNAME>
+<!--7E562C34A0496EB2E040007F01001D67-->  <AD_TABLE_ID><![CDATA[E42DDB42FF0B4F82B1CF3C711B3F0DC0]]></AD_TABLE_ID>
+<!--7E562C34A0496EB2E040007F01001D67-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--7E562C34A0496EB2E040007F01001D67-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--7E562C34A0496EB2E040007F01001D67-->  <ISKEY><![CDATA[Y]]></ISKEY>
+<!--7E562C34A0496EB2E040007F01001D67-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E562C34A0496EB2E040007F01001D67-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E562C34A0496EB2E040007F01001D67-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--7E562C34A0496EB2E040007F01001D67-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E562C34A0496EB2E040007F01001D67-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--7E562C34A0496EB2E040007F01001D67-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E562C34A0496EB2E040007F01001D67-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E562C34A0496EB2E040007F01001D67-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E562C34A0496EB2E040007F01001D67-->  <AD_ELEMENT_ID><![CDATA[7E562C34A0566EB2E040007F01001D67]]></AD_ELEMENT_ID>
+<!--7E562C34A0496EB2E040007F01001D67-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E562C34A0496EB2E040007F01001D67-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E562C34A0496EB2E040007F01001D67-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E562C34A0496EB2E040007F01001D67-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E562C34A0496EB2E040007F01001D67-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E562C34A0496EB2E040007F01001D67-->  <POSITION><![CDATA[1]]></POSITION>
+<!--7E562C34A0496EB2E040007F01001D67-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E562C34A0496EB2E040007F01001D67--></AD_COLUMN>
+
+<!--7E562C34A04A6EB2E040007F01001D67--><AD_COLUMN>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <AD_COLUMN_ID><![CDATA[7E562C34A04A6EB2E040007F01001D67]]></AD_COLUMN_ID>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <NAME><![CDATA[Sales Order Line]]></NAME>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <DESCRIPTION><![CDATA[A unique and often automatically generated identifier for a sales order line.]]></DESCRIPTION>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <HELP><![CDATA[A unique identifier and a reference to a sales order line (product).]]></HELP>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <COLUMNNAME><![CDATA[C_Orderline_ID]]></COLUMNNAME>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <AD_TABLE_ID><![CDATA[E42DDB42FF0B4F82B1CF3C711B3F0DC0]]></AD_TABLE_ID>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <ISPARENT><![CDATA[Y]]></ISPARENT>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <AD_ELEMENT_ID><![CDATA[561]]></AD_ELEMENT_ID>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <POSITION><![CDATA[2]]></POSITION>
+<!--7E562C34A04A6EB2E040007F01001D67-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E562C34A04A6EB2E040007F01001D67--></AD_COLUMN>
+
+<!--7E562C34A04B6EB2E040007F01001D67--><AD_COLUMN>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <AD_COLUMN_ID><![CDATA[7E562C34A04B6EB2E040007F01001D67]]></AD_COLUMN_ID>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <NAME><![CDATA[Tax]]></NAME>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <DESCRIPTION><![CDATA[The percentage of money requested by the government for this specified product or transaction.]]></DESCRIPTION>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <HELP><![CDATA[The Tax indicates the type of tax for this document line.]]></HELP>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <COLUMNNAME><![CDATA[C_Tax_ID]]></COLUMNNAME>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <AD_TABLE_ID><![CDATA[E42DDB42FF0B4F82B1CF3C711B3F0DC0]]></AD_TABLE_ID>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <AD_ELEMENT_ID><![CDATA[213]]></AD_ELEMENT_ID>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <POSITION><![CDATA[3]]></POSITION>
+<!--7E562C34A04B6EB2E040007F01001D67-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E562C34A04B6EB2E040007F01001D67--></AD_COLUMN>
+
+<!--7E562C34A04C6EB2E040007F01001D67--><AD_COLUMN>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <AD_COLUMN_ID><![CDATA[7E562C34A04C6EB2E040007F01001D67]]></AD_COLUMN_ID>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <NAME><![CDATA[Client]]></NAME>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <AD_TABLE_ID><![CDATA[E42DDB42FF0B4F82B1CF3C711B3F0DC0]]></AD_TABLE_ID>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <AD_VAL_RULE_ID><![CDATA[103]]></AD_VAL_RULE_ID>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <SEQNO><![CDATA[40]]></SEQNO>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <POSITION><![CDATA[4]]></POSITION>
+<!--7E562C34A04C6EB2E040007F01001D67-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E562C34A04C6EB2E040007F01001D67--></AD_COLUMN>
+
+<!--7E562C34A04D6EB2E040007F01001D67--><AD_COLUMN>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <AD_COLUMN_ID><![CDATA[7E562C34A04D6EB2E040007F01001D67]]></AD_COLUMN_ID>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <NAME><![CDATA[Organization]]></NAME>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <AD_TABLE_ID><![CDATA[E42DDB42FF0B4F82B1CF3C711B3F0DC0]]></AD_TABLE_ID>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <AD_VAL_RULE_ID><![CDATA[104]]></AD_VAL_RULE_ID>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <POSITION><![CDATA[5]]></POSITION>
+<!--7E562C34A04D6EB2E040007F01001D67-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E562C34A04D6EB2E040007F01001D67--></AD_COLUMN>
+
+<!--7E562C34A04E6EB2E040007F01001D67--><AD_COLUMN>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <AD_COLUMN_ID><![CDATA[7E562C34A04E6EB2E040007F01001D67]]></AD_COLUMN_ID>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <NAME><![CDATA[Active]]></NAME>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <HELP><![CDATA[There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reporting. There are two reasons for de-activating and not deleting records: 
+(1) The system requires the record for auditing purposes.
+(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are existing invoices for it. By de-activating the Business Partner you prevent it from being used in future transactions.]]></HELP>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <COLUMNNAME><![CDATA[Isactive]]></COLUMNNAME>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <AD_TABLE_ID><![CDATA[E42DDB42FF0B4F82B1CF3C711B3F0DC0]]></AD_TABLE_ID>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <AD_ELEMENT_ID><![CDATA[348]]></AD_ELEMENT_ID>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <POSITION><![CDATA[6]]></POSITION>
+<!--7E562C34A04E6EB2E040007F01001D67-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E562C34A04E6EB2E040007F01001D67--></AD_COLUMN>
+
+<!--7E562C34A04F6EB2E040007F01001D67--><AD_COLUMN>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <AD_COLUMN_ID><![CDATA[7E562C34A04F6EB2E040007F01001D67]]></AD_COLUMN_ID>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <NAME><![CDATA[Creation Date]]></NAME>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <COLUMNNAME><![CDATA[Created]]></COLUMNNAME>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <AD_TABLE_ID><![CDATA[E42DDB42FF0B4F82B1CF3C711B3F0DC0]]></AD_TABLE_ID>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <DEFAULTVALUE><![CDATA[SYSDATE]]></DEFAULTVALUE>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <AD_ELEMENT_ID><![CDATA[245]]></AD_ELEMENT_ID>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <POSITION><![CDATA[7]]></POSITION>
+<!--7E562C34A04F6EB2E040007F01001D67-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E562C34A04F6EB2E040007F01001D67--></AD_COLUMN>
+
+<!--7E562C34A0506EB2E040007F01001D67--><AD_COLUMN>
+<!--7E562C34A0506EB2E040007F01001D67-->  <AD_COLUMN_ID><![CDATA[7E562C34A0506EB2E040007F01001D67]]></AD_COLUMN_ID>
+<!--7E562C34A0506EB2E040007F01001D67-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E562C34A0506EB2E040007F01001D67-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E562C34A0506EB2E040007F01001D67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E562C34A0506EB2E040007F01001D67-->  <NAME><![CDATA[Created By]]></NAME>
+<!--7E562C34A0506EB2E040007F01001D67-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
+<!--7E562C34A0506EB2E040007F01001D67-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
+<!--7E562C34A0506EB2E040007F01001D67-->  <COLUMNNAME><![CDATA[Createdby]]></COLUMNNAME>
+<!--7E562C34A0506EB2E040007F01001D67-->  <AD_TABLE_ID><![CDATA[E42DDB42FF0B4F82B1CF3C711B3F0DC0]]></AD_TABLE_ID>
+<!--7E562C34A0506EB2E040007F01001D67-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--7E562C34A0506EB2E040007F01001D67-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--7E562C34A0506EB2E040007F01001D67-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E562C34A0506EB2E040007F01001D67-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E562C34A0506EB2E040007F01001D67-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E562C34A0506EB2E040007F01001D67-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--7E562C34A0506EB2E040007F01001D67-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E562C34A0506EB2E040007F01001D67-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--7E562C34A0506EB2E040007F01001D67-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E562C34A0506EB2E040007F01001D67-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E562C34A0506EB2E040007F01001D67-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E562C34A0506EB2E040007F01001D67-->  <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID>
+<!--7E562C34A0506EB2E040007F01001D67-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E562C34A0506EB2E040007F01001D67-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E562C34A0506EB2E040007F01001D67-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E562C34A0506EB2E040007F01001D67-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E562C34A0506EB2E040007F01001D67-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E562C34A0506EB2E040007F01001D67-->  <POSITION><![CDATA[8]]></POSITION>
+<!--7E562C34A0506EB2E040007F01001D67-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E562C34A0506EB2E040007F01001D67--></AD_COLUMN>
+
+<!--7E562C34A0516EB2E040007F01001D67--><AD_COLUMN>
+<!--7E562C34A0516EB2E040007F01001D67-->  <AD_COLUMN_ID><![CDATA[7E562C34A0516EB2E040007F01001D67]]></AD_COLUMN_ID>
+<!--7E562C34A0516EB2E040007F01001D67-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E562C34A0516EB2E040007F01001D67-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E562C34A0516EB2E040007F01001D67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E562C34A0516EB2E040007F01001D67-->  <NAME><![CDATA[Updated]]></NAME>
+<!--7E562C34A0516EB2E040007F01001D67-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--7E562C34A0516EB2E040007F01001D67-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
+<!--7E562C34A0516EB2E040007F01001D67-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
+<!--7E562C34A0516EB2E040007F01001D67-->  <AD_TABLE_ID><![CDATA[E42DDB42FF0B4F82B1CF3C711B3F0DC0]]></AD_TABLE_ID>
+<!--7E562C34A0516EB2E040007F01001D67-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--7E562C34A0516EB2E040007F01001D67-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--7E562C34A0516EB2E040007F01001D67-->  <DEFAULTVALUE><![CDATA[SYSDATE]]></DEFAULTVALUE>
+<!--7E562C34A0516EB2E040007F01001D67-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E562C34A0516EB2E040007F01001D67-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E562C34A0516EB2E040007F01001D67-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E562C34A0516EB2E040007F01001D67-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--7E562C34A0516EB2E040007F01001D67-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E562C34A0516EB2E040007F01001D67-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--7E562C34A0516EB2E040007F01001D67-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E562C34A0516EB2E040007F01001D67-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E562C34A0516EB2E040007F01001D67-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E562C34A0516EB2E040007F01001D67-->  <AD_ELEMENT_ID><![CDATA[607]]></AD_ELEMENT_ID>
+<!--7E562C34A0516EB2E040007F01001D67-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E562C34A0516EB2E040007F01001D67-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E562C34A0516EB2E040007F01001D67-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E562C34A0516EB2E040007F01001D67-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E562C34A0516EB2E040007F01001D67-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E562C34A0516EB2E040007F01001D67-->  <POSITION><![CDATA[9]]></POSITION>
+<!--7E562C34A0516EB2E040007F01001D67-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E562C34A0516EB2E040007F01001D67--></AD_COLUMN>
+
+<!--7E562C34A0526EB2E040007F01001D67--><AD_COLUMN>
+<!--7E562C34A0526EB2E040007F01001D67-->  <AD_COLUMN_ID><![CDATA[7E562C34A0526EB2E040007F01001D67]]></AD_COLUMN_ID>
+<!--7E562C34A0526EB2E040007F01001D67-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E562C34A0526EB2E040007F01001D67-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E562C34A0526EB2E040007F01001D67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E562C34A0526EB2E040007F01001D67-->  <NAME><![CDATA[Updated By]]></NAME>
+<!--7E562C34A0526EB2E040007F01001D67-->  <DESCRIPTION><![CDATA[User who updated this records]]></DESCRIPTION>
+<!--7E562C34A0526EB2E040007F01001D67-->  <HELP><![CDATA[The Updated By field indicates the user who updated this record.]]></HELP>
+<!--7E562C34A0526EB2E040007F01001D67-->  <COLUMNNAME><![CDATA[Updatedby]]></COLUMNNAME>
+<!--7E562C34A0526EB2E040007F01001D67-->  <AD_TABLE_ID><![CDATA[E42DDB42FF0B4F82B1CF3C711B3F0DC0]]></AD_TABLE_ID>
+<!--7E562C34A0526EB2E040007F01001D67-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--7E562C34A0526EB2E040007F01001D67-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--7E562C34A0526EB2E040007F01001D67-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E562C34A0526EB2E040007F01001D67-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E562C34A0526EB2E040007F01001D67-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E562C34A0526EB2E040007F01001D67-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--7E562C34A0526EB2E040007F01001D67-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E562C34A0526EB2E040007F01001D67-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--7E562C34A0526EB2E040007F01001D67-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E562C34A0526EB2E040007F01001D67-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E562C34A0526EB2E040007F01001D67-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E562C34A0526EB2E040007F01001D67-->  <AD_ELEMENT_ID><![CDATA[608]]></AD_ELEMENT_ID>
+<!--7E562C34A0526EB2E040007F01001D67-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E562C34A0526EB2E040007F01001D67-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E562C34A0526EB2E040007F01001D67-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E562C34A0526EB2E040007F01001D67-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E562C34A0526EB2E040007F01001D67-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E562C34A0526EB2E040007F01001D67-->  <POSITION><![CDATA[10]]></POSITION>
+<!--7E562C34A0526EB2E040007F01001D67-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E562C34A0526EB2E040007F01001D67--></AD_COLUMN>
+
+<!--7E562C34A0536EB2E040007F01001D67--><AD_COLUMN>
+<!--7E562C34A0536EB2E040007F01001D67-->  <AD_COLUMN_ID><![CDATA[7E562C34A0536EB2E040007F01001D67]]></AD_COLUMN_ID>
+<!--7E562C34A0536EB2E040007F01001D67-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E562C34A0536EB2E040007F01001D67-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E562C34A0536EB2E040007F01001D67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E562C34A0536EB2E040007F01001D67-->  <NAME><![CDATA[Taxable Amount]]></NAME>
+<!--7E562C34A0536EB2E040007F01001D67-->  <DESCRIPTION><![CDATA[The total sum on which taxes are added.]]></DESCRIPTION>
+<!--7E562C34A0536EB2E040007F01001D67-->  <HELP><![CDATA[The Tax Base Amount indicates the base amount used for calculating the tax amount.]]></HELP>
+<!--7E562C34A0536EB2E040007F01001D67-->  <COLUMNNAME><![CDATA[Taxbaseamt]]></COLUMNNAME>
+<!--7E562C34A0536EB2E040007F01001D67-->  <AD_TABLE_ID><![CDATA[E42DDB42FF0B4F82B1CF3C711B3F0DC0]]></AD_TABLE_ID>
+<!--7E562C34A0536EB2E040007F01001D67-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
+<!--7E562C34A0536EB2E040007F01001D67-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--7E562C34A0536EB2E040007F01001D67-->  <DEFAULTVALUE><![CDATA[0]]></DEFAULTVALUE>
+<!--7E562C34A0536EB2E040007F01001D67-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E562C34A0536EB2E040007F01001D67-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E562C34A0536EB2E040007F01001D67-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E562C34A0536EB2E040007F01001D67-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7E562C34A0536EB2E040007F01001D67-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E562C34A0536EB2E040007F01001D67-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--7E562C34A0536EB2E040007F01001D67-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E562C34A0536EB2E040007F01001D67-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E562C34A0536EB2E040007F01001D67-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E562C34A0536EB2E040007F01001D67-->  <AD_ELEMENT_ID><![CDATA[1134]]></AD_ELEMENT_ID>
+<!--7E562C34A0536EB2E040007F01001D67-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E562C34A0536EB2E040007F01001D67-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E562C34A0536EB2E040007F01001D67-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E562C34A0536EB2E040007F01001D67-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E562C34A0536EB2E040007F01001D67-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E562C34A0536EB2E040007F01001D67-->  <POSITION><![CDATA[11]]></POSITION>
+<!--7E562C34A0536EB2E040007F01001D67-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E562C34A0536EB2E040007F01001D67--></AD_COLUMN>
+
+<!--7E562C34A0546EB2E040007F01001D67--><AD_COLUMN>
+<!--7E562C34A0546EB2E040007F01001D67-->  <AD_COLUMN_ID><![CDATA[7E562C34A0546EB2E040007F01001D67]]></AD_COLUMN_ID>
+<!--7E562C34A0546EB2E040007F01001D67-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E562C34A0546EB2E040007F01001D67-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E562C34A0546EB2E040007F01001D67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E562C34A0546EB2E040007F01001D67-->  <NAME><![CDATA[Tax Amount]]></NAME>
+<!--7E562C34A0546EB2E040007F01001D67-->  <DESCRIPTION><![CDATA[The total sum of money requested by the government of the specified transaction.]]></DESCRIPTION>
+<!--7E562C34A0546EB2E040007F01001D67-->  <HELP><![CDATA[The Tax Amount displays the total tax amount for a document.]]></HELP>
+<!--7E562C34A0546EB2E040007F01001D67-->  <COLUMNNAME><![CDATA[Taxamt]]></COLUMNNAME>
+<!--7E562C34A0546EB2E040007F01001D67-->  <AD_TABLE_ID><![CDATA[E42DDB42FF0B4F82B1CF3C711B3F0DC0]]></AD_TABLE_ID>
+<!--7E562C34A0546EB2E040007F01001D67-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
+<!--7E562C34A0546EB2E040007F01001D67-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--7E562C34A0546EB2E040007F01001D67-->  <DEFAULTVALUE><![CDATA[0]]></DEFAULTVALUE>
+<!--7E562C34A0546EB2E040007F01001D67-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E562C34A0546EB2E040007F01001D67-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E562C34A0546EB2E040007F01001D67-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E562C34A0546EB2E040007F01001D67-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7E562C34A0546EB2E040007F01001D67-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E562C34A0546EB2E040007F01001D67-->  <SEQNO><![CDATA[120]]></SEQNO>
+<!--7E562C34A0546EB2E040007F01001D67-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E562C34A0546EB2E040007F01001D67-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E562C34A0546EB2E040007F01001D67-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E562C34A0546EB2E040007F01001D67-->  <AD_ELEMENT_ID><![CDATA[1133]]></AD_ELEMENT_ID>
+<!--7E562C34A0546EB2E040007F01001D67-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E562C34A0546EB2E040007F01001D67-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E562C34A0546EB2E040007F01001D67-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E562C34A0546EB2E040007F01001D67-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E562C34A0546EB2E040007F01001D67-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E562C34A0546EB2E040007F01001D67-->  <POSITION><![CDATA[12]]></POSITION>
+<!--7E562C34A0546EB2E040007F01001D67-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E562C34A0546EB2E040007F01001D67--></AD_COLUMN>
+
+<!--7E562C34A0556EB2E040007F01001D67--><AD_COLUMN>
+<!--7E562C34A0556EB2E040007F01001D67-->  <AD_COLUMN_ID><![CDATA[7E562C34A0556EB2E040007F01001D67]]></AD_COLUMN_ID>
+<!--7E562C34A0556EB2E040007F01001D67-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E562C34A0556EB2E040007F01001D67-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E562C34A0556EB2E040007F01001D67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E562C34A0556EB2E040007F01001D67-->  <NAME><![CDATA[Line No.]]></NAME>
+<!--7E562C34A0556EB2E040007F01001D67-->  <DESCRIPTION><![CDATA[A line stating the position of this request in the document.]]></DESCRIPTION>
+<!--7E562C34A0556EB2E040007F01001D67-->  <HELP><![CDATA[Indicates the unique line for a document.  It will also control the display order of the lines within a document.]]></HELP>
+<!--7E562C34A0556EB2E040007F01001D67-->  <COLUMNNAME><![CDATA[Line]]></COLUMNNAME>
+<!--7E562C34A0556EB2E040007F01001D67-->  <AD_TABLE_ID><![CDATA[E42DDB42FF0B4F82B1CF3C711B3F0DC0]]></AD_TABLE_ID>
+<!--7E562C34A0556EB2E040007F01001D67-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--7E562C34A0556EB2E040007F01001D67-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--7E562C34A0556EB2E040007F01001D67-->  <DEFAULTVALUE><![CDATA[@SQL=SELECT COALESCE(MAX(LINE),0)+10 AS DefaultValue FROM C_ORDERLINETAX WHERE C_ORDERLINE_ID=@C_OrderLine_ID@]]></DEFAULTVALUE>
+<!--7E562C34A0556EB2E040007F01001D67-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E562C34A0556EB2E040007F01001D67-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E562C34A0556EB2E040007F01001D67-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--7E562C34A0556EB2E040007F01001D67-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7E562C34A0556EB2E040007F01001D67-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E562C34A0556EB2E040007F01001D67-->  <SEQNO><![CDATA[130]]></SEQNO>
+<!--7E562C34A0556EB2E040007F01001D67-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E562C34A0556EB2E040007F01001D67-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E562C34A0556EB2E040007F01001D67-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E562C34A0556EB2E040007F01001D67-->  <AD_ELEMENT_ID><![CDATA[439]]></AD_ELEMENT_ID>
+<!--7E562C34A0556EB2E040007F01001D67-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E562C34A0556EB2E040007F01001D67-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E562C34A0556EB2E040007F01001D67-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E562C34A0556EB2E040007F01001D67-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E562C34A0556EB2E040007F01001D67-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E562C34A0556EB2E040007F01001D67-->  <POSITION><![CDATA[13]]></POSITION>
+<!--7E562C34A0556EB2E040007F01001D67-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E562C34A0556EB2E040007F01001D67--></AD_COLUMN>
+
 <!--7E58D482996311DD9B45001D09C4A2FE--><AD_COLUMN>
 <!--7E58D482996311DD9B45001D09C4A2FE-->  <AD_COLUMN_ID><![CDATA[7E58D482996311DD9B45001D09C4A2FE]]></AD_COLUMN_ID>
 <!--7E58D482996311DD9B45001D09C4A2FE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -267947,6 +268542,484 @@
 <!--7E58D482996311DD9B45001D09C4A2FE-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--7E58D482996311DD9B45001D09C4A2FE--></AD_COLUMN>
 
+<!--7E595A11D612446FE040007F010052E9--><AD_COLUMN>
+<!--7E595A11D612446FE040007F010052E9-->  <AD_COLUMN_ID><![CDATA[7E595A11D612446FE040007F010052E9]]></AD_COLUMN_ID>
+<!--7E595A11D612446FE040007F010052E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E595A11D612446FE040007F010052E9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E595A11D612446FE040007F010052E9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E595A11D612446FE040007F010052E9-->  <NAME><![CDATA[Invoice Line Tax]]></NAME>
+<!--7E595A11D612446FE040007F010052E9-->  <DESCRIPTION><![CDATA[Invoice Line Tax]]></DESCRIPTION>
+<!--7E595A11D612446FE040007F010052E9-->  <HELP><![CDATA[Refers to the tax related to a given invoice line.]]></HELP>
+<!--7E595A11D612446FE040007F010052E9-->  <COLUMNNAME><![CDATA[C_InvoiceLineTax_ID]]></COLUMNNAME>
+<!--7E595A11D612446FE040007F010052E9-->  <AD_TABLE_ID><![CDATA[2C75DEA0B5914305B4D789F76FCFD276]]></AD_TABLE_ID>
+<!--7E595A11D612446FE040007F010052E9-->  <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--7E595A11D612446FE040007F010052E9-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--7E595A11D612446FE040007F010052E9-->  <ISKEY><![CDATA[Y]]></ISKEY>
+<!--7E595A11D612446FE040007F010052E9-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E595A11D612446FE040007F010052E9-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E595A11D612446FE040007F010052E9-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--7E595A11D612446FE040007F010052E9-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E595A11D612446FE040007F010052E9-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--7E595A11D612446FE040007F010052E9-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E595A11D612446FE040007F010052E9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E595A11D612446FE040007F010052E9-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E595A11D612446FE040007F010052E9-->  <AD_ELEMENT_ID><![CDATA[7E595A11D621446FE040007F010052E9]]></AD_ELEMENT_ID>
+<!--7E595A11D612446FE040007F010052E9-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--7E595A11D612446FE040007F010052E9-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E595A11D612446FE040007F010052E9-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E595A11D612446FE040007F010052E9-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E595A11D612446FE040007F010052E9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E595A11D612446FE040007F010052E9-->  <POSITION><![CDATA[1]]></POSITION>
+<!--7E595A11D612446FE040007F010052E9-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E595A11D612446FE040007F010052E9--></AD_COLUMN>
+
+<!--7E595A11D613446FE040007F010052E9--><AD_COLUMN>
+<!--7E595A11D613446FE040007F010052E9-->  <AD_COLUMN_ID><![CDATA[7E595A11D613446FE040007F010052E9]]></AD_COLUMN_ID>
+<!--7E595A11D613446FE040007F010052E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E595A11D613446FE040007F010052E9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E595A11D613446FE040007F010052E9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E595A11D613446FE040007F010052E9-->  <NAME><![CDATA[Tax]]></NAME>
+<!--7E595A11D613446FE040007F010052E9-->  <DESCRIPTION><![CDATA[The percentage of money requested by the government for this specified product or transaction.]]></DESCRIPTION>
+<!--7E595A11D613446FE040007F010052E9-->  <HELP><![CDATA[The Tax indicates the type of tax for this document line.]]></HELP>
+<!--7E595A11D613446FE040007F010052E9-->  <COLUMNNAME><![CDATA[C_Tax_ID]]></COLUMNNAME>
+<!--7E595A11D613446FE040007F010052E9-->  <AD_TABLE_ID><![CDATA[2C75DEA0B5914305B4D789F76FCFD276]]></AD_TABLE_ID>
+<!--7E595A11D613446FE040007F010052E9-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--7E595A11D613446FE040007F010052E9-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--7E595A11D613446FE040007F010052E9-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E595A11D613446FE040007F010052E9-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E595A11D613446FE040007F010052E9-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E595A11D613446FE040007F010052E9-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7E595A11D613446FE040007F010052E9-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--7E595A11D613446FE040007F010052E9-->  <SEQNO><![CDATA[20]]></SEQNO>
+<!--7E595A11D613446FE040007F010052E9-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E595A11D613446FE040007F010052E9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E595A11D613446FE040007F010052E9-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E595A11D613446FE040007F010052E9-->  <AD_ELEMENT_ID><![CDATA[213]]></AD_ELEMENT_ID>
+<!--7E595A11D613446FE040007F010052E9-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E595A11D613446FE040007F010052E9-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E595A11D613446FE040007F010052E9-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E595A11D613446FE040007F010052E9-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E595A11D613446FE040007F010052E9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E595A11D613446FE040007F010052E9-->  <POSITION><![CDATA[2]]></POSITION>
+<!--7E595A11D613446FE040007F010052E9-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E595A11D613446FE040007F010052E9--></AD_COLUMN>
+
+<!--7E595A11D614446FE040007F010052E9--><AD_COLUMN>
+<!--7E595A11D614446FE040007F010052E9-->  <AD_COLUMN_ID><![CDATA[7E595A11D614446FE040007F010052E9]]></AD_COLUMN_ID>
+<!--7E595A11D614446FE040007F010052E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E595A11D614446FE040007F010052E9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E595A11D614446FE040007F010052E9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E595A11D614446FE040007F010052E9-->  <NAME><![CDATA[Invoice]]></NAME>
+<!--7E595A11D614446FE040007F010052E9-->  <DESCRIPTION><![CDATA[A document listing products, quantities and prices, payment terms, etc.]]></DESCRIPTION>
+<!--7E595A11D614446FE040007F010052E9-->  <HELP><![CDATA[The Invoice ID uniquely identifies an Invoice Document.]]></HELP>
+<!--7E595A11D614446FE040007F010052E9-->  <COLUMNNAME><![CDATA[C_Invoice_ID]]></COLUMNNAME>
+<!--7E595A11D614446FE040007F010052E9-->  <AD_TABLE_ID><![CDATA[2C75DEA0B5914305B4D789F76FCFD276]]></AD_TABLE_ID>
+<!--7E595A11D614446FE040007F010052E9-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--7E595A11D614446FE040007F010052E9-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--7E595A11D614446FE040007F010052E9-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E595A11D614446FE040007F010052E9-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E595A11D614446FE040007F010052E9-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E595A11D614446FE040007F010052E9-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7E595A11D614446FE040007F010052E9-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E595A11D614446FE040007F010052E9-->  <SEQNO><![CDATA[30]]></SEQNO>
+<!--7E595A11D614446FE040007F010052E9-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E595A11D614446FE040007F010052E9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E595A11D614446FE040007F010052E9-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E595A11D614446FE040007F010052E9-->  <AD_ELEMENT_ID><![CDATA[1008]]></AD_ELEMENT_ID>
+<!--7E595A11D614446FE040007F010052E9-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E595A11D614446FE040007F010052E9-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E595A11D614446FE040007F010052E9-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E595A11D614446FE040007F010052E9-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E595A11D614446FE040007F010052E9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E595A11D614446FE040007F010052E9-->  <POSITION><![CDATA[3]]></POSITION>
+<!--7E595A11D614446FE040007F010052E9-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E595A11D614446FE040007F010052E9--></AD_COLUMN>
+
+<!--7E595A11D615446FE040007F010052E9--><AD_COLUMN>
+<!--7E595A11D615446FE040007F010052E9-->  <AD_COLUMN_ID><![CDATA[7E595A11D615446FE040007F010052E9]]></AD_COLUMN_ID>
+<!--7E595A11D615446FE040007F010052E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E595A11D615446FE040007F010052E9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E595A11D615446FE040007F010052E9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E595A11D615446FE040007F010052E9-->  <NAME><![CDATA[Invoice Line]]></NAME>
+<!--7E595A11D615446FE040007F010052E9-->  <DESCRIPTION><![CDATA[A statement displaying one item or charge in an invoice.]]></DESCRIPTION>
+<!--7E595A11D615446FE040007F010052E9-->  <HELP><![CDATA[The Invoice Line uniquely identifies a single line of an Invoice.]]></HELP>
+<!--7E595A11D615446FE040007F010052E9-->  <COLUMNNAME><![CDATA[C_Invoiceline_ID]]></COLUMNNAME>
+<!--7E595A11D615446FE040007F010052E9-->  <AD_TABLE_ID><![CDATA[2C75DEA0B5914305B4D789F76FCFD276]]></AD_TABLE_ID>
+<!--7E595A11D615446FE040007F010052E9-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--7E595A11D615446FE040007F010052E9-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--7E595A11D615446FE040007F010052E9-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E595A11D615446FE040007F010052E9-->  <ISPARENT><![CDATA[Y]]></ISPARENT>
+<!--7E595A11D615446FE040007F010052E9-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E595A11D615446FE040007F010052E9-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--7E595A11D615446FE040007F010052E9-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
+<!--7E595A11D615446FE040007F010052E9-->  <SEQNO><![CDATA[10]]></SEQNO>
+<!--7E595A11D615446FE040007F010052E9-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E595A11D615446FE040007F010052E9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E595A11D615446FE040007F010052E9-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E595A11D615446FE040007F010052E9-->  <AD_ELEMENT_ID><![CDATA[1076]]></AD_ELEMENT_ID>
+<!--7E595A11D615446FE040007F010052E9-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E595A11D615446FE040007F010052E9-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E595A11D615446FE040007F010052E9-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E595A11D615446FE040007F010052E9-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E595A11D615446FE040007F010052E9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E595A11D615446FE040007F010052E9-->  <POSITION><![CDATA[4]]></POSITION>
+<!--7E595A11D615446FE040007F010052E9-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E595A11D615446FE040007F010052E9--></AD_COLUMN>
+
+<!--7E595A11D616446FE040007F010052E9--><AD_COLUMN>
+<!--7E595A11D616446FE040007F010052E9-->  <AD_COLUMN_ID><![CDATA[7E595A11D616446FE040007F010052E9]]></AD_COLUMN_ID>
+<!--7E595A11D616446FE040007F010052E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E595A11D616446FE040007F010052E9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E595A11D616446FE040007F010052E9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E595A11D616446FE040007F010052E9-->  <NAME><![CDATA[Client]]></NAME>
+<!--7E595A11D616446FE040007F010052E9-->  <DESCRIPTION><![CDATA[Client for this installation.]]></DESCRIPTION>
+<!--7E595A11D616446FE040007F010052E9-->  <HELP><![CDATA[A Client is a company or a legal entity. You cannot share data between Clients.]]></HELP>
+<!--7E595A11D616446FE040007F010052E9-->  <COLUMNNAME><![CDATA[AD_Client_ID]]></COLUMNNAME>
+<!--7E595A11D616446FE040007F010052E9-->  <AD_TABLE_ID><![CDATA[2C75DEA0B5914305B4D789F76FCFD276]]></AD_TABLE_ID>
+<!--7E595A11D616446FE040007F010052E9-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--7E595A11D616446FE040007F010052E9-->  <AD_VAL_RULE_ID><![CDATA[103]]></AD_VAL_RULE_ID>
+<!--7E595A11D616446FE040007F010052E9-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--7E595A11D616446FE040007F010052E9-->  <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
+<!--7E595A11D616446FE040007F010052E9-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E595A11D616446FE040007F010052E9-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E595A11D616446FE040007F010052E9-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E595A11D616446FE040007F010052E9-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--7E595A11D616446FE040007F010052E9-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E595A11D616446FE040007F010052E9-->  <SEQNO><![CDATA[50]]></SEQNO>
+<!--7E595A11D616446FE040007F010052E9-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E595A11D616446FE040007F010052E9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E595A11D616446FE040007F010052E9-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E595A11D616446FE040007F010052E9-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
+<!--7E595A11D616446FE040007F010052E9-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--7E595A11D616446FE040007F010052E9-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E595A11D616446FE040007F010052E9-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E595A11D616446FE040007F010052E9-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E595A11D616446FE040007F010052E9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E595A11D616446FE040007F010052E9-->  <POSITION><![CDATA[5]]></POSITION>
+<!--7E595A11D616446FE040007F010052E9-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E595A11D616446FE040007F010052E9--></AD_COLUMN>
+
+<!--7E595A11D617446FE040007F010052E9--><AD_COLUMN>
+<!--7E595A11D617446FE040007F010052E9-->  <AD_COLUMN_ID><![CDATA[7E595A11D617446FE040007F010052E9]]></AD_COLUMN_ID>
+<!--7E595A11D617446FE040007F010052E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E595A11D617446FE040007F010052E9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E595A11D617446FE040007F010052E9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E595A11D617446FE040007F010052E9-->  <NAME><![CDATA[Organization]]></NAME>
+<!--7E595A11D617446FE040007F010052E9-->  <DESCRIPTION><![CDATA[Organizational entity within client]]></DESCRIPTION>
+<!--7E595A11D617446FE040007F010052E9-->  <HELP><![CDATA[An organization is a unit of your client or legal entity - examples are store, department. You can share data between organizations.]]></HELP>
+<!--7E595A11D617446FE040007F010052E9-->  <COLUMNNAME><![CDATA[AD_Org_ID]]></COLUMNNAME>
+<!--7E595A11D617446FE040007F010052E9-->  <AD_TABLE_ID><![CDATA[2C75DEA0B5914305B4D789F76FCFD276]]></AD_TABLE_ID>
+<!--7E595A11D617446FE040007F010052E9-->  <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--7E595A11D617446FE040007F010052E9-->  <AD_VAL_RULE_ID><![CDATA[104]]></AD_VAL_RULE_ID>
+<!--7E595A11D617446FE040007F010052E9-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--7E595A11D617446FE040007F010052E9-->  <DEFAULTVALUE><![CDATA[@AD_ORG_ID@]]></DEFAULTVALUE>
+<!--7E595A11D617446FE040007F010052E9-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E595A11D617446FE040007F010052E9-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E595A11D617446FE040007F010052E9-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E595A11D617446FE040007F010052E9-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--7E595A11D617446FE040007F010052E9-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E595A11D617446FE040007F010052E9-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--7E595A11D617446FE040007F010052E9-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E595A11D617446FE040007F010052E9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E595A11D617446FE040007F010052E9-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E595A11D617446FE040007F010052E9-->  <AD_ELEMENT_ID><![CDATA[113]]></AD_ELEMENT_ID>
+<!--7E595A11D617446FE040007F010052E9-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--7E595A11D617446FE040007F010052E9-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E595A11D617446FE040007F010052E9-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E595A11D617446FE040007F010052E9-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E595A11D617446FE040007F010052E9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E595A11D617446FE040007F010052E9-->  <POSITION><![CDATA[6]]></POSITION>
+<!--7E595A11D617446FE040007F010052E9-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E595A11D617446FE040007F010052E9--></AD_COLUMN>
+
+<!--7E595A11D618446FE040007F010052E9--><AD_COLUMN>
+<!--7E595A11D618446FE040007F010052E9-->  <AD_COLUMN_ID><![CDATA[7E595A11D618446FE040007F010052E9]]></AD_COLUMN_ID>
+<!--7E595A11D618446FE040007F010052E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E595A11D618446FE040007F010052E9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E595A11D618446FE040007F010052E9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E595A11D618446FE040007F010052E9-->  <NAME><![CDATA[Active]]></NAME>
+<!--7E595A11D618446FE040007F010052E9-->  <DESCRIPTION><![CDATA[A flag indicating whether this record is available for use or de-activated.]]></DESCRIPTION>
+<!--7E595A11D618446FE040007F010052E9-->  <HELP><![CDATA[There are two methods of making records unavailable in the system: One is to delete the record, the other is to de-activate the record. A de-activated record is not available for selection, but available for reporting. There are two reasons for de-activating and not deleting records: 
+(1) The system requires the record for auditing purposes.
+(2) The record is referenced by other records. E.g., you cannot delete a Business Partner, if there are existing invoices for it. By de-activating the Business Partner you prevent it from being used in future transactions.]]></HELP>
+<!--7E595A11D618446FE040007F010052E9-->  <COLUMNNAME><![CDATA[Isactive]]></COLUMNNAME>
+<!--7E595A11D618446FE040007F010052E9-->  <AD_TABLE_ID><![CDATA[2C75DEA0B5914305B4D789F76FCFD276]]></AD_TABLE_ID>
+<!--7E595A11D618446FE040007F010052E9-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--7E595A11D618446FE040007F010052E9-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--7E595A11D618446FE040007F010052E9-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--7E595A11D618446FE040007F010052E9-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E595A11D618446FE040007F010052E9-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E595A11D618446FE040007F010052E9-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E595A11D618446FE040007F010052E9-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7E595A11D618446FE040007F010052E9-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E595A11D618446FE040007F010052E9-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--7E595A11D618446FE040007F010052E9-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E595A11D618446FE040007F010052E9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E595A11D618446FE040007F010052E9-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E595A11D618446FE040007F010052E9-->  <AD_ELEMENT_ID><![CDATA[348]]></AD_ELEMENT_ID>
+<!--7E595A11D618446FE040007F010052E9-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E595A11D618446FE040007F010052E9-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E595A11D618446FE040007F010052E9-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E595A11D618446FE040007F010052E9-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E595A11D618446FE040007F010052E9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E595A11D618446FE040007F010052E9-->  <POSITION><![CDATA[7]]></POSITION>
+<!--7E595A11D618446FE040007F010052E9-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E595A11D618446FE040007F010052E9--></AD_COLUMN>
+
+<!--7E595A11D619446FE040007F010052E9--><AD_COLUMN>
+<!--7E595A11D619446FE040007F010052E9-->  <AD_COLUMN_ID><![CDATA[7E595A11D619446FE040007F010052E9]]></AD_COLUMN_ID>
+<!--7E595A11D619446FE040007F010052E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E595A11D619446FE040007F010052E9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E595A11D619446FE040007F010052E9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E595A11D619446FE040007F010052E9-->  <NAME><![CDATA[Creation Date]]></NAME>
+<!--7E595A11D619446FE040007F010052E9-->  <DESCRIPTION><![CDATA[The date that this record is completed.]]></DESCRIPTION>
+<!--7E595A11D619446FE040007F010052E9-->  <HELP><![CDATA[The Created field indicates the date that this record was created.]]></HELP>
+<!--7E595A11D619446FE040007F010052E9-->  <COLUMNNAME><![CDATA[Created]]></COLUMNNAME>
+<!--7E595A11D619446FE040007F010052E9-->  <AD_TABLE_ID><![CDATA[2C75DEA0B5914305B4D789F76FCFD276]]></AD_TABLE_ID>
+<!--7E595A11D619446FE040007F010052E9-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--7E595A11D619446FE040007F010052E9-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--7E595A11D619446FE040007F010052E9-->  <DEFAULTVALUE><![CDATA[SYSDATE]]></DEFAULTVALUE>
+<!--7E595A11D619446FE040007F010052E9-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E595A11D619446FE040007F010052E9-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E595A11D619446FE040007F010052E9-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E595A11D619446FE040007F010052E9-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--7E595A11D619446FE040007F010052E9-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E595A11D619446FE040007F010052E9-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--7E595A11D619446FE040007F010052E9-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E595A11D619446FE040007F010052E9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E595A11D619446FE040007F010052E9-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E595A11D619446FE040007F010052E9-->  <AD_ELEMENT_ID><![CDATA[245]]></AD_ELEMENT_ID>
+<!--7E595A11D619446FE040007F010052E9-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E595A11D619446FE040007F010052E9-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E595A11D619446FE040007F010052E9-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E595A11D619446FE040007F010052E9-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E595A11D619446FE040007F010052E9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E595A11D619446FE040007F010052E9-->  <POSITION><![CDATA[8]]></POSITION>
+<!--7E595A11D619446FE040007F010052E9-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E595A11D619446FE040007F010052E9--></AD_COLUMN>
+
+<!--7E595A11D61A446FE040007F010052E9--><AD_COLUMN>
+<!--7E595A11D61A446FE040007F010052E9-->  <AD_COLUMN_ID><![CDATA[7E595A11D61A446FE040007F010052E9]]></AD_COLUMN_ID>
+<!--7E595A11D61A446FE040007F010052E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E595A11D61A446FE040007F010052E9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E595A11D61A446FE040007F010052E9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E595A11D61A446FE040007F010052E9-->  <NAME><![CDATA[Created By]]></NAME>
+<!--7E595A11D61A446FE040007F010052E9-->  <DESCRIPTION><![CDATA[User who created this records]]></DESCRIPTION>
+<!--7E595A11D61A446FE040007F010052E9-->  <HELP><![CDATA[The Created By field indicates the user who created this record.]]></HELP>
+<!--7E595A11D61A446FE040007F010052E9-->  <COLUMNNAME><![CDATA[Createdby]]></COLUMNNAME>
+<!--7E595A11D61A446FE040007F010052E9-->  <AD_TABLE_ID><![CDATA[2C75DEA0B5914305B4D789F76FCFD276]]></AD_TABLE_ID>
+<!--7E595A11D61A446FE040007F010052E9-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--7E595A11D61A446FE040007F010052E9-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--7E595A11D61A446FE040007F010052E9-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E595A11D61A446FE040007F010052E9-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E595A11D61A446FE040007F010052E9-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E595A11D61A446FE040007F010052E9-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--7E595A11D61A446FE040007F010052E9-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E595A11D61A446FE040007F010052E9-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--7E595A11D61A446FE040007F010052E9-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E595A11D61A446FE040007F010052E9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E595A11D61A446FE040007F010052E9-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E595A11D61A446FE040007F010052E9-->  <AD_ELEMENT_ID><![CDATA[246]]></AD_ELEMENT_ID>
+<!--7E595A11D61A446FE040007F010052E9-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E595A11D61A446FE040007F010052E9-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E595A11D61A446FE040007F010052E9-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E595A11D61A446FE040007F010052E9-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E595A11D61A446FE040007F010052E9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E595A11D61A446FE040007F010052E9-->  <POSITION><![CDATA[9]]></POSITION>
+<!--7E595A11D61A446FE040007F010052E9-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E595A11D61A446FE040007F010052E9--></AD_COLUMN>
+
+<!--7E595A11D61B446FE040007F010052E9--><AD_COLUMN>
+<!--7E595A11D61B446FE040007F010052E9-->  <AD_COLUMN_ID><![CDATA[7E595A11D61B446FE040007F010052E9]]></AD_COLUMN_ID>
+<!--7E595A11D61B446FE040007F010052E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E595A11D61B446FE040007F010052E9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E595A11D61B446FE040007F010052E9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E595A11D61B446FE040007F010052E9-->  <NAME><![CDATA[Updated]]></NAME>
+<!--7E595A11D61B446FE040007F010052E9-->  <DESCRIPTION><![CDATA[x not implemented]]></DESCRIPTION>
+<!--7E595A11D61B446FE040007F010052E9-->  <HELP><![CDATA[The Updated field indicates the date that this record was updated.]]></HELP>
+<!--7E595A11D61B446FE040007F010052E9-->  <COLUMNNAME><![CDATA[Updated]]></COLUMNNAME>
+<!--7E595A11D61B446FE040007F010052E9-->  <AD_TABLE_ID><![CDATA[2C75DEA0B5914305B4D789F76FCFD276]]></AD_TABLE_ID>
+<!--7E595A11D61B446FE040007F010052E9-->  <AD_REFERENCE_ID><![CDATA[16]]></AD_REFERENCE_ID>
+<!--7E595A11D61B446FE040007F010052E9-->  <FIELDLENGTH><![CDATA[19]]></FIELDLENGTH>
+<!--7E595A11D61B446FE040007F010052E9-->  <DEFAULTVALUE><![CDATA[SYSDATE]]></DEFAULTVALUE>
+<!--7E595A11D61B446FE040007F010052E9-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E595A11D61B446FE040007F010052E9-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E595A11D61B446FE040007F010052E9-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E595A11D61B446FE040007F010052E9-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--7E595A11D61B446FE040007F010052E9-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E595A11D61B446FE040007F010052E9-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--7E595A11D61B446FE040007F010052E9-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E595A11D61B446FE040007F010052E9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E595A11D61B446FE040007F010052E9-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E595A11D61B446FE040007F010052E9-->  <AD_ELEMENT_ID><![CDATA[607]]></AD_ELEMENT_ID>
+<!--7E595A11D61B446FE040007F010052E9-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E595A11D61B446FE040007F010052E9-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E595A11D61B446FE040007F010052E9-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E595A11D61B446FE040007F010052E9-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E595A11D61B446FE040007F010052E9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E595A11D61B446FE040007F010052E9-->  <POSITION><![CDATA[10]]></POSITION>
+<!--7E595A11D61B446FE040007F010052E9-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E595A11D61B446FE040007F010052E9--></AD_COLUMN>
+
+<!--7E595A11D61C446FE040007F010052E9--><AD_COLUMN>
+<!--7E595A11D61C446FE040007F010052E9-->  <AD_COLUMN_ID><![CDATA[7E595A11D61C446FE040007F010052E9]]></AD_COLUMN_ID>
+<!--7E595A11D61C446FE040007F010052E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E595A11D61C446FE040007F010052E9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E595A11D61C446FE040007F010052E9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E595A11D61C446FE040007F010052E9-->  <NAME><![CDATA[Updated By]]></NAME>
+<!--7E595A11D61C446FE040007F010052E9-->  <DESCRIPTION><![CDATA[User who updated this records]]></DESCRIPTION>
+<!--7E595A11D61C446FE040007F010052E9-->  <HELP><![CDATA[The Updated By field indicates the user who updated this record.]]></HELP>
+<!--7E595A11D61C446FE040007F010052E9-->  <COLUMNNAME><![CDATA[Updatedby]]></COLUMNNAME>
+<!--7E595A11D61C446FE040007F010052E9-->  <AD_TABLE_ID><![CDATA[2C75DEA0B5914305B4D789F76FCFD276]]></AD_TABLE_ID>
+<!--7E595A11D61C446FE040007F010052E9-->  <AD_REFERENCE_ID><![CDATA[30]]></AD_REFERENCE_ID>
+<!--7E595A11D61C446FE040007F010052E9-->  <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--7E595A11D61C446FE040007F010052E9-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E595A11D61C446FE040007F010052E9-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E595A11D61C446FE040007F010052E9-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E595A11D61C446FE040007F010052E9-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--7E595A11D61C446FE040007F010052E9-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E595A11D61C446FE040007F010052E9-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--7E595A11D61C446FE040007F010052E9-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E595A11D61C446FE040007F010052E9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E595A11D61C446FE040007F010052E9-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E595A11D61C446FE040007F010052E9-->  <AD_ELEMENT_ID><![CDATA[608]]></AD_ELEMENT_ID>
+<!--7E595A11D61C446FE040007F010052E9-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E595A11D61C446FE040007F010052E9-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E595A11D61C446FE040007F010052E9-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E595A11D61C446FE040007F010052E9-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E595A11D61C446FE040007F010052E9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E595A11D61C446FE040007F010052E9-->  <POSITION><![CDATA[11]]></POSITION>
+<!--7E595A11D61C446FE040007F010052E9-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E595A11D61C446FE040007F010052E9--></AD_COLUMN>
+
+<!--7E595A11D61D446FE040007F010052E9--><AD_COLUMN>
+<!--7E595A11D61D446FE040007F010052E9-->  <AD_COLUMN_ID><![CDATA[7E595A11D61D446FE040007F010052E9]]></AD_COLUMN_ID>
+<!--7E595A11D61D446FE040007F010052E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E595A11D61D446FE040007F010052E9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E595A11D61D446FE040007F010052E9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E595A11D61D446FE040007F010052E9-->  <NAME><![CDATA[Taxable Amount]]></NAME>
+<!--7E595A11D61D446FE040007F010052E9-->  <DESCRIPTION><![CDATA[The total sum on which taxes are added.]]></DESCRIPTION>
+<!--7E595A11D61D446FE040007F010052E9-->  <HELP><![CDATA[The Tax Base Amount indicates the base amount used for calculating the tax amount.]]></HELP>
+<!--7E595A11D61D446FE040007F010052E9-->  <COLUMNNAME><![CDATA[Taxbaseamt]]></COLUMNNAME>
+<!--7E595A11D61D446FE040007F010052E9-->  <AD_TABLE_ID><![CDATA[2C75DEA0B5914305B4D789F76FCFD276]]></AD_TABLE_ID>
+<!--7E595A11D61D446FE040007F010052E9-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
+<!--7E595A11D61D446FE040007F010052E9-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--7E595A11D61D446FE040007F010052E9-->  <DEFAULTVALUE><![CDATA[0]]></DEFAULTVALUE>
+<!--7E595A11D61D446FE040007F010052E9-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E595A11D61D446FE040007F010052E9-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E595A11D61D446FE040007F010052E9-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E595A11D61D446FE040007F010052E9-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7E595A11D61D446FE040007F010052E9-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E595A11D61D446FE040007F010052E9-->  <SEQNO><![CDATA[120]]></SEQNO>
+<!--7E595A11D61D446FE040007F010052E9-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E595A11D61D446FE040007F010052E9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E595A11D61D446FE040007F010052E9-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E595A11D61D446FE040007F010052E9-->  <AD_ELEMENT_ID><![CDATA[1134]]></AD_ELEMENT_ID>
+<!--7E595A11D61D446FE040007F010052E9-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E595A11D61D446FE040007F010052E9-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E595A11D61D446FE040007F010052E9-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E595A11D61D446FE040007F010052E9-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E595A11D61D446FE040007F010052E9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E595A11D61D446FE040007F010052E9-->  <POSITION><![CDATA[12]]></POSITION>
+<!--7E595A11D61D446FE040007F010052E9-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E595A11D61D446FE040007F010052E9--></AD_COLUMN>
+
+<!--7E595A11D61E446FE040007F010052E9--><AD_COLUMN>
+<!--7E595A11D61E446FE040007F010052E9-->  <AD_COLUMN_ID><![CDATA[7E595A11D61E446FE040007F010052E9]]></AD_COLUMN_ID>
+<!--7E595A11D61E446FE040007F010052E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E595A11D61E446FE040007F010052E9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E595A11D61E446FE040007F010052E9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E595A11D61E446FE040007F010052E9-->  <NAME><![CDATA[Tax Amount]]></NAME>
+<!--7E595A11D61E446FE040007F010052E9-->  <DESCRIPTION><![CDATA[The total sum of money requested by the government of the specified transaction.]]></DESCRIPTION>
+<!--7E595A11D61E446FE040007F010052E9-->  <HELP><![CDATA[The Tax Amount displays the total tax amount for a document.]]></HELP>
+<!--7E595A11D61E446FE040007F010052E9-->  <COLUMNNAME><![CDATA[Taxamt]]></COLUMNNAME>
+<!--7E595A11D61E446FE040007F010052E9-->  <AD_TABLE_ID><![CDATA[2C75DEA0B5914305B4D789F76FCFD276]]></AD_TABLE_ID>
+<!--7E595A11D61E446FE040007F010052E9-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
+<!--7E595A11D61E446FE040007F010052E9-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--7E595A11D61E446FE040007F010052E9-->  <DEFAULTVALUE><![CDATA[0]]></DEFAULTVALUE>
+<!--7E595A11D61E446FE040007F010052E9-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E595A11D61E446FE040007F010052E9-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E595A11D61E446FE040007F010052E9-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E595A11D61E446FE040007F010052E9-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7E595A11D61E446FE040007F010052E9-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E595A11D61E446FE040007F010052E9-->  <SEQNO><![CDATA[130]]></SEQNO>
+<!--7E595A11D61E446FE040007F010052E9-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E595A11D61E446FE040007F010052E9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E595A11D61E446FE040007F010052E9-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E595A11D61E446FE040007F010052E9-->  <AD_ELEMENT_ID><![CDATA[1133]]></AD_ELEMENT_ID>
+<!--7E595A11D61E446FE040007F010052E9-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E595A11D61E446FE040007F010052E9-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E595A11D61E446FE040007F010052E9-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E595A11D61E446FE040007F010052E9-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E595A11D61E446FE040007F010052E9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E595A11D61E446FE040007F010052E9-->  <POSITION><![CDATA[13]]></POSITION>
+<!--7E595A11D61E446FE040007F010052E9-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E595A11D61E446FE040007F010052E9--></AD_COLUMN>
+
+<!--7E595A11D61F446FE040007F010052E9--><AD_COLUMN>
+<!--7E595A11D61F446FE040007F010052E9-->  <AD_COLUMN_ID><![CDATA[7E595A11D61F446FE040007F010052E9]]></AD_COLUMN_ID>
+<!--7E595A11D61F446FE040007F010052E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E595A11D61F446FE040007F010052E9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E595A11D61F446FE040007F010052E9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E595A11D61F446FE040007F010052E9-->  <NAME><![CDATA[Line No.]]></NAME>
+<!--7E595A11D61F446FE040007F010052E9-->  <DESCRIPTION><![CDATA[A line stating the position of this request in the document.]]></DESCRIPTION>
+<!--7E595A11D61F446FE040007F010052E9-->  <HELP><![CDATA[Indicates the unique line for a document.  It will also control the display order of the lines within a document.]]></HELP>
+<!--7E595A11D61F446FE040007F010052E9-->  <COLUMNNAME><![CDATA[Line]]></COLUMNNAME>
+<!--7E595A11D61F446FE040007F010052E9-->  <AD_TABLE_ID><![CDATA[2C75DEA0B5914305B4D789F76FCFD276]]></AD_TABLE_ID>
+<!--7E595A11D61F446FE040007F010052E9-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--7E595A11D61F446FE040007F010052E9-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--7E595A11D61F446FE040007F010052E9-->  <DEFAULTVALUE><![CDATA[@SQL=SELECT COALESCE(MAX(LINE),0)+10 AS DefaultValue FROM C_INVOICELINETAX WHERE C_INVOICELINE_ID=@C_InvoiceLine_ID@]]></DEFAULTVALUE>
+<!--7E595A11D61F446FE040007F010052E9-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E595A11D61F446FE040007F010052E9-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E595A11D61F446FE040007F010052E9-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E595A11D61F446FE040007F010052E9-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7E595A11D61F446FE040007F010052E9-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E595A11D61F446FE040007F010052E9-->  <SEQNO><![CDATA[140]]></SEQNO>
+<!--7E595A11D61F446FE040007F010052E9-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E595A11D61F446FE040007F010052E9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E595A11D61F446FE040007F010052E9-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E595A11D61F446FE040007F010052E9-->  <AD_ELEMENT_ID><![CDATA[439]]></AD_ELEMENT_ID>
+<!--7E595A11D61F446FE040007F010052E9-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E595A11D61F446FE040007F010052E9-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E595A11D61F446FE040007F010052E9-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E595A11D61F446FE040007F010052E9-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E595A11D61F446FE040007F010052E9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E595A11D61F446FE040007F010052E9-->  <POSITION><![CDATA[14]]></POSITION>
+<!--7E595A11D61F446FE040007F010052E9-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E595A11D61F446FE040007F010052E9--></AD_COLUMN>
+
+<!--7E595A11D620446FE040007F010052E9--><AD_COLUMN>
+<!--7E595A11D620446FE040007F010052E9-->  <AD_COLUMN_ID><![CDATA[7E595A11D620446FE040007F010052E9]]></AD_COLUMN_ID>
+<!--7E595A11D620446FE040007F010052E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E595A11D620446FE040007F010052E9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E595A11D620446FE040007F010052E9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E595A11D620446FE040007F010052E9-->  <NAME><![CDATA[Recalculate]]></NAME>
+<!--7E595A11D620446FE040007F010052E9-->  <DESCRIPTION><![CDATA[Recalculate tax]]></DESCRIPTION>
+<!--7E595A11D620446FE040007F010052E9-->  <HELP><![CDATA[Recalculate tax when Order or Invoice is processed. Usually taxes are recalculated when the document they are associated to is processed, so if the amounts are manually edited it has any effect. If tax is checked as no recalculate, manually edited amounts will be directly applied.]]></HELP>
+<!--7E595A11D620446FE040007F010052E9-->  <COLUMNNAME><![CDATA[Recalculate]]></COLUMNNAME>
+<!--7E595A11D620446FE040007F010052E9-->  <AD_TABLE_ID><![CDATA[2C75DEA0B5914305B4D789F76FCFD276]]></AD_TABLE_ID>
+<!--7E595A11D620446FE040007F010052E9-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--7E595A11D620446FE040007F010052E9-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--7E595A11D620446FE040007F010052E9-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--7E595A11D620446FE040007F010052E9-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E595A11D620446FE040007F010052E9-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E595A11D620446FE040007F010052E9-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E595A11D620446FE040007F010052E9-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7E595A11D620446FE040007F010052E9-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E595A11D620446FE040007F010052E9-->  <SEQNO><![CDATA[150]]></SEQNO>
+<!--7E595A11D620446FE040007F010052E9-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E595A11D620446FE040007F010052E9-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E595A11D620446FE040007F010052E9-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E595A11D620446FE040007F010052E9-->  <AD_ELEMENT_ID><![CDATA[800789]]></AD_ELEMENT_ID>
+<!--7E595A11D620446FE040007F010052E9-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E595A11D620446FE040007F010052E9-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E595A11D620446FE040007F010052E9-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E595A11D620446FE040007F010052E9-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E595A11D620446FE040007F010052E9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E595A11D620446FE040007F010052E9-->  <POSITION><![CDATA[15]]></POSITION>
+<!--7E595A11D620446FE040007F010052E9-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E595A11D620446FE040007F010052E9--></AD_COLUMN>
+
 <!--7E5CC370CF414A1FA0D6671EBAA3EFFE--><AD_COLUMN>
 <!--7E5CC370CF414A1FA0D6671EBAA3EFFE-->  <AD_COLUMN_ID><![CDATA[7E5CC370CF414A1FA0D6671EBAA3EFFE]]></AD_COLUMN_ID>
 <!--7E5CC370CF414A1FA0D6671EBAA3EFFE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -267980,6 +269053,71 @@
 <!--7E5CC370CF414A1FA0D6671EBAA3EFFE-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--7E5CC370CF414A1FA0D6671EBAA3EFFE--></AD_COLUMN>
 
+<!--7E8829EBCFF6143AE040007F010018ED--><AD_COLUMN>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <AD_COLUMN_ID><![CDATA[7E8829EBCFF6143AE040007F010018ED]]></AD_COLUMN_ID>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <NAME><![CDATA[DocTaxAmount]]></NAME>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <DESCRIPTION><![CDATA[Document tax amount calculation criteria]]></DESCRIPTION>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <HELP><![CDATA[Criteria used for the calculation of tax base amount at document level.]]></HELP>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <COLUMNNAME><![CDATA[DocTaxAmount]]></COLUMNNAME>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <AD_TABLE_ID><![CDATA[261]]></AD_TABLE_ID>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <AD_REFERENCE_ID><![CDATA[17]]></AD_REFERENCE_ID>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <AD_REFERENCE_VALUE_ID><![CDATA[5BBEA02A7BCE441A81BC546DF034162E]]></AD_REFERENCE_VALUE_ID>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <DEFAULTVALUE><![CDATA[D]]></DEFAULTVALUE>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <SEQNO><![CDATA[141]]></SEQNO>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <AD_ELEMENT_ID><![CDATA[7E8829EBCFF7143AE040007F010018ED]]></AD_ELEMENT_ID>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <POSITION><![CDATA[35]]></POSITION>
+<!--7E8829EBCFF6143AE040007F010018ED-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E8829EBCFF6143AE040007F010018ED--></AD_COLUMN>
+
+<!--7EC3B5CF03719057E040007F010110BF--><AD_COLUMN>
+<!--7EC3B5CF03719057E040007F010110BF-->  <AD_COLUMN_ID><![CDATA[7EC3B5CF03719057E040007F010110BF]]></AD_COLUMN_ID>
+<!--7EC3B5CF03719057E040007F010110BF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7EC3B5CF03719057E040007F010110BF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7EC3B5CF03719057E040007F010110BF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7EC3B5CF03719057E040007F010110BF-->  <NAME><![CDATA[Require At Least One Value]]></NAME>
+<!--7EC3B5CF03719057E040007F010110BF-->  <DESCRIPTION><![CDATA[At least one attribute set value will be required in transactions.]]></DESCRIPTION>
+<!--7EC3B5CF03719057E040007F010110BF-->  <HELP><![CDATA[At least one attribute set value will be required in transactions.]]></HELP>
+<!--7EC3B5CF03719057E040007F010110BF-->  <COLUMNNAME><![CDATA[Isoneattrsetvalrequired]]></COLUMNNAME>
+<!--7EC3B5CF03719057E040007F010110BF-->  <AD_TABLE_ID><![CDATA[560]]></AD_TABLE_ID>
+<!--7EC3B5CF03719057E040007F010110BF-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--7EC3B5CF03719057E040007F010110BF-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--7EC3B5CF03719057E040007F010110BF-->  <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--7EC3B5CF03719057E040007F010110BF-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7EC3B5CF03719057E040007F010110BF-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7EC3B5CF03719057E040007F010110BF-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--7EC3B5CF03719057E040007F010110BF-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7EC3B5CF03719057E040007F010110BF-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7EC3B5CF03719057E040007F010110BF-->  <SEQNO><![CDATA[21]]></SEQNO>
+<!--7EC3B5CF03719057E040007F010110BF-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7EC3B5CF03719057E040007F010110BF-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7EC3B5CF03719057E040007F010110BF-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7EC3B5CF03719057E040007F010110BF-->  <AD_ELEMENT_ID><![CDATA[7EC3B5CF03729057E040007F010110BF]]></AD_ELEMENT_ID>
+<!--7EC3B5CF03719057E040007F010110BF-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7EC3B5CF03719057E040007F010110BF-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7EC3B5CF03719057E040007F010110BF-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7EC3B5CF03719057E040007F010110BF-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7EC3B5CF03719057E040007F010110BF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7EC3B5CF03719057E040007F010110BF-->  <POSITION><![CDATA[18]]></POSITION>
+<!--7EC3B5CF03719057E040007F010110BF-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7EC3B5CF03719057E040007F010110BF--></AD_COLUMN>
+
 <!--7ED4235BAC474A13B9059BCE003BCAEF--><AD_COLUMN>
 <!--7ED4235BAC474A13B9059BCE003BCAEF-->  <AD_COLUMN_ID><![CDATA[7ED4235BAC474A13B9059BCE003BCAEF]]></AD_COLUMN_ID>
 <!--7ED4235BAC474A13B9059BCE003BCAEF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_DATASET.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/sourcedata/AD_DATASET.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -28,20 +28,6 @@
 <!--1-->  <EXPORTALLOWED><![CDATA[N]]></EXPORTALLOWED>
 <!--1--></AD_DATASET>
 
-<!--2--><AD_DATASET>
-<!--2-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--2-->  <VALUE><![CDATA[ADCS]]></VALUE>
-<!--2-->  <NAME><![CDATA[ADCS]]></NAME>
-<!--2-->  <DESCRIPTION><![CDATA[Application dictionary for configuration script generation]]></DESCRIPTION>
-<!--2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--2-->  <EXPORT><![CDATA[N]]></EXPORT>
-<!--2-->  <ACCESSLEVEL><![CDATA[4]]></ACCESSLEVEL>
-<!--2-->  <EXPORTALLOWED><![CDATA[N]]></EXPORTALLOWED>
-<!--2--></AD_DATASET>
-
 <!--A6A16A6324E0457BA19A13FDD553AD79--><AD_DATASET>
 <!--A6A16A6324E0457BA19A13FDD553AD79-->  <AD_DATASET_ID><![CDATA[A6A16A6324E0457BA19A13FDD553AD79]]></AD_DATASET_ID>
 <!--A6A16A6324E0457BA19A13FDD553AD79-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -56,20 +42,6 @@
 <!--A6A16A6324E0457BA19A13FDD553AD79-->  <EXPORTALLOWED><![CDATA[Y]]></EXPORTALLOWED>
 <!--A6A16A6324E0457BA19A13FDD553AD79--></AD_DATASET>
 
-<!--C22005ECEB254DFF86061605E9939AAF--><AD_DATASET>
-<!--C22005ECEB254DFF86061605E9939AAF-->  <AD_DATASET_ID><![CDATA[C22005ECEB254DFF86061605E9939AAF]]></AD_DATASET_ID>
-<!--C22005ECEB254DFF86061605E9939AAF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--C22005ECEB254DFF86061605E9939AAF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--C22005ECEB254DFF86061605E9939AAF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--C22005ECEB254DFF86061605E9939AAF-->  <VALUE><![CDATA[DS]]></VALUE>
-<!--C22005ECEB254DFF86061605E9939AAF-->  <NAME><![CDATA[Dataset Definition]]></NAME>
-<!--C22005ECEB254DFF86061605E9939AAF-->  <DESCRIPTION><![CDATA[The definition of the dataset tables]]></DESCRIPTION>
-<!--C22005ECEB254DFF86061605E9939AAF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--C22005ECEB254DFF86061605E9939AAF-->  <EXPORT><![CDATA[N]]></EXPORT>
-<!--C22005ECEB254DFF86061605E9939AAF-->  <ACCESSLEVEL><![CDATA[4]]></ACCESSLEVEL>
-<!--C22005ECEB254DFF86061605E9939AAF-->  <EXPORTALLOWED><![CDATA[N]]></EXPORTALLOWED>
-<!--C22005ECEB254DFF86061605E9939AAF--></AD_DATASET>
-
 <!--D81C5C810AEF47C690E4F688ABC8AAC8--><AD_DATASET>
 <!--D81C5C810AEF47C690E4F688ABC8AAC8-->  <AD_DATASET_ID><![CDATA[D81C5C810AEF47C690E4F688ABC8AAC8]]></AD_DATASET_ID>
 <!--D81C5C810AEF47C690E4F688ABC8AAC8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_DATASET_COLUMN.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/sourcedata/AD_DATASET_COLUMN.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -11,17 +11,6 @@
 <!--00F9F94AA5D811DD9010001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--00F9F94AA5D811DD9010001B388C61A4--></AD_DATASET_COLUMN>
 
-<!--00FA38CEA5D811DDBF93001B388C61A4--><AD_DATASET_COLUMN>
-<!--00FA38CEA5D811DDBF93001B388C61A4-->  <AD_DATASET_COLUMN_ID><![CDATA[00FA38CEA5D811DDBF93001B388C61A4]]></AD_DATASET_COLUMN_ID>
-<!--00FA38CEA5D811DDBF93001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--00FA38CEA5D811DDBF93001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--00FA38CEA5D811DDBF93001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--00FA38CEA5D811DDBF93001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9F40ACA05211DDAE4E001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--00FA38CEA5D811DDBF93001B388C61A4-->  <AD_COLUMN_ID><![CDATA[565E56DF64EC9042E040007F01002829]]></AD_COLUMN_ID>
-<!--00FA38CEA5D811DDBF93001B388C61A4-->  <ISEXCLUDED><![CDATA[Y]]></ISEXCLUDED>
-<!--00FA38CEA5D811DDBF93001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--00FA38CEA5D811DDBF93001B388C61A4--></AD_DATASET_COLUMN>
-
 <!--047D9ACCA5D811DDAF84001B388C61A4--><AD_DATASET_COLUMN>
 <!--047D9ACCA5D811DDAF84001B388C61A4-->  <AD_DATASET_COLUMN_ID><![CDATA[047D9ACCA5D811DDAF84001B388C61A4]]></AD_DATASET_COLUMN_ID>
 <!--047D9ACCA5D811DDAF84001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -33,17 +22,6 @@
 <!--047D9ACCA5D811DDAF84001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--047D9ACCA5D811DDAF84001B388C61A4--></AD_DATASET_COLUMN>
 
-<!--047DE612A5D811DDA430001B388C61A4--><AD_DATASET_COLUMN>
-<!--047DE612A5D811DDA430001B388C61A4-->  <AD_DATASET_COLUMN_ID><![CDATA[047DE612A5D811DDA430001B388C61A4]]></AD_DATASET_COLUMN_ID>
-<!--047DE612A5D811DDA430001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--047DE612A5D811DDA430001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--047DE612A5D811DDA430001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--047DE612A5D811DDA430001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9F40ACA05211DDAE4E001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--047DE612A5D811DDA430001B388C61A4-->  <AD_COLUMN_ID><![CDATA[57CB1DF9C8CD1174E040007F0100423E]]></AD_COLUMN_ID>
-<!--047DE612A5D811DDA430001B388C61A4-->  <ISEXCLUDED><![CDATA[Y]]></ISEXCLUDED>
-<!--047DE612A5D811DDA430001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--047DE612A5D811DDA430001B388C61A4--></AD_DATASET_COLUMN>
-
 <!--086A405EA5D811DD88C3001B388C61A4--><AD_DATASET_COLUMN>
 <!--086A405EA5D811DD88C3001B388C61A4-->  <AD_DATASET_COLUMN_ID><![CDATA[086A405EA5D811DD88C3001B388C61A4]]></AD_DATASET_COLUMN_ID>
 <!--086A405EA5D811DD88C3001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -55,17 +33,6 @@
 <!--086A405EA5D811DD88C3001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--086A405EA5D811DD88C3001B388C61A4--></AD_DATASET_COLUMN>
 
-<!--086A8802A5D811DD9DA7001B388C61A4--><AD_DATASET_COLUMN>
-<!--086A8802A5D811DD9DA7001B388C61A4-->  <AD_DATASET_COLUMN_ID><![CDATA[086A8802A5D811DD9DA7001B388C61A4]]></AD_DATASET_COLUMN_ID>
-<!--086A8802A5D811DD9DA7001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--086A8802A5D811DD9DA7001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--086A8802A5D811DD9DA7001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--086A8802A5D811DD9DA7001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9F40ACA05211DDAE4E001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--086A8802A5D811DD9DA7001B388C61A4-->  <AD_COLUMN_ID><![CDATA[59D47C703D99BCCFE040007F0100439B]]></AD_COLUMN_ID>
-<!--086A8802A5D811DD9DA7001B388C61A4-->  <ISEXCLUDED><![CDATA[Y]]></ISEXCLUDED>
-<!--086A8802A5D811DD9DA7001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--086A8802A5D811DD9DA7001B388C61A4--></AD_DATASET_COLUMN>
-
 <!--0D45D3BF64854B34906D3326AA5B7546--><AD_DATASET_COLUMN>
 <!--0D45D3BF64854B34906D3326AA5B7546-->  <AD_DATASET_COLUMN_ID><![CDATA[0D45D3BF64854B34906D3326AA5B7546]]></AD_DATASET_COLUMN_ID>
 <!--0D45D3BF64854B34906D3326AA5B7546-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -187,17 +154,6 @@
 <!--F1529682A5D711DD8552001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--F1529682A5D711DD8552001B388C61A4--></AD_DATASET_COLUMN>
 
-<!--F1592600A5D711DDA11D001B388C61A4--><AD_DATASET_COLUMN>
-<!--F1592600A5D711DDA11D001B388C61A4-->  <AD_DATASET_COLUMN_ID><![CDATA[F1592600A5D711DDA11D001B388C61A4]]></AD_DATASET_COLUMN_ID>
-<!--F1592600A5D711DDA11D001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--F1592600A5D711DDA11D001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--F1592600A5D711DDA11D001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--F1592600A5D711DDA11D001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9F40ACA05211DDAE4E001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--F1592600A5D711DDA11D001B388C61A4-->  <AD_COLUMN_ID><![CDATA[5663A9C58E5C9AF1E040007F01007B6F]]></AD_COLUMN_ID>
-<!--F1592600A5D711DDA11D001B388C61A4-->  <ISEXCLUDED><![CDATA[Y]]></ISEXCLUDED>
-<!--F1592600A5D711DDA11D001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--F1592600A5D711DDA11D001B388C61A4--></AD_DATASET_COLUMN>
-
 <!--F7B0B1C6A5D711DD89FF001B388C61A4--><AD_DATASET_COLUMN>
 <!--F7B0B1C6A5D711DD89FF001B388C61A4-->  <AD_DATASET_COLUMN_ID><![CDATA[F7B0B1C6A5D711DD89FF001B388C61A4]]></AD_DATASET_COLUMN_ID>
 <!--F7B0B1C6A5D711DD89FF001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -209,17 +165,6 @@
 <!--F7B0B1C6A5D711DD89FF001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--F7B0B1C6A5D711DD89FF001B388C61A4--></AD_DATASET_COLUMN>
 
-<!--F7B0F622A5D711DDB46A001B388C61A4--><AD_DATASET_COLUMN>
-<!--F7B0F622A5D711DDB46A001B388C61A4-->  <AD_DATASET_COLUMN_ID><![CDATA[F7B0F622A5D711DDB46A001B388C61A4]]></AD_DATASET_COLUMN_ID>
-<!--F7B0F622A5D711DDB46A001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--F7B0F622A5D711DDB46A001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--F7B0F622A5D711DDB46A001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--F7B0F622A5D711DDB46A001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9F40ACA05211DDAE4E001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--F7B0F622A5D711DDB46A001B388C61A4-->  <AD_COLUMN_ID><![CDATA[567551655567DFD2E040007F01001C7C]]></AD_COLUMN_ID>
-<!--F7B0F622A5D711DDB46A001B388C61A4-->  <ISEXCLUDED><![CDATA[Y]]></ISEXCLUDED>
-<!--F7B0F622A5D711DDB46A001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--F7B0F622A5D711DDB46A001B388C61A4--></AD_DATASET_COLUMN>
-
 <!--FC4E3B40A5D711DDBF8D001B388C61A4--><AD_DATASET_COLUMN>
 <!--FC4E3B40A5D711DDBF8D001B388C61A4-->  <AD_DATASET_COLUMN_ID><![CDATA[FC4E3B40A5D711DDBF8D001B388C61A4]]></AD_DATASET_COLUMN_ID>
 <!--FC4E3B40A5D711DDBF8D001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -231,15 +176,4 @@
 <!--FC4E3B40A5D711DDBF8D001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--FC4E3B40A5D711DDBF8D001B388C61A4--></AD_DATASET_COLUMN>
 
-<!--FC4E9626A5D711DDADF7001B388C61A4--><AD_DATASET_COLUMN>
-<!--FC4E9626A5D711DDADF7001B388C61A4-->  <AD_DATASET_COLUMN_ID><![CDATA[FC4E9626A5D711DDADF7001B388C61A4]]></AD_DATASET_COLUMN_ID>
-<!--FC4E9626A5D711DDADF7001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FC4E9626A5D711DDADF7001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FC4E9626A5D711DDADF7001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FC4E9626A5D711DDADF7001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9F40ACA05211DDAE4E001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--FC4E9626A5D711DDADF7001B388C61A4-->  <AD_COLUMN_ID><![CDATA[56EE494063ACD85BE040007F0100423B]]></AD_COLUMN_ID>
-<!--FC4E9626A5D711DDADF7001B388C61A4-->  <ISEXCLUDED><![CDATA[Y]]></ISEXCLUDED>
-<!--FC4E9626A5D711DDADF7001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--FC4E9626A5D711DDADF7001B388C61A4--></AD_DATASET_COLUMN>
-
 </data>
--- a/src-db/database/sourcedata/AD_DATASET_TABLE.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/sourcedata/AD_DATASET_TABLE.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -8,7 +8,7 @@
 <!--06474D67C7E94CC4BB62E05F51C5EF0F-->  <AD_DATASET_ID><![CDATA[1]]></AD_DATASET_ID>
 <!--06474D67C7E94CC4BB62E05F51C5EF0F-->  <AD_TABLE_ID><![CDATA[82D4EDCF39AE44FB9B24E95A1B18B21C]]></AD_TABLE_ID>
 <!--06474D67C7E94CC4BB62E05F51C5EF0F-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--06474D67C7E94CC4BB62E05F51C5EF0F-->  <WHERECLAUSE><![CDATA[client.id='0']]></WHERECLAUSE>
+<!--06474D67C7E94CC4BB62E05F51C5EF0F-->  <WHERECLAUSE><![CDATA[ad_client_id='0']]></WHERECLAUSE>
 <!--06474D67C7E94CC4BB62E05F51C5EF0F-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--06474D67C7E94CC4BB62E05F51C5EF0F-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--06474D67C7E94CC4BB62E05F51C5EF0F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -22,7 +22,7 @@
 <!--093DB70096DC11DDBA25001B388C61A4-->  <AD_DATASET_ID><![CDATA[1]]></AD_DATASET_ID>
 <!--093DB70096DC11DDBA25001B388C61A4-->  <AD_TABLE_ID><![CDATA[156]]></AD_TABLE_ID>
 <!--093DB70096DC11DDBA25001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--093DB70096DC11DDBA25001B388C61A4-->  <WHERECLAUSE><![CDATA[id='0']]></WHERECLAUSE>
+<!--093DB70096DC11DDBA25001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_role_id='0']]></WHERECLAUSE>
 <!--093DB70096DC11DDBA25001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--093DB70096DC11DDBA25001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--093DB70096DC11DDBA25001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -56,32 +56,6 @@
 <!--0EC7C0E18259457CAA1B443CD87CF621-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--0EC7C0E18259457CAA1B443CD87CF621--></AD_DATASET_TABLE>
 
-<!--1328E49EA1B111DD831D001B388C61A4--><AD_DATASET_TABLE>
-<!--1328E49EA1B111DD831D001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[1328E49EA1B111DD831D001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--1328E49EA1B111DD831D001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--1328E49EA1B111DD831D001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--1328E49EA1B111DD831D001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1328E49EA1B111DD831D001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--1328E49EA1B111DD831D001B388C61A4-->  <AD_TABLE_ID><![CDATA[4D8B61CFF8F04F38B2C9BF2E30D92024]]></AD_TABLE_ID>
-<!--1328E49EA1B111DD831D001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--1328E49EA1B111DD831D001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--1328E49EA1B111DD831D001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--1328E49EA1B111DD831D001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1328E49EA1B111DD831D001B388C61A4--></AD_DATASET_TABLE>
-
-<!--1A9DB740A1B111DDA65C001B388C61A4--><AD_DATASET_TABLE>
-<!--1A9DB740A1B111DDA65C001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[1A9DB740A1B111DDA65C001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--1A9DB740A1B111DDA65C001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--1A9DB740A1B111DDA65C001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--1A9DB740A1B111DDA65C001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1A9DB740A1B111DDA65C001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--1A9DB740A1B111DDA65C001B388C61A4-->  <AD_TABLE_ID><![CDATA[686694E77C424953BC759965AB2D19C5]]></AD_TABLE_ID>
-<!--1A9DB740A1B111DDA65C001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--1A9DB740A1B111DDA65C001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--1A9DB740A1B111DDA65C001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--1A9DB740A1B111DDA65C001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1A9DB740A1B111DDA65C001B388C61A4--></AD_DATASET_TABLE>
-
 <!--1B07D20496E111DDAEF7001B388C61A4--><AD_DATASET_TABLE>
 <!--1B07D20496E111DDAEF7001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[1B07D20496E111DDAEF7001B388C61A4]]></AD_DATASET_TABLE_ID>
 <!--1B07D20496E111DDAEF7001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -90,7 +64,7 @@
 <!--1B07D20496E111DDAEF7001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--1B07D20496E111DDAEF7001B388C61A4-->  <AD_TABLE_ID><![CDATA[284]]></AD_TABLE_ID>
 <!--1B07D20496E111DDAEF7001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--1B07D20496E111DDAEF7001B388C61A4-->  <WHERECLAUSE><![CDATA[module.id=:moduleid]]></WHERECLAUSE>
+<!--1B07D20496E111DDAEF7001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--1B07D20496E111DDAEF7001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--1B07D20496E111DDAEF7001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--1B07D20496E111DDAEF7001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -104,7 +78,7 @@
 <!--1BA50CC296DC11DD8DA5001B388C61A4-->  <AD_DATASET_ID><![CDATA[1]]></AD_DATASET_ID>
 <!--1BA50CC296DC11DD8DA5001B388C61A4-->  <AD_TABLE_ID><![CDATA[114]]></AD_TABLE_ID>
 <!--1BA50CC296DC11DD8DA5001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--1BA50CC296DC11DD8DA5001B388C61A4-->  <WHERECLAUSE><![CDATA[id='0' or id='100']]></WHERECLAUSE>
+<!--1BA50CC296DC11DD8DA5001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_user_id='0' or ad_user_id='100']]></WHERECLAUSE>
 <!--1BA50CC296DC11DD8DA5001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--1BA50CC296DC11DD8DA5001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--1BA50CC296DC11DD8DA5001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -118,7 +92,7 @@
 <!--1F64026096E011DDADF9001B388C61A4-->  <AD_DATASET_ID><![CDATA[1]]></AD_DATASET_ID>
 <!--1F64026096E011DDADF9001B388C61A4-->  <AD_TABLE_ID><![CDATA[111]]></AD_TABLE_ID>
 <!--1F64026096E011DDADF9001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--1F64026096E011DDADF9001B388C61A4-->  <WHERECLAUSE><![CDATA[client.id='0']]></WHERECLAUSE>
+<!--1F64026096E011DDADF9001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_client_id='0']]></WHERECLAUSE>
 <!--1F64026096E011DDADF9001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--1F64026096E011DDADF9001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--1F64026096E011DDADF9001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -132,7 +106,7 @@
 <!--21B81CC096E211DDB937001B388C61A4-->  <AD_DATASET_ID><![CDATA[1]]></AD_DATASET_ID>
 <!--21B81CC096E211DDB937001B388C61A4-->  <AD_TABLE_ID><![CDATA[560]]></AD_TABLE_ID>
 <!--21B81CC096E211DDB937001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--21B81CC096E211DDB937001B388C61A4-->  <WHERECLAUSE><![CDATA[id='0']]></WHERECLAUSE>
+<!--21B81CC096E211DDB937001B388C61A4-->  <WHERECLAUSE><![CDATA[m_attributeset_id='0']]></WHERECLAUSE>
 <!--21B81CC096E211DDB937001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--21B81CC096E211DDB937001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--21B81CC096E211DDB937001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -146,25 +120,12 @@
 <!--25F1866E96DD11DD9312001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--25F1866E96DD11DD9312001B388C61A4-->  <AD_TABLE_ID><![CDATA[276]]></AD_TABLE_ID>
 <!--25F1866E96DD11DD9312001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--25F1866E96DD11DD9312001B388C61A4-->  <WHERECLAUSE><![CDATA[module.id=:moduleid]]></WHERECLAUSE>
+<!--25F1866E96DD11DD9312001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--25F1866E96DD11DD9312001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--25F1866E96DD11DD9312001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--25F1866E96DD11DD9312001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--25F1866E96DD11DD9312001B388C61A4--></AD_DATASET_TABLE>
 
-<!--26D4C64A620A43ED8B8A698095AD9A6F--><AD_DATASET_TABLE>
-<!--26D4C64A620A43ED8B8A698095AD9A6F-->  <AD_DATASET_TABLE_ID><![CDATA[26D4C64A620A43ED8B8A698095AD9A6F]]></AD_DATASET_TABLE_ID>
-<!--26D4C64A620A43ED8B8A698095AD9A6F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--26D4C64A620A43ED8B8A698095AD9A6F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--26D4C64A620A43ED8B8A698095AD9A6F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--26D4C64A620A43ED8B8A698095AD9A6F-->  <AD_DATASET_ID><![CDATA[C22005ECEB254DFF86061605E9939AAF]]></AD_DATASET_ID>
-<!--26D4C64A620A43ED8B8A698095AD9A6F-->  <AD_TABLE_ID><![CDATA[D5066ABE94C144C19E3516C882B51DE4]]></AD_TABLE_ID>
-<!--26D4C64A620A43ED8B8A698095AD9A6F-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--26D4C64A620A43ED8B8A698095AD9A6F-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--26D4C64A620A43ED8B8A698095AD9A6F-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--26D4C64A620A43ED8B8A698095AD9A6F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--26D4C64A620A43ED8B8A698095AD9A6F--></AD_DATASET_TABLE>
-
 <!--2839C00896E211DD9D33001B388C61A4--><AD_DATASET_TABLE>
 <!--2839C00896E211DD9D33001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[2839C00896E211DD9D33001B388C61A4]]></AD_DATASET_TABLE_ID>
 <!--2839C00896E211DD9D33001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -173,7 +134,7 @@
 <!--2839C00896E211DD9D33001B388C61A4-->  <AD_DATASET_ID><![CDATA[1]]></AD_DATASET_ID>
 <!--2839C00896E211DD9D33001B388C61A4-->  <AD_TABLE_ID><![CDATA[559]]></AD_TABLE_ID>
 <!--2839C00896E211DD9D33001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--2839C00896E211DD9D33001B388C61A4-->  <WHERECLAUSE><![CDATA[id='0']]></WHERECLAUSE>
+<!--2839C00896E211DD9D33001B388C61A4-->  <WHERECLAUSE><![CDATA[m_attributesetinstance_id='0']]></WHERECLAUSE>
 <!--2839C00896E211DD9D33001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--2839C00896E211DD9D33001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--2839C00896E211DD9D33001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -187,7 +148,7 @@
 <!--2BF53DD296E011DDBB12001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--2BF53DD296E011DDBB12001B388C61A4-->  <AD_TABLE_ID><![CDATA[116]]></AD_TABLE_ID>
 <!--2BF53DD296E011DDBB12001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--2BF53DD296E011DDBB12001B388C61A4-->  <WHERECLAUSE><![CDATA[module.id=:moduleid]]></WHERECLAUSE>
+<!--2BF53DD296E011DDBB12001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--2BF53DD296E011DDBB12001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--2BF53DD296E011DDBB12001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--2BF53DD296E011DDBB12001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -201,7 +162,7 @@
 <!--2DC6102296DC11DDB441001B388C61A4-->  <AD_DATASET_ID><![CDATA[1]]></AD_DATASET_ID>
 <!--2DC6102296DC11DDB441001B388C61A4-->  <AD_TABLE_ID><![CDATA[593]]></AD_TABLE_ID>
 <!--2DC6102296DC11DDB441001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--2DC6102296DC11DDB441001B388C61A4-->  <WHERECLAUSE><![CDATA[client.id='0']]></WHERECLAUSE>
+<!--2DC6102296DC11DDB441001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_client_id='0']]></WHERECLAUSE>
 <!--2DC6102296DC11DDB441001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--2DC6102296DC11DDB441001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--2DC6102296DC11DDB441001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -229,24 +190,12 @@
 <!--3763B10296E111DD9FE4001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--3763B10296E111DD9FE4001B388C61A4-->  <AD_TABLE_ID><![CDATA[285]]></AD_TABLE_ID>
 <!--3763B10296E111DD9FE4001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--3763B10296E111DD9FE4001B388C61A4-->  <WHERECLAUSE><![CDATA[process.module.id=:moduleid]]></WHERECLAUSE>
+<!--3763B10296E111DD9FE4001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_process_id in (select ad_process_id from ad_process where ad_module_id in (:moduleid))]]></WHERECLAUSE>
 <!--3763B10296E111DD9FE4001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--3763B10296E111DD9FE4001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--3763B10296E111DD9FE4001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--3763B10296E111DD9FE4001B388C61A4--></AD_DATASET_TABLE>
 
-<!--3BB8BC7AA50F11DD96CA001B388C61A4--><AD_DATASET_TABLE>
-<!--3BB8BC7AA50F11DD96CA001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[3BB8BC7AA50F11DD96CA001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--3BB8BC7AA50F11DD96CA001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--3BB8BC7AA50F11DD96CA001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--3BB8BC7AA50F11DD96CA001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--3BB8BC7AA50F11DD96CA001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--3BB8BC7AA50F11DD96CA001B388C61A4-->  <AD_TABLE_ID><![CDATA[42EFE5EEF79147C791EFAF73D4FEA5D7]]></AD_TABLE_ID>
-<!--3BB8BC7AA50F11DD96CA001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--3BB8BC7AA50F11DD96CA001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--3BB8BC7AA50F11DD96CA001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--3BB8BC7AA50F11DD96CA001B388C61A4--></AD_DATASET_TABLE>
-
 <!--419A2576CA6E4544A3B8FB12E6A31FBA--><AD_DATASET_TABLE>
 <!--419A2576CA6E4544A3B8FB12E6A31FBA-->  <AD_DATASET_TABLE_ID><![CDATA[419A2576CA6E4544A3B8FB12E6A31FBA]]></AD_DATASET_TABLE_ID>
 <!--419A2576CA6E4544A3B8FB12E6A31FBA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -255,7 +204,7 @@
 <!--419A2576CA6E4544A3B8FB12E6A31FBA-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--419A2576CA6E4544A3B8FB12E6A31FBA-->  <AD_TABLE_ID><![CDATA[D82A7D094F51425BB4475C223A572B2A]]></AD_TABLE_ID>
 <!--419A2576CA6E4544A3B8FB12E6A31FBA-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--419A2576CA6E4544A3B8FB12E6A31FBA-->  <WHERECLAUSE><![CDATA[module.id=:moduleid]]></WHERECLAUSE>
+<!--419A2576CA6E4544A3B8FB12E6A31FBA-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--419A2576CA6E4544A3B8FB12E6A31FBA-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--419A2576CA6E4544A3B8FB12E6A31FBA-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--419A2576CA6E4544A3B8FB12E6A31FBA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -269,7 +218,7 @@
 <!--43FEBC9696E011DD936C001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--43FEBC9696E011DD936C001B388C61A4-->  <AD_TABLE_ID><![CDATA[109]]></AD_TABLE_ID>
 <!--43FEBC9696E011DD936C001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--43FEBC9696E011DD936C001B388C61A4-->  <WHERECLAUSE><![CDATA[module.id=:moduleid]]></WHERECLAUSE>
+<!--43FEBC9696E011DD936C001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--43FEBC9696E011DD936C001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--43FEBC9696E011DD936C001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--43FEBC9696E011DD936C001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -283,7 +232,7 @@
 <!--487B3E4296E111DD8330001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--487B3E4296E111DD8330001B388C61A4-->  <AD_TABLE_ID><![CDATA[102]]></AD_TABLE_ID>
 <!--487B3E4296E111DD8330001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--487B3E4296E111DD8330001B388C61A4-->  <WHERECLAUSE><![CDATA[module.id=:moduleid]]></WHERECLAUSE>
+<!--487B3E4296E111DD8330001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--487B3E4296E111DD8330001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--487B3E4296E111DD8330001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--487B3E4296E111DD8330001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -297,38 +246,12 @@
 <!--49A4795096DC11DD97E0001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--49A4795096DC11DD97E0001B388C61A4-->  <AD_TABLE_ID><![CDATA[800001]]></AD_TABLE_ID>
 <!--49A4795096DC11DD97E0001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--49A4795096DC11DD97E0001B388C61A4-->  <WHERECLAUSE><![CDATA[module.id=:moduleid]]></WHERECLAUSE>
+<!--49A4795096DC11DD97E0001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--49A4795096DC11DD97E0001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--49A4795096DC11DD97E0001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--49A4795096DC11DD97E0001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--49A4795096DC11DD97E0001B388C61A4--></AD_DATASET_TABLE>
 
-<!--49E6FB6EC99041CB89AAFD73D96C5159--><AD_DATASET_TABLE>
-<!--49E6FB6EC99041CB89AAFD73D96C5159-->  <AD_DATASET_TABLE_ID><![CDATA[49E6FB6EC99041CB89AAFD73D96C5159]]></AD_DATASET_TABLE_ID>
-<!--49E6FB6EC99041CB89AAFD73D96C5159-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--49E6FB6EC99041CB89AAFD73D96C5159-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--49E6FB6EC99041CB89AAFD73D96C5159-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--49E6FB6EC99041CB89AAFD73D96C5159-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--49E6FB6EC99041CB89AAFD73D96C5159-->  <AD_TABLE_ID><![CDATA[579B46D6525A42DC94E6BD5B5DBA26BC]]></AD_TABLE_ID>
-<!--49E6FB6EC99041CB89AAFD73D96C5159-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--49E6FB6EC99041CB89AAFD73D96C5159-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--49E6FB6EC99041CB89AAFD73D96C5159-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--49E6FB6EC99041CB89AAFD73D96C5159-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--49E6FB6EC99041CB89AAFD73D96C5159--></AD_DATASET_TABLE>
-
-<!--4C117ED6FD0148848E2CB9A57D42AB9E--><AD_DATASET_TABLE>
-<!--4C117ED6FD0148848E2CB9A57D42AB9E-->  <AD_DATASET_TABLE_ID><![CDATA[4C117ED6FD0148848E2CB9A57D42AB9E]]></AD_DATASET_TABLE_ID>
-<!--4C117ED6FD0148848E2CB9A57D42AB9E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--4C117ED6FD0148848E2CB9A57D42AB9E-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--4C117ED6FD0148848E2CB9A57D42AB9E-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--4C117ED6FD0148848E2CB9A57D42AB9E-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--4C117ED6FD0148848E2CB9A57D42AB9E-->  <AD_TABLE_ID><![CDATA[BE310ED7C5F243C48D41F7684116F4AF]]></AD_TABLE_ID>
-<!--4C117ED6FD0148848E2CB9A57D42AB9E-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--4C117ED6FD0148848E2CB9A57D42AB9E-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--4C117ED6FD0148848E2CB9A57D42AB9E-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--4C117ED6FD0148848E2CB9A57D42AB9E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--4C117ED6FD0148848E2CB9A57D42AB9E--></AD_DATASET_TABLE>
-
 <!--50A1A004991911DD8BA4001B388C61A4--><AD_DATASET_TABLE>
 <!--50A1A004991911DD8BA4001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[50A1A004991911DD8BA4001B388C61A4]]></AD_DATASET_TABLE_ID>
 <!--50A1A004991911DD8BA4001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -337,25 +260,12 @@
 <!--50A1A004991911DD8BA4001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--50A1A004991911DD8BA4001B388C61A4-->  <AD_TABLE_ID><![CDATA[4D8B61CFF8F04F38B2C9BF2E30D92024]]></AD_TABLE_ID>
 <!--50A1A004991911DD8BA4001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--50A1A004991911DD8BA4001B388C61A4-->  <WHERECLAUSE><![CDATA[module.id=:moduleid]]></WHERECLAUSE>
+<!--50A1A004991911DD8BA4001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--50A1A004991911DD8BA4001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--50A1A004991911DD8BA4001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--50A1A004991911DD8BA4001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--50A1A004991911DD8BA4001B388C61A4--></AD_DATASET_TABLE>
 
-<!--550EBC3A2D334633B40D0FA6ACA1AB30--><AD_DATASET_TABLE>
-<!--550EBC3A2D334633B40D0FA6ACA1AB30-->  <AD_DATASET_TABLE_ID><![CDATA[550EBC3A2D334633B40D0FA6ACA1AB30]]></AD_DATASET_TABLE_ID>
-<!--550EBC3A2D334633B40D0FA6ACA1AB30-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--550EBC3A2D334633B40D0FA6ACA1AB30-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--550EBC3A2D334633B40D0FA6ACA1AB30-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--550EBC3A2D334633B40D0FA6ACA1AB30-->  <AD_DATASET_ID><![CDATA[C22005ECEB254DFF86061605E9939AAF]]></AD_DATASET_ID>
-<!--550EBC3A2D334633B40D0FA6ACA1AB30-->  <AD_TABLE_ID><![CDATA[102]]></AD_TABLE_ID>
-<!--550EBC3A2D334633B40D0FA6ACA1AB30-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--550EBC3A2D334633B40D0FA6ACA1AB30-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--550EBC3A2D334633B40D0FA6ACA1AB30-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--550EBC3A2D334633B40D0FA6ACA1AB30-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--550EBC3A2D334633B40D0FA6ACA1AB30--></AD_DATASET_TABLE>
-
 <!--59A8CDEC96DC11DDA00C001B388C61A4--><AD_DATASET_TABLE>
 <!--59A8CDEC96DC11DDA00C001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[59A8CDEC96DC11DDA00C001B388C61A4]]></AD_DATASET_TABLE_ID>
 <!--59A8CDEC96DC11DDA00C001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -364,7 +274,7 @@
 <!--59A8CDEC96DC11DDA00C001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--59A8CDEC96DC11DDA00C001B388C61A4-->  <AD_TABLE_ID><![CDATA[800155]]></AD_TABLE_ID>
 <!--59A8CDEC96DC11DDA00C001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--59A8CDEC96DC11DDA00C001B388C61A4-->  <WHERECLAUSE><![CDATA[module.id=:moduleid]]></WHERECLAUSE>
+<!--59A8CDEC96DC11DDA00C001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--59A8CDEC96DC11DDA00C001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--59A8CDEC96DC11DDA00C001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--59A8CDEC96DC11DDA00C001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -378,7 +288,7 @@
 <!--5A1493B299C311DD89B1001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--5A1493B299C311DD89B1001B388C61A4-->  <AD_TABLE_ID><![CDATA[47CA957C59F947D2B8E8D7E37AFA40DE]]></AD_TABLE_ID>
 <!--5A1493B299C311DD89B1001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--5A1493B299C311DD89B1001B388C61A4-->  <WHERECLAUSE><![CDATA[module.id=:moduleid]]></WHERECLAUSE>
+<!--5A1493B299C311DD89B1001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--5A1493B299C311DD89B1001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--5A1493B299C311DD89B1001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--5A1493B299C311DD89B1001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -392,7 +302,7 @@
 <!--5ADD2FB496E111DD924D001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--5ADD2FB496E111DD924D001B388C61A4-->  <AD_TABLE_ID><![CDATA[104]]></AD_TABLE_ID>
 <!--5ADD2FB496E111DD924D001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--5ADD2FB496E111DD924D001B388C61A4-->  <WHERECLAUSE><![CDATA[module.id=:moduleid]]></WHERECLAUSE>
+<!--5ADD2FB496E111DD924D001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--5ADD2FB496E111DD924D001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--5ADD2FB496E111DD924D001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--5ADD2FB496E111DD924D001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -406,7 +316,7 @@
 <!--5CE2A73C991911DDBC40001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--5CE2A73C991911DDBC40001B388C61A4-->  <AD_TABLE_ID><![CDATA[686694E77C424953BC759965AB2D19C5]]></AD_TABLE_ID>
 <!--5CE2A73C991911DDBC40001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--5CE2A73C991911DDBC40001B388C61A4-->  <WHERECLAUSE><![CDATA[module.id=:moduleid]]></WHERECLAUSE>
+<!--5CE2A73C991911DDBC40001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--5CE2A73C991911DDBC40001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--5CE2A73C991911DDBC40001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--5CE2A73C991911DDBC40001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -420,25 +330,27 @@
 <!--5E0A2E1896E011DDA64C001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--5E0A2E1896E011DDA64C001B388C61A4-->  <AD_TABLE_ID><![CDATA[800148]]></AD_TABLE_ID>
 <!--5E0A2E1896E011DDA64C001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--5E0A2E1896E011DDA64C001B388C61A4-->  <WHERECLAUSE><![CDATA[as mo left join mo.callout left join mo.reference left join mo.specialForm left join mo.process left join mo.workflow left join mo.tab where (mo.callout.module.id=:moduleid or mo.reference.module.id=:moduleid or mo.specialForm.module.id=:moduleid or mo.process.module.id=:moduleid or mo.workflow.module.id=:moduleid or mo.tab.module.id=:moduleid) or (mo.callout is null and mo.reference is null and mo.specialForm is null and mo.process is null and mo.workflow is null and mo.tab is null and mo.module.id=:moduleid) or (mo.id='801180' and :moduleid='0')]]></WHERECLAUSE>
+<!--5E0A2E1896E011DDA64C001B388C61A4-->  <WHERECLAUSE><![CDATA[(ad_callout_id is not null and ad_callout_id in (select ad_callout_id from ad_callout where ad_module_id in (:moduleid)))
+OR
+(ad_reference_id is not null and ad_reference_id in (select ad_reference_id from ad_reference where ad_module_id in (:moduleid)))
+OR
+(ad_form_id is not null and ad_form_id in (select ad_form_id from ad_form where ad_module_id in (:moduleid)))
+OR
+(ad_process_id is not null and ad_process_id in (select ad_process_id from ad_process where ad_module_id in (:moduleid)))
+OR
+(ad_workflow_id is not null and ad_workflow_id in (select ad_workflow_id from ad_workflow where ad_module_id in (:moduleid)))
+OR
+(ad_tab_id is not null and ad_tab_id in (select ad_tab_id from ad_tab where ad_module_id in (:moduleid)))
+OR
+(ad_callout_id is null and ad_reference_id is null and ad_form_id is null and ad_process_id is null
+and ad_workflow_id is null and ad_tab_id is null and ad_module_id in (:moduleid))
+OR
+(AD_MODEL_OBJECT_ID='801180' AND :moduleid='0')]]></WHERECLAUSE>
 <!--5E0A2E1896E011DDA64C001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--5E0A2E1896E011DDA64C001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--5E0A2E1896E011DDA64C001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--5E0A2E1896E011DDA64C001B388C61A4--></AD_DATASET_TABLE>
 
-<!--5F9B6555BDAE42E986B8905E54B61C42--><AD_DATASET_TABLE>
-<!--5F9B6555BDAE42E986B8905E54B61C42-->  <AD_DATASET_TABLE_ID><![CDATA[5F9B6555BDAE42E986B8905E54B61C42]]></AD_DATASET_TABLE_ID>
-<!--5F9B6555BDAE42E986B8905E54B61C42-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--5F9B6555BDAE42E986B8905E54B61C42-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--5F9B6555BDAE42E986B8905E54B61C42-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--5F9B6555BDAE42E986B8905E54B61C42-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--5F9B6555BDAE42E986B8905E54B61C42-->  <AD_TABLE_ID><![CDATA[D82A7D094F51425BB4475C223A572B2A]]></AD_TABLE_ID>
-<!--5F9B6555BDAE42E986B8905E54B61C42-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--5F9B6555BDAE42E986B8905E54B61C42-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--5F9B6555BDAE42E986B8905E54B61C42-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--5F9B6555BDAE42E986B8905E54B61C42-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--5F9B6555BDAE42E986B8905E54B61C42--></AD_DATASET_TABLE>
-
 <!--60CA90DE96E011DD9026001B388C61A4--><AD_DATASET_TABLE>
 <!--60CA90DE96E011DD9026001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[60CA90DE96E011DD9026001B388C61A4]]></AD_DATASET_TABLE_ID>
 <!--60CA90DE96E011DD9026001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -447,7 +359,23 @@
 <!--60CA90DE96E011DD9026001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--60CA90DE96E011DD9026001B388C61A4-->  <AD_TABLE_ID><![CDATA[800149]]></AD_TABLE_ID>
 <!--60CA90DE96E011DD9026001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--60CA90DE96E011DD9026001B388C61A4-->  <WHERECLAUSE><![CDATA[as mom left join mom.modelObject as mo left join mo.callout left join mo.reference left join mo.specialForm left join mo.process left join mo.workflow left join mo.tab where (mo.callout.module.id=:moduleid or mo.reference.module.id=:moduleid or mo.specialForm.module.id=:moduleid or mo.process.module.id=:moduleid or mo.workflow.module.id=:moduleid or mo.tab.module.id=:moduleid) or  (mo.callout is null and mo.reference is null and mo.specialForm is null and mo.process is null and mo.workflow is null and mo.tab is null and mo.module.id=:moduleid) or (mo.id='801180' and :moduleid='0')]]></WHERECLAUSE>
+<!--60CA90DE96E011DD9026001B388C61A4-->  <WHERECLAUSE><![CDATA[AD_MODEL_OBJECT_ID IN (SELECT AD_MODEL_OBJECT_ID FROM AD_MODEL_OBJECT WHERE
+(ad_callout_id is not null and ad_callout_id in (select ad_callout_id from ad_callout where ad_module_id in (:moduleid)))
+OR
+(ad_reference_id is not null and ad_reference_id in (select ad_reference_id from ad_reference where ad_module_id in (:moduleid)))
+OR
+(ad_form_id is not null and ad_form_id in (select ad_form_id from ad_form where ad_module_id in (:moduleid)))
+OR
+(ad_process_id is not null and ad_process_id in (select ad_process_id from ad_process where ad_module_id in (:moduleid)))
+OR
+(ad_workflow_id is not null and ad_workflow_id in (select ad_workflow_id from ad_workflow where ad_module_id in (:moduleid)))
+OR
+(ad_tab_id is not null and ad_tab_id in (select ad_tab_id from ad_tab where ad_module_id in (:moduleid)))
+OR
+(ad_callout_id is null and ad_reference_id is null and ad_form_id is null and ad_process_id is null
+and ad_workflow_id is null and ad_tab_id is null and ad_module_id in (:moduleid))
+OR
+(AD_MODEL_OBJECT_ID='801180' AND :moduleid='0'))]]></WHERECLAUSE>
 <!--60CA90DE96E011DD9026001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--60CA90DE96E011DD9026001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--60CA90DE96E011DD9026001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -461,7 +389,7 @@
 <!--638A19CE96DC11DD9288001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--638A19CE96DC11DD9288001B388C61A4-->  <AD_TABLE_ID><![CDATA[101]]></AD_TABLE_ID>
 <!--638A19CE96DC11DD9288001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--638A19CE96DC11DD9288001B388C61A4-->  <WHERECLAUSE><![CDATA[module.id=:moduleid]]></WHERECLAUSE>
+<!--638A19CE96DC11DD9288001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--638A19CE96DC11DD9288001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--638A19CE96DC11DD9288001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--638A19CE96DC11DD9288001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -475,7 +403,7 @@
 <!--676D5346B0C545BF92B94A691204648B-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--676D5346B0C545BF92B94A691204648B-->  <AD_TABLE_ID><![CDATA[579B46D6525A42DC94E6BD5B5DBA26BC]]></AD_TABLE_ID>
 <!--676D5346B0C545BF92B94A691204648B-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--676D5346B0C545BF92B94A691204648B-->  <WHERECLAUSE><![CDATA[module.id=:moduleid]]></WHERECLAUSE>
+<!--676D5346B0C545BF92B94A691204648B-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--676D5346B0C545BF92B94A691204648B-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--676D5346B0C545BF92B94A691204648B-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--676D5346B0C545BF92B94A691204648B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -503,7 +431,7 @@
 <!--6D9A95189B5711DD8552001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--6D9A95189B5711DD8552001B388C61A4-->  <AD_TABLE_ID><![CDATA[D5066ABE94C144C19E3516C882B51DE4]]></AD_TABLE_ID>
 <!--6D9A95189B5711DD8552001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--6D9A95189B5711DD8552001B388C61A4-->  <WHERECLAUSE><![CDATA[module.id=:moduleid]]></WHERECLAUSE>
+<!--6D9A95189B5711DD8552001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--6D9A95189B5711DD8552001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--6D9A95189B5711DD8552001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--6D9A95189B5711DD8552001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -517,7 +445,7 @@
 <!--6EE4A47E96E111DDAD4D001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--6EE4A47E96E111DDAD4D001B388C61A4-->  <AD_TABLE_ID><![CDATA[800154]]></AD_TABLE_ID>
 <!--6EE4A47E96E111DDAD4D001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--6EE4A47E96E111DDAD4D001B388C61A4-->  <WHERECLAUSE><![CDATA[reference.module.id=:moduleid]]></WHERECLAUSE>
+<!--6EE4A47E96E111DDAD4D001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_reference_id in (select ad_reference_id from ad_reference where ad_module_id in (:moduleid))]]></WHERECLAUSE>
 <!--6EE4A47E96E111DDAD4D001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--6EE4A47E96E111DDAD4D001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--6EE4A47E96E111DDAD4D001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -531,7 +459,7 @@
 <!--71FC341E96DD11DDB961001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--71FC341E96DD11DDB961001B388C61A4-->  <AD_TABLE_ID><![CDATA[414]]></AD_TABLE_ID>
 <!--71FC341E96DD11DDB961001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--71FC341E96DD11DDB961001B388C61A4-->  <WHERECLAUSE><![CDATA[module.id=:moduleid]]></WHERECLAUSE>
+<!--71FC341E96DD11DDB961001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--71FC341E96DD11DDB961001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--71FC341E96DD11DDB961001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--71FC341E96DD11DDB961001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -545,25 +473,13 @@
 <!--742BF79896E111DD9F89001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--742BF79896E111DD9F89001B388C61A4-->  <AD_TABLE_ID><![CDATA[800165]]></AD_TABLE_ID>
 <!--742BF79896E111DD9F89001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--742BF79896E111DD9F89001B388C61A4-->  <WHERECLAUSE><![CDATA[search.reference.module.id=:moduleid]]></WHERECLAUSE>
+<!--742BF79896E111DD9F89001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_ref_search_id in (select ad_ref_search_id from ad_ref_search where ad_reference_id in (select ad_reference_id from ad_reference where ad_module_id in (:moduleid)))
+]]></WHERECLAUSE>
 <!--742BF79896E111DD9F89001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--742BF79896E111DD9F89001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--742BF79896E111DD9F89001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--742BF79896E111DD9F89001B388C61A4--></AD_DATASET_TABLE>
 
-<!--7497271360FE4300BE3489C113995151--><AD_DATASET_TABLE>
-<!--7497271360FE4300BE3489C113995151-->  <AD_DATASET_TABLE_ID><![CDATA[7497271360FE4300BE3489C113995151]]></AD_DATASET_TABLE_ID>
-<!--7497271360FE4300BE3489C113995151-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--7497271360FE4300BE3489C113995151-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--7497271360FE4300BE3489C113995151-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7497271360FE4300BE3489C113995151-->  <AD_DATASET_ID><![CDATA[C22005ECEB254DFF86061605E9939AAF]]></AD_DATASET_ID>
-<!--7497271360FE4300BE3489C113995151-->  <AD_TABLE_ID><![CDATA[686694E77C424953BC759965AB2D19C5]]></AD_TABLE_ID>
-<!--7497271360FE4300BE3489C113995151-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--7497271360FE4300BE3489C113995151-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--7497271360FE4300BE3489C113995151-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--7497271360FE4300BE3489C113995151-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--7497271360FE4300BE3489C113995151--></AD_DATASET_TABLE>
-
 <!--7AF5DEC896E011DDA8AC001B388C61A4--><AD_DATASET_TABLE>
 <!--7AF5DEC896E011DDA8AC001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[7AF5DEC896E011DDA8AC001B388C61A4]]></AD_DATASET_TABLE_ID>
 <!--7AF5DEC896E011DDA8AC001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -572,25 +488,12 @@
 <!--7AF5DEC896E011DDA8AC001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--7AF5DEC896E011DDA8AC001B388C61A4-->  <AD_TABLE_ID><![CDATA[9D36D488605044F5A0264D7C8B916657]]></AD_TABLE_ID>
 <!--7AF5DEC896E011DDA8AC001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--7AF5DEC896E011DDA8AC001B388C61A4-->  <WHERECLAUSE><![CDATA[id=:moduleid]]></WHERECLAUSE>
+<!--7AF5DEC896E011DDA8AC001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--7AF5DEC896E011DDA8AC001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--7AF5DEC896E011DDA8AC001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--7AF5DEC896E011DDA8AC001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7AF5DEC896E011DDA8AC001B388C61A4--></AD_DATASET_TABLE>
 
-<!--7D28B6D1F86A40A4A62129558A1F089C--><AD_DATASET_TABLE>
-<!--7D28B6D1F86A40A4A62129558A1F089C-->  <AD_DATASET_TABLE_ID><![CDATA[7D28B6D1F86A40A4A62129558A1F089C]]></AD_DATASET_TABLE_ID>
-<!--7D28B6D1F86A40A4A62129558A1F089C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--7D28B6D1F86A40A4A62129558A1F089C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--7D28B6D1F86A40A4A62129558A1F089C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7D28B6D1F86A40A4A62129558A1F089C-->  <AD_DATASET_ID><![CDATA[C22005ECEB254DFF86061605E9939AAF]]></AD_DATASET_ID>
-<!--7D28B6D1F86A40A4A62129558A1F089C-->  <AD_TABLE_ID><![CDATA[100]]></AD_TABLE_ID>
-<!--7D28B6D1F86A40A4A62129558A1F089C-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--7D28B6D1F86A40A4A62129558A1F089C-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--7D28B6D1F86A40A4A62129558A1F089C-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--7D28B6D1F86A40A4A62129558A1F089C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--7D28B6D1F86A40A4A62129558A1F089C--></AD_DATASET_TABLE>
-
 <!--7DC6889096E111DDA4F6001B388C61A4--><AD_DATASET_TABLE>
 <!--7DC6889096E111DDA4F6001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[7DC6889096E111DDA4F6001B388C61A4]]></AD_DATASET_TABLE_ID>
 <!--7DC6889096E111DDA4F6001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -599,442 +502,12 @@
 <!--7DC6889096E111DDA4F6001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--7DC6889096E111DDA4F6001B388C61A4-->  <AD_TABLE_ID><![CDATA[103]]></AD_TABLE_ID>
 <!--7DC6889096E111DDA4F6001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--7DC6889096E111DDA4F6001B388C61A4-->  <WHERECLAUSE><![CDATA[reference.module.id=:moduleid]]></WHERECLAUSE>
+<!--7DC6889096E111DDA4F6001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_reference_id in (select ad_reference_id from ad_reference where ad_module_id in (:moduleid))]]></WHERECLAUSE>
 <!--7DC6889096E111DDA4F6001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--7DC6889096E111DDA4F6001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--7DC6889096E111DDA4F6001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7DC6889096E111DDA4F6001B388C61A4--></AD_DATASET_TABLE>
 
-<!--8ACFC500687E46F6998CD02A4DF4B475--><AD_DATASET_TABLE>
-<!--8ACFC500687E46F6998CD02A4DF4B475-->  <AD_DATASET_TABLE_ID><![CDATA[8ACFC500687E46F6998CD02A4DF4B475]]></AD_DATASET_TABLE_ID>
-<!--8ACFC500687E46F6998CD02A4DF4B475-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8ACFC500687E46F6998CD02A4DF4B475-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8ACFC500687E46F6998CD02A4DF4B475-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8ACFC500687E46F6998CD02A4DF4B475-->  <AD_DATASET_ID><![CDATA[C22005ECEB254DFF86061605E9939AAF]]></AD_DATASET_ID>
-<!--8ACFC500687E46F6998CD02A4DF4B475-->  <AD_TABLE_ID><![CDATA[103]]></AD_TABLE_ID>
-<!--8ACFC500687E46F6998CD02A4DF4B475-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8ACFC500687E46F6998CD02A4DF4B475-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8ACFC500687E46F6998CD02A4DF4B475-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8ACFC500687E46F6998CD02A4DF4B475-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8ACFC500687E46F6998CD02A4DF4B475--></AD_DATASET_TABLE>
-
-<!--8D9EEE68A05211DD9D1A001B388C61A4--><AD_DATASET_TABLE>
-<!--8D9EEE68A05211DD9D1A001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9EEE68A05211DD9D1A001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8D9EEE68A05211DD9D1A001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D9EEE68A05211DD9D1A001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D9EEE68A05211DD9D1A001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D9EEE68A05211DD9D1A001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8D9EEE68A05211DD9D1A001B388C61A4-->  <AD_TABLE_ID><![CDATA[800148]]></AD_TABLE_ID>
-<!--8D9EEE68A05211DD9D1A001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8D9EEE68A05211DD9D1A001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8D9EEE68A05211DD9D1A001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8D9EEE68A05211DD9D1A001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D9EEE68A05211DD9D1A001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8D9EF908A05211DD8A79001B388C61A4--><AD_DATASET_TABLE>
-<!--8D9EF908A05211DD8A79001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9EF908A05211DD8A79001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8D9EF908A05211DD8A79001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D9EF908A05211DD8A79001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D9EF908A05211DD8A79001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D9EF908A05211DD8A79001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8D9EF908A05211DD8A79001B388C61A4-->  <AD_TABLE_ID><![CDATA[800149]]></AD_TABLE_ID>
-<!--8D9EF908A05211DD8A79001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8D9EF908A05211DD8A79001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8D9EF908A05211DD8A79001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8D9EF908A05211DD8A79001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D9EF908A05211DD8A79001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8D9F03DAA05211DD9F17001B388C61A4--><AD_DATASET_TABLE>
-<!--8D9F03DAA05211DD9F17001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9F03DAA05211DD9F17001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8D9F03DAA05211DD9F17001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D9F03DAA05211DD9F17001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D9F03DAA05211DD9F17001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D9F03DAA05211DD9F17001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8D9F03DAA05211DD9F17001B388C61A4-->  <AD_TABLE_ID><![CDATA[D5066ABE94C144C19E3516C882B51DE4]]></AD_TABLE_ID>
-<!--8D9F03DAA05211DD9F17001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8D9F03DAA05211DD9F17001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8D9F03DAA05211DD9F17001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8D9F03DAA05211DD9F17001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D9F03DAA05211DD9F17001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8D9F0E70A05211DDB76B001B388C61A4--><AD_DATASET_TABLE>
-<!--8D9F0E70A05211DDB76B001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9F0E70A05211DDB76B001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8D9F0E70A05211DDB76B001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D9F0E70A05211DDB76B001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D9F0E70A05211DDB76B001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D9F0E70A05211DDB76B001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8D9F0E70A05211DDB76B001B388C61A4-->  <AD_TABLE_ID><![CDATA[289]]></AD_TABLE_ID>
-<!--8D9F0E70A05211DDB76B001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8D9F0E70A05211DDB76B001B388C61A4-->  <WHERECLAUSE><![CDATA[tree.id='10' and exists( from ADMenu as menu where menu.id = node_id) or (tree.id='10' and reportSet is null) or (tree.id='50')]]></WHERECLAUSE>
-<!--8D9F0E70A05211DDB76B001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8D9F0E70A05211DDB76B001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8D9F0E70A05211DDB76B001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D9F0E70A05211DDB76B001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8D9F19CEA05211DD8C5F001B388C61A4--><AD_DATASET_TABLE>
-<!--8D9F19CEA05211DD8C5F001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9F19CEA05211DD8C5F001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8D9F19CEA05211DD8C5F001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D9F19CEA05211DD8C5F001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D9F19CEA05211DD8C5F001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D9F19CEA05211DD8C5F001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8D9F19CEA05211DD8C5F001B388C61A4-->  <AD_TABLE_ID><![CDATA[800154]]></AD_TABLE_ID>
-<!--8D9F19CEA05211DD8C5F001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8D9F19CEA05211DD8C5F001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8D9F19CEA05211DD8C5F001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8D9F19CEA05211DD8C5F001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D9F19CEA05211DD8C5F001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8D9F2496A05211DD8480001B388C61A4--><AD_DATASET_TABLE>
-<!--8D9F2496A05211DD8480001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9F2496A05211DD8480001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8D9F2496A05211DD8480001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D9F2496A05211DD8480001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D9F2496A05211DD8480001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D9F2496A05211DD8480001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8D9F2496A05211DD8480001B388C61A4-->  <AD_TABLE_ID><![CDATA[414]]></AD_TABLE_ID>
-<!--8D9F2496A05211DD8480001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8D9F2496A05211DD8480001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8D9F2496A05211DD8480001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8D9F2496A05211DD8480001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D9F2496A05211DD8480001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8D9F35DAA05211DDBCC1001B388C61A4--><AD_DATASET_TABLE>
-<!--8D9F35DAA05211DDBCC1001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9F35DAA05211DDBCC1001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8D9F35DAA05211DDBCC1001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D9F35DAA05211DDBCC1001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D9F35DAA05211DDBCC1001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D9F35DAA05211DDBCC1001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8D9F35DAA05211DDBCC1001B388C61A4-->  <AD_TABLE_ID><![CDATA[800165]]></AD_TABLE_ID>
-<!--8D9F35DAA05211DDBCC1001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8D9F35DAA05211DDBCC1001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8D9F35DAA05211DDBCC1001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8D9F35DAA05211DDBCC1001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D9F35DAA05211DDBCC1001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8D9F40ACA05211DDAE4E001B388C61A4--><AD_DATASET_TABLE>
-<!--8D9F40ACA05211DDAE4E001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9F40ACA05211DDAE4E001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8D9F40ACA05211DDAE4E001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D9F40ACA05211DDAE4E001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D9F40ACA05211DDAE4E001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D9F40ACA05211DDAE4E001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8D9F40ACA05211DDAE4E001B388C61A4-->  <AD_TABLE_ID><![CDATA[9D36D488605044F5A0264D7C8B916657]]></AD_TABLE_ID>
-<!--8D9F40ACA05211DDAE4E001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8D9F40ACA05211DDAE4E001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8D9F40ACA05211DDAE4E001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8D9F40ACA05211DDAE4E001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D9F40ACA05211DDAE4E001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8D9F4ACAA05211DD9D11001B388C61A4--><AD_DATASET_TABLE>
-<!--8D9F4ACAA05211DD9D11001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9F4ACAA05211DD9D11001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8D9F4ACAA05211DD9D11001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D9F4ACAA05211DD9D11001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D9F4ACAA05211DD9D11001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D9F4ACAA05211DD9D11001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8D9F4ACAA05211DD9D11001B388C61A4-->  <AD_TABLE_ID><![CDATA[103]]></AD_TABLE_ID>
-<!--8D9F4ACAA05211DD9D11001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8D9F4ACAA05211DD9D11001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8D9F4ACAA05211DD9D11001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8D9F4ACAA05211DD9D11001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D9F4ACAA05211DD9D11001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8D9F5574A05211DDAE67001B388C61A4--><AD_DATASET_TABLE>
-<!--8D9F5574A05211DDAE67001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9F5574A05211DDAE67001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8D9F5574A05211DDAE67001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D9F5574A05211DDAE67001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D9F5574A05211DDAE67001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D9F5574A05211DDAE67001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8D9F5574A05211DDAE67001B388C61A4-->  <AD_TABLE_ID><![CDATA[106]]></AD_TABLE_ID>
-<!--8D9F5574A05211DDAE67001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8D9F5574A05211DDAE67001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8D9F5574A05211DDAE67001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8D9F5574A05211DDAE67001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D9F5574A05211DDAE67001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8D9F6046A05211DDBA50001B388C61A4--><AD_DATASET_TABLE>
-<!--8D9F6046A05211DDBA50001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9F6046A05211DDBA50001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8D9F6046A05211DDBA50001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D9F6046A05211DDBA50001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D9F6046A05211DDBA50001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D9F6046A05211DDBA50001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8D9F6046A05211DDBA50001B388C61A4-->  <AD_TABLE_ID><![CDATA[08A203FD84AA412BB38882A1EDDD1A83]]></AD_TABLE_ID>
-<!--8D9F6046A05211DDBA50001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8D9F6046A05211DDBA50001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8D9F6046A05211DDBA50001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8D9F6046A05211DDBA50001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D9F6046A05211DDBA50001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8D9F6AD2A05211DDB76F001B388C61A4--><AD_DATASET_TABLE>
-<!--8D9F6AD2A05211DDB76F001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9F6AD2A05211DDB76F001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8D9F6AD2A05211DDB76F001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D9F6AD2A05211DDB76F001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D9F6AD2A05211DDB76F001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D9F6AD2A05211DDB76F001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8D9F6AD2A05211DDB76F001B388C61A4-->  <AD_TABLE_ID><![CDATA[107]]></AD_TABLE_ID>
-<!--8D9F6AD2A05211DDB76F001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8D9F6AD2A05211DDB76F001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8D9F6AD2A05211DDB76F001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8D9F6AD2A05211DDB76F001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D9F6AD2A05211DDB76F001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8D9F74C8A05211DDB6AC001B388C61A4--><AD_DATASET_TABLE>
-<!--8D9F74C8A05211DDB6AC001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9F74C8A05211DDB6AC001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8D9F74C8A05211DDB6AC001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D9F74C8A05211DDB6AC001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D9F74C8A05211DDB6AC001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D9F74C8A05211DDB6AC001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8D9F74C8A05211DDB6AC001B388C61A4-->  <AD_TABLE_ID><![CDATA[55EA8703587B40C1A05D225FBEE8C7FE]]></AD_TABLE_ID>
-<!--8D9F74C8A05211DDB6AC001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8D9F74C8A05211DDB6AC001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8D9F74C8A05211DDB6AC001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8D9F74C8A05211DDB6AC001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D9F74C8A05211DDB6AC001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8D9F7F86A05211DD8032001B388C61A4--><AD_DATASET_TABLE>
-<!--8D9F7F86A05211DD8032001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9F7F86A05211DD8032001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8D9F7F86A05211DD8032001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D9F7F86A05211DD8032001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D9F7F86A05211DD8032001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D9F7F86A05211DD8032001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8D9F7F86A05211DD8032001B388C61A4-->  <AD_TABLE_ID><![CDATA[100]]></AD_TABLE_ID>
-<!--8D9F7F86A05211DD8032001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8D9F7F86A05211DD8032001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8D9F7F86A05211DD8032001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8D9F7F86A05211DD8032001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D9F7F86A05211DD8032001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8D9F8A08A05211DDA456001B388C61A4--><AD_DATASET_TABLE>
-<!--8D9F8A08A05211DDA456001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9F8A08A05211DDA456001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8D9F8A08A05211DDA456001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D9F8A08A05211DDA456001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D9F8A08A05211DDA456001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D9F8A08A05211DDA456001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8D9F8A08A05211DDA456001B388C61A4-->  <AD_TABLE_ID><![CDATA[800146]]></AD_TABLE_ID>
-<!--8D9F8A08A05211DDA456001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8D9F8A08A05211DDA456001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8D9F8A08A05211DDA456001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8D9F8A08A05211DDA456001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D9F8A08A05211DDA456001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8D9F969CA05211DD9A78001B388C61A4--><AD_DATASET_TABLE>
-<!--8D9F969CA05211DD9A78001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9F969CA05211DD9A78001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8D9F969CA05211DD9A78001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D9F969CA05211DD9A78001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D9F969CA05211DD9A78001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D9F969CA05211DD9A78001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8D9F969CA05211DD9A78001B388C61A4-->  <AD_TABLE_ID><![CDATA[117]]></AD_TABLE_ID>
-<!--8D9F969CA05211DD9A78001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8D9F969CA05211DD9A78001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8D9F969CA05211DD9A78001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8D9F969CA05211DD9A78001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D9F969CA05211DD9A78001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8D9FA0A6A05211DD9FCF001B388C61A4--><AD_DATASET_TABLE>
-<!--8D9FA0A6A05211DD9FCF001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9FA0A6A05211DD9FCF001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8D9FA0A6A05211DD9FCF001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D9FA0A6A05211DD9FCF001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D9FA0A6A05211DD9FCF001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D9FA0A6A05211DD9FCF001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8D9FA0A6A05211DD9FCF001B388C61A4-->  <AD_TABLE_ID><![CDATA[108]]></AD_TABLE_ID>
-<!--8D9FA0A6A05211DD9FCF001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8D9FA0A6A05211DD9FCF001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8D9FA0A6A05211DD9FCF001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8D9FA0A6A05211DD9FCF001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D9FA0A6A05211DD9FCF001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8D9FAB3CA05211DDA58C001B388C61A4--><AD_DATASET_TABLE>
-<!--8D9FAB3CA05211DDA58C001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9FAB3CA05211DDA58C001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8D9FAB3CA05211DDA58C001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D9FAB3CA05211DDA58C001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D9FAB3CA05211DDA58C001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D9FAB3CA05211DDA58C001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8D9FAB3CA05211DDA58C001B388C61A4-->  <AD_TABLE_ID><![CDATA[129]]></AD_TABLE_ID>
-<!--8D9FAB3CA05211DDA58C001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8D9FAB3CA05211DDA58C001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8D9FAB3CA05211DDA58C001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8D9FAB3CA05211DDA58C001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D9FAB3CA05211DDA58C001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8D9FCB4EA05211DDA2D3001B388C61A4--><AD_DATASET_TABLE>
-<!--8D9FCB4EA05211DDA2D3001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9FCB4EA05211DDA2D3001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8D9FCB4EA05211DDA2D3001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D9FCB4EA05211DDA2D3001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D9FCB4EA05211DDA2D3001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D9FCB4EA05211DDA2D3001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8D9FCB4EA05211DDA2D3001B388C61A4-->  <AD_TABLE_ID><![CDATA[284]]></AD_TABLE_ID>
-<!--8D9FCB4EA05211DDA2D3001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8D9FCB4EA05211DDA2D3001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8D9FCB4EA05211DDA2D3001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8D9FCB4EA05211DDA2D3001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D9FCB4EA05211DDA2D3001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8D9FD5DAA05211DDA664001B388C61A4--><AD_DATASET_TABLE>
-<!--8D9FD5DAA05211DDA664001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9FD5DAA05211DDA664001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8D9FD5DAA05211DDA664001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D9FD5DAA05211DDA664001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D9FD5DAA05211DDA664001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D9FD5DAA05211DDA664001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8D9FD5DAA05211DDA664001B388C61A4-->  <AD_TABLE_ID><![CDATA[276]]></AD_TABLE_ID>
-<!--8D9FD5DAA05211DDA664001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8D9FD5DAA05211DDA664001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8D9FD5DAA05211DDA664001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8D9FD5DAA05211DDA664001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D9FD5DAA05211DDA664001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8D9FE052A05211DDAED1001B388C61A4--><AD_DATASET_TABLE>
-<!--8D9FE052A05211DDAED1001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9FE052A05211DDAED1001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8D9FE052A05211DDAED1001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D9FE052A05211DDAED1001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D9FE052A05211DDAED1001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D9FE052A05211DDAED1001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8D9FE052A05211DDAED1001B388C61A4-->  <AD_TABLE_ID><![CDATA[116]]></AD_TABLE_ID>
-<!--8D9FE052A05211DDAED1001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8D9FE052A05211DDAED1001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8D9FE052A05211DDAED1001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8D9FE052A05211DDAED1001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D9FE052A05211DDAED1001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8D9FEAFCA05211DD8264001B388C61A4--><AD_DATASET_TABLE>
-<!--8D9FEAFCA05211DD8264001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9FEAFCA05211DD8264001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8D9FEAFCA05211DD8264001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D9FEAFCA05211DD8264001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D9FEAFCA05211DD8264001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D9FEAFCA05211DD8264001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8D9FEAFCA05211DD8264001B388C61A4-->  <AD_TABLE_ID><![CDATA[285]]></AD_TABLE_ID>
-<!--8D9FEAFCA05211DD8264001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8D9FEAFCA05211DD8264001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8D9FEAFCA05211DD8264001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8D9FEAFCA05211DD8264001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D9FEAFCA05211DD8264001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8D9FF4F2A05211DD9E13001B388C61A4--><AD_DATASET_TABLE>
-<!--8D9FF4F2A05211DD9E13001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9FF4F2A05211DD9E13001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8D9FF4F2A05211DD9E13001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D9FF4F2A05211DD9E13001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D9FF4F2A05211DD9E13001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D9FF4F2A05211DD9E13001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8D9FF4F2A05211DD9E13001B388C61A4-->  <AD_TABLE_ID><![CDATA[109]]></AD_TABLE_ID>
-<!--8D9FF4F2A05211DD9E13001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8D9FF4F2A05211DD9E13001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8D9FF4F2A05211DD9E13001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8D9FF4F2A05211DD9E13001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D9FF4F2A05211DD9E13001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8D9FFF74A05211DD8551001B388C61A4--><AD_DATASET_TABLE>
-<!--8D9FFF74A05211DD8551001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8D9FFF74A05211DD8551001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8D9FFF74A05211DD8551001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8D9FFF74A05211DD8551001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8D9FFF74A05211DD8551001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8D9FFF74A05211DD8551001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8D9FFF74A05211DD8551001B388C61A4-->  <AD_TABLE_ID><![CDATA[102]]></AD_TABLE_ID>
-<!--8D9FFF74A05211DD8551001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8D9FFF74A05211DD8551001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8D9FFF74A05211DD8551001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8D9FFF74A05211DD8551001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8D9FFF74A05211DD8551001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8DA00A46A05211DDAF04001B388C61A4--><AD_DATASET_TABLE>
-<!--8DA00A46A05211DDAF04001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8DA00A46A05211DDAF04001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8DA00A46A05211DDAF04001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8DA00A46A05211DDAF04001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8DA00A46A05211DDAF04001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8DA00A46A05211DDAF04001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8DA00A46A05211DDAF04001B388C61A4-->  <AD_TABLE_ID><![CDATA[800001]]></AD_TABLE_ID>
-<!--8DA00A46A05211DDAF04001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8DA00A46A05211DDAF04001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8DA00A46A05211DDAF04001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8DA00A46A05211DDAF04001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8DA00A46A05211DDAF04001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8DA014DCA05211DDA578001B388C61A4--><AD_DATASET_TABLE>
-<!--8DA014DCA05211DDA578001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8DA014DCA05211DDA578001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8DA014DCA05211DDA578001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8DA014DCA05211DDA578001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8DA014DCA05211DDA578001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8DA014DCA05211DDA578001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8DA014DCA05211DDA578001B388C61A4-->  <AD_TABLE_ID><![CDATA[800155]]></AD_TABLE_ID>
-<!--8DA014DCA05211DDA578001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8DA014DCA05211DDA578001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8DA014DCA05211DDA578001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8DA014DCA05211DDA578001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8DA014DCA05211DDA578001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8DA01EC8A05211DDA8EA001B388C61A4--><AD_DATASET_TABLE>
-<!--8DA01EC8A05211DDA8EA001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8DA01EC8A05211DDA8EA001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8DA01EC8A05211DDA8EA001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8DA01EC8A05211DDA8EA001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8DA01EC8A05211DDA8EA001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8DA01EC8A05211DDA8EA001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8DA01EC8A05211DDA8EA001B388C61A4-->  <AD_TABLE_ID><![CDATA[47CA957C59F947D2B8E8D7E37AFA40DE]]></AD_TABLE_ID>
-<!--8DA01EC8A05211DDA8EA001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8DA01EC8A05211DDA8EA001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8DA01EC8A05211DDA8EA001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8DA01EC8A05211DDA8EA001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8DA01EC8A05211DDA8EA001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8DA02968A05211DDAC84001B388C61A4--><AD_DATASET_TABLE>
-<!--8DA02968A05211DDAC84001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8DA02968A05211DDAC84001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8DA02968A05211DDAC84001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8DA02968A05211DDAC84001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8DA02968A05211DDAC84001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8DA02968A05211DDAC84001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8DA02968A05211DDAC84001B388C61A4-->  <AD_TABLE_ID><![CDATA[104]]></AD_TABLE_ID>
-<!--8DA02968A05211DDAC84001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8DA02968A05211DDAC84001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8DA02968A05211DDAC84001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8DA02968A05211DDAC84001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8DA02968A05211DDAC84001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8DA033FEA05211DD90F0001B388C61A4--><AD_DATASET_TABLE>
-<!--8DA033FEA05211DD90F0001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8DA033FEA05211DD90F0001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8DA033FEA05211DD90F0001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8DA033FEA05211DD90F0001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8DA033FEA05211DD90F0001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8DA033FEA05211DD90F0001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8DA033FEA05211DD90F0001B388C61A4-->  <AD_TABLE_ID><![CDATA[101]]></AD_TABLE_ID>
-<!--8DA033FEA05211DD90F0001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8DA033FEA05211DD90F0001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8DA033FEA05211DD90F0001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8DA033FEA05211DD90F0001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8DA033FEA05211DD90F0001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8DA048A8A05211DDA810001B388C61A4--><AD_DATASET_TABLE>
-<!--8DA048A8A05211DDA810001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8DA048A8A05211DDA810001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8DA048A8A05211DDA810001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8DA048A8A05211DDA810001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8DA048A8A05211DDA810001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8DA048A8A05211DDA810001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8DA048A8A05211DDA810001B388C61A4-->  <AD_TABLE_ID><![CDATA[131]]></AD_TABLE_ID>
-<!--8DA048A8A05211DDA810001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8DA048A8A05211DDA810001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8DA048A8A05211DDA810001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8DA048A8A05211DDA810001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8DA048A8A05211DDA810001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8DA053F2A05211DD8DDF001B388C61A4--><AD_DATASET_TABLE>
-<!--8DA053F2A05211DD8DDF001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8DA053F2A05211DD8DDF001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8DA053F2A05211DD8DDF001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8DA053F2A05211DD8DDF001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8DA053F2A05211DD8DDF001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8DA053F2A05211DD8DDF001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8DA053F2A05211DD8DDF001B388C61A4-->  <AD_TABLE_ID><![CDATA[376]]></AD_TABLE_ID>
-<!--8DA053F2A05211DD8DDF001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8DA053F2A05211DD8DDF001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8DA053F2A05211DD8DDF001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8DA053F2A05211DD8DDF001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8DA053F2A05211DD8DDF001B388C61A4--></AD_DATASET_TABLE>
-
-<!--8DA05E74A05211DDA60F001B388C61A4--><AD_DATASET_TABLE>
-<!--8DA05E74A05211DDA60F001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[8DA05E74A05211DDA60F001B388C61A4]]></AD_DATASET_TABLE_ID>
-<!--8DA05E74A05211DDA60F001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8DA05E74A05211DDA60F001B388C61A4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8DA05E74A05211DDA60F001B388C61A4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8DA05E74A05211DDA60F001B388C61A4-->  <AD_DATASET_ID><![CDATA[2]]></AD_DATASET_ID>
-<!--8DA05E74A05211DDA60F001B388C61A4-->  <AD_TABLE_ID><![CDATA[105]]></AD_TABLE_ID>
-<!--8DA05E74A05211DDA60F001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--8DA05E74A05211DDA60F001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--8DA05E74A05211DDA60F001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--8DA05E74A05211DDA60F001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8DA05E74A05211DDA60F001B388C61A4--></AD_DATASET_TABLE>
-
 <!--917173E696E111DDBBB9001B388C61A4--><AD_DATASET_TABLE>
 <!--917173E696E111DDBBB9001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[917173E696E111DDBBB9001B388C61A4]]></AD_DATASET_TABLE_ID>
 <!--917173E696E111DDBBB9001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1043,25 +516,12 @@
 <!--917173E696E111DDBBB9001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--917173E696E111DDBBB9001B388C61A4-->  <AD_TABLE_ID><![CDATA[106]]></AD_TABLE_ID>
 <!--917173E696E111DDBBB9001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--917173E696E111DDBBB9001B388C61A4-->  <WHERECLAUSE><![CDATA[module.id=:moduleid]]></WHERECLAUSE>
+<!--917173E696E111DDBBB9001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--917173E696E111DDBBB9001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--917173E696E111DDBBB9001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--917173E696E111DDBBB9001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--917173E696E111DDBBB9001B388C61A4--></AD_DATASET_TABLE>
 
-<!--959C7EF481C54AB5A05F2FE8F56828D4--><AD_DATASET_TABLE>
-<!--959C7EF481C54AB5A05F2FE8F56828D4-->  <AD_DATASET_TABLE_ID><![CDATA[959C7EF481C54AB5A05F2FE8F56828D4]]></AD_DATASET_TABLE_ID>
-<!--959C7EF481C54AB5A05F2FE8F56828D4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--959C7EF481C54AB5A05F2FE8F56828D4-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--959C7EF481C54AB5A05F2FE8F56828D4-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--959C7EF481C54AB5A05F2FE8F56828D4-->  <AD_DATASET_ID><![CDATA[C22005ECEB254DFF86061605E9939AAF]]></AD_DATASET_ID>
-<!--959C7EF481C54AB5A05F2FE8F56828D4-->  <AD_TABLE_ID><![CDATA[08A203FD84AA412BB38882A1EDDD1A83]]></AD_TABLE_ID>
-<!--959C7EF481C54AB5A05F2FE8F56828D4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--959C7EF481C54AB5A05F2FE8F56828D4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--959C7EF481C54AB5A05F2FE8F56828D4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--959C7EF481C54AB5A05F2FE8F56828D4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--959C7EF481C54AB5A05F2FE8F56828D4--></AD_DATASET_TABLE>
-
 <!--95BF92A6991711DD9B85001B388C61A4--><AD_DATASET_TABLE>
 <!--95BF92A6991711DD9B85001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[95BF92A6991711DD9B85001B388C61A4]]></AD_DATASET_TABLE_ID>
 <!--95BF92A6991711DD9B85001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1070,7 +530,7 @@
 <!--95BF92A6991711DD9B85001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--95BF92A6991711DD9B85001B388C61A4-->  <AD_TABLE_ID><![CDATA[08A203FD84AA412BB38882A1EDDD1A83]]></AD_TABLE_ID>
 <!--95BF92A6991711DD9B85001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--95BF92A6991711DD9B85001B388C61A4-->  <WHERECLAUSE><![CDATA[module.id=:moduleid]]></WHERECLAUSE>
+<!--95BF92A6991711DD9B85001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--95BF92A6991711DD9B85001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--95BF92A6991711DD9B85001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--95BF92A6991711DD9B85001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -1084,7 +544,7 @@
 <!--97FF266096D511DDA179001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--97FF266096D511DDA179001B388C61A4-->  <AD_TABLE_ID><![CDATA[107]]></AD_TABLE_ID>
 <!--97FF266096D511DDA179001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--97FF266096D511DDA179001B388C61A4-->  <WHERECLAUSE><![CDATA[module.id=:moduleid]]></WHERECLAUSE>
+<!--97FF266096D511DDA179001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--97FF266096D511DDA179001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--97FF266096D511DDA179001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--97FF266096D511DDA179001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -1098,7 +558,7 @@
 <!--98439D6C96E011DD93EE001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--98439D6C96E011DD93EE001B388C61A4-->  <AD_TABLE_ID><![CDATA[55EA8703587B40C1A05D225FBEE8C7FE]]></AD_TABLE_ID>
 <!--98439D6C96E011DD93EE001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--98439D6C96E011DD93EE001B388C61A4-->  <WHERECLAUSE><![CDATA[module.id=:moduleid]]></WHERECLAUSE>
+<!--98439D6C96E011DD93EE001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--98439D6C96E011DD93EE001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--98439D6C96E011DD93EE001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--98439D6C96E011DD93EE001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -1112,7 +572,23 @@
 <!--9C642B25C5B540EE97B4363AB384985E-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--9C642B25C5B540EE97B4363AB384985E-->  <AD_TABLE_ID><![CDATA[42EFE5EEF79147C791EFAF73D4FEA5D7]]></AD_TABLE_ID>
 <!--9C642B25C5B540EE97B4363AB384985E-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--9C642B25C5B540EE97B4363AB384985E-->  <WHERECLAUSE><![CDATA[as mom left join mom.modelObject as mo left join mo.callout left join mo.reference left join mo.specialForm left join mo.process left join mo.workflow left join mo.tab where (mo.callout.module.id=:moduleid or mo.reference.module.id=:moduleid or mo.specialForm.module.id=:moduleid or mo.process.module.id=:moduleid or mo.workflow.module.id=:moduleid or mo.tab.module.id=:moduleid) or  (mo.callout is null and mo.reference is null and mo.specialForm is null and mo.process is null and mo.workflow is null and mo.tab is null and mo.module.id=:moduleid)]]></WHERECLAUSE>
+<!--9C642B25C5B540EE97B4363AB384985E-->  <WHERECLAUSE><![CDATA[AD_MODEL_OBJECT_ID IN (SELECT AD_MODEL_OBJECT_ID FROM AD_MODEL_OBJECT WHERE
+(ad_callout_id is not null and ad_callout_id in (select ad_callout_id from ad_callout where ad_module_id in (:moduleid)))
+OR
+(ad_reference_id is not null and ad_reference_id in (select ad_reference_id from ad_reference where ad_module_id in (:moduleid)))
+OR
+(ad_form_id is not null and ad_form_id in (select ad_form_id from ad_form where ad_module_id in (:moduleid)))
+OR
+(ad_process_id is not null and ad_process_id in (select ad_process_id from ad_process where ad_module_id in (:moduleid)))
+OR
+(ad_workflow_id is not null and ad_workflow_id in (select ad_workflow_id from ad_workflow where ad_module_id in (:moduleid)))
+OR
+(ad_tab_id is not null and ad_tab_id in (select ad_tab_id from ad_tab where ad_module_id in (:moduleid)))
+OR
+(ad_callout_id is null and ad_reference_id is null and ad_form_id is null and ad_process_id is null
+and ad_workflow_id is null and ad_tab_id is null and ad_module_id in (:moduleid))
+OR
+(AD_MODEL_OBJECT_ID='801180' AND :moduleid='0'))]]></WHERECLAUSE>
 <!--9C642B25C5B540EE97B4363AB384985E-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--9C642B25C5B540EE97B4363AB384985E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--9C642B25C5B540EE97B4363AB384985E--></AD_DATASET_TABLE>
@@ -1125,7 +601,7 @@
 <!--9DD4A7FC96E111DD94EF001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--9DD4A7FC96E111DD94EF001B388C61A4-->  <AD_TABLE_ID><![CDATA[100]]></AD_TABLE_ID>
 <!--9DD4A7FC96E111DD94EF001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--9DD4A7FC96E111DD94EF001B388C61A4-->  <WHERECLAUSE><![CDATA[dataPackage.module.id=:moduleid]]></WHERECLAUSE>
+<!--9DD4A7FC96E111DD94EF001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_package_id in (select ad_package_id from ad_package where ad_module_id in (:moduleid))]]></WHERECLAUSE>
 <!--9DD4A7FC96E111DD94EF001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--9DD4A7FC96E111DD94EF001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--9DD4A7FC96E111DD94EF001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -6193,7 +5669,7 @@
 <!--A836C05496E111DDA9C5001B388C61A4-->  <AD_DATASET_ID><![CDATA[1]]></AD_DATASET_ID>
 <!--A836C05496E111DDA9C5001B388C61A4-->  <AD_TABLE_ID><![CDATA[118]]></AD_TABLE_ID>
 <!--A836C05496E111DDA9C5001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--A836C05496E111DDA9C5001B388C61A4-->  <WHERECLAUSE><![CDATA[client.id='0']]></WHERECLAUSE>
+<!--A836C05496E111DDA9C5001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_client_id='0']]></WHERECLAUSE>
 <!--A836C05496E111DDA9C5001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--A836C05496E111DDA9C5001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--A836C05496E111DDA9C5001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -6207,7 +5683,7 @@
 <!--B81566BA96E111DD95E3001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--B81566BA96E111DD95E3001B388C61A4-->  <AD_TABLE_ID><![CDATA[800146]]></AD_TABLE_ID>
 <!--B81566BA96E111DD95E3001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--B81566BA96E111DD95E3001B388C61A4-->  <WHERECLAUSE><![CDATA[module.id=:moduleid]]></WHERECLAUSE>
+<!--B81566BA96E111DD95E3001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--B81566BA96E111DD95E3001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--B81566BA96E111DD95E3001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--B81566BA96E111DD95E3001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -6221,7 +5697,7 @@
 <!--BA24D5C296E011DD936F001B388C61A4-->  <AD_DATASET_ID><![CDATA[1]]></AD_DATASET_ID>
 <!--BA24D5C296E011DD936F001B388C61A4-->  <AD_TABLE_ID><![CDATA[800049]]></AD_TABLE_ID>
 <!--BA24D5C296E011DD936F001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--BA24D5C296E011DD936F001B388C61A4-->  <WHERECLAUSE><![CDATA[client.id='0']]></WHERECLAUSE>
+<!--BA24D5C296E011DD936F001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_client_id='0']]></WHERECLAUSE>
 <!--BA24D5C296E011DD936F001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--BA24D5C296E011DD936F001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--BA24D5C296E011DD936F001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -6235,7 +5711,7 @@
 <!--BD9670F4992D11DDAD81001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--BD9670F4992D11DDAD81001B388C61A4-->  <AD_TABLE_ID><![CDATA[117]]></AD_TABLE_ID>
 <!--BD9670F4992D11DDAD81001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--BD9670F4992D11DDAD81001B388C61A4-->  <WHERECLAUSE><![CDATA[module.id=:moduleid]]></WHERECLAUSE>
+<!--BD9670F4992D11DDAD81001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--BD9670F4992D11DDAD81001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--BD9670F4992D11DDAD81001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--BD9670F4992D11DDAD81001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -6249,7 +5725,7 @@
 <!--BF1902C896E111DDB89F001B388C61A4-->  <AD_DATASET_ID><![CDATA[1]]></AD_DATASET_ID>
 <!--BF1902C896E111DDB89F001B388C61A4-->  <AD_TABLE_ID><![CDATA[288]]></AD_TABLE_ID>
 <!--BF1902C896E111DDB89F001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--BF1902C896E111DDB89F001B388C61A4-->  <WHERECLAUSE><![CDATA[client.id='0']]></WHERECLAUSE>
+<!--BF1902C896E111DDB89F001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_client_id='0']]></WHERECLAUSE>
 <!--BF1902C896E111DDB89F001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--BF1902C896E111DDB89F001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--BF1902C896E111DDB89F001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -6291,7 +5767,7 @@
 <!--C4A8525296E111DDBAF2001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--C4A8525296E111DDBAF2001B388C61A4-->  <AD_TABLE_ID><![CDATA[289]]></AD_TABLE_ID>
 <!--C4A8525296E111DDBAF2001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--C4A8525296E111DDBAF2001B388C61A4-->  <WHERECLAUSE><![CDATA[(tree.id='10' and exists( from ADMenu as menu where menu.id = node_id and menu.module.id=:moduleid)) or (:moduleid='0' and tree.id='10' and reportSet is null) or (:moduleid='0' and tree.id='50')]]></WHERECLAUSE>
+<!--C4A8525296E111DDBAF2001B388C61A4-->  <WHERECLAUSE><![CDATA[(ad_tree_id='10' and node_id in (select ad_menu_id from ad_menu where ad_module_id in (:moduleid)))]]></WHERECLAUSE>
 <!--C4A8525296E111DDBAF2001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--C4A8525296E111DDBAF2001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--C4A8525296E111DDBAF2001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -6305,7 +5781,7 @@
 <!--C7F92A079B9C418F8DF0213492C2CFF0-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--C7F92A079B9C418F8DF0213492C2CFF0-->  <AD_TABLE_ID><![CDATA[BE310ED7C5F243C48D41F7684116F4AF]]></AD_TABLE_ID>
 <!--C7F92A079B9C418F8DF0213492C2CFF0-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--C7F92A079B9C418F8DF0213492C2CFF0-->  <WHERECLAUSE><![CDATA[module.id=:moduleid]]></WHERECLAUSE>
+<!--C7F92A079B9C418F8DF0213492C2CFF0-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--C7F92A079B9C418F8DF0213492C2CFF0-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--C7F92A079B9C418F8DF0213492C2CFF0-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--C7F92A079B9C418F8DF0213492C2CFF0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -6333,7 +5809,7 @@
 <!--C9E9E59296DB11DDB70F001B388C61A4-->  <AD_DATASET_ID><![CDATA[1]]></AD_DATASET_ID>
 <!--C9E9E59296DB11DDB70F001B388C61A4-->  <AD_TABLE_ID><![CDATA[112]]></AD_TABLE_ID>
 <!--C9E9E59296DB11DDB70F001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--C9E9E59296DB11DDB70F001B388C61A4-->  <WHERECLAUSE><![CDATA[id='0']]></WHERECLAUSE>
+<!--C9E9E59296DB11DDB70F001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_client_id='0']]></WHERECLAUSE>
 <!--C9E9E59296DB11DDB70F001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--C9E9E59296DB11DDB70F001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--C9E9E59296DB11DDB70F001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -6347,25 +5823,12 @@
 <!--CAD50C6096E111DDAE90001B388C61A4-->  <AD_DATASET_ID><![CDATA[1]]></AD_DATASET_ID>
 <!--CAD50C6096E111DDAE90001B388C61A4-->  <AD_TABLE_ID><![CDATA[451]]></AD_TABLE_ID>
 <!--CAD50C6096E111DDAE90001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--CAD50C6096E111DDAE90001B388C61A4-->  <WHERECLAUSE><![CDATA[client.id='0']]></WHERECLAUSE>
+<!--CAD50C6096E111DDAE90001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_client_id='0']]></WHERECLAUSE>
 <!--CAD50C6096E111DDAE90001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--CAD50C6096E111DDAE90001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--CAD50C6096E111DDAE90001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--CAD50C6096E111DDAE90001B388C61A4--></AD_DATASET_TABLE>
 
-<!--CD2E89EA58764D56810DA1FD1B5084A2--><AD_DATASET_TABLE>
-<!--CD2E89EA58764D56810DA1FD1B5084A2-->  <AD_DATASET_TABLE_ID><![CDATA[CD2E89EA58764D56810DA1FD1B5084A2]]></AD_DATASET_TABLE_ID>
-<!--CD2E89EA58764D56810DA1FD1B5084A2-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--CD2E89EA58764D56810DA1FD1B5084A2-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--CD2E89EA58764D56810DA1FD1B5084A2-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--CD2E89EA58764D56810DA1FD1B5084A2-->  <AD_DATASET_ID><![CDATA[C22005ECEB254DFF86061605E9939AAF]]></AD_DATASET_ID>
-<!--CD2E89EA58764D56810DA1FD1B5084A2-->  <AD_TABLE_ID><![CDATA[104]]></AD_TABLE_ID>
-<!--CD2E89EA58764D56810DA1FD1B5084A2-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--CD2E89EA58764D56810DA1FD1B5084A2-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--CD2E89EA58764D56810DA1FD1B5084A2-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--CD2E89EA58764D56810DA1FD1B5084A2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--CD2E89EA58764D56810DA1FD1B5084A2--></AD_DATASET_TABLE>
-
 <!--CDAC10B183BA4D66A12668319F7C02C6--><AD_DATASET_TABLE>
 <!--CDAC10B183BA4D66A12668319F7C02C6-->  <AD_DATASET_TABLE_ID><![CDATA[CDAC10B183BA4D66A12668319F7C02C6]]></AD_DATASET_TABLE_ID>
 <!--CDAC10B183BA4D66A12668319F7C02C6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -6388,7 +5851,7 @@
 <!--D25DB1EE96E111DD8551001B388C61A4-->  <AD_DATASET_ID><![CDATA[1]]></AD_DATASET_ID>
 <!--D25DB1EE96E111DD8551001B388C61A4-->  <AD_TABLE_ID><![CDATA[453]]></AD_TABLE_ID>
 <!--D25DB1EE96E111DD8551001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--D25DB1EE96E111DD8551001B388C61A4-->  <WHERECLAUSE><![CDATA[client.id='0']]></WHERECLAUSE>
+<!--D25DB1EE96E111DD8551001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_client_id='0']]></WHERECLAUSE>
 <!--D25DB1EE96E111DD8551001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--D25DB1EE96E111DD8551001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--D25DB1EE96E111DD8551001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -6402,7 +5865,7 @@
 <!--D4BF993096DB11DDAA87001B388C61A4-->  <AD_DATASET_ID><![CDATA[1]]></AD_DATASET_ID>
 <!--D4BF993096DB11DDAA87001B388C61A4-->  <AD_TABLE_ID><![CDATA[227]]></AD_TABLE_ID>
 <!--D4BF993096DB11DDAA87001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--D4BF993096DB11DDAA87001B388C61A4-->  <WHERECLAUSE><![CDATA[client.id='0']]></WHERECLAUSE>
+<!--D4BF993096DB11DDAA87001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_client_id='0']]></WHERECLAUSE>
 <!--D4BF993096DB11DDAA87001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--D4BF993096DB11DDAA87001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--D4BF993096DB11DDAA87001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -6422,19 +5885,6 @@
 <!--D5E0D610BAD711DD8763001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--D5E0D610BAD711DD8763001B388C61A4--></AD_DATASET_TABLE>
 
-<!--D621906776C94378B4528834283A112C--><AD_DATASET_TABLE>
-<!--D621906776C94378B4528834283A112C-->  <AD_DATASET_TABLE_ID><![CDATA[D621906776C94378B4528834283A112C]]></AD_DATASET_TABLE_ID>
-<!--D621906776C94378B4528834283A112C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--D621906776C94378B4528834283A112C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--D621906776C94378B4528834283A112C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--D621906776C94378B4528834283A112C-->  <AD_DATASET_ID><![CDATA[C22005ECEB254DFF86061605E9939AAF]]></AD_DATASET_ID>
-<!--D621906776C94378B4528834283A112C-->  <AD_TABLE_ID><![CDATA[9D36D488605044F5A0264D7C8B916657]]></AD_TABLE_ID>
-<!--D621906776C94378B4528834283A112C-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--D621906776C94378B4528834283A112C-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--D621906776C94378B4528834283A112C-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--D621906776C94378B4528834283A112C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--D621906776C94378B4528834283A112C--></AD_DATASET_TABLE>
-
 <!--D7DDC46096DC11DDA6CE001B388C61A4--><AD_DATASET_TABLE>
 <!--D7DDC46096DC11DDA6CE001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[D7DDC46096DC11DDA6CE001B388C61A4]]></AD_DATASET_TABLE_ID>
 <!--D7DDC46096DC11DDA6CE001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -6443,7 +5893,7 @@
 <!--D7DDC46096DC11DDA6CE001B388C61A4-->  <AD_DATASET_ID><![CDATA[1]]></AD_DATASET_ID>
 <!--D7DDC46096DC11DDA6CE001B388C61A4-->  <AD_TABLE_ID><![CDATA[800047]]></AD_TABLE_ID>
 <!--D7DDC46096DC11DDA6CE001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--D7DDC46096DC11DDA6CE001B388C61A4-->  <WHERECLAUSE><![CDATA[client.id='0']]></WHERECLAUSE>
+<!--D7DDC46096DC11DDA6CE001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_client_id='0']]></WHERECLAUSE>
 <!--D7DDC46096DC11DDA6CE001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--D7DDC46096DC11DDA6CE001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--D7DDC46096DC11DDA6CE001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -6457,7 +5907,7 @@
 <!--DA0C680A96E011DDAA55001B388C61A4-->  <AD_DATASET_ID><![CDATA[1]]></AD_DATASET_ID>
 <!--DA0C680A96E011DDAA55001B388C61A4-->  <AD_TABLE_ID><![CDATA[195]]></AD_TABLE_ID>
 <!--DA0C680A96E011DDAA55001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--DA0C680A96E011DDAA55001B388C61A4-->  <WHERECLAUSE><![CDATA[client.id='0']]></WHERECLAUSE>
+<!--DA0C680A96E011DDAA55001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_client_id='0']]></WHERECLAUSE>
 <!--DA0C680A96E011DDAA55001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--DA0C680A96E011DDAA55001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--DA0C680A96E011DDAA55001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -6471,7 +5921,7 @@
 <!--DA60CE1C96E111DD963C001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--DA60CE1C96E111DD963C001B388C61A4-->  <AD_TABLE_ID><![CDATA[108]]></AD_TABLE_ID>
 <!--DA60CE1C96E111DD963C001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--DA60CE1C96E111DD963C001B388C61A4-->  <WHERECLAUSE><![CDATA[module.id=:moduleid]]></WHERECLAUSE>
+<!--DA60CE1C96E111DD963C001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--DA60CE1C96E111DD963C001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--DA60CE1C96E111DD963C001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--DA60CE1C96E111DD963C001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -6485,7 +5935,7 @@
 <!--E25ABC9096DC11DD8DF2001B388C61A4-->  <AD_DATASET_ID><![CDATA[1]]></AD_DATASET_ID>
 <!--E25ABC9096DC11DD8DF2001B388C61A4-->  <AD_TABLE_ID><![CDATA[800050]]></AD_TABLE_ID>
 <!--E25ABC9096DC11DD8DF2001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--E25ABC9096DC11DD8DF2001B388C61A4-->  <WHERECLAUSE><![CDATA[client.id='0']]></WHERECLAUSE>
+<!--E25ABC9096DC11DD8DF2001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_client_id='0']]></WHERECLAUSE>
 <!--E25ABC9096DC11DD8DF2001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--E25ABC9096DC11DD8DF2001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--E25ABC9096DC11DD8DF2001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -6499,7 +5949,7 @@
 <!--E64CF82296E111DD8ADE001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--E64CF82296E111DD8ADE001B388C61A4-->  <AD_TABLE_ID><![CDATA[129]]></AD_TABLE_ID>
 <!--E64CF82296E111DD8ADE001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--E64CF82296E111DD8ADE001B388C61A4-->  <WHERECLAUSE><![CDATA[workflow.module.id=:moduleid]]></WHERECLAUSE>
+<!--E64CF82296E111DD8ADE001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_workflow_id in (select ad_workflow_id from ad_workflow where ad_module_id in (:moduleid))]]></WHERECLAUSE>
 <!--E64CF82296E111DD8ADE001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--E64CF82296E111DD8ADE001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--E64CF82296E111DD8ADE001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -6519,32 +5969,6 @@
 <!--E88223421F0C45A19DB44D36176C37EA-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--E88223421F0C45A19DB44D36176C37EA--></AD_DATASET_TABLE>
 
-<!--EAC53921F7084F1C9077802EB7966772--><AD_DATASET_TABLE>
-<!--EAC53921F7084F1C9077802EB7966772-->  <AD_DATASET_TABLE_ID><![CDATA[EAC53921F7084F1C9077802EB7966772]]></AD_DATASET_TABLE_ID>
-<!--EAC53921F7084F1C9077802EB7966772-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--EAC53921F7084F1C9077802EB7966772-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--EAC53921F7084F1C9077802EB7966772-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--EAC53921F7084F1C9077802EB7966772-->  <AD_DATASET_ID><![CDATA[C22005ECEB254DFF86061605E9939AAF]]></AD_DATASET_ID>
-<!--EAC53921F7084F1C9077802EB7966772-->  <AD_TABLE_ID><![CDATA[101]]></AD_TABLE_ID>
-<!--EAC53921F7084F1C9077802EB7966772-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--EAC53921F7084F1C9077802EB7966772-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--EAC53921F7084F1C9077802EB7966772-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--EAC53921F7084F1C9077802EB7966772-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--EAC53921F7084F1C9077802EB7966772--></AD_DATASET_TABLE>
-
-<!--EB3E1401F99E447BA93BBCF2AF220B62--><AD_DATASET_TABLE>
-<!--EB3E1401F99E447BA93BBCF2AF220B62-->  <AD_DATASET_TABLE_ID><![CDATA[EB3E1401F99E447BA93BBCF2AF220B62]]></AD_DATASET_TABLE_ID>
-<!--EB3E1401F99E447BA93BBCF2AF220B62-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--EB3E1401F99E447BA93BBCF2AF220B62-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--EB3E1401F99E447BA93BBCF2AF220B62-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--EB3E1401F99E447BA93BBCF2AF220B62-->  <AD_DATASET_ID><![CDATA[C22005ECEB254DFF86061605E9939AAF]]></AD_DATASET_ID>
-<!--EB3E1401F99E447BA93BBCF2AF220B62-->  <AD_TABLE_ID><![CDATA[800154]]></AD_TABLE_ID>
-<!--EB3E1401F99E447BA93BBCF2AF220B62-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--EB3E1401F99E447BA93BBCF2AF220B62-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--EB3E1401F99E447BA93BBCF2AF220B62-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--EB3E1401F99E447BA93BBCF2AF220B62-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--EB3E1401F99E447BA93BBCF2AF220B62--></AD_DATASET_TABLE>
-
 <!--EBB65FEC96E111DDAFA8001B388C61A4--><AD_DATASET_TABLE>
 <!--EBB65FEC96E111DDAFA8001B388C61A4-->  <AD_DATASET_TABLE_ID><![CDATA[EBB65FEC96E111DDAFA8001B388C61A4]]></AD_DATASET_TABLE_ID>
 <!--EBB65FEC96E111DDAFA8001B388C61A4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -6553,7 +5977,8 @@
 <!--EBB65FEC96E111DDAFA8001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--EBB65FEC96E111DDAFA8001B388C61A4-->  <AD_TABLE_ID><![CDATA[131]]></AD_TABLE_ID>
 <!--EBB65FEC96E111DDAFA8001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--EBB65FEC96E111DDAFA8001B388C61A4-->  <WHERECLAUSE><![CDATA[node.workflow.module.id=:moduleid]]></WHERECLAUSE>
+<!--EBB65FEC96E111DDAFA8001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_wf_node_id in (select ad_wf_node_id from ad_wf_node where ad_workflow_id in (select ad_workflow_id from ad_workflow where ad_module_id in (:moduleid)))
+]]></WHERECLAUSE>
 <!--EBB65FEC96E111DDAFA8001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--EBB65FEC96E111DDAFA8001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--EBB65FEC96E111DDAFA8001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -6567,7 +5992,7 @@
 <!--EC6C7F3696DF11DD98BE001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--EC6C7F3696DF11DD98BE001B388C61A4-->  <AD_TABLE_ID><![CDATA[376]]></AD_TABLE_ID>
 <!--EC6C7F3696DF11DD98BE001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--EC6C7F3696DF11DD98BE001B388C61A4-->  <WHERECLAUSE><![CDATA[module.id=:moduleid]]></WHERECLAUSE>
+<!--EC6C7F3696DF11DD98BE001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--EC6C7F3696DF11DD98BE001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--EC6C7F3696DF11DD98BE001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--EC6C7F3696DF11DD98BE001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -6581,7 +6006,7 @@
 <!--ED89FA8296DB11DD91D4001B388C61A4-->  <AD_DATASET_ID><![CDATA[1]]></AD_DATASET_ID>
 <!--ED89FA8296DB11DD91D4001B388C61A4-->  <AD_TABLE_ID><![CDATA[155]]></AD_TABLE_ID>
 <!--ED89FA8296DB11DD91D4001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--ED89FA8296DB11DD91D4001B388C61A4-->  <WHERECLAUSE><![CDATA[id='0']]></WHERECLAUSE>
+<!--ED89FA8296DB11DD91D4001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_org_id='0']]></WHERECLAUSE>
 <!--ED89FA8296DB11DD91D4001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--ED89FA8296DB11DD91D4001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--ED89FA8296DB11DD91D4001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -6609,7 +6034,7 @@
 <!--F20434BE96E111DDBFA8001B388C61A4-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
 <!--F20434BE96E111DDBFA8001B388C61A4-->  <AD_TABLE_ID><![CDATA[105]]></AD_TABLE_ID>
 <!--F20434BE96E111DDBFA8001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--F20434BE96E111DDBFA8001B388C61A4-->  <WHERECLAUSE><![CDATA[module.id=:moduleid]]></WHERECLAUSE>
+<!--F20434BE96E111DDBFA8001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_module_id in (:moduleid)]]></WHERECLAUSE>
 <!--F20434BE96E111DDBFA8001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--F20434BE96E111DDBFA8001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--F20434BE96E111DDBFA8001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -6650,23 +6075,10 @@
 <!--FC362A8896DB11DD8E97001B388C61A4-->  <AD_DATASET_ID><![CDATA[1]]></AD_DATASET_ID>
 <!--FC362A8896DB11DD8E97001B388C61A4-->  <AD_TABLE_ID><![CDATA[228]]></AD_TABLE_ID>
 <!--FC362A8896DB11DD8E97001B388C61A4-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--FC362A8896DB11DD8E97001B388C61A4-->  <WHERECLAUSE><![CDATA[client.id='0']]></WHERECLAUSE>
+<!--FC362A8896DB11DD8E97001B388C61A4-->  <WHERECLAUSE><![CDATA[ad_client_id='0']]></WHERECLAUSE>
 <!--FC362A8896DB11DD8E97001B388C61A4-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
 <!--FC362A8896DB11DD8E97001B388C61A4-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
 <!--FC362A8896DB11DD8E97001B388C61A4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--FC362A8896DB11DD8E97001B388C61A4--></AD_DATASET_TABLE>
 
-<!--FD4396C5451D4530A11D1B940064DF6F--><AD_DATASET_TABLE>
-<!--FD4396C5451D4530A11D1B940064DF6F-->  <AD_DATASET_TABLE_ID><![CDATA[FD4396C5451D4530A11D1B940064DF6F]]></AD_DATASET_TABLE_ID>
-<!--FD4396C5451D4530A11D1B940064DF6F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FD4396C5451D4530A11D1B940064DF6F-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FD4396C5451D4530A11D1B940064DF6F-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FD4396C5451D4530A11D1B940064DF6F-->  <AD_DATASET_ID><![CDATA[C22005ECEB254DFF86061605E9939AAF]]></AD_DATASET_ID>
-<!--FD4396C5451D4530A11D1B940064DF6F-->  <AD_TABLE_ID><![CDATA[4D8B61CFF8F04F38B2C9BF2E30D92024]]></AD_TABLE_ID>
-<!--FD4396C5451D4530A11D1B940064DF6F-->  <INCLUDEALLCOLUMNS><![CDATA[Y]]></INCLUDEALLCOLUMNS>
-<!--FD4396C5451D4530A11D1B940064DF6F-->  <EXCLUDEAUDITINFO><![CDATA[Y]]></EXCLUDEAUDITINFO>
-<!--FD4396C5451D4530A11D1B940064DF6F-->  <ISBUSINESSOBJECT><![CDATA[N]]></ISBUSINESSOBJECT>
-<!--FD4396C5451D4530A11D1B940064DF6F-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--FD4396C5451D4530A11D1B940064DF6F--></AD_DATASET_TABLE>
-
 </data>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -2073,8 +2073,8 @@
 <!--316-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--316-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--316-->  <COLUMNNAME><![CDATA[GrandTotal]]></COLUMNNAME>
-<!--316-->  <NAME><![CDATA[Grand Total Amount]]></NAME>
-<!--316-->  <PRINTNAME><![CDATA[Grand Total]]></PRINTNAME>
+<!--316-->  <NAME><![CDATA[Total Gross Amount]]></NAME>
+<!--316-->  <PRINTNAME><![CDATA[Total Gross Amount]]></PRINTNAME>
 <!--316-->  <DESCRIPTION><![CDATA[The final monetary amount (including taxes) charge listed in a document.]]></DESCRIPTION>
 <!--316-->  <HELP><![CDATA[The Grand Total displays the total amount including Tax and Freight in document currency]]></HELP>
 <!--316-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -2528,10 +2528,10 @@
 <!--382-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--382-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--382-->  <COLUMNNAME><![CDATA[IsIdentifier]]></COLUMNNAME>
-<!--382-->  <NAME><![CDATA[Identifier]]></NAME>
+<!--382-->  <NAME><![CDATA[Used as Record Identifier]]></NAME>
 <!--382-->  <PRINTNAME><![CDATA[Identifier]]></PRINTNAME>
 <!--382-->  <DESCRIPTION><![CDATA[This column is part of the record identifier]]></DESCRIPTION>
-<!--382-->  <HELP><![CDATA[The Identifier checkbox indicates that this column is part of the identifier or key for this table.]]></HELP>
+<!--382-->  <HELP><![CDATA[The Identifier checkbox indicates that this column is part of the identifier or key for this table]]></HELP>
 <!--382-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--382--></AD_ELEMENT>
 
@@ -3572,8 +3572,8 @@
 <!--519-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--519-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--519-->  <COLUMNNAME><![CDATA[PriceActual]]></COLUMNNAME>
-<!--519-->  <NAME><![CDATA[Unit Price]]></NAME>
-<!--519-->  <PRINTNAME><![CDATA[Unit Price]]></PRINTNAME>
+<!--519-->  <NAME><![CDATA[Net Unit Price]]></NAME>
+<!--519-->  <PRINTNAME><![CDATA[Net Unit Price]]></PRINTNAME>
 <!--519-->  <DESCRIPTION><![CDATA[The price that will be paid for a specified item.]]></DESCRIPTION>
 <!--519-->  <HELP><![CDATA[The actual price indicates the price for a product in source currency.]]></HELP>
 <!--519-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -3585,8 +3585,8 @@
 <!--520-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--520-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--520-->  <COLUMNNAME><![CDATA[PriceList]]></COLUMNNAME>
-<!--520-->  <NAME><![CDATA[List Price]]></NAME>
-<!--520-->  <PRINTNAME><![CDATA[List Price]]></PRINTNAME>
+<!--520-->  <NAME><![CDATA[Net List Price]]></NAME>
+<!--520-->  <PRINTNAME><![CDATA[Net List Price]]></PRINTNAME>
 <!--520-->  <DESCRIPTION><![CDATA[The official price of a product in a specified currency.]]></DESCRIPTION>
 <!--520-->  <HELP><![CDATA[The List Price is the official price stated by the selected pricelist and the currency of the document.]]></HELP>
 <!--520-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -4350,8 +4350,8 @@
 <!--598-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--598-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--598-->  <COLUMNNAME><![CDATA[TotalLines]]></COLUMNNAME>
-<!--598-->  <NAME><![CDATA[Summed Line Amount]]></NAME>
-<!--598-->  <PRINTNAME><![CDATA[Total Lines]]></PRINTNAME>
+<!--598-->  <NAME><![CDATA[Total Net Amount]]></NAME>
+<!--598-->  <PRINTNAME><![CDATA[Total Net Amount]]></PRINTNAME>
 <!--598-->  <DESCRIPTION><![CDATA[The final sum of all line totals made to a specified document or transaction (not including taxes).]]></DESCRIPTION>
 <!--598-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency]]></HELP>
 <!--598-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -5427,8 +5427,8 @@
 <!--957-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--957-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--957-->  <COLUMNNAME><![CDATA[PriceStd]]></COLUMNNAME>
-<!--957-->  <NAME><![CDATA[Standard Price]]></NAME>
-<!--957-->  <PRINTNAME><![CDATA[Std Price]]></PRINTNAME>
+<!--957-->  <NAME><![CDATA[Net Standard Price]]></NAME>
+<!--957-->  <PRINTNAME><![CDATA[Net Standard Price]]></PRINTNAME>
 <!--957-->  <DESCRIPTION><![CDATA[The regular or normal price of a product in the respective price list.]]></DESCRIPTION>
 <!--957-->  <HELP><![CDATA[The Standard Price indicates the standard or normal price for a product on this price list]]></HELP>
 <!--957-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -9553,10 +9553,11 @@
 <!--1656-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--1656-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1656-->  <COLUMNNAME><![CDATA[IsSelectionColumn]]></COLUMNNAME>
-<!--1656-->  <NAME><![CDATA[Filter Column]]></NAME>
+<!--1656-->  <NAME><![CDATA[Used as Filter Column]]></NAME>
 <!--1656-->  <PRINTNAME><![CDATA[Selection]]></PRINTNAME>
 <!--1656-->  <DESCRIPTION><![CDATA[Is this column used for finding rows in windows]]></DESCRIPTION>
-<!--1656-->  <HELP><![CDATA[If selected, the column is listed in the first find window tab and in the selection part of the window]]></HELP>
+<!--1656-->  <HELP><![CDATA[
+If selected, this column will be used in the Search Window as an available filter criteria.]]></HELP>
 <!--1656-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1656--></AD_ELEMENT>
 
@@ -11757,8 +11758,7 @@
 <!--2019-->  <NAME><![CDATA[Attribute Set Value]]></NAME>
 <!--2019-->  <PRINTNAME><![CDATA[Attribute Set Instance]]></PRINTNAME>
 <!--2019-->  <DESCRIPTION><![CDATA[An attribute associated with a product as part of an attribute set.]]></DESCRIPTION>
-<!--2019-->  <HELP><![CDATA[
-The values of the actual Product Attributes]]></HELP>
+<!--2019-->  <HELP><![CDATA[The values of the actual Product Attributes]]></HELP>
 <!--2019-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2019--></AD_ELEMENT>
 
@@ -21860,10 +21860,11 @@
 <!--1006100000-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--1006100000-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1006100000-->  <COLUMNNAME><![CDATA[Isfirstfocusedfield]]></COLUMNNAME>
-<!--1006100000-->  <NAME><![CDATA[Is First Focused Field]]></NAME>
+<!--1006100000-->  <NAME><![CDATA[First Focused Field]]></NAME>
 <!--1006100000-->  <PRINTNAME><![CDATA[Is First Focused Field]]></PRINTNAME>
 <!--1006100000-->  <DESCRIPTION><![CDATA[Is First Focused Field]]></DESCRIPTION>
-<!--1006100000-->  <HELP><![CDATA[When it is active this field will be focused by default when the tab is opened.]]></HELP>
+<!--1006100000-->  <HELP><![CDATA[
+When it is active this field will be focused by default when the tab is opened.]]></HELP>
 <!--1006100000-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1006100000--></AD_ELEMENT>
 
@@ -24958,6 +24959,101 @@
 <!--7E011D1981B3E366E040007F01013030-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7E011D1981B3E366E040007F01013030--></AD_ELEMENT>
 
+<!--7E35F16BB0F6C186E040007F010014C7--><AD_ELEMENT>
+<!--7E35F16BB0F6C186E040007F010014C7-->  <AD_ELEMENT_ID><![CDATA[7E35F16BB0F6C186E040007F010014C7]]></AD_ELEMENT_ID>
+<!--7E35F16BB0F6C186E040007F010014C7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E35F16BB0F6C186E040007F010014C7-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E35F16BB0F6C186E040007F010014C7-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E35F16BB0F6C186E040007F010014C7-->  <COLUMNNAME><![CDATA[BaseAmount]]></COLUMNNAME>
+<!--7E35F16BB0F6C186E040007F010014C7-->  <NAME><![CDATA[Base Amount]]></NAME>
+<!--7E35F16BB0F6C186E040007F010014C7-->  <PRINTNAME><![CDATA[Base Amount]]></PRINTNAME>
+<!--7E35F16BB0F6C186E040007F010014C7-->  <DESCRIPTION><![CDATA[Base Amount to be used for the calculation of the tax amount.]]></DESCRIPTION>
+<!--7E35F16BB0F6C186E040007F010014C7-->  <HELP><![CDATA[Base Amount to be used as base for the calculation. Line net amount or alternate line net amount can be selected as base for the tax calculation.]]></HELP>
+<!--7E35F16BB0F6C186E040007F010014C7-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E35F16BB0F6C186E040007F010014C7--></AD_ELEMENT>
+
+<!--7E36B60C210930F0E040007F01016399--><AD_ELEMENT>
+<!--7E36B60C210930F0E040007F01016399-->  <AD_ELEMENT_ID><![CDATA[7E36B60C210930F0E040007F01016399]]></AD_ELEMENT_ID>
+<!--7E36B60C210930F0E040007F01016399-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E36B60C210930F0E040007F01016399-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E36B60C210930F0E040007F01016399-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E36B60C210930F0E040007F01016399-->  <COLUMNNAME><![CDATA[Attrsetvaluetype]]></COLUMNNAME>
+<!--7E36B60C210930F0E040007F01016399-->  <NAME><![CDATA[Use Attribute Set Value As]]></NAME>
+<!--7E36B60C210930F0E040007F01016399-->  <PRINTNAME><![CDATA[Use Attribute Set Value As]]></PRINTNAME>
+<!--7E36B60C210930F0E040007F01016399-->  <DESCRIPTION><![CDATA[A distinct Attribute Set Value characteristic.]]></DESCRIPTION>
+<!--7E36B60C210930F0E040007F01016399-->  <HELP><![CDATA[Permits to define different types of Attribute Set Values, depending on their usage.]]></HELP>
+<!--7E36B60C210930F0E040007F01016399-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E36B60C210930F0E040007F01016399--></AD_ELEMENT>
+
+<!--7E3C2453261B31A7E040007F0100680C--><AD_ELEMENT>
+<!--7E3C2453261B31A7E040007F0100680C-->  <AD_ELEMENT_ID><![CDATA[7E3C2453261B31A7E040007F0100680C]]></AD_ELEMENT_ID>
+<!--7E3C2453261B31A7E040007F0100680C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E3C2453261B31A7E040007F0100680C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E3C2453261B31A7E040007F0100680C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E3C2453261B31A7E040007F0100680C-->  <COLUMNNAME><![CDATA[C_TaxBase_ID]]></COLUMNNAME>
+<!--7E3C2453261B31A7E040007F0100680C-->  <NAME><![CDATA[Tax Base]]></NAME>
+<!--7E3C2453261B31A7E040007F0100680C-->  <PRINTNAME><![CDATA[Tax Base]]></PRINTNAME>
+<!--7E3C2453261B31A7E040007F0100680C-->  <DESCRIPTION><![CDATA[Tax rate used as tax base amount for tax calculation]]></DESCRIPTION>
+<!--7E3C2453261B31A7E040007F0100680C-->  <HELP><![CDATA[The amount of the tax selected here will be used as tax base amount for the tax calculation.]]></HELP>
+<!--7E3C2453261B31A7E040007F0100680C-->  <PO_NAME><![CDATA[rr]]></PO_NAME>
+<!--7E3C2453261B31A7E040007F0100680C-->  <PO_PRINTNAME><![CDATA[rrr]]></PO_PRINTNAME>
+<!--7E3C2453261B31A7E040007F0100680C-->  <PO_DESCRIPTION><![CDATA[rrr]]></PO_DESCRIPTION>
+<!--7E3C2453261B31A7E040007F0100680C-->  <PO_HELP><![CDATA[rrr]]></PO_HELP>
+<!--7E3C2453261B31A7E040007F0100680C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E3C2453261B31A7E040007F0100680C--></AD_ELEMENT>
+
+<!--7E562C34A0566EB2E040007F01001D67--><AD_ELEMENT>
+<!--7E562C34A0566EB2E040007F01001D67-->  <AD_ELEMENT_ID><![CDATA[7E562C34A0566EB2E040007F01001D67]]></AD_ELEMENT_ID>
+<!--7E562C34A0566EB2E040007F01001D67-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E562C34A0566EB2E040007F01001D67-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E562C34A0566EB2E040007F01001D67-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E562C34A0566EB2E040007F01001D67-->  <COLUMNNAME><![CDATA[C_Orderlinetax_ID]]></COLUMNNAME>
+<!--7E562C34A0566EB2E040007F01001D67-->  <NAME><![CDATA[Order Line Tax]]></NAME>
+<!--7E562C34A0566EB2E040007F01001D67-->  <PRINTNAME><![CDATA[Order Line Tax]]></PRINTNAME>
+<!--7E562C34A0566EB2E040007F01001D67-->  <DESCRIPTION><![CDATA[A unique and often automatically generated identifier for a sales order line tax.]]></DESCRIPTION>
+<!--7E562C34A0566EB2E040007F01001D67-->  <HELP><![CDATA[A unique identifier and a reference to a sales order line tax.]]></HELP>
+<!--7E562C34A0566EB2E040007F01001D67-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E562C34A0566EB2E040007F01001D67--></AD_ELEMENT>
+
+<!--7E595A11D621446FE040007F010052E9--><AD_ELEMENT>
+<!--7E595A11D621446FE040007F010052E9-->  <AD_ELEMENT_ID><![CDATA[7E595A11D621446FE040007F010052E9]]></AD_ELEMENT_ID>
+<!--7E595A11D621446FE040007F010052E9-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E595A11D621446FE040007F010052E9-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E595A11D621446FE040007F010052E9-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E595A11D621446FE040007F010052E9-->  <COLUMNNAME><![CDATA[C_InvoiceLineTax_ID]]></COLUMNNAME>
+<!--7E595A11D621446FE040007F010052E9-->  <NAME><![CDATA[InvoiceLineTax]]></NAME>
+<!--7E595A11D621446FE040007F010052E9-->  <PRINTNAME><![CDATA[Invoice Line Tax]]></PRINTNAME>
+<!--7E595A11D621446FE040007F010052E9-->  <DESCRIPTION><![CDATA[Invoice Line Tax]]></DESCRIPTION>
+<!--7E595A11D621446FE040007F010052E9-->  <HELP><![CDATA[Refers to the tax related to a given invoice line.]]></HELP>
+<!--7E595A11D621446FE040007F010052E9-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E595A11D621446FE040007F010052E9--></AD_ELEMENT>
+
+<!--7E8829EBCFF7143AE040007F010018ED--><AD_ELEMENT>
+<!--7E8829EBCFF7143AE040007F010018ED-->  <AD_ELEMENT_ID><![CDATA[7E8829EBCFF7143AE040007F010018ED]]></AD_ELEMENT_ID>
+<!--7E8829EBCFF7143AE040007F010018ED-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E8829EBCFF7143AE040007F010018ED-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E8829EBCFF7143AE040007F010018ED-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E8829EBCFF7143AE040007F010018ED-->  <COLUMNNAME><![CDATA[DocTaxAmount]]></COLUMNNAME>
+<!--7E8829EBCFF7143AE040007F010018ED-->  <NAME><![CDATA[Document Tax Amount Calculation]]></NAME>
+<!--7E8829EBCFF7143AE040007F010018ED-->  <PRINTNAME><![CDATA[Document Tax Amount Calculation]]></PRINTNAME>
+<!--7E8829EBCFF7143AE040007F010018ED-->  <DESCRIPTION><![CDATA[Document tax amount calculation criteria]]></DESCRIPTION>
+<!--7E8829EBCFF7143AE040007F010018ED-->  <HELP><![CDATA[Criteria used for the calculation of tax base amount at document level.]]></HELP>
+<!--7E8829EBCFF7143AE040007F010018ED-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E8829EBCFF7143AE040007F010018ED--></AD_ELEMENT>
+
+<!--7EC3B5CF03729057E040007F010110BF--><AD_ELEMENT>
+<!--7EC3B5CF03729057E040007F010110BF-->  <AD_ELEMENT_ID><![CDATA[7EC3B5CF03729057E040007F010110BF]]></AD_ELEMENT_ID>
+<!--7EC3B5CF03729057E040007F010110BF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7EC3B5CF03729057E040007F010110BF-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7EC3B5CF03729057E040007F010110BF-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7EC3B5CF03729057E040007F010110BF-->  <COLUMNNAME><![CDATA[Isoneattrsetvalrequired]]></COLUMNNAME>
+<!--7EC3B5CF03729057E040007F010110BF-->  <NAME><![CDATA[Require At Least One Value]]></NAME>
+<!--7EC3B5CF03729057E040007F010110BF-->  <PRINTNAME><![CDATA[Require At Least One Value]]></PRINTNAME>
+<!--7EC3B5CF03729057E040007F010110BF-->  <DESCRIPTION><![CDATA[At least one attribute set value will be required in transactions.]]></DESCRIPTION>
+<!--7EC3B5CF03729057E040007F010110BF-->  <HELP><![CDATA[At least one attribute set value will be required in transactions.]]></HELP>
+<!--7EC3B5CF03729057E040007F010110BF-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7EC3B5CF03729057E040007F010110BF--></AD_ELEMENT>
+
 <!--80044AA0505611DEBC12001CC0B8EF99--><AD_ELEMENT>
 <!--80044AA0505611DEBC12001CC0B8EF99-->  <AD_ELEMENT_ID><![CDATA[80044AA0505611DEBC12001CC0B8EF99]]></AD_ELEMENT_ID>
 <!--80044AA0505611DEBC12001CC0B8EF99-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -25089,8 +25185,8 @@
 <!--9F815073C39E4506A1C74BB3667C6B57-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--9F815073C39E4506A1C74BB3667C6B57-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--9F815073C39E4506A1C74BB3667C6B57-->  <COLUMNNAME><![CDATA[PriceActual]]></COLUMNNAME>
-<!--9F815073C39E4506A1C74BB3667C6B57-->  <NAME><![CDATA[Net Unit Price]]></NAME>
-<!--9F815073C39E4506A1C74BB3667C6B57-->  <PRINTNAME><![CDATA[Net Unit Price]]></PRINTNAME>
+<!--9F815073C39E4506A1C74BB3667C6B57-->  <NAME><![CDATA[Unit Price]]></NAME>
+<!--9F815073C39E4506A1C74BB3667C6B57-->  <PRINTNAME><![CDATA[Unit Price]]></PRINTNAME>
 <!--9F815073C39E4506A1C74BB3667C6B57-->  <DESCRIPTION><![CDATA[The price that will be paid for a specified item.]]></DESCRIPTION>
 <!--9F815073C39E4506A1C74BB3667C6B57-->  <HELP><![CDATA[The actual price indicates the price for a product in source currency.]]></HELP>
 <!--9F815073C39E4506A1C74BB3667C6B57-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -25243,8 +25339,8 @@
 <!--CD57A1DBADD440EC9551AE6BC51E8643-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--CD57A1DBADD440EC9551AE6BC51E8643-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--CD57A1DBADD440EC9551AE6BC51E8643-->  <COLUMNNAME><![CDATA[PriceStd]]></COLUMNNAME>
-<!--CD57A1DBADD440EC9551AE6BC51E8643-->  <NAME><![CDATA[Net Standard Price]]></NAME>
-<!--CD57A1DBADD440EC9551AE6BC51E8643-->  <PRINTNAME><![CDATA[Net Standard Price]]></PRINTNAME>
+<!--CD57A1DBADD440EC9551AE6BC51E8643-->  <NAME><![CDATA[Standard Price]]></NAME>
+<!--CD57A1DBADD440EC9551AE6BC51E8643-->  <PRINTNAME><![CDATA[Std Price]]></PRINTNAME>
 <!--CD57A1DBADD440EC9551AE6BC51E8643-->  <DESCRIPTION><![CDATA[The regular or normal price of a product in the respective price list.]]></DESCRIPTION>
 <!--CD57A1DBADD440EC9551AE6BC51E8643-->  <HELP><![CDATA[The Standard Price indicates the standard or normal price for a product on this price list]]></HELP>
 <!--CD57A1DBADD440EC9551AE6BC51E8643-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -25321,8 +25417,8 @@
 <!--E46619B0FD944516A50C9B18E0E4E727-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--E46619B0FD944516A50C9B18E0E4E727-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--E46619B0FD944516A50C9B18E0E4E727-->  <COLUMNNAME><![CDATA[GrandTotal]]></COLUMNNAME>
-<!--E46619B0FD944516A50C9B18E0E4E727-->  <NAME><![CDATA[Total Gross Amount]]></NAME>
-<!--E46619B0FD944516A50C9B18E0E4E727-->  <PRINTNAME><![CDATA[Total Gross Amount]]></PRINTNAME>
+<!--E46619B0FD944516A50C9B18E0E4E727-->  <NAME><![CDATA[Grand Total Amount]]></NAME>
+<!--E46619B0FD944516A50C9B18E0E4E727-->  <PRINTNAME><![CDATA[Grand Total]]></PRINTNAME>
 <!--E46619B0FD944516A50C9B18E0E4E727-->  <DESCRIPTION><![CDATA[The final monetary amount (including taxes) charge listed in a document.]]></DESCRIPTION>
 <!--E46619B0FD944516A50C9B18E0E4E727-->  <HELP><![CDATA[The Grand Total displays the total amount including Tax and Freight in document currency]]></HELP>
 <!--E46619B0FD944516A50C9B18E0E4E727-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
@@ -25347,8 +25443,8 @@
 <!--F3BF680089754BAC858ECFF2D5D0F232-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--F3BF680089754BAC858ECFF2D5D0F232-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--F3BF680089754BAC858ECFF2D5D0F232-->  <COLUMNNAME><![CDATA[TotalLines]]></COLUMNNAME>
-<!--F3BF680089754BAC858ECFF2D5D0F232-->  <NAME><![CDATA[Total Net Amount]]></NAME>
-<!--F3BF680089754BAC858ECFF2D5D0F232-->  <PRINTNAME><![CDATA[Total Net Amount]]></PRINTNAME>
+<!--F3BF680089754BAC858ECFF2D5D0F232-->  <NAME><![CDATA[Summed Line Amount]]></NAME>
+<!--F3BF680089754BAC858ECFF2D5D0F232-->  <PRINTNAME><![CDATA[Total Lines]]></PRINTNAME>
 <!--F3BF680089754BAC858ECFF2D5D0F232-->  <DESCRIPTION><![CDATA[The final sum of all line totals made to a specified document or transaction (not including taxes).]]></DESCRIPTION>
 <!--F3BF680089754BAC858ECFF2D5D0F232-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency.]]></HELP>
 <!--F3BF680089754BAC858ECFF2D5D0F232-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Thu Feb 04 17:13:12 2010 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Wed Feb 10 14:06:07 2010 +0100
@@ -1206,9 +1206,9 @@
 <!--168-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--168-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--168-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--168-->  <NAME><![CDATA[Identifier]]></NAME>
+<!--168-->  <NAME><![CDATA[Used as Record Identifier]]></NAME>
 <!--168-->  <DESCRIPTION><![CDATA[This column is part of the record identifier]]></DESCRIPTION>
-<!--168-->  <HELP><![CDATA[The Identifier checkbox indicates that this column is part of the identifier or key for this table.]]></HELP>
+<!--168-->  <HELP><![CDATA[The Identifier checkbox indicates that this column is part of the identifier or key for this table]]></HELP>
 <!--168-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--168-->  <AD_TAB_ID><![CDATA[101]]></AD_TAB_ID>
 <!--168-->  <AD_COLUMN_ID><![CDATA[126]]></AD_COLUMN_ID>
@@ -6484,7 +6484,7 @@
 <!--460-->  <AD_COLUMN_ID><![CDATA[1010]]></AD_COLUMN_ID>
 <!--460-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--460-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
-<!--460-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--460-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--460-->  <SEQNO><![CDATA[40]]></SEQNO>
 <!--460-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--460-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
@@ -11841,10 +11841,9 @@
 <!--973-->  <AD_TAB_ID><![CDATA[174]]></AD_TAB_ID>
 <!--973-->  <AD_COLUMN_ID><![CDATA[2249]]></AD_COLUMN_ID>
 <!--973-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--973-->  <DISPLAYLOGIC><![CDATA[@IsSummary@='N']]></DISPLAYLOGIC>
 <!--973-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--973-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--973-->  <SEQNO><![CDATA[130]]></SEQNO>
+<!--973-->  <SEQNO><![CDATA[120]]></SEQNO>
 <!--973-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--973-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--973-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -11867,7 +11866,7 @@
 <!--974-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--974-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--974-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--974-->  <SEQNO><![CDATA[200]]></SEQNO>
+<!--974-->  <SEQNO><![CDATA[240]]></SEQNO>
 <!--974-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--974-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--974-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -11890,7 +11889,7 @@
 <!--975-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--975-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--975-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--975-->  <SEQNO><![CDATA[220]]></SEQNO>
+<!--975-->  <SEQNO><![CDATA[270]]></SEQNO>
 <!--975-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--975-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--975-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -11913,7 +11912,7 @@
 <!--976-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--976-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--976-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--976-->  <SEQNO><![CDATA[210]]></SEQNO>
+<!--976-->  <SEQNO><![CDATA[250]]></SEQNO>
 <!--976-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--976-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--976-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -11936,7 +11935,7 @@
 <!--977-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--977-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--977-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--977-->  <SEQNO><![CDATA[230]]></SEQNO>
+<!--977-->  <SEQNO><![CDATA[290]]></SEQNO>
 <!--977-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--977-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--977-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -14082,7 +14081,7 @@
 <!--1112-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--1112-->  <NAME><![CDATA[Total Net Amount]]></NAME>
 <!--1112-->  <DESCRIPTION><![CDATA[The final sum of all line totals made to a specified document or transaction (not including taxes).]]></DESCRIPTION>
-<!--1112-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency.]]></HELP>
+<!--1112-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency]]></HELP>
 <!--1112-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>