Merge 1st iteration of DAL project (rev. 8119)
authorIván Perdomo <ivan.perdomo@openbravo.com>
Wed, 01 Oct 2008 12:57:20 +0000
changeset 1738 d8dcb2ecfd14
parent 1737 e73e8429e446
child 1739 51538c38affe
Merge 1st iteration of DAL project (rev. 8119)
.classpath
.project
.settings/org.eclipse.core.resources.prefs
.settings/org.eclipse.jdt.core.prefs
build.xml
config/log4j.lcf.template
legal/ANTLR-3.txt
legal/CPL-1.0.txt
legal/EPL-1.0.txt
legal/Licensing.txt
legal/Sun_license_agreement.txt
lib/activation.jar
lib/avalon-framework-4.1.5.jar
lib/axis-ant.jar
lib/axis.jar
lib/barcode4j-fop-ext-0.20.5-complete.jar
lib/batik.jar
lib/build/hybridlabs-beautifier-1.1.9.jar
lib/build/jalopy-1.5-rc3p1.jar
lib/build/junit.jar
lib/build/org.eclipse.emf.common_2.4.0.v200806091234.jar
lib/build/org.eclipse.emf.ecore.xmi_2.4.0.v200806091234.jar
lib/build/org.eclipse.emf.ecore_2.4.0.v200806091234.jar
lib/build/org.eclipse.equinox.common_3.4.0.v20080421-2006.jar
lib/build/org.eclipse.text_3.4.0.v20080605-1800.jar
lib/build/org.openarchitectureware.core.emftools_4.3.1.20080910-1400PRD.jar
lib/build/org.openarchitectureware.core.expressions_4.3.1.20080910-1400PRD.jar
lib/build/org.openarchitectureware.core.workflow_4.3.1.20080910-1400PRD.jar
lib/build/org.openarchitectureware.core.xpand2_4.3.1.20080910-1400PRD.jar
lib/comm.jar
lib/commons-beanutils-1.7.jar
lib/commons-codec-1.3.jar
lib/commons-collections.jar
lib/commons-dbcp.jar
lib/commons-digester-1.8.jar
lib/commons-discovery-0.2.jar
lib/commons-fileupload.jar
lib/commons-io.jar
lib/commons-logging-1.0.4.jar
lib/commons-pool.jar
lib/fop.jar
lib/itext-1.3.1.jar
lib/jasperreports-3.0.1.jar
lib/jaxrpc.jar
lib/jcommon-1.0.13.jar
lib/jdbc3-postgresql.jar
lib/jdtcore-3.1.0.jar
lib/jfreechart-1.0.10.jar
lib/jxl-2.6.jar
lib/lam-client.jar
lib/log4j-1.2.8.jar
lib/log4j-1.3alpha-8.jar
lib/mail.jar
lib/nekohtml.jar
lib/ojdbc14.jar
lib/renderFoRmi.jar
lib/runtime/activation.jar
lib/runtime/antlr-2.7.6.jar
lib/runtime/antlr-runtime-3.0.jar
lib/runtime/asm.jar
lib/runtime/avalon-framework-4.1.5.jar
lib/runtime/axis-ant.jar
lib/runtime/axis.jar
lib/runtime/barcode4j-fop-ext-0.20.5-complete.jar
lib/runtime/batik.jar
lib/runtime/cglib-2.1.3.jar
lib/runtime/comm.jar
lib/runtime/commons-beanutils-1.7.jar
lib/runtime/commons-codec-1.3.jar
lib/runtime/commons-collections-testframework.jar
lib/runtime/commons-collections.jar
lib/runtime/commons-dbcp.jar
lib/runtime/commons-digester-1.8.jar
lib/runtime/commons-discovery-0.2.jar
lib/runtime/commons-fileupload.jar
lib/runtime/commons-io.jar
lib/runtime/commons-logging-1.0.4.jar
lib/runtime/commons-logging-1.1.jar
lib/runtime/commons-pool.jar
lib/runtime/dom4j-1.6.1.jar
lib/runtime/ehcache-1.2.3.jar
lib/runtime/fop.jar
lib/runtime/hibernate3.jar
lib/runtime/itext-1.3.1.jar
lib/runtime/jasperreports-3.0.1.jar
lib/runtime/jaxrpc.jar
lib/runtime/jcommon-1.0.13.jar
lib/runtime/jdbc3-postgresql.jar
lib/runtime/jdtcore-3.1.0.jar
lib/runtime/jfreechart-1.0.10.jar
lib/runtime/jta.jar
lib/runtime/jxl-2.6.jar
lib/runtime/lam-client.jar
lib/runtime/log4j-1.2.8.jar
lib/runtime/log4j-1.3alpha-8.jar
lib/runtime/logkit-1.0.1.jar
lib/runtime/mail.jar
lib/runtime/nekohtml.jar
lib/runtime/ojdbc14.jar
lib/runtime/org.apache.commons.cli_1.0.0.jar
lib/runtime/renderFoRmi.jar
lib/runtime/saaj.jar
lib/runtime/servlet-api.jar
lib/runtime/ws-commons-util-1.0.1.jar
lib/runtime/wsdl4j-1.5.1.jar
lib/runtime/xercesImpl.jar
lib/runtime/xml-apis.jar
lib/runtime/xmlrpc-client-3.1.jar
lib/runtime/xmlrpc-common-3.1.jar
lib/saaj.jar
lib/servlet-api.jar
lib/ws-commons-util-1.0.1.jar
lib/wsdl4j-1.5.1.jar
lib/xercesImpl.jar
lib/xml-apis.jar
lib/xmlrpc-client-3.1.jar
lib/xmlrpc-common-3.1.jar
src-core/.classpath
src-core/.project
src-db/database/model/tables/AD_COLUMN.xml
src-db/database/model/tables/AD_MODULE.xml
src-db/database/model/tables/R_CONTACTINTEREST.xml
src-db/database/model/views/C_DEBT_PAYMENT_V.xml
src-db/database/model/views/C_INVOICE_V.xml
src-db/database/model/views/MA_PROCESSPLAN_TOTALIZED.xml
src-db/database/model/views/RV_C_INVOICE.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_REF_SEARCH.xml
src-db/database/sourcedata/AD_TAB.xml
src-trl/.classpath
src-wad/.classpath
src-wad/src/org/openbravo/wad/web.xml
src/build.xml
src/ehcache.xml
src/org/openbravo/base/exception/OBException.java
src/org/openbravo/base/exception/OBSecurityException.java
src/org/openbravo/base/gen/ModelProviderComponent.java
src/org/openbravo/base/gen/entity.xpt
src/org/openbravo/base/gen/gen_entity.oaw
src/org/openbravo/base/gen/gen_util.ext
src/org/openbravo/base/model/BaseOBObjectDef.java
src/org/openbravo/base/model/Column.hbm.xml
src/org/openbravo/base/model/Column.java
src/org/openbravo/base/model/Entity.java
src/org/openbravo/base/model/ModelObject.java
src/org/openbravo/base/model/ModelProvider.java
src/org/openbravo/base/model/ModelSessionFactoryController.java
src/org/openbravo/base/model/Property.java
src/org/openbravo/base/model/RefList.hbm.xml
src/org/openbravo/base/model/RefList.java
src/org/openbravo/base/model/RefSearch.hbm.xml
src/org/openbravo/base/model/RefSearch.java
src/org/openbravo/base/model/RefTable.hbm.xml
src/org/openbravo/base/model/RefTable.java
src/org/openbravo/base/model/Reference.hbm.xml
src/org/openbravo/base/model/Reference.java
src/org/openbravo/base/model/Table.hbm.xml
src/org/openbravo/base/model/Table.java
src/org/openbravo/base/security/AccessLevelChecker.java
src/org/openbravo/base/session/OBOracle10gDialect.java
src/org/openbravo/base/session/OBPropertiesProvider.java
src/org/openbravo/base/session/SessionFactoryController.java
src/org/openbravo/base/structure/ActiveEnabled.java
src/org/openbravo/base/structure/BaseOBObject.java
src/org/openbravo/base/structure/ClientEnabled.java
src/org/openbravo/base/structure/DynamicEnabled.java
src/org/openbravo/base/structure/DynamicOBObject.java
src/org/openbravo/base/structure/Identifiable.java
src/org/openbravo/base/structure/IdentifierProvider.java
src/org/openbravo/base/structure/OBFactory.java
src/org/openbravo/base/structure/OrganisationEnabled.java
src/org/openbravo/base/structure/Traceable.java
src/org/openbravo/base/util/ArgumentException.java
src/org/openbravo/base/util/Check.java
src/org/openbravo/base/util/CheckException.java
src/org/openbravo/base/util/ModelUtil.java
src/org/openbravo/base/util/NamingUtil.java
src/org/openbravo/base/util/OBClassLoader.java
src/org/openbravo/base/validation/EntityValidator.java
src/org/openbravo/base/validation/NumericPropertyValidator.java
src/org/openbravo/base/validation/PropertyValidator.java
src/org/openbravo/base/validation/StringPropertyValidator.java
src/org/openbravo/base/validation/ValidationException.java
src/org/openbravo/dal/core/DALUtil.java
src/org/openbravo/dal/core/DalContextListener.java
src/org/openbravo/dal/core/DalLayerInitializer.java
src/org/openbravo/dal/core/DalMappingGenerator.java
src/org/openbravo/dal/core/DalRequestFilter.java
src/org/openbravo/dal/core/DalSessionFactoryController.java
src/org/openbravo/dal/core/DalThreadHandler.java
src/org/openbravo/dal/core/OBContext.java
src/org/openbravo/dal/core/OBDynamicPropertyHandler.java
src/org/openbravo/dal/core/OBInstantiator.java
src/org/openbravo/dal/core/OBInterceptor.java
src/org/openbravo/dal/core/OBTuplizer.java
src/org/openbravo/dal/core/OBYesNoType.java
src/org/openbravo/dal/core/SessionHandler.java
src/org/openbravo/dal/core/ThreadHandler.java
src/org/openbravo/dal/core/template.hbm.xml
src/org/openbravo/dal/core/template_dynamic.hbm.xml
src/org/openbravo/dal/core/template_main.hbm.xml
src/org/openbravo/dal/security/EntityAccessChecker.java
src/org/openbravo/dal/security/OrganisationStructureProvider.java
src/org/openbravo/dal/security/SecurityChecker.java
src/org/openbravo/dal/security/SecurityConstants.java
src/org/openbravo/dal/service/DalToXMLConverter.java
src/org/openbravo/dal/service/DalWebServiceServlet.java
src/org/openbravo/dal/service/DalWebServiceUtil.java
src/org/openbravo/dal/service/OBDal.java
src/org/openbravo/dal/service/OBFilter.java
src/org/openbravo/dal/service/OBFilterQuery.java
src/org/openbravo/dal/service/OBWebServiceException.java
src/org/openbravo/dal/service/XMLImportMessage.java
src/org/openbravo/dal/service/XMLOptions.java
src/org/openbravo/dal/service/XMLToDalConverter.java
src/org/openbravo/dal/service/XMLTypeConverter.java
src/org/openbravo/dal/service/XMLUtil.java
src/org/openbravo/dal/service/bo.xslt
src/org/openbravo/dal/service/bolist.xslt
src/org/openbravo/dal/service/types.xslt
--- a/.classpath	Wed Oct 01 12:34:44 2008 +0000
+++ b/.classpath	Wed Oct 01 12:57:20 2008 +0000
@@ -4,10 +4,12 @@
 	<classpathentry exported="true" kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/OpenbravoTrl"/>
 	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/OpenbravoWAD"/>
-	<classpathentry including="**/*.java" kind="src" path="src"/>
+	<classpathentry including="**/*.ext|**/*.java|**/*.oaw|**/*.properties|**/*.xml|**/*.xpt|**/*.xslt" kind="src" path="src"/>
+	<classpathentry kind="src" path="src-gen"/>
 	<classpathentry including="**/*.java" kind="src" path="srcAD"/>
 	<classpathentry including="**/*.java" kind="src" path="build/javasqlc/srcAD"/>
 	<classpathentry including="**/*.java" kind="src" path="build/javasqlc/src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/build/org.openarchitectureware.core.workflow_4.3.1.20080910-1400PRD.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
--- a/.project	Wed Oct 01 12:34:44 2008 +0000
+++ b/.project	Wed Oct 01 12:57:20 2008 +0000
@@ -12,12 +12,7 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<name>org.openarchitectureware.base.oawBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
@@ -27,5 +22,6 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.openarchitectureware.base.oawNature</nature>
 	</natures>
 </projectDescription>
--- a/.settings/org.eclipse.core.resources.prefs	Wed Oct 01 12:34:44 2008 +0000
+++ b/.settings/org.eclipse.core.resources.prefs	Wed Oct 01 12:57:20 2008 +0000
@@ -1,3 +1,3 @@
-#Tue Oct 02 17:26:23 CEST 2007
+#Thu Sep 18 14:44:21 CEST 2008
 eclipse.preferences.version=1
 encoding/<project>=UTF-8
--- a/.settings/org.eclipse.jdt.core.prefs	Wed Oct 01 12:34:44 2008 +0000
+++ b/.settings/org.eclipse.jdt.core.prefs	Wed Oct 01 12:57:20 2008 +0000
@@ -1,7 +1,12 @@
-#Mon Oct 01 12:31:39 CEST 2007
+#Thu Sep 18 12:23:39 CEST 2008
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.5
--- a/build.xml	Wed Oct 01 12:34:44 2008 +0000
+++ b/build.xml	Wed Oct 01 12:57:20 2008 +0000
@@ -76,6 +76,7 @@
   <property name="base.src.db" location="src-db"/>
   <property name="base.src.trl" location="src-trl"/>
   <property name="base.src.wad" location="src-wad"/>
+  <property name="base.src.gen" location="src-gen"/>
   <property name="base.client.src" location="srcClient"/>
   <property name="base.db" location="src-db/database"/>
   <property name="base.web" location="web"/>
@@ -109,6 +110,7 @@
 
   <path id="project.class.path">
     <pathelement path="${build}"/>
+    <pathelement path="${base.src}" />
     <fileset dir="${base.lib}">
       <include name="**/*.jar"/>
     </fileset>
@@ -182,6 +184,14 @@
     <eclipse.refreshLocal resource="openbravo" depth="infinite"/>
     <eclipse.incrementalBuild project="openbravo" kind="full"/>
   </target>
+  
+  <target name="compile.src.gen" depends="init">
+    <ant dir="${base.src}" target="compile.src.gen" inheritAll="true" inheritRefs="true"/>
+  </target>
+
+  <target name="generate.entities" depends="compile.src.gen">
+    <ant dir="${base.src}" target="generate.entities" inheritAll="true" inheritRefs="true"/>
+  </target>
 
   <target name="compile.src" depends="init">
     <ant dir="${base.src}" target="compile.src" inheritAll="true" inheritRefs="true"/>
@@ -197,7 +207,7 @@
 
   <target name="core.lib" depends="init">
     <ant dir="${base.src.core}" target="build" inheritAll="true" inheritRefs="true"/>
-    <copy file="${base.src.core}/lib/openbravo-core.jar" todir="${base.lib}" overwrite="true" failonerror="false"/>
+    <copy file="${base.src.core}/lib/openbravo-core.jar" todir="${base.lib}/runtime" overwrite="true" failonerror="false"/>
   </target>
 
   <target name="eclipse.wad.lib" depends="init">
--- a/config/log4j.lcf.template	Wed Oct 01 12:34:44 2008 +0000
+++ b/config/log4j.lcf.template	Wed Oct 01 12:57:20 2008 +0000
@@ -10,7 +10,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) 2007 Openbravo SL 
+# * All portions are Copyright (C) 2007-2008 Openbravo SL 
 # * All Rights Reserved. 
 # * Contributor(s):  ______________________________________.
 # ************************************************************************
@@ -33,3 +33,43 @@
 
 # To debug an specific class
 #log4j.category.org.openbravo.erpCommon.ad_process=DEBUG
+
+#****************************************************
+# Hibernate
+#****************************************************
+log4j.appender.HB=org.apache.log4j.RollingFileAppender
+log4j.appender.HB.File=${catalina.base}/logs/openbravo_hibernate.log
+log4j.appender.HB.MaxFileSize=10000KB
+
+# R uses PatternLayout.
+log4j.appender.HB.layout=org.apache.log4j.PatternLayout
+log4j.appender.HB.layout.ConversionPattern=%d{HH:mm:ss} [%t] %-5p %c - %m%n
+
+# Keep one backup file
+log4j.appender.HB.MaxBackupIndex=1
+
+log4j.logger.org.hibernate=error, HB
+
+### log HQL query parser activity
+#log4j.logger.org.hibernate.hql.ast.AST=error, HB
+
+### log just the SQL
+log4j.logger.org.hibernate.SQL=error, HB
+
+### log JDBC bind parameters ###
+log4j.logger.org.hibernate.type=error, HB
+
+### log schema export/update ###
+log4j.logger.org.hibernate.tool.hbm2ddl=error, HB
+
+### log HQL parse trees
+log4j.logger.org.hibernate.hql=error, HB
+
+### log cache activity ###
+log4j.logger.org.hibernate.cache=error, HB
+
+### log transaction activity
+log4j.logger.org.hibernate.transaction=error, HB
+
+### log JDBC resource acquisition
+log4j.logger.org.hibernate.jdbc=error, HB
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/legal/ANTLR-3.txt	Wed Oct 01 12:57:20 2008 +0000
@@ -0,0 +1,26 @@
+ANTLR 3 License
+
+[The BSD License] Copyright (c) 2003-2008, Terence Parr All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.  * Redistributions
+    in binary form must reproduce the above copyright notice, this list of
+    conditions and the following disclaimer in the documentation and/or
+    other materials provided with the distribution.  * Neither the name
+    of the author nor the names of its contributors may be used to endorse
+    or promote products derived from this software without specific prior
+    written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/legal/CPL-1.0.txt	Wed Oct 01 12:57:20 2008 +0000
@@ -0,0 +1,213 @@
+Common Public License Version 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and
+documentation distributed under this Agreement, and
+
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are
+distributed by that particular Contributor. A Contribution 'originates' from a
+Contributor if it was added to the Program by such Contributor itself or anyone
+acting on such Contributor's behalf. Contributions do not include additions to
+the Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii) are not
+derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free copyright license to
+reproduce, prepare derivative works of, publicly display, publicly perform,
+distribute and sublicense the Contribution of such Contributor, if any, and such
+derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
+Patents to make, use, sell, offer to sell, import and otherwise transfer the
+Contribution of such Contributor, if any, in source code and object code form.
+This patent license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor, such
+addition of the Contribution causes such combination to be covered by the
+Licensed Patents. The patent license shall not apply to any other combinations
+which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses
+to its Contributions set forth herein, no assurances are provided by any
+Contributor that the Program does not infringe the patent or other intellectual
+property rights of any other entity. Each Contributor disclaims any liability to
+Recipient for claims brought by any other entity based on infringement of
+intellectual property rights or otherwise. As a condition to exercising the
+rights and licenses granted hereunder, each Recipient hereby assumes sole
+responsibility to secure any other intellectual property rights needed, if any.
+For example, if a third party patent license is required to allow Recipient to
+distribute the Program, it is Recipient's responsibility to acquire that license
+before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient
+copyright rights in its Contribution, if any, to grant the copyright license set
+forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its
+own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title and
+non-infringement, and implied warranties or conditions of merchantability and
+fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for
+damages, including direct, indirect, special, incidental and consequential
+damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered
+by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such
+Contributor, and informs licensees how to obtain it in a reasonable manner on or
+through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the
+Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if
+any, in a manner that reasonably allows subsequent Recipients to identify the
+originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a manner
+which does not create potential liability for other Contributors. Therefore, if
+a Contributor includes the Program in a commercial product offering, such
+Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+every other Contributor ("Indemnified Contributor") against any losses, damages
+and costs (collectively "Losses") arising from claims, lawsuits and other legal
+actions brought by a third party against the Indemnified Contributor to the
+extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor to
+control, and cooperate with the Commercial Contributor in, the defense and any
+related settlement negotiations. The Indemnified Contributor may participate in
+any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If that
+Commercial Contributor then makes performance claims, or offers warranties
+related to Product X, those performance claims and warranties are such
+Commercial Contributor's responsibility alone. Under this section, the
+Commercial Contributor would have to defend claims against the other
+Contributors related to those performance claims and warranties, and if a court
+requires any other Contributor to pay any damages as a result, the Commercial
+Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
+Recipient is solely responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its exercise of
+rights under this Agreement, including but not limited to the risks and costs of
+program errors, compliance with applicable laws, damage to or loss of data,
+programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable
+law, it shall not affect the validity or enforceability of the remainder of the
+terms of this Agreement, and without further action by the parties hereto, such
+provision shall be reformed to the minimum extent necessary to make such
+provision valid and enforceable.
+
+If Recipient institutes patent litigation against a Contributor with respect to
+a patent applicable to software (including a cross-claim or counterclaim in a
+lawsuit), then any patent licenses granted by that Contributor to such Recipient
+under this Agreement shall terminate as of the date such litigation is filed. In
+addition, if Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the Program
+itself (excluding combinations of the Program with other software or hardware)
+infringes such Recipient's patent(s), then such Recipient's rights granted under
+Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and does
+not cure such failure in a reasonable period of time after becoming aware of
+such noncompliance. If all Recipient's rights under this Agreement terminate,
+Recipient agrees to cease use and distribution of the Program as soon as
+reasonably practicable. However, Recipient's obligations under this Agreement
+and any licenses granted by Recipient relating to the Program shall continue and
+survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in
+order to avoid inconsistency the Agreement is copyrighted and may only be
+modified in the following manner. The Agreement Steward reserves the right to
+publish new versions (including revisions) of this Agreement from time to time.
+No one other than the Agreement Steward has the right to modify this Agreement.
+IBM is the initial Agreement Steward. IBM may assign the responsibility to serve
+as the Agreement Steward to a suitable separate entity. Each new version of the
+Agreement will be given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the Agreement
+under which it was received. In addition, after a new version of the Agreement
+is published, Contributor may elect to distribute the Program (including its
+Contributions) under the new version. Except as expressly stated in Sections
+2(a) and 2(b) above, Recipient receives no rights or licenses to the
+intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year
+after the cause of action arose. Each party waives its rights to a jury trial in
+any resulting litigation.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/legal/EPL-1.0.txt	Wed Oct 01 12:57:20 2008 +0000
@@ -0,0 +1,212 @@
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and
+
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are
+distributed by that particular Contributor. A Contribution 'originates'
+from a Contributor if it was added to the Program by such Contributor
+itself or anyone acting on such Contributor's behalf. Contributions do not
+include additions to the Program which: (i) are separate modules of software
+distributed in conjunction with the Program under their own license agreement,
+and (ii) are not derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this
+Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free copyright license to
+reproduce, prepare derivative works of, publicly display, publicly perform,
+distribute and sublicense the Contribution of such Contributor, if any,
+and such derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free patent license under
+Licensed Patents to make, use, sell, offer to sell, import and otherwise
+transfer the Contribution of such Contributor, if any, in source code and
+object code form. This patent license shall apply to the combination of the
+Contribution and the Program if, at the time the Contribution is added by
+the Contributor, such addition of the Contribution causes such combination
+to be covered by the Licensed Patents. The patent license shall not apply
+to any other combinations which include the Contribution. No hardware per
+se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses
+to its Contributions set forth herein, no assurances are provided by any
+Contributor that the Program does not infringe the patent or other intellectual
+property rights of any other entity. Each Contributor disclaims any liability
+to Recipient for claims brought by any other entity based on infringement of
+intellectual property rights or otherwise. As a condition to exercising the
+rights and licenses granted hereunder, each Recipient hereby assumes sole
+responsibility to secure any other intellectual property rights needed,
+if any. For example, if a third party patent license is required to allow
+Recipient to distribute the Program, it is Recipient's responsibility to
+acquire that license before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient
+copyright rights in its Contribution, if any, to grant the copyright license
+set forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under
+its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for
+damages, including direct, indirect, special, incidental and consequential
+damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered
+by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such Contributor,
+and informs licensees how to obtain it in a reasonable manner on or through
+a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within
+the Program.
+
+Each Contributor must identify itself as the originator of its Contribution,
+if any, in a manner that reasonably allows subsequent Recipients to identify
+the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities
+with respect to end users, business partners and the like. While this
+license is intended to facilitate the commercial use of the Program,
+the Contributor who includes the Program in a commercial product offering
+should do so in a manner which does not create potential liability for other
+Contributors. Therefore, if a Contributor includes the Program in a commercial
+product offering, such Contributor ("Commercial Contributor") hereby agrees
+to defend and indemnify every other Contributor ("Indemnified Contributor")
+against any losses, damages and costs (collectively "Losses") arising from
+claims, lawsuits and other legal actions brought by a third party against the
+Indemnified Contributor to the extent caused by the acts or omissions of such
+Commercial Contributor in connection with its distribution of the Program
+in a commercial product offering. The obligations in this section do not
+apply to any claims or Losses relating to any actual or alleged intellectual
+property infringement. In order to qualify, an Indemnified Contributor must:
+a) promptly notify the Commercial Contributor in writing of such claim, and b)
+allow the Commercial Contributor to control, and cooperate with the Commercial
+Contributor in, the defense and any related settlement negotiations. The
+Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If
+that Commercial Contributor then makes performance claims, or offers
+warranties related to Product X, those performance claims and warranties
+are such Commercial Contributor's responsibility alone. Under this section,
+the Commercial Contributor would have to defend claims against the other
+Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
+Recipient is solely responsible for determining the appropriateness of using
+and distributing the Program and assumes all risks associated with its exercise
+of rights under this Agreement , including but not limited to the risks and
+costs of program errors, compliance with applicable laws, damage to or loss of
+data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY
+RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable
+law, it shall not affect the validity or enforceability of the remainder
+of the terms of this Agreement, and without further action by the parties
+hereto, such provision shall be reformed to the minimum extent necessary to
+make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+(excluding combinations of the Program with other software or hardware)
+infringes such Recipient's patent(s), then such Recipient's rights granted
+under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and
+does not cure such failure in a reasonable period of time after becoming
+aware of such noncompliance. If all Recipient's rights under this Agreement
+terminate, Recipient agrees to cease use and distribution of the Program
+as soon as reasonably practicable. However, Recipient's obligations under
+this Agreement and any licenses granted by Recipient relating to the Program
+shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but
+in order to avoid inconsistency the Agreement is copyrighted and may only be
+modified in the following manner. The Agreement Steward reserves the right
+to publish new versions (including revisions) of this Agreement from time to
+time. No one other than the Agreement Steward has the right to modify this
+Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse
+Foundation may assign the responsibility to serve as the Agreement Steward to
+a suitable separate entity. Each new version of the Agreement will be given
+a distinguishing version number. The Program (including Contributions) may
+always be distributed subject to the version of the Agreement under which it
+was received. In addition, after a new version of the Agreement is published,
+Contributor may elect to distribute the Program (including its Contributions)
+under the new version. Except as expressly stated in Sections 2(a) and 2(b)
+above, Recipient receives no rights or licenses to the intellectual property
+of any Contributor under this Agreement, whether expressly, by implication,
+estoppel or otherwise. All rights in the Program not expressly granted under
+this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to
+this Agreement will bring a legal action under this Agreement more than one
+year after the cause of action arose. Each party waives its rights to a jury
+trial in any resulting litigation.
--- a/legal/Licensing.txt	Wed Oct 01 12:34:44 2008 +0000
+++ b/legal/Licensing.txt	Wed Oct 01 12:57:20 2008 +0000
@@ -1,22 +1,34 @@
 A) Openbravo Public License
 
-This license file applies to the Openbravo ERP software (the "Openbravo Software"), except as described below. 
+This license file applies to the Openbravo ERP software (the "Openbravo
+Software"), except as described below.
 
-This product is Copyright 2001-8 Openbravo S.L.  For other detailed notice, see  the "NOTICE" file with this distribution.
+This product is Copyright 2001-8 Openbravo S.L.  For other detailed notice,
+see the "NOTICE" file with this distribution.
 
-This product is free software; you can redistribute it and/or modify it under  the terms of Openbravo Public License v.1.1 being  
-the Mozilla Public with a permitted attribution clause (available at www.openbravo.com/legal/license.html) 
+This product is free software; you can redistribute it and/or modify
+it under  the terms of Openbravo Public License v.1.1 being the
+Mozilla Public with a permitted attribution clause (available at
+www.openbravo.com/legal/license.html)
 
-This product is distributed in the hope that it will be useful, but WITHOUT ANY  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A  PARTICULAR PURPOSE. See the Openbravo Public License (www.openbravo.com/legal/license.html) for more details.
+This product is distributed in the hope that it will be useful, but WITHOUT
+ANY  WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A  PARTICULAR PURPOSE. See the Openbravo Public License
+(www.openbravo.com/legal/license.html) for more details.
 
-You should have received a copy of the Openbravo Public License along with this product; if not, write to legal@openbravo.com.  
-You can also find the terms of the Openbravo Public License here: http://www.openbravo.com/legal/license.html 
+You should have received a copy of the Openbravo Public License along with this
+product; if not, write to legal@openbravo.com.  You can also find the terms of
+the Openbravo Public License here: http://www.openbravo.com/legal/license.html
 
 
 B) Apache Software License 
 
-The programs contained in the following folders, which are part of the Openbravo Software, are provided by Openbravo SL under the  
-Apache Software License 2.0. This license is available online at http://www.apache.org/licenses/LICENSE-2.0. This notice also appears in individual source files.
+The programs contained in the following folders, which are part
+of the Openbravo Software, are provided by Openbravo SL under the
+Apache Software License 2.0. This license is available online at
+http://www.apache.org/licenses/LICENSE-2.0. This notice also appears in
+individual source files.
+
 src-core/src/org/openbravo/base
 src-core/src/org/openbravo/data
 src-core/src/org/openbravo/database
@@ -28,12 +40,17 @@
 
 C) Third party code
 
-Some portions of the Openbravo Software are provided by third parties and thus are not available under the Openbravo Public License, but are available under other licensing terms. 
-In this distribution, they are: 
+Some portions of the Openbravo Software are provided by third parties and
+thus are not available under the Openbravo Public License, but are available
+under other licensing terms. In this distribution, they are:
 
 
 # Elements of Compiere ERP & CRM 2.4.0 to 2.5.0e. 
-In accordance with provision "3.2. Availability of Source Code" of the Compiere Public License 1.1, the source and modified source for the Compiere ERP & CRM files included in Openbravo ERP in this distribution are available under the Compiere Public license 1.1 and are located in the /database/ folder. For more information, see CompiereAddendum.txt in the legal/ folder
+In accordance with provision "3.2. Availability of Source Code" of the Compiere
+Public License 1.1, the source and modified source for the Compiere ERP &
+CRM files included in Openbravo ERP in this distribution are available
+under the Compiere Public license 1.1 and are located in the /database/
+folder. For more information, see CompiereAddendum.txt in the legal/ folder
 
 # calculator.js (at web/js)
 Under Tigra Calculator license (license available at http://www.softcomplex.com/)
@@ -41,11 +58,22 @@
 
 # Eclipse icons 
 # jdtcore.jar 
+# org.eclipse.emf.common_2.4.0.v200806091234.jar
+# org.eclipse.emf.ecore.xmi_2.4.0.v200806091234.jar
+# org.eclipse.emf.ecore_2.4.0.v200806091234.jar
+# org.eclipse.emf.equinox.common_2.4.0.v200806091234.jar
+# org.eclipse.text_3.4.0.20080605-1800.jar
+# org.openarchitectureware.core.emftools_4.3.1.20080910-1400PRD.jar
+# org.openarchitectureware.core.expressions_4.3.1.20080910-1400PRD.jar
+# org.openarchitectureware.core.workflow_4.3.1.20080910-1400PRD.jar
+# org.openarchitectureware.core.xpand2_4.3.1.20080910-1400PRD.jar
 # wsdl4j.jar 
-Icons and files under the Eclipse Public License (license available at http://www.eclipse.org/legal/epl-v10.html
+Icons and files under the Eclipse Public License (license available at
+http://www.eclipse.org/legal/epl-v10.html
 
 # nekohtml.jar (CyberNeko HTML Parser)
-Under the CyberNeko Software License, Version 1.0 (license available at http://people.apache.org/~andyc/neko/doc/html/
+Under the CyberNeko Software License, Version 1.0 (license available at
+http://people.apache.org/~andyc/neko/doc/html/
 
 # Axis-ant.jar
 # Axis.jar
@@ -71,33 +99,62 @@
 # xml-apis.jar
 # xmlrpc-client-3.0.jar 
 # xmlrpc-common-3.0.jar 
-All files under Apache Software License 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+# hybridlabs-beautifier-1.1.9.jar
+# org.apache.commons.cli_1.0.0.jar
+# commons-logging-1.1.jar
+# cglib-2.1.3.jar
+# ehcache-1.2.3.jar
+
+All files under Apache Software License 2.0, available at
+http://www.apache.org/licenses/LICENSE-2.0
 
 # JDBC3_PostgreSQL.jar 
 Under the BSD license, also available at http://jdbc.postgresql.org/license.html  
 
 # Xinha files in web/js/xinha/
-All filess available under the htmlarea license, available at http://xinha.python-hosting.com/wiki/Licence 
+All filess available under the htmlarea license, available at
+http://xinha.python-hosting.com/wiki/Licence
 
 # Dojo Foundation javascripts in web/js/dojo/
-All files under the Academic Free License 2.1 (license available at http://opensource.org/licenses/afl-2.1.php)
+All files under the Academic Free License 2.1 (license available at
+http://opensource.org/licenses/afl-2.1.php)
 
-# Dynarch DHTML/Javascript calendar at web/js/jscalendar (Copyright Mihai Bazon, 2002, 2003 - http://dynarch.com/mishoo/)
+# Dynarch DHTML/Javascript calendar at web/js/jscalendar (Copyright Mihai
+  Bazon, 2002, 2003 - http://dynarch.com/mishoo/)
+# hibernate3.jar
 # itext-1.3.1.jar  
+# jasperreports-1.3.3.jar 
 # jcommon-1.0.0.jar 
-# jasperreports-1.3.3.jar 
 # jfreechart-1.0.1.jar
 # jxl_2.6.jar
 All files under the LGPL 2.1 (available at www.gnu.org/licenses/lgpl.html)
 
-# dom4j-1.4.jar 
+# jalopy-1.5-rc3p1.jar
+# asm.jar
+# dom4j-1.6.1.jar
 Under a BSD style license  (available at http://www.dom4j.org/license.html) 
 
+# antlr-2.7.6.jar
+# antlr-runtime-3.0.jar
+Under the ANTLR license (available at http://www.antlr.org/license.html)
+
+# junit.jar
+Under the CPL license (available at http://www.opensource.org/licenses/cpl1.0.php)
 
 In addition, the distribution includes 
-- lam-client.jar (see lam_licenses.txt in lam-client.jar in this release for specific licensing information)
-- ojdbc14.jar under the OTN Development and Distribution License Agreement (in /legal folder and available at http://www.oracle.com/technology/software/popup-license/distribution-license.html) 
+- lam-client.jar (see lam_licenses.txt in lam-client.jar in this release
+  for specific licensing information)
+- ojdbc14.jar under the OTN Development and Distribution
+  License Agreement (in /legal folder and available at
+  http://www.oracle.com/technology/software/popup-license/distribution-license.html)
 - xml-apis.jar (see xml-apis license folder for licensing information)
+- jta.jar. This software is subject to the Sun License Agreement and terms
+  set out in [XXXX] and also available at
+  https://cds.sun.com/is-bin/INTERSHOP.enfinity/WFS/CDS-CDS_Developer-Site/en_US/-/USD/ViewLicense-Start?LicenseUUID=aanACUFBI3YAAAEY1Z45AXiO&ProductUUID=gp_ACUFBpawAAAEYhHY5AXub
+
+Note: the software marked Java, JAVAX or Sun may not be modified in any
+way.
+
 
 # Mail.jar 
 # activation.jar 
@@ -106,9 +163,11 @@
 # jcommon.jar 
 # servlet-api.jar 
 # stax-api-1.0.1 
-All files under the corresponding Sun Binary Code License. This is not free software, but provided under license from Sun Microsystems.
+All files under the corresponding Sun Binary Code License. This is not free
+software, but provided under license from Sun Microsystems.
 
+The license files for this third party software are available in the legal
+folder of this distribution.
 
-The license files for this third party software are available in the “legal” folder of this distribution. 
-
-If you have questions about the licensing terms for the Openbravo Software, please contact us at: legal@openbravo.com
+If you have questions about the licensing terms for the Openbravo Software,
+please contact us at: legal@openbravo.com
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/legal/Sun_license_agreement.txt	Wed Oct 01 12:57:20 2008 +0000
@@ -0,0 +1,367 @@
+Sun Microsystems, Inc. ("Sun") ENTITLEMENT for SOFTWARE
+
+Licensee/Company: Entity receiving Software.
+
+Effective Date: Date of delivery of the Software to
+You.
+
+Software: Java(TM) Transaction API (JTA) Specification
+1.1
+
+License Term: Perpetual (subject to termination under
+the SLA)
+
+Licensed Unit: Software Copy
+
+Licensed unit Count: Unlimited
+
+Permitted Uses:
+
+1. You may reproduce and use the Software for Your own
+Individual, Commercial, or Research and Instructional
+Use for the purposes of designing, developing,
+testing, and running Your applets and application
+("Programs").
+
+2. Subject to the terms and conditions of this
+Agreement and restrictions and exceptions set forth in
+the Software's documentation, You may reproduce and
+distribute portions of Software identified as a
+redistributable in the documentation
+("Redistributable"), provided that:
+
+(a) You distribute Redistributable complete and
+unmodified and only bundled as part of Your Programs,
+
+(b) Your Programs add significant and primary
+functionality to the Redistributable,
+
+(c) You distribute Redistributable for the sole
+purpose of running Your Programs,
+
+(d) You do not distribute additional software intended
+to replace any component(s) of the Redistributable,
+
+(e) You do not remove or alter any proprietary legends
+or notices contained in or on the Redistributable.
+
+(f) You only distribute the Redistributable subject to
+a license agreement that protects Sun's interests
+consistent with the terms contained in this Agreement,
+and
+
+(g) You agree to defend and indemnify Sun and its
+licensors from and against any damages, costs,
+liabilities, settlement amounts and/or expenses
+(including attorneys' fees) incurred in connection
+with any claim, lawsuit or action by any third party
+that arises or results from the use or distribution of
+any and all Programs and/or Redistributable.
+
+3. Java Technology Restrictions. You may not create,
+modify, or change the behavior of, or authorize your
+licensees to create, modify, or change the behavior
+of, classes, interfaces, or subpackages that are in
+any way identified as "java", "javax", "sun" or
+similar convention as specified by Sun in any naming
+convention designation.
+
+Sun Microsystems, Inc. ("Sun")
+SOFTWARE LICENSE AGREEMENT
+
+READ THE TERMS OF THIS AGREEMENT ("AGREEMENT")
+CAREFULLY BEFORE OPENING SOFTWARE MEDIA PACKAGE. BY
+OPENING SOFTWARE MEDIA PACKAGE, YOU AGREE TO THE TERMS
+OF THIS AGREEMENT. IF YOU ARE ACCESSING SOFTWARE
+ELECTRONICALLY, INDICATE YOUR ACCEPTANCE OF THESE
+TERMS BY SELECTING THE "ACCEPT" BUTTON AT THE END OF
+THIS AGREEMENT. IF YOU DO NOT AGREE TO ALL OF THE
+TERMS, PROMPTLY RETURN THE UNUSED SOFTWARE TO YOUR
+PLACE OF PURCHASE FOR A REFUND OR, IF SOFTWARE IS
+ACCESSED ELECTRONICALLY, SELECT THE "DECLINE" (OR
+"EXIT") BUTTON AT THE END OF THIS AGREEMENT. IF YOU
+HAVE SEPARATELY AGREED TO LICENSE TERMS ("MASTER
+TERMS") FOR YOUR LICENSE TO THIS SOFTWARE, THEN
+SECTIONS 1-5 OF THIS AGREEMENT ("SUPPLEMENTAL LICENSE
+TERMS") SHALL SUPPLEMENT AND SUPERSEDE THE MASTER
+TERMS IN RELATION TO THIS SOFTWARE.
+
+1. Definitions.
+
+(a) "Entitlement" means the collective set of
+applicable documents authorized by Sun evidencing your
+obligation to pay associated fees (if any) for the
+license, associated Services, and the authorized scope
+of use of Software under this Agreement.
+
+(b) "Licensed Unit" means the unit of measure by
+which your use of Software and/or Service is licensed,
+as described in your Entitlement.
+
+(c) "Permitted Use" means the licensed Software
+use(s) authorized in this Agreement as specified in
+your Entitlement. The Permitted Use for any bundled
+Sun software not specified in your Entitlement will be
+evaluation use as provided in Section 3.
+
+(d) "Service" means the service(s) that Sun or its
+delegate will provide, if any, as selected in your
+Entitlement and as further described in the applicable
+service listings at www.sun.com/service/servicelist.
+
+(e) "Software" means the Sun software described in
+your Entitlement. Also, certain software may be
+included for evaluation use under Section 3.
+
+(f) "You" and "Your" means the individual or legal
+entity specified in the Entitlement, or for evaluation
+purposes, the entity performing the evaluation.
+
+2. License Grant and Entitlement.
+
+Subject to the terms of your Entitlement, Sun grants
+you a nonexclusive, nontransferable limited license to
+use Software for its Permitted Use for the license
+term. Your Entitlement will specify (a) Software
+licensed, (b) the Permitted Use, (c) the license term,
+and (d) the Licensed Units.
+
+Additionally, if your Entitlement includes Services,
+then it will also specify the (e) Service and (f)
+service term.
+
+If your rights to Software or Services are limited in
+duration and the date such rights begin is other than
+the purchase date, your Entitlement will provide that
+beginning date(s).
+
+The Entitlement may be delivered to you in various
+ways depending on the manner in which you obtain
+Software and Services, for example, the Entitlement
+may be provided in your receipt, invoice or your
+contract with Sun or authorized Sun reseller. It may
+also be in electronic format if you download Software.
+
+3. Permitted Use.
+
+As selected in your Entitlement, one or more of the
+following Permitted Uses will apply to your use of
+Software. Unless you have an Entitlement that
+expressly permits it, you may not use Software for any
+of the other Permitted Uses. If you don't have an
+Entitlement, or if your Entitlement doesn't cover
+additional software delivered to you, then such
+software is for your Evaluation Use.
+
+(a) Evaluation Use. You may evaluate Software
+internally for a period of 90 days from your first
+use.
+
+(b) Research and Instructional Use. You may use
+Software internally to design, develop and test, and
+also to provide instruction on such uses.
+
+(c) Individual Use. You may use Software internally
+for personal, individual use.
+
+(d) Commercial Use. You may use Software internally
+for your own commercial purposes.
+
+(e) Service Provider Use. You may make Software
+functionality accessible (but not by providing
+Software itself or through outsourcing services) to
+your end users in an extranet deployment, but not to
+your affiliated companies or to government agencies.
+
+4. Licensed Units.
+
+Your Permitted Use is limited to the number of
+Licensed Units stated in your Entitlement. If you
+require additional Licensed Units, you will need
+additional Entitlement(s).
+
+5. Restrictions.
+
+(a) The copies of Software provided to you under this
+Agreement are licensed, not sold, to you by Sun. Sun
+reserves all rights not expressly granted. (b) You may
+make a single archival copy of Software, but otherwise
+may not copy, modify, or distribute Software. However
+if the Sun documentation accompanying Software lists
+specific portions of Software, such as header files,
+class libraries, reference source code, and/or
+redistributable files, that may be handled
+differently, you may do so only as provided in the Sun
+documentation. (c) You may not rent, lease, lend or
+encumber Software. (d) Unless enforcement is
+prohibited by applicable law, you may not decompile,
+or reverse engineer Software. (e) The terms and
+conditions of this Agreement will apply to any
+Software updates, provided to you at Sun's discretion,
+that replace and/or supplement the original Software,
+unless such update contains a separate license. (f)
+You may not publish or provide the results of any
+benchmark or comparison tests run on Software to any
+third party without the prior written consent of Sun.
+(g) Software is confidential and copyrighted. (h)
+Unless otherwise specified, if Software is delivered
+with embedded or bundled software that enables
+functionality of Software, you may not use such
+software on a stand-alone basis or use any portion of
+such software to interoperate with any program(s)
+other than Software. (i) Software may contain programs
+that perform automated collection of system data
+and/or automated software updating services. System
+data collected through such programs may be used by
+Sun, its subcontractors, and its service delivery
+partners for the purpose of providing you with remote
+system services and/or improving Sun's software and
+systems. (j) Software is not designed, licensed or
+intended for use in the design, construction,
+operation or maintenance of any nuclear facility and
+Sun and its licensors disclaim any express or implied
+warranty of fitness for such uses. (k) No right, title
+or interest in or to any trademark, service mark, logo
+or trade name of Sun or its licensors is granted under
+this Agreement.
+
+6. Term and Termination.
+
+The license and service term are set forth in your
+Entitlement(s). Your rights under this Agreement will
+terminate immediately without notice from Sun if you
+materially breach it or take any action in derogation
+of Sun's and/or its licensors' rights to Software. Sun
+may terminate this Agreement should any Software
+become, or in Sun's reasonable opinion likely to
+become, the subject of a claim of intellectual
+property infringement or trade secret
+misappropriation. Upon termination, you will cease use
+of, and destroy, Software and confirm compliance in
+writing to Sun. Sections 1, 5, 6, 7, and 9-15 will
+survive termination of the Agreement.
+
+7. Java Compatibility and Open Source.
+
+Software may contain Java technology. You may not
+create additional classes to, or modifications of, the
+Java technology, except under compatibility
+requirements available under a separate agreement
+available at www.java.net.
+
+Sun supports and benefits from the global community of
+open source developers, and thanks the community for
+its important contributions and open standards-based
+technology, which Sun has adopted into many of its
+products.
+
+Please note that portions of Software may be provided
+with notices and open source licenses from such
+communities and third parties that govern the use of
+those portions, and any licenses granted hereunder do
+not alter any rights and obligations you may have
+under such open source licenses, however, the
+disclaimer of warranty and limitation of liability
+provisions in this Agreement will apply to all
+Software in this distribution.
+
+8. Limited Warranty.
+
+Sun warrants to you that for a period of 90 days from
+the date of purchase, as evidenced by a copy of the
+receipt, the media on which Software is furnished (if
+any) will be free of defects in materials and
+workmanship under normal use. Except for the
+foregoing, Software is provided "AS IS". Your
+exclusive remedy and Sun's entire liability under this
+limited warranty will be at Sun's option to replace
+Software media or refund the fee paid for Software.
+Some states do not allow limitations on certain
+implied warranties, so the above may not apply to you.
+This limited warranty gives you specific legal rights.
+You may have others, which vary from state to state.
+
+9. Disclaimer of Warranty.
+
+UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR
+IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT
+ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE
+DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
+
+10. Limitation of Liability.
+
+TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL
+SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE,
+PROFIT OR DATA, OR FOR SPECIAL, INDIRECT,
+CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER
+CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING
+OUT OF OR RELATED TO THE USE OF OR INABILITY TO USE
+SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES. In no event will Sun's
+liability to you, whether in contract, tort (including
+negligence), or otherwise, exceed the amount paid by
+you for Software under this Agreement. The foregoing
+limitations will apply even if the above stated
+warranty fails of its essential purpose. Some states
+do not allow the exclusion of incidental or
+consequential damages, so some of the terms above may
+not be applicable to you.
+
+11. Export Regulations.
+
+All Software, documents, technical data, and any other
+materials delivered under this Agreement are subject
+to U.S. export control laws and may be subject to
+export or import regulations in other countries. You
+agree to comply strictly with these laws and
+regulations and acknowledge that you have the
+responsibility to obtain any licenses to export,
+re-export, or import as may be required after delivery
+to you.
+
+12. U.S. Government Restricted Rights.
+
+If Software is being acquired by or on behalf of the
+U.S. Government or by a U.S. Government prime
+contractor or subcontractor (at any tier), then the
+Government's rights in Software and accompanying
+documentation will be only as set forth in this
+Agreement; this is in accordance with 48 CFR 227.7201
+through 227.7202-4 (for Department of Defense (DOD)
+acquisitions) and with 48 CFR 2.101 and 12.212 (for
+non-DOD acquisitions).
+
+13. Governing Law.
+
+Any action related to this Agreement will be governed
+by California law and controlling U.S. federal law. No
+choice of law rules of any jurisdiction will apply.
+
+14. Severability.
+
+If any provision of this Agreement is held to be
+unenforceable, this Agreement will remain in effect
+with the provision omitted, unless omission would
+frustrate the intent of the parties, in which case
+this Agreement will immediately terminate.
+
+15. Integration.
+
+This Agreement, including any terms contained in your
+Entitlement, is the entire agreement between you and
+Sun relating to its subject matter. It supersedes all
+prior or contemporaneous oral or written
+communications, proposals, representations and
+warranties and prevails over any conflicting or
+additional terms of any quote, order, acknowledgment,
+or other communication between the parties relating to
+its subject matter during the term of this Agreement.
+No modification of this Agreement will be binding,
+unless in writing and signed by an authorized
+representative of each party.
+
+Please contact Sun Microsystems, Inc. 4150 Network
+Circle, Santa Clara, California 95054 if you have
+questions.
Binary file lib/activation.jar has changed
Binary file lib/avalon-framework-4.1.5.jar has changed
Binary file lib/axis-ant.jar has changed
Binary file lib/axis.jar has changed
Binary file lib/barcode4j-fop-ext-0.20.5-complete.jar has changed
Binary file lib/batik.jar has changed
Binary file lib/build/hybridlabs-beautifier-1.1.9.jar has changed
Binary file lib/build/jalopy-1.5-rc3p1.jar has changed
Binary file lib/build/junit.jar has changed
Binary file lib/build/org.eclipse.emf.common_2.4.0.v200806091234.jar has changed
Binary file lib/build/org.eclipse.emf.ecore.xmi_2.4.0.v200806091234.jar has changed
Binary file lib/build/org.eclipse.emf.ecore_2.4.0.v200806091234.jar has changed
Binary file lib/build/org.eclipse.equinox.common_3.4.0.v20080421-2006.jar has changed
Binary file lib/build/org.eclipse.text_3.4.0.v20080605-1800.jar has changed
Binary file lib/build/org.openarchitectureware.core.emftools_4.3.1.20080910-1400PRD.jar has changed
Binary file lib/build/org.openarchitectureware.core.expressions_4.3.1.20080910-1400PRD.jar has changed
Binary file lib/build/org.openarchitectureware.core.workflow_4.3.1.20080910-1400PRD.jar has changed
Binary file lib/build/org.openarchitectureware.core.xpand2_4.3.1.20080910-1400PRD.jar has changed
Binary file lib/comm.jar has changed
Binary file lib/commons-beanutils-1.7.jar has changed
Binary file lib/commons-codec-1.3.jar has changed
Binary file lib/commons-collections.jar has changed
Binary file lib/commons-dbcp.jar has changed
Binary file lib/commons-digester-1.8.jar has changed
Binary file lib/commons-discovery-0.2.jar has changed
Binary file lib/commons-fileupload.jar has changed
Binary file lib/commons-io.jar has changed
Binary file lib/commons-logging-1.0.4.jar has changed
Binary file lib/commons-pool.jar has changed
Binary file lib/fop.jar has changed
Binary file lib/itext-1.3.1.jar has changed
Binary file lib/jasperreports-3.0.1.jar has changed
Binary file lib/jaxrpc.jar has changed
Binary file lib/jcommon-1.0.13.jar has changed
Binary file lib/jdbc3-postgresql.jar has changed
Binary file lib/jdtcore-3.1.0.jar has changed
Binary file lib/jfreechart-1.0.10.jar has changed
Binary file lib/jxl-2.6.jar has changed
Binary file lib/lam-client.jar has changed
Binary file lib/log4j-1.2.8.jar has changed
Binary file lib/log4j-1.3alpha-8.jar has changed
Binary file lib/mail.jar has changed
Binary file lib/nekohtml.jar has changed
Binary file lib/ojdbc14.jar has changed
Binary file lib/renderFoRmi.jar has changed
Binary file lib/runtime/activation.jar has changed
Binary file lib/runtime/antlr-2.7.6.jar has changed
Binary file lib/runtime/antlr-runtime-3.0.jar has changed
Binary file lib/runtime/asm.jar has changed
Binary file lib/runtime/avalon-framework-4.1.5.jar has changed
Binary file lib/runtime/axis-ant.jar has changed
Binary file lib/runtime/axis.jar has changed
Binary file lib/runtime/barcode4j-fop-ext-0.20.5-complete.jar has changed
Binary file lib/runtime/batik.jar has changed
Binary file lib/runtime/cglib-2.1.3.jar has changed
Binary file lib/runtime/comm.jar has changed
Binary file lib/runtime/commons-beanutils-1.7.jar has changed
Binary file lib/runtime/commons-codec-1.3.jar has changed
Binary file lib/runtime/commons-collections-testframework.jar has changed
Binary file lib/runtime/commons-collections.jar has changed
Binary file lib/runtime/commons-dbcp.jar has changed
Binary file lib/runtime/commons-digester-1.8.jar has changed
Binary file lib/runtime/commons-discovery-0.2.jar has changed
Binary file lib/runtime/commons-fileupload.jar has changed
Binary file lib/runtime/commons-io.jar has changed
Binary file lib/runtime/commons-logging-1.0.4.jar has changed
Binary file lib/runtime/commons-logging-1.1.jar has changed
Binary file lib/runtime/commons-pool.jar has changed
Binary file lib/runtime/dom4j-1.6.1.jar has changed
Binary file lib/runtime/ehcache-1.2.3.jar has changed
Binary file lib/runtime/fop.jar has changed
Binary file lib/runtime/hibernate3.jar has changed
Binary file lib/runtime/itext-1.3.1.jar has changed
Binary file lib/runtime/jasperreports-3.0.1.jar has changed
Binary file lib/runtime/jaxrpc.jar has changed
Binary file lib/runtime/jcommon-1.0.13.jar has changed
Binary file lib/runtime/jdbc3-postgresql.jar has changed
Binary file lib/runtime/jdtcore-3.1.0.jar has changed
Binary file lib/runtime/jfreechart-1.0.10.jar has changed
Binary file lib/runtime/jta.jar has changed
Binary file lib/runtime/jxl-2.6.jar has changed
Binary file lib/runtime/lam-client.jar has changed
Binary file lib/runtime/log4j-1.2.8.jar has changed
Binary file lib/runtime/log4j-1.3alpha-8.jar has changed
Binary file lib/runtime/logkit-1.0.1.jar has changed
Binary file lib/runtime/mail.jar has changed
Binary file lib/runtime/nekohtml.jar has changed
Binary file lib/runtime/ojdbc14.jar has changed
Binary file lib/runtime/org.apache.commons.cli_1.0.0.jar has changed
Binary file lib/runtime/renderFoRmi.jar has changed
Binary file lib/runtime/saaj.jar has changed
Binary file lib/runtime/servlet-api.jar has changed
Binary file lib/runtime/ws-commons-util-1.0.1.jar has changed
Binary file lib/runtime/wsdl4j-1.5.1.jar has changed
Binary file lib/runtime/xercesImpl.jar has changed
Binary file lib/runtime/xml-apis.jar has changed
Binary file lib/runtime/xmlrpc-client-3.1.jar has changed
Binary file lib/runtime/xmlrpc-common-3.1.jar has changed
Binary file lib/saaj.jar has changed
Binary file lib/servlet-api.jar has changed
Binary file lib/ws-commons-util-1.0.1.jar has changed
Binary file lib/wsdl4j-1.5.1.jar has changed
Binary file lib/xercesImpl.jar has changed
Binary file lib/xml-apis.jar has changed
Binary file lib/xmlrpc-client-3.1.jar has changed
Binary file lib/xmlrpc-common-3.1.jar has changed
--- a/src-core/.classpath	Wed Oct 01 12:34:44 2008 +0000
+++ b/src-core/.classpath	Wed Oct 01 12:57:20 2008 +0000
@@ -2,18 +2,18 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/openbravo/lib/servlet-api.jar"/>
-	<classpathentry kind="lib" path="/openbravo/lib/comm.jar"/>
-	<classpathentry kind="lib" path="/openbravo/lib/commons-dbcp.jar"/>
-	<classpathentry kind="lib" path="/openbravo/lib/commons-pool.jar"/>
-	<classpathentry kind="lib" path="/openbravo/lib/log4j-1.3alpha-8.jar"/>
-	<classpathentry kind="lib" path="/openbravo/lib/fop.jar"/>
-	<classpathentry kind="lib" path="/openbravo/lib/renderFoRmi.jar"/>
-	<classpathentry kind="lib" path="/openbravo/lib/avalon-framework-4.1.5.jar"/>
-	<classpathentry kind="lib" path="/openbravo/lib/commons-fileupload.jar"/>
-	<classpathentry kind="lib" path="/openbravo/lib/commons-io.jar"/>
-    <classpathentry kind="lib" path="/openbravo/lib/xercesImpl.jar"/>
-	<classpathentry kind="lib" path="/openbravo/lib/nekohtml.jar"/>
-	<classpathentry kind="lib" path="/openbravo/lib/commons-codec-1.3.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/servlet-api.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/comm.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/commons-dbcp.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/commons-pool.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-1.3alpha-8.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/fop.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/renderFoRmi.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/avalon-framework-4.1.5.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/commons-fileupload.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/commons-io.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/xercesImpl.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/nekohtml.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/commons-codec-1.3.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
--- a/src-core/.project	Wed Oct 01 12:34:44 2008 +0000
+++ b/src-core/.project	Wed Oct 01 12:57:20 2008 +0000
@@ -6,20 +6,10 @@
 	</projects>
 	<buildSpec>
 		<buildCommand>
-			<name>org.eclipse.wst.common.project.facet.core.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
--- a/src-db/database/model/tables/AD_COLUMN.xml	Wed Oct 01 12:34:44 2008 +0000
+++ b/src-db/database/model/tables/AD_COLUMN.xml	Wed Oct 01 12:57:20 2008 +0000
@@ -65,8 +65,8 @@
         <default/>
         <onCreateDefault/>
       </column>
-      <column name="FIELDLENGTH" primaryKey="false" required="false" type="DECIMAL" size="10,0" autoIncrement="false">
-        <default/>
+      <column name="FIELDLENGTH" primaryKey="false" required="true" type="DECIMAL" size="10,0" autoIncrement="false">
+        <default><![CDATA[0]]></default>
         <onCreateDefault/>
       </column>
       <column name="DEFAULTVALUE" primaryKey="false" required="false" type="NVARCHAR" size="2000" autoIncrement="false">
--- a/src-db/database/model/tables/AD_MODULE.xml	Wed Oct 01 12:34:44 2008 +0000
+++ b/src-db/database/model/tables/AD_MODULE.xml	Wed Oct 01 12:57:20 2008 +0000
@@ -91,17 +91,9 @@
       <foreign-key foreignTable="AD_CLIENT" name="ADMODULE_ADCLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
-      <check name="AD_MODULE_INDEVELOPMENT_CHK"><![CDATA[
-INDEVELOPMENT IN ('Y','N')
-]]></check>
-      <check name="AD_MODULE_ISACTIVE_CHK"><![CDATA[
-ISACTIVE IN ('Y','N')
-]]></check>
-      <check name="AD_MODULE_ISACTIVETEMPLATE_CHK"><![CDATA[
-ISACTIVETEMPLATE IN ('Y','N')
-]]></check>
-      <check name="AD_MODULE_TYPE_CHK"><![CDATA[
-TYPE IN ('M','P','T')
-]]></check>
+      <check name="AD_MODULE_INDEVELOPMENT_CHK"><![CDATA[INDEVELOPMENT IN ('Y', 'N')]]></check>
+      <check name="AD_MODULE_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+      <check name="AD_MODULE_ISACTIVETEMPLATE_CHK"><![CDATA[ISACTIVETEMPLATE IN ('Y', 'N')]]></check>
+      <check name="AD_MODULE_TYPE_CHK"><![CDATA[TYPE IN ('M', 'P', 'T')]]></check>
     </table>
   </database>
--- a/src-db/database/model/tables/R_CONTACTINTEREST.xml	Wed Oct 01 12:34:44 2008 +0000
+++ b/src-db/database/model/tables/R_CONTACTINTEREST.xml	Wed Oct 01 12:57:20 2008 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
   <database name="TABLE R_CONTACTINTEREST">
-    <table name="R_CONTACTINTEREST">
+    <table name="R_CONTACTINTEREST" primaryKey="R_CONTACTINTEREST_KEY">
       <column name="R_INTERESTAREA_ID" primaryKey="false" required="true" type="VARCHAR" size="32" autoIncrement="false">
         <default/>
         <onCreateDefault/>
@@ -45,6 +45,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="R_CONTACTINTEREST_ID" primaryKey="true" required="true" type="VARCHAR" size="32" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="ADCLIENT_RCONTACTINTEREST">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
@@ -57,10 +61,6 @@
       <foreign-key foreignTable="R_INTERESTAREA" name="RINTERESTAREA_RCONTACTINTEREST">
         <reference local="R_INTERESTAREA_ID" foreign="R_INTERESTAREA_ID"/>
       </foreign-key>
-      <unique name="R_CONTACTINTEREST_KEY">
-        <unique-column name="AD_USER_ID"/>
-        <unique-column name="R_INTERESTAREA_ID"/>
-      </unique>
       <check name="R_CONTACTINTERE_ISACTIVE_CHECK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
     </table>
   </database>
--- a/src-db/database/model/views/C_DEBT_PAYMENT_V.xml	Wed Oct 01 12:34:44 2008 +0000
+++ b/src-db/database/model/views/C_DEBT_PAYMENT_V.xml	Wed Oct 01 12:57:20 2008 +0000
@@ -3,15 +3,15 @@
     <view name="C_DEBT_PAYMENT_V"><![CDATA[SELECT c_debt_payment.c_debt_payment_id, c_debt_payment.ad_client_id, c_debt_payment.ad_org_id, c_debt_payment.isactive, c_debt_payment.created, c_debt_payment.createdby, c_debt_payment.updated, c_debt_payment.updatedby, c_debt_payment.isreceipt, c_debt_payment.c_settlement_cancel_id, c_debt_payment.c_settlement_generate_id, c_debt_payment.description, c_debt_payment.c_invoice_id, c_debt_payment.c_bpartner_id, c_debt_payment.c_currency_id, c_debt_payment.c_cashline_id, c_debt_payment.c_bankaccount_id, c_debt_payment.c_cashbook_id, c_debt_payment.paymentrule, c_debt_payment.ispaid, c_debt_payment.dateplanned, c_debt_payment.ismanual, c_debt_payment.isvalid, c_debt_payment.c_bankstatementline_id, c_debt_payment.changesettlementcancel, c_debt_payment.cancel_processed, c_debt_payment.generate_processed, c_debt_payment.c_withholding_id, c_debt_payment.withholdingamount, 
         CASE c_debt_payment.isreceipt
             WHEN 'Y' THEN c_debt_payment.amount
-            ELSE c_debt_payment.amount * -1
+            ELSE c_debt_payment.amount * (-1)
         END AS amount, 
         CASE c_debt_payment.isreceipt
             WHEN 'Y' THEN c_debt_payment.writeoffamt
-            ELSE c_debt_payment.writeoffamt * -1
+            ELSE c_debt_payment.writeoffamt * (-1)
         END AS writeoffamt, 
         CASE c_debt_payment.isreceipt
             WHEN 'Y' THEN 1
-            ELSE -1
+            ELSE (-1)
         END AS multiplierap, c_debt_payment.glitemamt, c_debt_payment.c_order_id, c_debt_payment.status
    FROM c_debt_payment]]></view>
   </database>
--- a/src-db/database/model/views/C_INVOICE_V.xml	Wed Oct 01 12:34:44 2008 +0000
+++ b/src-db/database/model/views/C_INVOICE_V.xml	Wed Oct 01 12:57:20 2008 +0000
@@ -2,23 +2,23 @@
   <database name="VIEW C_INVOICE_V">
     <view name="C_INVOICE_V"><![CDATA[SELECT i.c_invoice_id, i.ad_client_id, i.ad_org_id, i.isactive, i.created, i.createdby, i.updated, i.updatedby, i.issotrx, i.documentno, i.docstatus, i.docaction, i.processing, i.processed, i.c_doctype_id, i.c_doctypetarget_id, i.c_order_id, i.description, i.salesrep_id, i.dateinvoiced, i.dateprinted, i.dateacct, i.c_bpartner_id, i.c_bpartner_location_id, i.ad_user_id, i.poreference, i.dateordered, i.c_currency_id, i.paymentrule, i.c_paymentterm_id, i.c_charge_id, i.m_pricelist_id, i.c_campaign_id, i.c_project_id, i.c_activity_id, i.isprinted, i.isdiscountprinted, 
         CASE
-            WHEN substr(d.docbasetype, 3) = 'C' THEN i.chargeamt * -1
+            WHEN substr(d.docbasetype, 3) = 'C' THEN i.chargeamt * (-1)
             ELSE i.chargeamt
         END AS chargeamt, 
         CASE
-            WHEN substr(d.docbasetype, 3) = 'C' THEN i.totallines * -1
+            WHEN substr(d.docbasetype, 3) = 'C' THEN i.totallines * (-1)
             ELSE i.totallines
         END AS totallines, 
         CASE
-            WHEN substr(d.docbasetype, 3) = 'C' THEN i.grandtotal * -1
+            WHEN substr(d.docbasetype, 3) = 'C' THEN i.grandtotal * (-1)
             ELSE i.grandtotal
         END AS grandtotal, 
         CASE
-            WHEN substr(d.docbasetype, 3) = 'C' THEN -1
+            WHEN substr(d.docbasetype, 3) = 'C' THEN (-1)
             ELSE 1
         END AS multiplier, 
         CASE
-            WHEN substr(d.docbasetype, 2, 1) = 'P' THEN -1
+            WHEN substr(d.docbasetype, 2, 1) = 'P' THEN (-1)
             ELSE 1
         END AS multiplierap, d.docbasetype
    FROM c_invoice i
--- a/src-db/database/model/views/MA_PROCESSPLAN_TOTALIZED.xml	Wed Oct 01 12:34:44 2008 +0000
+++ b/src-db/database/model/views/MA_PROCESSPLAN_TOTALIZED.xml	Wed Oct 01 12:57:20 2008 +0000
@@ -4,7 +4,7 @@
    FROM m_product, ma_processplan_version, ( SELECT ma_processplan_version.ma_processplan_version_id, ma_sequenceproduct.m_product_id, sum(
                 CASE ma_sequenceproduct.productiontype
                     WHEN '+' THEN ma_sequenceproduct.quantity * ma_sequence.multiplier
-                    WHEN '-' THEN ma_sequenceproduct.quantity * ma_sequence.multiplier * -1
+                    WHEN '-' THEN ma_sequenceproduct.quantity * ma_sequence.multiplier * (-1)
                     ELSE NULL
                 END) AS qty
            FROM ma_processplan_version, ma_sequence, ma_sequenceproduct
@@ -12,7 +12,7 @@
           GROUP BY ma_processplan_version.ma_processplan_version_id, ma_sequenceproduct.m_product_id) sp1, ( SELECT ma_processplan_version.ma_processplan_version_id, ma_sequenceproduct.m_product_id, sum(
                 CASE ma_sequenceproduct.productiontype
                     WHEN '+' THEN ma_sequenceproduct.quantity * ma_sequence.multiplier
-                    WHEN '-' THEN ma_sequenceproduct.quantity * ma_sequence.multiplier * -1
+                    WHEN '-' THEN ma_sequenceproduct.quantity * ma_sequence.multiplier * (-1)
                     ELSE NULL
                 END) AS qty
            FROM ma_processplan_version, ma_sequence, ma_sequenceproduct
--- a/src-db/database/model/views/RV_C_INVOICE.xml	Wed Oct 01 12:34:44 2008 +0000
+++ b/src-db/database/model/views/RV_C_INVOICE.xml	Wed Oct 01 12:57:20 2008 +0000
@@ -2,19 +2,19 @@
   <database name="VIEW RV_C_INVOICE">
     <view name="RV_C_INVOICE"><![CDATA[SELECT i.c_invoice_id, i.ad_client_id, i.ad_org_id, i.isactive, i.created, i.createdby, i.updated, i.updatedby, i.issotrx, i.documentno, i.docstatus, i.docaction, i.isprinted, i.isdiscountprinted, i.processing, i.processed, i.c_doctype_id, i.c_doctypetarget_id, i.c_order_id, i.description, i.salesrep_id, i.dateinvoiced, i.dateprinted, i.dateacct, i.c_bpartner_id, i.c_bpartner_location_id, i.ad_user_id, b.c_bp_group_id, i.poreference, i.dateordered, i.c_currency_id, i.paymentrule, i.c_paymentterm_id, i.m_pricelist_id, i.c_campaign_id, i.c_project_id, i.c_activity_id, i.c_charge_id, 
         CASE substr(d.docbasetype, 3)
-            WHEN 'C' THEN i.chargeamt * -1
+            WHEN 'C' THEN i.chargeamt * (-1)
             ELSE i.chargeamt
         END AS chargeamt, 
         CASE substr(d.docbasetype, 3)
-            WHEN 'C' THEN i.totallines * -1
+            WHEN 'C' THEN i.totallines * (-1)
             ELSE i.totallines
         END AS totallines, 
         CASE substr(d.docbasetype, 3)
-            WHEN 'C' THEN i.grandtotal * -1
+            WHEN 'C' THEN i.grandtotal * (-1)
             ELSE i.grandtotal
         END AS grandtotal, 
         CASE substr(d.docbasetype, 3)
-            WHEN 'C' THEN -1
+            WHEN 'C' THEN (-1)
             ELSE 1
         END AS multiplier
    FROM c_invoice i, c_doctype d, c_bpartner b
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Wed Oct 01 12:34:44 2008 +0000
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Wed Oct 01 12:57:20 2008 +0000
@@ -30,7 +30,7 @@
 <!--100 AD_REFERENCE_ID-->
 <!--100-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--100 FIELDLENGTH-->
-<!--100-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--100-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--100 ISKEY-->
 <!--100-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--100 ISPARENT-->
@@ -412,7 +412,7 @@
 <!--109 AD_REFERENCE_ID-->
 <!--109-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--109 FIELDLENGTH-->
-<!--109-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--109-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--109 ISKEY-->
 <!--109-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--109 ISPARENT-->
@@ -1426,7 +1426,7 @@
 <!--129 AD_REFERENCE_ID-->
 <!--129-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--129 FIELDLENGTH-->
-<!--129-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--129-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--129 ISKEY-->
 <!--129-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--129 ISPARENT-->
@@ -1751,7 +1751,7 @@
 <!--142 FIELDLENGTH-->
 <!--142-->              <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
 <!--142 ISKEY-->
-<!--142-->              <ISKEY><![CDATA[N]]></ISKEY>
+<!--142-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--142 ISPARENT-->
 <!--142-->              <ISPARENT><![CDATA[Y]]></ISPARENT>
 <!--142 ISMANDATORY-->
@@ -2137,7 +2137,7 @@
 <!--148 AD_REFERENCE_ID-->
 <!--148-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--148 FIELDLENGTH-->
-<!--148-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--148-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--148 ISKEY-->
 <!--148-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--148 ISPARENT-->
@@ -2517,7 +2517,7 @@
 <!--155 AD_REFERENCE_ID-->
 <!--155-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--155 FIELDLENGTH-->
-<!--155-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--155-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--155 ISKEY-->
 <!--155-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--155 ISPARENT-->
@@ -2771,7 +2771,7 @@
 <!--160 AD_REFERENCE_ID-->
 <!--160-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--160 FIELDLENGTH-->
-<!--160-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--160-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--160 ISKEY-->
 <!--160-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--160 ISPARENT-->
@@ -3218,7 +3218,7 @@
 <!--167 AD_REFERENCE_ID-->
 <!--167-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--167 FIELDLENGTH-->
-<!--167-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--167-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--167 ISKEY-->
 <!--167-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--167 ISPARENT-->
@@ -4110,7 +4110,7 @@
 <!--187 AD_REFERENCE_ID-->
 <!--187-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--187 FIELDLENGTH-->
-<!--187-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--187-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--187 ISKEY-->
 <!--187-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--187 ISPARENT-->
@@ -4951,7 +4951,7 @@
 <!--207 AD_VAL_RULE_ID-->
 <!--207-->              <AD_VAL_RULE_ID><![CDATA[103]]></AD_VAL_RULE_ID>
 <!--207 FIELDLENGTH-->
-<!--207-->              <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
+<!--207-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--207 DEFAULTVALUE-->
 <!--207-->              <DEFAULTVALUE><![CDATA[@AD_CLIENT_ID@]]></DEFAULTVALUE>
 <!--207 ISKEY-->
@@ -5144,7 +5144,7 @@
 <!--212 AD_REFERENCE_ID-->
 <!--212-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--212 FIELDLENGTH-->
-<!--212-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--212-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--212 DEFAULTVALUE-->
 <!--212-->              <DEFAULTVALUE><![CDATA[-1]]></DEFAULTVALUE>
 <!--212 ISKEY-->
@@ -5790,7 +5790,7 @@
 <!--228 AD_REFERENCE_ID-->
 <!--228-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--228 FIELDLENGTH-->
-<!--228-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--228-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--228 ISKEY-->
 <!--228-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--228 ISPARENT-->
@@ -6426,7 +6426,7 @@
 <!--239 AD_REFERENCE_ID-->
 <!--239-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--239 FIELDLENGTH-->
-<!--239-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--239-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--239 ISKEY-->
 <!--239-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--239 ISPARENT-->
@@ -8590,7 +8590,7 @@
 <!--293 AD_REFERENCE_ID-->
 <!--293-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--293 FIELDLENGTH-->
-<!--293-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--293-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--293 ISKEY-->
 <!--293-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--293 ISPARENT-->
@@ -9988,7 +9988,7 @@
 <!--325 AD_REFERENCE_ID-->
 <!--325-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--325 FIELDLENGTH-->
-<!--325-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--325-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--325 ISKEY-->
 <!--325-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--325 ISPARENT-->
@@ -11447,7 +11447,7 @@
 <!--351 AD_REFERENCE_ID-->
 <!--351-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--351 FIELDLENGTH-->
-<!--351-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--351-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--351 ISKEY-->
 <!--351-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--351 ISPARENT-->
@@ -13955,7 +13955,7 @@
 <!--445 AD_REFERENCE_ID-->
 <!--445-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--445 FIELDLENGTH-->
-<!--445-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--445-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--445 ISKEY-->
 <!--445-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--445 ISPARENT-->
@@ -14406,7 +14406,7 @@
 <!--457 AD_REFERENCE_ID-->
 <!--457-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--457 FIELDLENGTH-->
-<!--457-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--457-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--457 ISKEY-->
 <!--457-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--457 ISPARENT-->
@@ -14727,7 +14727,7 @@
 <!--464 AD_REFERENCE_ID-->
 <!--464-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--464 FIELDLENGTH-->
-<!--464-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--464-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--464 ISKEY-->
 <!--464-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--464 ISPARENT-->
@@ -15109,7 +15109,7 @@
 <!--485 AD_REFERENCE_ID-->
 <!--485-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--485 FIELDLENGTH-->
-<!--485-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--485-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--485 ISKEY-->
 <!--485-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--485 ISPARENT-->
@@ -15621,7 +15621,7 @@
 <!--528 AD_REFERENCE_ID-->
 <!--528-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--528 FIELDLENGTH-->
-<!--528-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--528-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--528 DEFAULTVALUE-->
 <!--528-->              <DEFAULTVALUE><![CDATA[@AD_Org_ID@]]></DEFAULTVALUE>
 <!--528 ISKEY-->
@@ -15686,7 +15686,7 @@
 <!--531 AD_REFERENCE_ID-->
 <!--531-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--531 FIELDLENGTH-->
-<!--531-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--531-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--531 ISKEY-->
 <!--531-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--531 ISPARENT-->
@@ -27515,7 +27515,7 @@
 <!--778 AD_REFERENCE_ID-->
 <!--778-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--778 FIELDLENGTH-->
-<!--778-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--778-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--778 ISKEY-->
 <!--778-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--778 ISPARENT-->
@@ -29333,7 +29333,7 @@
 <!--808 AD_REFERENCE_ID-->
 <!--808-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--808 FIELDLENGTH-->
-<!--808-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--808-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--808 ISKEY-->
 <!--808-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--808 ISPARENT-->
@@ -30306,7 +30306,7 @@
 <!--826 AD_REFERENCE_ID-->
 <!--826-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--826 FIELDLENGTH-->
-<!--826-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--826-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--826 ISKEY-->
 <!--826-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--826 ISPARENT-->
@@ -30950,7 +30950,7 @@
 <!--837 AD_REFERENCE_ID-->
 <!--837-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--837 FIELDLENGTH-->
-<!--837-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--837-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--837 ISKEY-->
 <!--837-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--837 ISPARENT-->
@@ -32179,7 +32179,7 @@
 <!--856 AD_REFERENCE_ID-->
 <!--856-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--856 FIELDLENGTH-->
-<!--856-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--856-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--856 ISKEY-->
 <!--856-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--856 ISPARENT-->
@@ -32888,7 +32888,7 @@
 <!--941 AD_REFERENCE_ID-->
 <!--941-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--941 FIELDLENGTH-->
-<!--941-->              <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
+<!--941-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--941 ISKEY-->
 <!--941-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--941 ISPARENT-->
@@ -33987,7 +33987,7 @@
 <!--1002 AD_REFERENCE_ID-->
 <!--1002-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1002 FIELDLENGTH-->
-<!--1002-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--1002-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1002 ISKEY-->
 <!--1002-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1002 ISPARENT-->
@@ -34769,7 +34769,7 @@
 <!--1014 AD_REFERENCE_ID-->
 <!--1014-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1014 FIELDLENGTH-->
-<!--1014-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--1014-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1014 ISKEY-->
 <!--1014-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1014 ISPARENT-->
@@ -35352,7 +35352,7 @@
 <!--1031 AD_REFERENCE_ID-->
 <!--1031-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1031 FIELDLENGTH-->
-<!--1031-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--1031-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1031 ISKEY-->
 <!--1031-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1031 ISPARENT-->
@@ -36711,7 +36711,7 @@
 <!--1125 AD_REFERENCE_ID-->
 <!--1125-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1125 FIELDLENGTH-->
-<!--1125-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--1125-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1125 ISKEY-->
 <!--1125-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1125 ISPARENT-->
@@ -37936,7 +37936,7 @@
 <!--1151 AD_REFERENCE_ID-->
 <!--1151-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1151 FIELDLENGTH-->
-<!--1151-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--1151-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1151 ISKEY-->
 <!--1151-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1151 ISPARENT-->
@@ -38574,7 +38574,7 @@
 <!--1186 AD_REFERENCE_ID-->
 <!--1186-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1186 FIELDLENGTH-->
-<!--1186-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--1186-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1186 ISKEY-->
 <!--1186-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1186 ISPARENT-->
@@ -43904,7 +43904,7 @@
 <!--1349 AD_REFERENCE_ID-->
 <!--1349-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1349 FIELDLENGTH-->
-<!--1349-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--1349-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1349 ISKEY-->
 <!--1349-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1349 ISPARENT-->
@@ -44737,7 +44737,7 @@
 <!--1389 AD_REFERENCE_ID-->
 <!--1389-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1389 FIELDLENGTH-->
-<!--1389-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--1389-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1389 ISKEY-->
 <!--1389-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1389 ISPARENT-->
@@ -45507,7 +45507,7 @@
 <!--1402 AD_REFERENCE_ID-->
 <!--1402-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1402 FIELDLENGTH-->
-<!--1402-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--1402-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1402 ISKEY-->
 <!--1402-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1402 ISPARENT-->
@@ -47248,7 +47248,7 @@
 <!--1470 AD_REFERENCE_ID-->
 <!--1470-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1470 FIELDLENGTH-->
-<!--1470-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--1470-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1470 ISKEY-->
 <!--1470-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1470 ISPARENT-->
@@ -47374,7 +47374,7 @@
 <!--1501 AD_REFERENCE_ID-->
 <!--1501-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1501 FIELDLENGTH-->
-<!--1501-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--1501-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1501 ISKEY-->
 <!--1501-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1501 ISPARENT-->
@@ -48213,7 +48213,7 @@
 <!--1530 AD_REFERENCE_ID-->
 <!--1530-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1530 FIELDLENGTH-->
-<!--1530-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--1530-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1530 ISKEY-->
 <!--1530-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1530 ISPARENT-->
@@ -48859,7 +48859,7 @@
 <!--1617 AD_REFERENCE_ID-->
 <!--1617-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1617 FIELDLENGTH-->
-<!--1617-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--1617-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1617 ISKEY-->
 <!--1617-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1617 ISPARENT-->
@@ -50437,7 +50437,7 @@
 <!--1641 AD_REFERENCE_ID-->
 <!--1641-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1641 FIELDLENGTH-->
-<!--1641-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--1641-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1641 ISKEY-->
 <!--1641-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1641 ISPARENT-->
@@ -51536,7 +51536,7 @@
 <!--1659 AD_REFERENCE_ID-->
 <!--1659-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1659 FIELDLENGTH-->
-<!--1659-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--1659-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1659 ISKEY-->
 <!--1659-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1659 ISPARENT-->
@@ -54614,7 +54614,7 @@
 <!--1809 DEFAULTVALUE-->
 <!--1809-->              <DEFAULTVALUE><![CDATA[@AD_Org_ID@]]></DEFAULTVALUE>
 <!--1809 ISKEY-->
-<!--1809-->              <ISKEY><![CDATA[N]]></ISKEY>
+<!--1809-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1809 ISPARENT-->
 <!--1809-->              <ISPARENT><![CDATA[Y]]></ISPARENT>
 <!--1809 ISMANDATORY-->
@@ -54742,7 +54742,7 @@
 <!--1812 AD_REFERENCE_ID-->
 <!--1812-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1812 FIELDLENGTH-->
-<!--1812-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--1812-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1812 ISKEY-->
 <!--1812-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1812 ISPARENT-->
@@ -55392,7 +55392,7 @@
 <!--1823 AD_REFERENCE_ID-->
 <!--1823-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1823 FIELDLENGTH-->
-<!--1823-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--1823-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1823 ISKEY-->
 <!--1823-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1823 ISPARENT-->
@@ -58437,7 +58437,7 @@
 <!--2020 AD_REFERENCE_ID-->
 <!--2020-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--2020 FIELDLENGTH-->
-<!--2020-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--2020-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--2020 ISKEY-->
 <!--2020-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--2020 ISPARENT-->
@@ -58565,7 +58565,7 @@
 <!--2027 AD_REFERENCE_ID-->
 <!--2027-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--2027 FIELDLENGTH-->
-<!--2027-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--2027-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--2027 ISKEY-->
 <!--2027-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--2027 ISPARENT-->
@@ -60170,7 +60170,7 @@
 <!--2066 AD_REFERENCE_ID-->
 <!--2066-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--2066 FIELDLENGTH-->
-<!--2066-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--2066-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--2066 ISKEY-->
 <!--2066-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--2066 ISPARENT-->
@@ -60814,7 +60814,7 @@
 <!--2077 AD_REFERENCE_ID-->
 <!--2077-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--2077 FIELDLENGTH-->
-<!--2077-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--2077-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--2077 ISKEY-->
 <!--2077-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--2077 ISPARENT-->
@@ -61456,7 +61456,7 @@
 <!--2087 AD_REFERENCE_ID-->
 <!--2087-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--2087 FIELDLENGTH-->
-<!--2087-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--2087-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--2087 ISKEY-->
 <!--2087-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--2087 ISPARENT-->
@@ -62227,7 +62227,7 @@
 <!--2100 AD_REFERENCE_ID-->
 <!--2100-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--2100 FIELDLENGTH-->
-<!--2100-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--2100-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--2100 ISKEY-->
 <!--2100-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--2100 ISPARENT-->
@@ -62932,7 +62932,7 @@
 <!--2136 AD_REFERENCE_ID-->
 <!--2136-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--2136 FIELDLENGTH-->
-<!--2136-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--2136-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--2136 ISKEY-->
 <!--2136-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--2136 ISPARENT-->
@@ -63771,7 +63771,7 @@
 <!--2161 AD_REFERENCE_ID-->
 <!--2161-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--2161 FIELDLENGTH-->
-<!--2161-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--2161-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--2161 ISKEY-->
 <!--2161-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--2161 ISPARENT-->
@@ -65918,7 +65918,7 @@
 <!--2205 AD_REFERENCE_ID-->
 <!--2205-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--2205 FIELDLENGTH-->
-<!--2205-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--2205-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--2205 ISKEY-->
 <!--2205-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--2205 ISPARENT-->
@@ -67681,7 +67681,7 @@
 <!--2240 AD_REFERENCE_ID-->
 <!--2240-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--2240 FIELDLENGTH-->
-<!--2240-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--2240-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--2240 ISKEY-->
 <!--2240-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--2240 ISPARENT-->
@@ -73737,7 +73737,7 @@
 <!--2463 AD_REFERENCE_ID-->
 <!--2463-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--2463 FIELDLENGTH-->
-<!--2463-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--2463-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--2463 ISKEY-->
 <!--2463-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--2463 ISPARENT-->
@@ -78101,7 +78101,7 @@
 <!--2570 AD_REFERENCE_ID-->
 <!--2570-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--2570 FIELDLENGTH-->
-<!--2570-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--2570-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--2570 ISKEY-->
 <!--2570-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--2570 ISPARENT-->
@@ -78995,7 +78995,7 @@
 <!--2584 AD_REFERENCE_ID-->
 <!--2584-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--2584 FIELDLENGTH-->
-<!--2584-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--2584-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--2584 ISKEY-->
 <!--2584-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--2584 ISPARENT-->
@@ -79637,7 +79637,7 @@
 <!--2594 AD_REFERENCE_ID-->
 <!--2594-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--2594 FIELDLENGTH-->
-<!--2594-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--2594-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--2594 ISKEY-->
 <!--2594-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--2594 ISPARENT-->
@@ -81370,7 +81370,7 @@
 <!--2654 AD_REFERENCE_ID-->
 <!--2654-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--2654 FIELDLENGTH-->
-<!--2654-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--2654-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--2654 ISKEY-->
 <!--2654-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--2654 ISPARENT-->
@@ -85486,7 +85486,7 @@
 <!--2780 AD_REFERENCE_ID-->
 <!--2780-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--2780 FIELDLENGTH-->
-<!--2780-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--2780-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--2780 ISKEY-->
 <!--2780-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--2780 ISPARENT-->
@@ -86244,7 +86244,7 @@
 <!--2801 AD_REFERENCE_ID-->
 <!--2801-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--2801 FIELDLENGTH-->
-<!--2801-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--2801-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--2801 ISKEY-->
 <!--2801-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--2801 ISPARENT-->
@@ -87014,7 +87014,7 @@
 <!--2814 AD_REFERENCE_ID-->
 <!--2814-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--2814 FIELDLENGTH-->
-<!--2814-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--2814-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--2814 ISKEY-->
 <!--2814-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--2814 ISPARENT-->
@@ -89651,7 +89651,7 @@
 <!--2856 AD_REFERENCE_ID-->
 <!--2856-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--2856 FIELDLENGTH-->
-<!--2856-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--2856-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--2856 ISKEY-->
 <!--2856-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--2856 ISPARENT-->
@@ -90858,7 +90858,7 @@
 <!--2876 CREATED-->
 <!--2876-->              <CREATED><![CDATA[0099-11-10 00:00:00.0]]></CREATED>
 <!--2876 UPDATED-->
-<!--2876-->              <UPDATED><![CDATA[2004-09-28 11:17:35.0]]></UPDATED>
+<!--2876-->              <UPDATED><![CDATA[2008-09-18 13:29:17.0]]></UPDATED>
 <!--2876 CREATEDBY-->
 <!--2876-->              <CREATEDBY><![CDATA[0]]></CREATEDBY>
 <!--2876 UPDATEDBY-->
@@ -90874,7 +90874,7 @@
 <!--2876 AD_TABLE_ID-->
 <!--2876-->              <AD_TABLE_ID><![CDATA[289]]></AD_TABLE_ID>
 <!--2876 AD_REFERENCE_ID-->
-<!--2876-->              <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--2876-->              <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
 <!--2876 FIELDLENGTH-->
 <!--2876-->              <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
 <!--2876 ISKEY-->
@@ -90923,7 +90923,7 @@
 <!--2877 CREATED-->
 <!--2877-->              <CREATED><![CDATA[0099-11-10 00:00:00.0]]></CREATED>
 <!--2877 UPDATED-->
-<!--2877-->              <UPDATED><![CDATA[2004-09-28 11:17:29.0]]></UPDATED>
+<!--2877-->              <UPDATED><![CDATA[2008-09-18 13:29:42.0]]></UPDATED>
 <!--2877 CREATEDBY-->
 <!--2877-->              <CREATEDBY><![CDATA[0]]></CREATEDBY>
 <!--2877 UPDATEDBY-->
@@ -90939,7 +90939,7 @@
 <!--2877 AD_TABLE_ID-->
 <!--2877-->              <AD_TABLE_ID><![CDATA[289]]></AD_TABLE_ID>
 <!--2877 AD_REFERENCE_ID-->
-<!--2877-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--2877-->              <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
 <!--2877 FIELDLENGTH-->
 <!--2877-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
 <!--2877 ISKEY-->
@@ -91071,7 +91071,7 @@
 <!--2893 AD_REFERENCE_ID-->
 <!--2893-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--2893 FIELDLENGTH-->
-<!--2893-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--2893-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--2893 DEFAULTVALUE-->
 <!--2893-->              <DEFAULTVALUE><![CDATA[@C_BPartner_ID@]]></DEFAULTVALUE>
 <!--2893 ISKEY-->
@@ -94205,7 +94205,7 @@
 <!--2987 AD_REFERENCE_ID-->
 <!--2987-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--2987 FIELDLENGTH-->
-<!--2987-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--2987-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--2987 ISKEY-->
 <!--2987-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--2987 ISPARENT-->
@@ -94974,7 +94974,7 @@
 <!--3001 AD_REFERENCE_ID-->
 <!--3001-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--3001 FIELDLENGTH-->
-<!--3001-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--3001-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--3001 ISKEY-->
 <!--3001-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--3001 ISPARENT-->
@@ -96498,7 +96498,7 @@
 <!--3031 AD_REFERENCE_ID-->
 <!--3031-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--3031 FIELDLENGTH-->
-<!--3031-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--3031-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--3031 ISKEY-->
 <!--3031-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--3031 ISPARENT-->
@@ -98554,7 +98554,7 @@
 <!--3077 AD_REFERENCE_ID-->
 <!--3077-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--3077 FIELDLENGTH-->
-<!--3077-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--3077-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--3077 ISKEY-->
 <!--3077-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--3077 ISPARENT-->
@@ -99385,7 +99385,7 @@
 <!--3094 AD_REFERENCE_ID-->
 <!--3094-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--3094 FIELDLENGTH-->
-<!--3094-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--3094-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--3094 ISKEY-->
 <!--3094-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--3094 ISPARENT-->
@@ -103107,7 +103107,7 @@
 <!--3177 AD_REFERENCE_ID-->
 <!--3177-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--3177 FIELDLENGTH-->
-<!--3177-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--3177-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--3177 ISKEY-->
 <!--3177-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--3177 ISPARENT-->
@@ -105277,7 +105277,7 @@
 <!--3333 AD_REFERENCE_ID-->
 <!--3333-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--3333 FIELDLENGTH-->
-<!--3333-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--3333-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--3333 ISKEY-->
 <!--3333-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--3333 ISPARENT-->
@@ -109082,7 +109082,7 @@
 <!--3434 AD_REFERENCE_ID-->
 <!--3434-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--3434 FIELDLENGTH-->
-<!--3434-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--3434-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--3434 ISKEY-->
 <!--3434-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--3434 ISPARENT-->
@@ -110571,7 +110571,7 @@
 <!--3457 AD_REFERENCE_ID-->
 <!--3457-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--3457 FIELDLENGTH-->
-<!--3457-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--3457-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--3457 ISKEY-->
 <!--3457-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--3457 ISPARENT-->
@@ -111278,7 +111278,7 @@
 <!--3484 AD_REFERENCE_ID-->
 <!--3484-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--3484 FIELDLENGTH-->
-<!--3484-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--3484-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--3484 ISKEY-->
 <!--3484-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--3484 ISPARENT-->
@@ -113294,7 +113294,7 @@
 <!--3521 AD_REFERENCE_ID-->
 <!--3521-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--3521 FIELDLENGTH-->
-<!--3521-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--3521-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--3521 ISKEY-->
 <!--3521-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--3521 ISPARENT-->
@@ -113808,7 +113808,7 @@
 <!--3529 AD_REFERENCE_ID-->
 <!--3529-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--3529 FIELDLENGTH-->
-<!--3529-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--3529-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--3529 ISKEY-->
 <!--3529-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--3529 ISPARENT-->
@@ -114657,7 +114657,7 @@
 <!--3542 AD_REFERENCE_ID-->
 <!--3542-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--3542 FIELDLENGTH-->
-<!--3542-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--3542-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--3542 ISKEY-->
 <!--3542-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--3542 ISPARENT-->
@@ -115494,7 +115494,7 @@
 <!--3555 AD_REFERENCE_ID-->
 <!--3555-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--3555 FIELDLENGTH-->
-<!--3555-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--3555-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--3555 ISKEY-->
 <!--3555-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--3555 ISPARENT-->
@@ -116406,7 +116406,7 @@
 <!--3569 AD_REFERENCE_ID-->
 <!--3569-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--3569 FIELDLENGTH-->
-<!--3569-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--3569-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--3569 ISKEY-->
 <!--3569-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--3569 ISPARENT-->
@@ -117243,7 +117243,7 @@
 <!--3582 AD_REFERENCE_ID-->
 <!--3582-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--3582 FIELDLENGTH-->
-<!--3582-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--3582-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--3582 ISKEY-->
 <!--3582-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--3582 ISPARENT-->
@@ -118155,7 +118155,7 @@
 <!--3596 AD_REFERENCE_ID-->
 <!--3596-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--3596 FIELDLENGTH-->
-<!--3596-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--3596-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--3596 ISKEY-->
 <!--3596-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--3596 ISPARENT-->
@@ -118992,7 +118992,7 @@
 <!--3611 AD_REFERENCE_ID-->
 <!--3611-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--3611 FIELDLENGTH-->
-<!--3611-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--3611-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--3611 ISKEY-->
 <!--3611-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--3611 ISPARENT-->
@@ -119768,7 +119768,7 @@
 <!--3658 AD_REFERENCE_ID-->
 <!--3658-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--3658 FIELDLENGTH-->
-<!--3658-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--3658-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--3658 ISKEY-->
 <!--3658-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--3658 ISPARENT-->
@@ -121578,7 +121578,7 @@
 <!--3733 AD_REFERENCE_ID-->
 <!--3733-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--3733 FIELDLENGTH-->
-<!--3733-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--3733-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--3733 DEFAULTVALUE-->
 <!--3733-->              <DEFAULTVALUE><![CDATA[@SQL=SELECT COALESCE(MAX(SeqNo),0)+10 AS DefaultValue FROM AD_PInstance_Para WHERE AD_PInstance_ID=@AD_PInstance_ID@]]></DEFAULTVALUE>
 <!--3733 ISKEY-->
@@ -125069,7 +125069,7 @@
 <!--3828 AD_REFERENCE_ID-->
 <!--3828-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--3828 FIELDLENGTH-->
-<!--3828-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--3828-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--3828 ISKEY-->
 <!--3828-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--3828 ISPARENT-->
@@ -128813,7 +128813,7 @@
 <!--3918 AD_REFERENCE_ID-->
 <!--3918-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--3918 FIELDLENGTH-->
-<!--3918-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--3918-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--3918 ISKEY-->
 <!--3918-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--3918 ISPARENT-->
@@ -129638,7 +129638,7 @@
 <!--3931 AD_REFERENCE_ID-->
 <!--3931-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--3931 FIELDLENGTH-->
-<!--3931-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--3931-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--3931 ISKEY-->
 <!--3931-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--3931 ISPARENT-->
@@ -130534,7 +130534,7 @@
 <!--3946 AD_REFERENCE_ID-->
 <!--3946-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--3946 FIELDLENGTH-->
-<!--3946-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--3946-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--3946 ISKEY-->
 <!--3946-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--3946 ISPARENT-->
@@ -132139,7 +132139,7 @@
 <!--3998 AD_REFERENCE_ID-->
 <!--3998-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--3998 FIELDLENGTH-->
-<!--3998-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--3998-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--3998 ISKEY-->
 <!--3998-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--3998 ISPARENT-->
@@ -133892,7 +133892,7 @@
 <!--4069 AD_REFERENCE_ID-->
 <!--4069-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--4069 FIELDLENGTH-->
-<!--4069-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--4069-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--4069 ISKEY-->
 <!--4069-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--4069 ISPARENT-->
@@ -142261,7 +142261,7 @@
 <!--4423 FIELDLENGTH-->
 <!--4423-->              <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
 <!--4423 ISKEY-->
-<!--4423-->              <ISKEY><![CDATA[Y]]></ISKEY>
+<!--4423-->              <ISKEY><![CDATA[N]]></ISKEY>
 <!--4423 ISPARENT-->
 <!--4423-->              <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--4423 ISMANDATORY-->
@@ -147025,7 +147025,7 @@
 <!--4596 AD_REFERENCE_ID-->
 <!--4596-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--4596 FIELDLENGTH-->
-<!--4596-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--4596-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--4596 ISKEY-->
 <!--4596-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--4596 ISPARENT-->
@@ -150180,7 +150180,7 @@
 <!--4668 AD_REFERENCE_ID-->
 <!--4668-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--4668 FIELDLENGTH-->
-<!--4668-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--4668-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--4668 ISKEY-->
 <!--4668-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--4668 ISPARENT-->
@@ -150887,7 +150887,7 @@
 <!--4681 AD_REFERENCE_ID-->
 <!--4681-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--4681 FIELDLENGTH-->
-<!--4681-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--4681-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--4681 ISKEY-->
 <!--4681-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--4681 ISPARENT-->
@@ -152740,7 +152740,7 @@
 <!--4713 AD_REFERENCE_ID-->
 <!--4713-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--4713 FIELDLENGTH-->
-<!--4713-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--4713-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--4713 ISKEY-->
 <!--4713-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--4713 ISPARENT-->
@@ -153701,7 +153701,7 @@
 <!--4754 AD_REFERENCE_ID-->
 <!--4754-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--4754 FIELDLENGTH-->
-<!--4754-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--4754-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--4754 ISKEY-->
 <!--4754-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--4754 ISPARENT-->
@@ -156944,7 +156944,7 @@
 <!--4825 AD_REFERENCE_ID-->
 <!--4825-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--4825 FIELDLENGTH-->
-<!--4825-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--4825-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--4825 ISKEY-->
 <!--4825-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--4825 ISPARENT-->
@@ -160899,7 +160899,7 @@
 <!--4909 AD_REFERENCE_ID-->
 <!--4909-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--4909 FIELDLENGTH-->
-<!--4909-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--4909-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--4909 ISKEY-->
 <!--4909-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--4909 ISPARENT-->
@@ -161990,7 +161990,7 @@
 <!--4926 AD_REFERENCE_ID-->
 <!--4926-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--4926 FIELDLENGTH-->
-<!--4926-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--4926-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--4926 ISKEY-->
 <!--4926-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--4926 ISPARENT-->
@@ -162758,7 +162758,7 @@
 <!--4961 AD_REFERENCE_ID-->
 <!--4961-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--4961 FIELDLENGTH-->
-<!--4961-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--4961-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--4961 ISKEY-->
 <!--4961-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--4961 ISPARENT-->
@@ -171670,7 +171670,7 @@
 <!--5241 AD_REFERENCE_ID-->
 <!--5241-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--5241 FIELDLENGTH-->
-<!--5241-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--5241-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--5241 ISKEY-->
 <!--5241-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--5241 ISPARENT-->
@@ -172895,7 +172895,7 @@
 <!--5260 AD_REFERENCE_ID-->
 <!--5260-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--5260 FIELDLENGTH-->
-<!--5260-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--5260-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--5260 ISKEY-->
 <!--5260-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--5260 ISPARENT-->
@@ -174378,7 +174378,7 @@
 <!--5283 AD_REFERENCE_ID-->
 <!--5283-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--5283 FIELDLENGTH-->
-<!--5283-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--5283-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--5283 ISKEY-->
 <!--5283-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--5283 ISPARENT-->
@@ -175735,7 +175735,7 @@
 <!--5376 AD_REFERENCE_ID-->
 <!--5376-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--5376 FIELDLENGTH-->
-<!--5376-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--5376-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--5376 ISKEY-->
 <!--5376-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--5376 ISPARENT-->
@@ -177218,7 +177218,7 @@
 <!--5403 AD_REFERENCE_ID-->
 <!--5403-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--5403 FIELDLENGTH-->
-<!--5403-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--5403-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--5403 ISKEY-->
 <!--5403-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--5403 ISPARENT-->
@@ -177984,7 +177984,7 @@
 <!--5415 AD_REFERENCE_ID-->
 <!--5415-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--5415 FIELDLENGTH-->
-<!--5415-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--5415-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--5415 ISKEY-->
 <!--5415-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--5415 ISPARENT-->
@@ -179991,7 +179991,7 @@
 <!--5448 AD_REFERENCE_ID-->
 <!--5448-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--5448 FIELDLENGTH-->
-<!--5448-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--5448-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--5448 ISKEY-->
 <!--5448-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--5448 ISPARENT-->
@@ -180759,7 +180759,7 @@
 <!--5468 AD_REFERENCE_ID-->
 <!--5468-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--5468 FIELDLENGTH-->
-<!--5468-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--5468-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--5468 ISKEY-->
 <!--5468-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--5468 ISPARENT-->
@@ -188126,7 +188126,7 @@
 <!--5667 AD_REFERENCE_ID-->
 <!--5667-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--5667 FIELDLENGTH-->
-<!--5667-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--5667-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--5667 ISKEY-->
 <!--5667-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--5667 ISPARENT-->
@@ -189255,7 +189255,7 @@
 <!--5684 AD_REFERENCE_ID-->
 <!--5684-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--5684 FIELDLENGTH-->
-<!--5684-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--5684-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--5684 ISKEY-->
 <!--5684-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--5684 ISPARENT-->
@@ -190045,7 +190045,7 @@
 <!--5700 AD_REFERENCE_ID-->
 <!--5700-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--5700 FIELDLENGTH-->
-<!--5700-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--5700-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--5700 ISKEY-->
 <!--5700-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--5700 ISPARENT-->
@@ -192080,7 +192080,7 @@
 <!--5758 AD_REFERENCE_ID-->
 <!--5758-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--5758 FIELDLENGTH-->
-<!--5758-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--5758-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--5758 ISKEY-->
 <!--5758-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--5758 ISPARENT-->
@@ -194096,7 +194096,7 @@
 <!--5802 AD_REFERENCE_ID-->
 <!--5802-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--5802 FIELDLENGTH-->
-<!--5802-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--5802-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--5802 ISKEY-->
 <!--5802-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--5802 ISPARENT-->
@@ -195546,7 +195546,7 @@
 <!--5827 AD_REFERENCE_ID-->
 <!--5827-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--5827 FIELDLENGTH-->
-<!--5827-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--5827-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--5827 ISKEY-->
 <!--5827-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--5827 ISPARENT-->
@@ -198046,7 +198046,7 @@
 <!--5960 AD_REFERENCE_ID-->
 <!--5960-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--5960 FIELDLENGTH-->
-<!--5960-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--5960-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--5960 ISKEY-->
 <!--5960-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--5960 ISPARENT-->
@@ -199031,7 +199031,7 @@
 <!--5975 AD_REFERENCE_ID-->
 <!--5975-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--5975 FIELDLENGTH-->
-<!--5975-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--5975-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--5975 ISKEY-->
 <!--5975-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--5975 ISPARENT-->
@@ -200946,7 +200946,7 @@
 <!--6136 AD_REFERENCE_ID-->
 <!--6136-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--6136 FIELDLENGTH-->
-<!--6136-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--6136-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--6136 ISKEY-->
 <!--6136-->              <ISKEY><![CDATA[N]]></ISKEY>
 <!--6136 ISPARENT-->
@@ -201478,7 +201478,7 @@
 <!--6144 AD_REFERENCE_ID-->
 <!--6144-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--6144 FIELDLENGTH-->
-<!--6144-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--6144-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--6144 ISKEY-->
 <!--6144-->              <ISKEY><![CDATA[N]]></ISKEY>
 <!--6144 ISPARENT-->
@@ -202008,7 +202008,7 @@
 <!--6155 AD_REFERENCE_ID-->
 <!--6155-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--6155 FIELDLENGTH-->
-<!--6155-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--6155-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--6155 ISKEY-->
 <!--6155-->              <ISKEY><![CDATA[N]]></ISKEY>
 <!--6155 ISPARENT-->
@@ -202203,7 +202203,7 @@
 <!--6161 AD_REFERENCE_ID-->
 <!--6161-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--6161 FIELDLENGTH-->
-<!--6161-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--6161-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--6161 ISKEY-->
 <!--6161-->              <ISKEY><![CDATA[N]]></ISKEY>
 <!--6161 ISPARENT-->
@@ -202402,7 +202402,7 @@
 <!--6164 AD_REFERENCE_ID-->
 <!--6164-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--6164 FIELDLENGTH-->
-<!--6164-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--6164-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--6164 ISKEY-->
 <!--6164-->              <ISKEY><![CDATA[N]]></ISKEY>
 <!--6164 ISPARENT-->
@@ -202934,7 +202934,7 @@
 <!--6172 AD_REFERENCE_ID-->
 <!--6172-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--6172 FIELDLENGTH-->
-<!--6172-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--6172-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--6172 ISKEY-->
 <!--6172-->              <ISKEY><![CDATA[N]]></ISKEY>
 <!--6172 ISPARENT-->
@@ -203598,7 +203598,7 @@
 <!--6213 AD_REFERENCE_ID-->
 <!--6213-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--6213 FIELDLENGTH-->
-<!--6213-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--6213-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--6213 ISKEY-->
 <!--6213-->              <ISKEY><![CDATA[N]]></ISKEY>
 <!--6213 ISPARENT-->
@@ -204118,7 +204118,7 @@
 <!--6287 AD_REFERENCE_ID-->
 <!--6287-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--6287 FIELDLENGTH-->
-<!--6287-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--6287-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--6287 ISKEY-->
 <!--6287-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--6287 ISPARENT-->
@@ -207298,7 +207298,7 @@
 <!--6497 AD_REFERENCE_ID-->
 <!--6497-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--6497 FIELDLENGTH-->
-<!--6497-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--6497-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--6497 ISKEY-->
 <!--6497-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--6497 ISPARENT-->
@@ -208289,7 +208289,7 @@
 <!--6513 AD_REFERENCE_ID-->
 <!--6513-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--6513 FIELDLENGTH-->
-<!--6513-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--6513-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--6513 ISKEY-->
 <!--6513-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--6513 ISPARENT-->
@@ -210202,7 +210202,7 @@
 <!--6544 AD_REFERENCE_ID-->
 <!--6544-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--6544 FIELDLENGTH-->
-<!--6544-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--6544-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--6544 ISKEY-->
 <!--6544-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--6544 ISPARENT-->
@@ -211654,7 +211654,7 @@
 <!--6581 AD_REFERENCE_ID-->
 <!--6581-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--6581 FIELDLENGTH-->
-<!--6581-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--6581-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--6581 ISKEY-->
 <!--6581-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--6581 ISPARENT-->
@@ -212785,7 +212785,7 @@
 <!--6612 AD_REFERENCE_ID-->
 <!--6612-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--6612 FIELDLENGTH-->
-<!--6612-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--6612-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--6612 ISKEY-->
 <!--6612-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--6612 ISPARENT-->
@@ -215569,7 +215569,7 @@
 <!--6701 AD_REFERENCE_ID-->
 <!--6701-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--6701 FIELDLENGTH-->
-<!--6701-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--6701-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--6701 ISKEY-->
 <!--6701-->              <ISKEY><![CDATA[N]]></ISKEY>
 <!--6701 ISPARENT-->
@@ -217135,7 +217135,7 @@
 <!--6765 AD_REFERENCE_ID-->
 <!--6765-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--6765 FIELDLENGTH-->
-<!--6765-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--6765-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--6765 ISKEY-->
 <!--6765-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--6765 ISPARENT-->
@@ -218455,7 +218455,7 @@
 <!--6788 AD_REFERENCE_ID-->
 <!--6788-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--6788 FIELDLENGTH-->
-<!--6788-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--6788-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--6788 ISKEY-->
 <!--6788-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--6788 ISPARENT-->
@@ -219310,7 +219310,7 @@
 <!--6834 AD_REFERENCE_ID-->
 <!--6834-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--6834 FIELDLENGTH-->
-<!--6834-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--6834-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--6834 ISKEY-->
 <!--6834-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--6834 ISPARENT-->
@@ -220238,7 +220238,7 @@
 <!--6848 AD_REFERENCE_ID-->
 <!--6848-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--6848 FIELDLENGTH-->
-<!--6848-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--6848-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--6848 ISKEY-->
 <!--6848-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--6848 ISPARENT-->
@@ -221158,7 +221158,7 @@
 <!--6862 AD_REFERENCE_ID-->
 <!--6862-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--6862 FIELDLENGTH-->
-<!--6862-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--6862-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--6862 ISKEY-->
 <!--6862-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--6862 ISPARENT-->
@@ -222896,7 +222896,7 @@
 <!--6888 AD_REFERENCE_ID-->
 <!--6888-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--6888 FIELDLENGTH-->
-<!--6888-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--6888-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--6888 ISKEY-->
 <!--6888-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--6888 ISPARENT-->
@@ -222957,7 +222957,7 @@
 <!--6889 AD_REFERENCE_ID-->
 <!--6889-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--6889 FIELDLENGTH-->
-<!--6889-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--6889-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--6889 ISKEY-->
 <!--6889-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--6889 ISPARENT-->
@@ -223816,7 +223816,7 @@
 <!--6903 AD_REFERENCE_ID-->
 <!--6903-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--6903 FIELDLENGTH-->
-<!--6903-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--6903-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--6903 ISKEY-->
 <!--6903-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--6903 ISPARENT-->
@@ -226649,7 +226649,7 @@
 <!--7052 AD_REFERENCE_ID-->
 <!--7052-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--7052 FIELDLENGTH-->
-<!--7052-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--7052-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--7052 ISKEY-->
 <!--7052-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--7052 ISPARENT-->
@@ -228357,7 +228357,7 @@
 <!--7082 AD_REFERENCE_ID-->
 <!--7082-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--7082 FIELDLENGTH-->
-<!--7082-->              <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
+<!--7082-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--7082 ISKEY-->
 <!--7082-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--7082 ISPARENT-->
@@ -229867,7 +229867,7 @@
 <!--7106 AD_REFERENCE_ID-->
 <!--7106-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--7106 FIELDLENGTH-->
-<!--7106-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--7106-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--7106 ISKEY-->
 <!--7106-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--7106 ISPARENT-->
@@ -232489,7 +232489,7 @@
 <!--7146 AD_REFERENCE_ID-->
 <!--7146-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--7146 FIELDLENGTH-->
-<!--7146-->              <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
+<!--7146-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--7146 ISKEY-->
 <!--7146-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--7146 ISPARENT-->
@@ -234855,7 +234855,7 @@
 <!--7211 AD_REFERENCE_ID-->
 <!--7211-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--7211 FIELDLENGTH-->
-<!--7211-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--7211-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--7211 ISKEY-->
 <!--7211-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--7211 ISPARENT-->
@@ -240299,7 +240299,7 @@
 <!--7703 AD_REFERENCE_ID-->
 <!--7703-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--7703 FIELDLENGTH-->
-<!--7703-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--7703-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--7703 ISKEY-->
 <!--7703-->              <ISKEY><![CDATA[N]]></ISKEY>
 <!--7703 ISPARENT-->
@@ -240364,7 +240364,7 @@
 <!--7705 AD_REFERENCE_ID-->
 <!--7705-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--7705 FIELDLENGTH-->
-<!--7705-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--7705-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--7705 ISKEY-->
 <!--7705-->              <ISKEY><![CDATA[N]]></ISKEY>
 <!--7705 ISPARENT-->
@@ -240429,7 +240429,7 @@
 <!--7706 AD_REFERENCE_ID-->
 <!--7706-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--7706 FIELDLENGTH-->
-<!--7706-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--7706-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--7706 ISKEY-->
 <!--7706-->              <ISKEY><![CDATA[N]]></ISKEY>
 <!--7706 ISPARENT-->
@@ -242320,7 +242320,7 @@
 <!--7771 AD_REFERENCE_ID-->
 <!--7771-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--7771 FIELDLENGTH-->
-<!--7771-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--7771-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--7771 ISKEY-->
 <!--7771-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--7771 ISPARENT-->
@@ -243112,7 +243112,7 @@
 <!--7783 AD_REFERENCE_ID-->
 <!--7783-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--7783 FIELDLENGTH-->
-<!--7783-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--7783-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--7783 ISKEY-->
 <!--7783-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--7783 ISPARENT-->
@@ -244440,7 +244440,7 @@
 <!--7808 AD_REFERENCE_ID-->
 <!--7808-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--7808 FIELDLENGTH-->
-<!--7808-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--7808-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--7808 ISKEY-->
 <!--7808-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--7808 ISPARENT-->
@@ -245163,7 +245163,7 @@
 <!--7820 AD_REFERENCE_ID-->
 <!--7820-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--7820 FIELDLENGTH-->
-<!--7820-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--7820-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--7820 ISKEY-->
 <!--7820-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--7820 ISPARENT-->
@@ -248691,7 +248691,7 @@
 <!--7874 AD_REFERENCE_ID-->
 <!--7874-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--7874 FIELDLENGTH-->
-<!--7874-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--7874-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--7874 ISKEY-->
 <!--7874-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--7874 ISPARENT-->
@@ -251124,7 +251124,7 @@
 <!--7911 AD_REFERENCE_ID-->
 <!--7911-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--7911 FIELDLENGTH-->
-<!--7911-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--7911-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--7911 ISKEY-->
 <!--7911-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--7911 ISPARENT-->
@@ -255649,7 +255649,7 @@
 <!--8070 AD_REFERENCE_ID-->
 <!--8070-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8070 FIELDLENGTH-->
-<!--8070-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8070-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8070 ISKEY-->
 <!--8070-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--8070 ISPARENT-->
@@ -256076,71 +256076,6 @@
 <!--8107-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--8107**************--></AD_COLUMN>
 
-<!--8108**************--><AD_COLUMN>
-<!--8108 AD_COLUMN_ID-->
-<!--8108-->              <AD_COLUMN_ID><![CDATA[8108]]></AD_COLUMN_ID>
-<!--8108 AD_CLIENT_ID-->
-<!--8108-->              <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--8108 AD_ORG_ID-->
-<!--8108-->              <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--8108 ISACTIVE-->
-<!--8108-->              <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--8108 CREATED-->
-<!--8108-->              <CREATED><![CDATA[2003-01-23 00:08:50.0]]></CREATED>
-<!--8108 UPDATED-->
-<!--8108-->              <UPDATED><![CDATA[2003-01-23 00:08:50.0]]></UPDATED>
-<!--8108 CREATEDBY-->
-<!--8108-->              <CREATEDBY><![CDATA[0]]></CREATEDBY>
-<!--8108 UPDATEDBY-->
-<!--8108-->              <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-<!--8108 NAME-->
-<!--8108-->              <NAME><![CDATA[Owned]]></NAME>
-<!--8108 DESCRIPTION-->
-<!--8108-->              <DESCRIPTION><![CDATA[The asset is owned by the organization]]></DESCRIPTION>
-<!--8108 HELP-->
-<!--8108-->              <HELP><![CDATA[The asset may not be in possession, but the asset is legally owned by the organization]]></HELP>
-<!--8108 COLUMNNAME-->
-<!--8108-->              <COLUMNNAME><![CDATA[IsOwned]]></COLUMNNAME>
-<!--8108 AD_TABLE_ID-->
-<!--8108-->              <AD_TABLE_ID><![CDATA[542]]></AD_TABLE_ID>
-<!--8108 AD_REFERENCE_ID-->
-<!--8108-->              <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
-<!--8108 FIELDLENGTH-->
-<!--8108-->              <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
-<!--8108 ISKEY-->
-<!--8108-->              <ISKEY><![CDATA[N]]></ISKEY>
-<!--8108 ISPARENT-->
-<!--8108-->              <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--8108 ISMANDATORY-->
-<!--8108-->              <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--8108 ISUPDATEABLE-->
-<!--8108-->              <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--8108 ISIDENTIFIER-->
-<!--8108-->              <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--8108 SEQNO-->
-<!--8108-->              <SEQNO><![CDATA[0]]></SEQNO>
-<!--8108 ISTRANSLATED-->
-<!--8108-->              <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--8108 ISENCRYPTED-->
-<!--8108-->              <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--8108 ISSELECTIONCOLUMN-->
-<!--8108-->              <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--8108 AD_ELEMENT_ID-->
-<!--8108-->              <AD_ELEMENT_ID><![CDATA[1941]]></AD_ELEMENT_ID>
-<!--8108 ISSYNCDATABASE-->
-<!--8108-->              <ISSYNCDATABASE><![CDATA[N]]></ISSYNCDATABASE>
-<!--8108 ISSESSIONATTR-->
-<!--8108-->              <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--8108 ISSECONDARYKEY-->
-<!--8108-->              <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--8108 ISDESENCRYPTABLE-->
-<!--8108-->              <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--8108 DEVELOPMENTSTATUS-->
-<!--8108-->              <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--8108 AD_MODULE_ID-->
-<!--8108-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--8108**************--></AD_COLUMN>
-
 <!--8109**************--><AD_COLUMN>
 <!--8109 AD_COLUMN_ID-->
 <!--8109-->              <AD_COLUMN_ID><![CDATA[8109]]></AD_COLUMN_ID>
@@ -256504,7 +256439,7 @@
 <!--8114 AD_REFERENCE_ID-->
 <!--8114-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8114 FIELDLENGTH-->
-<!--8114-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8114-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8114 ISKEY-->
 <!--8114-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--8114 ISPARENT-->
@@ -258695,7 +258630,7 @@
 <!--8184 AD_REFERENCE_ID-->
 <!--8184-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8184 FIELDLENGTH-->
-<!--8184-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8184-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8184 ISKEY-->
 <!--8184-->              <ISKEY><![CDATA[N]]></ISKEY>
 <!--8184 ISPARENT-->
@@ -261454,7 +261389,7 @@
 <!--8364 AD_REFERENCE_ID-->
 <!--8364-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8364 FIELDLENGTH-->
-<!--8364-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8364-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8364 ISKEY-->
 <!--8364-->              <ISKEY><![CDATA[N]]></ISKEY>
 <!--8364 ISPARENT-->
@@ -261911,7 +261846,7 @@
 <!--8394 AD_REFERENCE_ID-->
 <!--8394-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8394 FIELDLENGTH-->
-<!--8394-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8394-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8394 ISKEY-->
 <!--8394-->              <ISKEY><![CDATA[N]]></ISKEY>
 <!--8394 ISPARENT-->
@@ -262043,7 +261978,7 @@
 <!--8396 AD_REFERENCE_ID-->
 <!--8396-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8396 FIELDLENGTH-->
-<!--8396-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8396-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8396 ISKEY-->
 <!--8396-->              <ISKEY><![CDATA[N]]></ISKEY>
 <!--8396 ISPARENT-->
@@ -262173,7 +262108,7 @@
 <!--8402 AD_REFERENCE_ID-->
 <!--8402-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8402 FIELDLENGTH-->
-<!--8402-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8402-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8402 ISKEY-->
 <!--8402-->              <ISKEY><![CDATA[N]]></ISKEY>
 <!--8402 ISPARENT-->
@@ -262305,7 +262240,7 @@
 <!--8406 AD_REFERENCE_ID-->
 <!--8406-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8406 FIELDLENGTH-->
-<!--8406-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8406-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8406 ISKEY-->
 <!--8406-->              <ISKEY><![CDATA[N]]></ISKEY>
 <!--8406 ISPARENT-->
@@ -262700,7 +262635,7 @@
 <!--8420 AD_REFERENCE_ID-->
 <!--8420-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8420 FIELDLENGTH-->
-<!--8420-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8420-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8420 ISKEY-->
 <!--8420-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--8420 ISPARENT-->
@@ -263955,7 +263890,7 @@
 <!--8439 AD_REFERENCE_ID-->
 <!--8439-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8439 FIELDLENGTH-->
-<!--8439-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8439-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8439 ISKEY-->
 <!--8439-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--8439 ISPARENT-->
@@ -264483,7 +264418,7 @@
 <!--8447 AD_REFERENCE_ID-->
 <!--8447-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8447 FIELDLENGTH-->
-<!--8447-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8447-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8447 ISKEY-->
 <!--8447-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--8447 ISPARENT-->
@@ -265935,7 +265870,7 @@
 <!--8469 AD_REFERENCE_ID-->
 <!--8469-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8469 FIELDLENGTH-->
-<!--8469-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8469-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8469 ISKEY-->
 <!--8469-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--8469 ISPARENT-->
@@ -266131,7 +266066,7 @@
 <!--8472 AD_REFERENCE_ID-->
 <!--8472-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8472 FIELDLENGTH-->
-<!--8472-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8472-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8472 ISKEY-->
 <!--8472-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--8472 ISPARENT-->
@@ -267315,7 +267250,7 @@
 <!--8490 AD_REFERENCE_ID-->
 <!--8490-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8490 FIELDLENGTH-->
-<!--8490-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8490-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8490 ISKEY-->
 <!--8490-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--8490 ISPARENT-->
@@ -268701,7 +268636,7 @@
 <!--8512 AD_REFERENCE_ID-->
 <!--8512-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8512 FIELDLENGTH-->
-<!--8512-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8512-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8512 ISKEY-->
 <!--8512-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--8512 ISPARENT-->
@@ -272342,7 +272277,7 @@
 <!--8585 AD_REFERENCE_ID-->
 <!--8585-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8585 FIELDLENGTH-->
-<!--8585-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8585-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8585 ISKEY-->
 <!--8585-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--8585 ISPARENT-->
@@ -274003,7 +273938,7 @@
 <!--8653 AD_REFERENCE_ID-->
 <!--8653-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8653 FIELDLENGTH-->
-<!--8653-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8653-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8653 ISKEY-->
 <!--8653-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--8653 ISPARENT-->
@@ -275254,7 +275189,7 @@
 <!--8709 AD_REFERENCE_ID-->
 <!--8709-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8709 FIELDLENGTH-->
-<!--8709-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8709-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8709 ISKEY-->
 <!--8709-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--8709 ISPARENT-->
@@ -276442,7 +276377,7 @@
 <!--8728 AD_REFERENCE_ID-->
 <!--8728-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8728 FIELDLENGTH-->
-<!--8728-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8728-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8728 ISKEY-->
 <!--8728-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--8728 ISPARENT-->
@@ -278949,7 +278884,7 @@
 <!--8768 AD_REFERENCE_ID-->
 <!--8768-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8768 FIELDLENGTH-->
-<!--8768-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8768-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8768 ISKEY-->
 <!--8768-->              <ISKEY><![CDATA[N]]></ISKEY>
 <!--8768 ISPARENT-->
@@ -279476,7 +279411,7 @@
 <!--8779 AD_REFERENCE_ID-->
 <!--8779-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8779 FIELDLENGTH-->
-<!--8779-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8779-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8779 ISKEY-->
 <!--8779-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--8779 ISPARENT-->
@@ -279736,7 +279671,7 @@
 <!--8783 AD_REFERENCE_ID-->
 <!--8783-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8783 FIELDLENGTH-->
-<!--8783-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8783-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8783 ISKEY-->
 <!--8783-->              <ISKEY><![CDATA[N]]></ISKEY>
 <!--8783 ISPARENT-->
@@ -280266,7 +280201,7 @@
 <!--8811 AD_REFERENCE_ID-->
 <!--8811-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8811 FIELDLENGTH-->
-<!--8811-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8811-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8811 ISKEY-->
 <!--8811-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--8811 ISPARENT-->
@@ -282819,7 +282754,7 @@
 <!--8854 AD_REFERENCE_ID-->
 <!--8854-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8854 FIELDLENGTH-->
-<!--8854-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8854-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8854 ISKEY-->
 <!--8854-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--8854 ISPARENT-->
@@ -283349,7 +283284,7 @@
 <!--8862 AD_REFERENCE_ID-->
 <!--8862-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8862 FIELDLENGTH-->
-<!--8862-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8862-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8862 ISKEY-->
 <!--8862-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--8862 ISPARENT-->
@@ -283871,7 +283806,7 @@
 <!--8870 AD_TABLE_ID-->
 <!--8870-->              <AD_TABLE_ID><![CDATA[582]]></AD_TABLE_ID>
 <!--8870 AD_REFERENCE_ID-->
-<!--8870-->              <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--8870-->              <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
 <!--8870 FIELDLENGTH-->
 <!--8870-->              <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
 <!--8870 ISKEY-->
@@ -284929,7 +284864,7 @@
 <!--8886 AD_REFERENCE_ID-->
 <!--8886-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8886 FIELDLENGTH-->
-<!--8886-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8886-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8886 ISKEY-->
 <!--8886-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--8886 ISPARENT-->
@@ -285855,7 +285790,7 @@
 <!--8900 AD_REFERENCE_ID-->
 <!--8900-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8900 FIELDLENGTH-->
-<!--8900-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8900-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8900 ISKEY-->
 <!--8900-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--8900 ISPARENT-->
@@ -286513,7 +286448,7 @@
 <!--8910 AD_REFERENCE_ID-->
 <!--8910-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8910 FIELDLENGTH-->
-<!--8910-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8910-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8910 ISKEY-->
 <!--8910-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--8910 ISPARENT-->
@@ -287041,7 +286976,7 @@
 <!--8972 AD_REFERENCE_ID-->
 <!--8972-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--8972 FIELDLENGTH-->
-<!--8972-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--8972-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--8972 ISKEY-->
 <!--8972-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--8972 ISPARENT-->
@@ -288818,7 +288753,7 @@
 <!--9007 AD_REFERENCE_ID-->
 <!--9007-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--9007 FIELDLENGTH-->
-<!--9007-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--9007-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--9007 ISKEY-->
 <!--9007-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--9007 ISPARENT-->
@@ -291772,7 +291707,7 @@
 <!--9093 AD_REFERENCE_ID-->
 <!--9093-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--9093 FIELDLENGTH-->
-<!--9093-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--9093-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--9093 ISKEY-->
 <!--9093-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--9093 ISPARENT-->
@@ -291904,7 +291839,7 @@
 <!--9095 AD_REFERENCE_ID-->
 <!--9095-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--9095 FIELDLENGTH-->
-<!--9095-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--9095-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--9095 ISKEY-->
 <!--9095-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--9095 ISPARENT-->
@@ -294735,7 +294670,7 @@
 <!--9203 AD_REFERENCE_ID-->
 <!--9203-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--9203 FIELDLENGTH-->
-<!--9203-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--9203-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--9203 ISKEY-->
 <!--9203-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--9203 ISPARENT-->
@@ -296379,7 +296314,7 @@
 <!--9228 AD_REFERENCE_ID-->
 <!--9228-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--9228 FIELDLENGTH-->
-<!--9228-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--9228-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--9228 ISKEY-->
 <!--9228-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--9228 ISPARENT-->
@@ -297951,7 +297886,7 @@
 <!--9252 AD_TABLE_ID-->
 <!--9252-->              <AD_TABLE_ID><![CDATA[599]]></AD_TABLE_ID>
 <!--9252 AD_REFERENCE_ID-->
-<!--9252-->              <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--9252-->              <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
 <!--9252 FIELDLENGTH-->
 <!--9252-->              <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
 <!--9252 ISKEY-->
@@ -301428,7 +301363,7 @@
 <!--9306 AD_REFERENCE_ID-->
 <!--9306-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--9306 FIELDLENGTH-->
-<!--9306-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--9306-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--9306 ISKEY-->
 <!--9306-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--9306 ISPARENT-->
@@ -308209,7 +308144,7 @@
 <!--9622 AD_REFERENCE_ID-->
 <!--9622-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--9622 FIELDLENGTH-->
-<!--9622-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--9622-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--9622 DEFAULTVALUE-->
 <!--9622-->              <DEFAULTVALUE><![CDATA[@SQL=SELECT AD_GET_NEXT_SEQUENCE('AD_Language', '0') AS DefaultValue FROM AD_Language]]></DEFAULTVALUE>
 <!--9622 ISKEY-->
@@ -315889,7 +315824,7 @@
 <!--9850 AD_REFERENCE_ID-->
 <!--9850-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--9850 FIELDLENGTH-->
-<!--9850-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--9850-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--9850 ISKEY-->
 <!--9850-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--9850 ISPARENT-->
@@ -318506,7 +318441,7 @@
 <!--800016 AD_REFERENCE_ID-->
 <!--800016-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800016 FIELDLENGTH-->
-<!--800016-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--800016-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800016 ISKEY-->
 <!--800016-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800016 ISPARENT-->
@@ -318833,7 +318768,7 @@
 <!--800021 AD_REFERENCE_ID-->
 <!--800021-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800021 FIELDLENGTH-->
-<!--800021-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--800021-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800021 ISKEY-->
 <!--800021-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800021 ISPARENT-->
@@ -319491,7 +319426,7 @@
 <!--800063 AD_REFERENCE_ID-->
 <!--800063-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800063 FIELDLENGTH-->
-<!--800063-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800063-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800063 ISKEY-->
 <!--800063-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800063 ISPARENT-->
@@ -320425,7 +320360,7 @@
 <!--800077 AD_REFERENCE_ID-->
 <!--800077-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800077 FIELDLENGTH-->
-<!--800077-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800077-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800077 ISKEY-->
 <!--800077-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800077 ISPARENT-->
@@ -321347,7 +321282,7 @@
 <!--800092 AD_REFERENCE_ID-->
 <!--800092-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800092 FIELDLENGTH-->
-<!--800092-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800092-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800092 ISKEY-->
 <!--800092-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800092 ISPARENT-->
@@ -322212,7 +322147,7 @@
 <!--800105 AD_REFERENCE_ID-->
 <!--800105-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800105 FIELDLENGTH-->
-<!--800105-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800105-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800105 ISKEY-->
 <!--800105-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800105 ISPARENT-->
@@ -322941,7 +322876,7 @@
 <!--800116 AD_REFERENCE_ID-->
 <!--800116-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800116 FIELDLENGTH-->
-<!--800116-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800116-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800116 ISKEY-->
 <!--800116-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800116 ISPARENT-->
@@ -326656,7 +326591,7 @@
 <!--800174 AD_REFERENCE_ID-->
 <!--800174-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800174 FIELDLENGTH-->
-<!--800174-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800174-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800174 ISKEY-->
 <!--800174-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800174 ISPARENT-->
@@ -327393,7 +327328,7 @@
 <!--800196 AD_REFERENCE_ID-->
 <!--800196-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800196 FIELDLENGTH-->
-<!--800196-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800196-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800196 ISKEY-->
 <!--800196-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800196 ISPARENT-->
@@ -328333,7 +328268,7 @@
 <!--800210 AD_REFERENCE_ID-->
 <!--800210-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800210 FIELDLENGTH-->
-<!--800210-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800210-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800210 ISKEY-->
 <!--800210-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800210 ISPARENT-->
@@ -328997,7 +328932,7 @@
 <!--800220 AD_REFERENCE_ID-->
 <!--800220-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800220 FIELDLENGTH-->
-<!--800220-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800220-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800220 ISKEY-->
 <!--800220-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800220 ISPARENT-->
@@ -329661,7 +329596,7 @@
 <!--800231 AD_REFERENCE_ID-->
 <!--800231-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800231 FIELDLENGTH-->
-<!--800231-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800231-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800231 ISKEY-->
 <!--800231-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800231 ISPARENT-->
@@ -330591,7 +330526,7 @@
 <!--800245 AD_REFERENCE_ID-->
 <!--800245-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800245 FIELDLENGTH-->
-<!--800245-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800245-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800245 ISKEY-->
 <!--800245-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800245 ISPARENT-->
@@ -331588,7 +331523,7 @@
 <!--800260 AD_REFERENCE_ID-->
 <!--800260-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800260 FIELDLENGTH-->
-<!--800260-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--800260-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800260 ISKEY-->
 <!--800260-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800260 ISPARENT-->
@@ -332591,7 +332526,7 @@
 <!--800299 AD_REFERENCE_ID-->
 <!--800299-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800299 FIELDLENGTH-->
-<!--800299-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800299-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800299 ISKEY-->
 <!--800299-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800299 ISPARENT-->
@@ -334246,7 +334181,7 @@
 <!--800325 AD_REFERENCE_ID-->
 <!--800325-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800325 FIELDLENGTH-->
-<!--800325-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800325-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800325 ISKEY-->
 <!--800325-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800325 ISPARENT-->
@@ -335450,7 +335385,7 @@
 <!--800347 AD_REFERENCE_ID-->
 <!--800347-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800347 FIELDLENGTH-->
-<!--800347-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800347-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800347 ISKEY-->
 <!--800347-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800347 ISPARENT-->
@@ -337032,7 +336967,7 @@
 <!--800372 AD_REFERENCE_ID-->
 <!--800372-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800372 FIELDLENGTH-->
-<!--800372-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800372-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800372 ISKEY-->
 <!--800372-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800372 ISPARENT-->
@@ -341059,7 +340994,7 @@
 <!--800437 AD_REFERENCE_ID-->
 <!--800437-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800437 FIELDLENGTH-->
-<!--800437-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800437-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800437 ISKEY-->
 <!--800437-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800437 ISPARENT-->
@@ -342460,7 +342395,7 @@
 <!--800458 AD_REFERENCE_ID-->
 <!--800458-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800458 FIELDLENGTH-->
-<!--800458-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800458-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800458 ISKEY-->
 <!--800458-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800458 ISPARENT-->
@@ -344115,7 +344050,7 @@
 <!--800485 AD_REFERENCE_ID-->
 <!--800485-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800485 FIELDLENGTH-->
-<!--800485-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800485-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800485 ISKEY-->
 <!--800485-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800485 ISPARENT-->
@@ -344757,7 +344692,7 @@
 <!--800509 AD_REFERENCE_ID-->
 <!--800509-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800509 FIELDLENGTH-->
-<!--800509-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800509-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800509 ISKEY-->
 <!--800509-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800509 ISPARENT-->
@@ -345825,7 +345760,7 @@
 <!--800528 AD_REFERENCE_ID-->
 <!--800528-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800528 FIELDLENGTH-->
-<!--800528-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800528-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800528 ISKEY-->
 <!--800528-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800528 ISPARENT-->
@@ -346359,7 +346294,7 @@
 <!--800552 AD_REFERENCE_ID-->
 <!--800552-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800552 FIELDLENGTH-->
-<!--800552-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800552-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800552 ISKEY-->
 <!--800552-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800552 ISPARENT-->
@@ -347025,7 +346960,7 @@
 <!--800562 AD_REFERENCE_ID-->
 <!--800562-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800562 FIELDLENGTH-->
-<!--800562-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800562-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800562 ISKEY-->
 <!--800562-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800562 ISPARENT-->
@@ -347752,7 +347687,7 @@
 <!--800573 AD_REFERENCE_ID-->
 <!--800573-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800573 FIELDLENGTH-->
-<!--800573-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800573-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800573 ISKEY-->
 <!--800573-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800573 ISPARENT-->
@@ -348485,7 +348420,7 @@
 <!--800584 AD_REFERENCE_ID-->
 <!--800584-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800584 FIELDLENGTH-->
-<!--800584-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800584-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800584 ISKEY-->
 <!--800584-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800584 ISPARENT-->
@@ -349413,7 +349348,7 @@
 <!--800617 AD_REFERENCE_ID-->
 <!--800617-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800617 FIELDLENGTH-->
-<!--800617-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800617-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800617 ISKEY-->
 <!--800617-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800617 ISPARENT-->
@@ -351388,7 +351323,7 @@
 <!--800650 AD_REFERENCE_ID-->
 <!--800650-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800650 FIELDLENGTH-->
-<!--800650-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800650-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800650 ISKEY-->
 <!--800650-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800650 ISPARENT-->
@@ -352510,7 +352445,7 @@
 <!--800667 AD_REFERENCE_ID-->
 <!--800667-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800667 FIELDLENGTH-->
-<!--800667-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800667-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800667 ISKEY-->
 <!--800667-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800667 ISPARENT-->
@@ -352640,7 +352575,7 @@
 <!--800669 AD_REFERENCE_ID-->
 <!--800669-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800669 FIELDLENGTH-->
-<!--800669-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800669-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800669 ISKEY-->
 <!--800669-->              <ISKEY><![CDATA[N]]></ISKEY>
 <!--800669 ISPARENT-->
@@ -352772,7 +352707,7 @@
 <!--800682 AD_REFERENCE_ID-->
 <!--800682-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800682 FIELDLENGTH-->
-<!--800682-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800682-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800682 ISKEY-->
 <!--800682-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800682 ISPARENT-->
@@ -354681,7 +354616,7 @@
 <!--800712 AD_REFERENCE_ID-->
 <!--800712-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800712 FIELDLENGTH-->
-<!--800712-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800712-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800712 ISKEY-->
 <!--800712-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800712 ISPARENT-->
@@ -355130,7 +355065,7 @@
 <!--800719 AD_REFERENCE_ID-->
 <!--800719-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800719 FIELDLENGTH-->
-<!--800719-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800719-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800719 ISKEY-->
 <!--800719-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800719 ISPARENT-->
@@ -356062,7 +355997,7 @@
 <!--800733 AD_REFERENCE_ID-->
 <!--800733-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800733 FIELDLENGTH-->
-<!--800733-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800733-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800733 ISKEY-->
 <!--800733-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800733 ISPARENT-->
@@ -357191,7 +357126,7 @@
 <!--800750 AD_REFERENCE_ID-->
 <!--800750-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800750 FIELDLENGTH-->
-<!--800750-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800750-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800750 ISKEY-->
 <!--800750-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800750 ISPARENT-->
@@ -358444,7 +358379,7 @@
 <!--800769 AD_REFERENCE_ID-->
 <!--800769-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800769 FIELDLENGTH-->
-<!--800769-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800769-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800769 ISKEY-->
 <!--800769-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800769 ISPARENT-->
@@ -359372,7 +359307,7 @@
 <!--800783 AD_REFERENCE_ID-->
 <!--800783-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800783 FIELDLENGTH-->
-<!--800783-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800783-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800783 ISKEY-->
 <!--800783-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800783 ISPARENT-->
@@ -360170,7 +360105,7 @@
 <!--800795 AD_REFERENCE_ID-->
 <!--800795-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800795 FIELDLENGTH-->
-<!--800795-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800795-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800795 ISKEY-->
 <!--800795-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800795 ISPARENT-->
@@ -361039,7 +360974,7 @@
 <!--800808 AD_REFERENCE_ID-->
 <!--800808-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800808 FIELDLENGTH-->
-<!--800808-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800808-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800808 ISKEY-->
 <!--800808-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800808 ISPARENT-->
@@ -361772,7 +361707,7 @@
 <!--800819 AD_REFERENCE_ID-->
 <!--800819-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800819 FIELDLENGTH-->
-<!--800819-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800819-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800819 ISKEY-->
 <!--800819-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800819 ISPARENT-->
@@ -362966,7 +362901,7 @@
 <!--800839 AD_REFERENCE_ID-->
 <!--800839-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800839 FIELDLENGTH-->
-<!--800839-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800839-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800839 ISKEY-->
 <!--800839-->              <ISKEY><![CDATA[N]]></ISKEY>
 <!--800839 ISPARENT-->
@@ -363373,7 +363308,7 @@
 <!--800848 AD_REFERENCE_ID-->
 <!--800848-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800848 FIELDLENGTH-->
-<!--800848-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800848-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800848 ISKEY-->
 <!--800848-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800848 ISPARENT-->
@@ -364110,7 +364045,7 @@
 <!--800859 AD_REFERENCE_ID-->
 <!--800859-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800859 FIELDLENGTH-->
-<!--800859-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800859-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800859 ISKEY-->
 <!--800859-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800859 ISPARENT-->
@@ -366153,7 +366088,7 @@
 <!--800891 AD_REFERENCE_ID-->
 <!--800891-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800891 FIELDLENGTH-->
-<!--800891-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800891-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800891 ISKEY-->
 <!--800891-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800891 ISPARENT-->
@@ -367575,7 +367510,7 @@
 <!--800913 AD_REFERENCE_ID-->
 <!--800913-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800913 FIELDLENGTH-->
-<!--800913-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800913-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800913 ISKEY-->
 <!--800913-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800913 ISPARENT-->
@@ -369933,7 +369868,7 @@
 <!--800949 AD_REFERENCE_ID-->
 <!--800949-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800949 FIELDLENGTH-->
-<!--800949-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800949-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800949 ISKEY-->
 <!--800949-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800949 ISPARENT-->
@@ -371233,7 +371168,7 @@
 <!--800969 AD_REFERENCE_ID-->
 <!--800969-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800969 FIELDLENGTH-->
-<!--800969-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800969-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800969 ISKEY-->
 <!--800969-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800969 ISPARENT-->
@@ -371893,7 +371828,7 @@
 <!--800979 AD_REFERENCE_ID-->
 <!--800979-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--800979 FIELDLENGTH-->
-<!--800979-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--800979-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--800979 ISKEY-->
 <!--800979-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--800979 ISPARENT-->
@@ -373236,7 +373171,7 @@
 <!--801000 AD_REFERENCE_ID-->
 <!--801000-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801000 FIELDLENGTH-->
-<!--801000-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801000-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801000 ISKEY-->
 <!--801000-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801000 ISPARENT-->
@@ -374475,7 +374410,7 @@
 <!--801019 AD_REFERENCE_ID-->
 <!--801019-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801019 FIELDLENGTH-->
-<!--801019-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801019-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801019 ISKEY-->
 <!--801019-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801019 ISPARENT-->
@@ -375994,7 +375929,7 @@
 <!--801042 AD_REFERENCE_ID-->
 <!--801042-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801042 FIELDLENGTH-->
-<!--801042-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801042-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801042 ISKEY-->
 <!--801042-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801042 ISPARENT-->
@@ -377711,7 +377646,7 @@
 <!--801069 AD_REFERENCE_ID-->
 <!--801069-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801069 FIELDLENGTH-->
-<!--801069-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801069-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801069 ISKEY-->
 <!--801069-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801069 ISPARENT-->
@@ -379108,7 +379043,7 @@
 <!--801090 AD_REFERENCE_ID-->
 <!--801090-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801090 FIELDLENGTH-->
-<!--801090-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801090-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801090 ISKEY-->
 <!--801090-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801090 ISPARENT-->
@@ -380036,7 +379971,7 @@
 <!--801104 AD_REFERENCE_ID-->
 <!--801104-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801104 FIELDLENGTH-->
-<!--801104-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801104-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801104 ISKEY-->
 <!--801104-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801104 ISPARENT-->
@@ -381305,7 +381240,7 @@
 <!--801123 AD_REFERENCE_ID-->
 <!--801123-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801123 FIELDLENGTH-->
-<!--801123-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801123-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801123 ISKEY-->
 <!--801123-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801123 ISPARENT-->
@@ -381969,7 +381904,7 @@
 <!--801133 AD_REFERENCE_ID-->
 <!--801133-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801133 FIELDLENGTH-->
-<!--801133-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801133-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801133 ISKEY-->
 <!--801133-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801133 ISPARENT-->
@@ -382633,7 +382568,7 @@
 <!--801143 AD_REFERENCE_ID-->
 <!--801143-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801143 FIELDLENGTH-->
-<!--801143-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801143-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801143 ISKEY-->
 <!--801143-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801143 ISPARENT-->
@@ -383299,7 +383234,7 @@
 <!--801153 AD_REFERENCE_ID-->
 <!--801153-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801153 FIELDLENGTH-->
-<!--801153-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801153-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801153 ISKEY-->
 <!--801153-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801153 ISPARENT-->
@@ -384895,7 +384830,7 @@
 <!--801180 AD_REFERENCE_ID-->
 <!--801180-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801180 FIELDLENGTH-->
-<!--801180-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801180-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801180 ISKEY-->
 <!--801180-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801180 ISPARENT-->
@@ -385561,7 +385496,7 @@
 <!--801200 AD_REFERENCE_ID-->
 <!--801200-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801200 FIELDLENGTH-->
-<!--801200-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801200-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801200 ISKEY-->
 <!--801200-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801200 ISPARENT-->
@@ -386290,7 +386225,7 @@
 <!--801212 AD_REFERENCE_ID-->
 <!--801212-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801212 FIELDLENGTH-->
-<!--801212-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801212-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801212 ISKEY-->
 <!--801212-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801212 ISPARENT-->
@@ -386956,7 +386891,7 @@
 <!--801224 AD_REFERENCE_ID-->
 <!--801224-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801224 FIELDLENGTH-->
-<!--801224-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801224-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801224 ISKEY-->
 <!--801224-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801224 ISPARENT-->
@@ -387624,7 +387559,7 @@
 <!--801234 AD_REFERENCE_ID-->
 <!--801234-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801234 FIELDLENGTH-->
-<!--801234-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801234-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801234 ISKEY-->
 <!--801234-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801234 ISPARENT-->
@@ -388556,7 +388491,7 @@
 <!--801320 AD_REFERENCE_ID-->
 <!--801320-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801320 FIELDLENGTH-->
-<!--801320-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801320-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801320 ISKEY-->
 <!--801320-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801320 ISPARENT-->
@@ -389285,7 +389220,7 @@
 <!--801331 AD_REFERENCE_ID-->
 <!--801331-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801331 FIELDLENGTH-->
-<!--801331-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801331-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801331 ISKEY-->
 <!--801331-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801331 ISPARENT-->
@@ -390150,7 +390085,7 @@
 <!--801344 AD_REFERENCE_ID-->
 <!--801344-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801344 FIELDLENGTH-->
-<!--801344-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801344-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801344 ISKEY-->
 <!--801344-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801344 ISPARENT-->
@@ -390879,7 +390814,7 @@
 <!--801476 AD_REFERENCE_ID-->
 <!--801476-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801476 FIELDLENGTH-->
-<!--801476-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801476-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801476 ISKEY-->
 <!--801476-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801476 ISPARENT-->
@@ -391608,7 +391543,7 @@
 <!--801508 AD_REFERENCE_ID-->
 <!--801508-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801508 FIELDLENGTH-->
-<!--801508-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801508-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801508 ISKEY-->
 <!--801508-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801508 ISPARENT-->
@@ -392341,7 +392276,7 @@
 <!--801519 AD_REFERENCE_ID-->
 <!--801519-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801519 FIELDLENGTH-->
-<!--801519-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801519-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801519 ISKEY-->
 <!--801519-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801519 ISPARENT-->
@@ -393330,7 +393265,7 @@
 <!--801536 AD_REFERENCE_ID-->
 <!--801536-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801536 FIELDLENGTH-->
-<!--801536-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801536-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801536 ISKEY-->
 <!--801536-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801536 ISPARENT-->
@@ -394134,7 +394069,7 @@
 <!--801549 AD_REFERENCE_ID-->
 <!--801549-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801549 FIELDLENGTH-->
-<!--801549-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801549-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801549 ISKEY-->
 <!--801549-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801549 ISPARENT-->
@@ -395133,7 +395068,7 @@
 <!--801564 AD_REFERENCE_ID-->
 <!--801564-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801564 FIELDLENGTH-->
-<!--801564-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801564-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801564 ISKEY-->
 <!--801564-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801564 ISPARENT-->
@@ -396122,7 +396057,7 @@
 <!--801580 AD_REFERENCE_ID-->
 <!--801580-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801580 FIELDLENGTH-->
-<!--801580-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801580-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801580 ISKEY-->
 <!--801580-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801580 ISPARENT-->
@@ -396855,7 +396790,7 @@
 <!--801605 AD_REFERENCE_ID-->
 <!--801605-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801605 FIELDLENGTH-->
-<!--801605-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801605-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801605 ISKEY-->
 <!--801605-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801605 ISPARENT-->
@@ -397521,7 +397456,7 @@
 <!--801615 AD_REFERENCE_ID-->
 <!--801615-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801615 FIELDLENGTH-->
-<!--801615-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801615-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801615 ISKEY-->
 <!--801615-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801615 ISPARENT-->
@@ -399107,7 +399042,7 @@
 <!--801754 AD_REFERENCE_ID-->
 <!--801754-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--801754 FIELDLENGTH-->
-<!--801754-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--801754-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--801754 ISKEY-->
 <!--801754-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--801754 ISPARENT-->
@@ -399572,7 +399507,7 @@
 <!--802023 ISPARENT-->
 <!--802023-->              <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--802023 ISMANDATORY-->
-<!--802023-->              <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--802023-->              <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
 <!--802023 ISUPDATEABLE-->
 <!--802023-->              <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
 <!--802023 ISIDENTIFIER-->
@@ -400892,7 +400827,7 @@
 <!--802066 AD_REFERENCE_ID-->
 <!--802066-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802066 FIELDLENGTH-->
-<!--802066-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802066-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802066 ISKEY-->
 <!--802066-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802066 ISPARENT-->
@@ -402407,7 +402342,7 @@
 <!--802105 AD_REFERENCE_ID-->
 <!--802105-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802105 FIELDLENGTH-->
-<!--802105-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802105-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802105 ISKEY-->
 <!--802105-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802105 ISPARENT-->
@@ -404070,7 +404005,7 @@
 <!--802207 AD_REFERENCE_ID-->
 <!--802207-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802207 FIELDLENGTH-->
-<!--802207-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802207-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802207 ISKEY-->
 <!--802207-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802207 ISPARENT-->
@@ -404799,7 +404734,7 @@
 <!--802218 AD_REFERENCE_ID-->
 <!--802218-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802218 FIELDLENGTH-->
-<!--802218-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802218-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802218 ISKEY-->
 <!--802218-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802218 ISPARENT-->
@@ -405723,7 +405658,7 @@
 <!--802232 AD_REFERENCE_ID-->
 <!--802232-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802232 FIELDLENGTH-->
-<!--802232-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802232-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802232 ISKEY-->
 <!--802232-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802232 ISPARENT-->
@@ -406326,7 +406261,7 @@
 <!--802243 AD_REFERENCE_ID-->
 <!--802243-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802243 FIELDLENGTH-->
-<!--802243-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802243-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802243 ISKEY-->
 <!--802243-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802243 ISPARENT-->
@@ -406986,7 +406921,7 @@
 <!--802253 AD_REFERENCE_ID-->
 <!--802253-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802253 FIELDLENGTH-->
-<!--802253-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802253-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802253 ISKEY-->
 <!--802253-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802253 ISPARENT-->
@@ -408036,7 +407971,7 @@
 <!--802300 AD_REFERENCE_ID-->
 <!--802300-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802300 FIELDLENGTH-->
-<!--802300-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802300-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802300 ISKEY-->
 <!--802300-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802300 ISPARENT-->
@@ -409159,7 +409094,7 @@
 <!--802317 AD_REFERENCE_ID-->
 <!--802317-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802317 FIELDLENGTH-->
-<!--802317-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802317-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802317 ISKEY-->
 <!--802317-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802317 ISPARENT-->
@@ -409823,7 +409758,7 @@
 <!--802327 AD_REFERENCE_ID-->
 <!--802327-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802327 FIELDLENGTH-->
-<!--802327-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802327-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802327 ISKEY-->
 <!--802327-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802327 ISPARENT-->
@@ -410613,7 +410548,7 @@
 <!--802339 AD_REFERENCE_ID-->
 <!--802339-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802339 FIELDLENGTH-->
-<!--802339-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802339-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802339 ISKEY-->
 <!--802339-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802339 ISPARENT-->
@@ -411473,7 +411408,7 @@
 <!--802352 AD_REFERENCE_ID-->
 <!--802352-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802352 FIELDLENGTH-->
-<!--802352-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802352-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802352 ISKEY-->
 <!--802352-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802352 ISPARENT-->
@@ -412720,7 +412655,7 @@
 <!--802380 AD_REFERENCE_ID-->
 <!--802380-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802380 FIELDLENGTH-->
-<!--802380-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802380-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802380 ISKEY-->
 <!--802380-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802380 ISPARENT-->
@@ -414958,7 +414893,7 @@
 <!--802424 AD_REFERENCE_ID-->
 <!--802424-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802424 FIELDLENGTH-->
-<!--802424-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802424-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802424 ISKEY-->
 <!--802424-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802424 ISPARENT-->
@@ -415557,7 +415492,7 @@
 <!--802433 FIELDLENGTH-->
 <!--802433-->              <FIELDLENGTH><![CDATA[60]]></FIELDLENGTH>
 <!--802433 ISKEY-->
-<!--802433-->              <ISKEY><![CDATA[Y]]></ISKEY>
+<!--802433-->              <ISKEY><![CDATA[N]]></ISKEY>
 <!--802433 ISPARENT-->
 <!--802433-->              <ISPARENT><![CDATA[Y]]></ISPARENT>
 <!--802433 ISMANDATORY-->
@@ -415624,7 +415559,7 @@
 <!--802434 FIELDLENGTH-->
 <!--802434-->              <FIELDLENGTH><![CDATA[6]]></FIELDLENGTH>
 <!--802434 ISKEY-->
-<!--802434-->              <ISKEY><![CDATA[Y]]></ISKEY>
+<!--802434-->              <ISKEY><![CDATA[N]]></ISKEY>
 <!--802434 ISPARENT-->
 <!--802434-->              <ISPARENT><![CDATA[Y]]></ISPARENT>
 <!--802434 ISMANDATORY-->
@@ -416347,7 +416282,7 @@
 <!--802445 AD_REFERENCE_ID-->
 <!--802445-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802445 FIELDLENGTH-->
-<!--802445-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802445-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802445 ISKEY-->
 <!--802445-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802445 ISPARENT-->
@@ -417078,7 +417013,7 @@
 <!--802457 AD_REFERENCE_ID-->
 <!--802457-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802457 FIELDLENGTH-->
-<!--802457-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802457-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802457 ISKEY-->
 <!--802457-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802457 ISPARENT-->
@@ -417878,7 +417813,7 @@
 <!--802469 AD_REFERENCE_ID-->
 <!--802469-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802469 FIELDLENGTH-->
-<!--802469-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802469-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802469 ISKEY-->
 <!--802469-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802469 ISPARENT-->
@@ -419220,7 +419155,7 @@
 <!--802489 AD_REFERENCE_ID-->
 <!--802489-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802489 FIELDLENGTH-->
-<!--802489-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802489-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802489 ISKEY-->
 <!--802489-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802489 ISPARENT-->
@@ -420605,7 +420540,7 @@
 <!--802522 AD_REFERENCE_ID-->
 <!--802522-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802522 FIELDLENGTH-->
-<!--802522-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802522-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802522 ISKEY-->
 <!--802522-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802522 ISPARENT-->
@@ -421200,7 +421135,7 @@
 <!--802531 AD_REFERENCE_ID-->
 <!--802531-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802531 FIELDLENGTH-->
-<!--802531-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802531-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802531 ISKEY-->
 <!--802531-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802531 ISPARENT-->
@@ -423883,7 +423818,7 @@
 <!--802573 AD_REFERENCE_ID-->
 <!--802573-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802573 FIELDLENGTH-->
-<!--802573-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802573-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802573 ISKEY-->
 <!--802573-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802573 ISPARENT-->
@@ -424549,7 +424484,7 @@
 <!--802583 AD_REFERENCE_ID-->
 <!--802583-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802583 FIELDLENGTH-->
-<!--802583-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802583-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802583 ISKEY-->
 <!--802583-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802583 ISPARENT-->
@@ -425215,7 +425150,7 @@
 <!--802593 AD_REFERENCE_ID-->
 <!--802593-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802593 FIELDLENGTH-->
-<!--802593-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802593-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802593 ISKEY-->
 <!--802593-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802593 ISPARENT-->
@@ -426267,7 +426202,7 @@
 <!--802623 AD_REFERENCE_ID-->
 <!--802623-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802623 FIELDLENGTH-->
-<!--802623-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802623-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802623 ISKEY-->
 <!--802623-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802623 ISPARENT-->
@@ -427128,7 +427063,7 @@
 <!--802637 AD_REFERENCE_ID-->
 <!--802637-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802637 FIELDLENGTH-->
-<!--802637-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802637-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802637 ISKEY-->
 <!--802637-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802637 ISPARENT-->
@@ -428452,7 +428387,7 @@
 <!--802671 AD_REFERENCE_ID-->
 <!--802671-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802671 FIELDLENGTH-->
-<!--802671-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802671-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802671 ISKEY-->
 <!--802671-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802671 ISPARENT-->
@@ -429246,7 +429181,7 @@
 <!--802683 AD_REFERENCE_ID-->
 <!--802683-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802683 FIELDLENGTH-->
-<!--802683-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802683-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802683 ISKEY-->
 <!--802683-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802683 ISPARENT-->
@@ -429973,7 +429908,7 @@
 <!--802695 AD_REFERENCE_ID-->
 <!--802695-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802695 FIELDLENGTH-->
-<!--802695-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802695-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802695 ISKEY-->
 <!--802695-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802695 ISPARENT-->
@@ -430700,7 +430635,7 @@
 <!--802706 AD_REFERENCE_ID-->
 <!--802706-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802706 FIELDLENGTH-->
-<!--802706-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802706-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802706 ISKEY-->
 <!--802706-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802706 ISPARENT-->
@@ -431488,7 +431423,7 @@
 <!--802719 AD_REFERENCE_ID-->
 <!--802719-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802719 FIELDLENGTH-->
-<!--802719-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802719-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802719 ISKEY-->
 <!--802719-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802719 ISPARENT-->
@@ -432154,7 +432089,7 @@
 <!--802731 AD_REFERENCE_ID-->
 <!--802731-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802731 FIELDLENGTH-->
-<!--802731-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802731-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802731 ISKEY-->
 <!--802731-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802731 ISPARENT-->
@@ -433220,7 +433155,7 @@
 <!--802748 AD_REFERENCE_ID-->
 <!--802748-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802748 FIELDLENGTH-->
-<!--802748-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802748-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802748 ISKEY-->
 <!--802748-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802748 ISPARENT-->
@@ -434152,7 +434087,7 @@
 <!--802762 AD_REFERENCE_ID-->
 <!--802762-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802762 FIELDLENGTH-->
-<!--802762-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802762-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802762 ISKEY-->
 <!--802762-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802762 ISPARENT-->
@@ -437750,7 +437685,7 @@
 <!--802833 AD_REFERENCE_ID-->
 <!--802833-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802833 FIELDLENGTH-->
-<!--802833-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802833-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802833 ISKEY-->
 <!--802833-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802833 ISPARENT-->
@@ -438546,7 +438481,7 @@
 <!--802845 AD_REFERENCE_ID-->
 <!--802845-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802845 FIELDLENGTH-->
-<!--802845-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802845-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802845 ISKEY-->
 <!--802845-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802845 ISPARENT-->
@@ -440802,7 +440737,7 @@
 <!--802880 AD_REFERENCE_ID-->
 <!--802880-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802880 FIELDLENGTH-->
-<!--802880-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802880-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802880 ISKEY-->
 <!--802880-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802880 ISPARENT-->
@@ -441371,69 +441306,6 @@
 <!--802888-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--802888**************--></AD_COLUMN>
 
-<!--802890**************--><AD_COLUMN>
-<!--802890 AD_COLUMN_ID-->
-<!--802890-->              <AD_COLUMN_ID><![CDATA[802890]]></AD_COLUMN_ID>
-<!--802890 AD_CLIENT_ID-->
-<!--802890-->              <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--802890 AD_ORG_ID-->
-<!--802890-->              <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--802890 ISACTIVE-->
-<!--802890-->              <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--802890 CREATED-->
-<!--802890-->              <CREATED><![CDATA[2006-06-06 17:19:38.0]]></CREATED>
-<!--802890 UPDATED-->
-<!--802890-->              <UPDATED><![CDATA[2008-04-04 09:44:23.0]]></UPDATED>
-<!--802890 CREATEDBY-->
-<!--802890-->              <CREATEDBY><![CDATA[0]]></CREATEDBY>
-<!--802890 UPDATEDBY-->
-<!--802890-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
-<!--802890 NAME-->
-<!--802890-->              <NAME><![CDATA[Account Identification]]></NAME>
-<!--802890 HELP-->
-<!--802890-->              <HELP><![CDATA[The identifier for the account. This identifier is the result of all the columns that are marked as isidentifier]]></HELP>
-<!--802890 COLUMNNAME-->
-<!--802890-->              <COLUMNNAME><![CDATA[AccountIDIdent]]></COLUMNNAME>
-<!--802890 AD_TABLE_ID-->
-<!--802890-->              <AD_TABLE_ID><![CDATA[800175]]></AD_TABLE_ID>
-<!--802890 AD_REFERENCE_ID-->
-<!--802890-->              <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
-<!--802890 FIELDLENGTH-->
-<!--802890-->              <FIELDLENGTH><![CDATA[100]]></FIELDLENGTH>
-<!--802890 ISKEY-->
-<!--802890-->              <ISKEY><![CDATA[N]]></ISKEY>
-<!--802890 ISPARENT-->
-<!--802890-->              <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--802890 ISMANDATORY-->
-<!--802890-->              <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--802890 ISUPDATEABLE-->
-<!--802890-->              <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--802890 ISIDENTIFIER-->
-<!--802890-->              <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--802890 SEQNO-->
-<!--802890-->              <SEQNO><![CDATA[110]]></SEQNO>
-<!--802890 ISTRANSLATED-->
-<!--802890-->              <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--802890 ISENCRYPTED-->
-<!--802890-->              <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--802890 ISSELECTIONCOLUMN-->
-<!--802890-->              <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--802890 AD_ELEMENT_ID-->
-<!--802890-->              <AD_ELEMENT_ID><![CDATA[800623]]></AD_ELEMENT_ID>
-<!--802890 ISSYNCDATABASE-->
-<!--802890-->              <ISSYNCDATABASE><![CDATA[N]]></ISSYNCDATABASE>
-<!--802890 ISSESSIONATTR-->
-<!--802890-->              <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--802890 ISSECONDARYKEY-->
-<!--802890-->              <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--802890 ISDESENCRYPTABLE-->
-<!--802890-->              <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--802890 DEVELOPMENTSTATUS-->
-<!--802890-->              <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--802890 AD_MODULE_ID-->
-<!--802890-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--802890**************--></AD_COLUMN>
-
 <!--802891**************--><AD_COLUMN>
 <!--802891 AD_COLUMN_ID-->
 <!--802891-->              <AD_COLUMN_ID><![CDATA[802891]]></AD_COLUMN_ID>
@@ -443532,7 +443404,7 @@
 <!--802923 AD_REFERENCE_ID-->
 <!--802923-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802923 FIELDLENGTH-->
-<!--802923-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802923-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802923 ISKEY-->
 <!--802923-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802923 ISPARENT-->
@@ -444998,7 +444870,7 @@
 <!--802952 AD_REFERENCE_ID-->
 <!--802952-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802952 FIELDLENGTH-->
-<!--802952-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802952-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802952 ISKEY-->
 <!--802952-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802952 ISPARENT-->
@@ -447191,7 +447063,7 @@
 <!--802987 AD_REFERENCE_ID-->
 <!--802987-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802987 FIELDLENGTH-->
-<!--802987-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802987-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802987 ISKEY-->
 <!--802987-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802987 ISPARENT-->
@@ -447388,7 +447260,7 @@
 <!--802991 AD_REFERENCE_ID-->
 <!--802991-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--802991 FIELDLENGTH-->
-<!--802991-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--802991-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--802991 ISKEY-->
 <!--802991-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--802991 ISPARENT-->
@@ -448515,7 +448387,7 @@
 <!--803008 AD_REFERENCE_ID-->
 <!--803008-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803008 FIELDLENGTH-->
-<!--803008-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803008-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803008 ISKEY-->
 <!--803008-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803008 ISPARENT-->
@@ -449778,7 +449650,7 @@
 <!--803027 AD_REFERENCE_ID-->
 <!--803027-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803027 FIELDLENGTH-->
-<!--803027-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803027-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803027 ISKEY-->
 <!--803027-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803027 ISPARENT-->
@@ -450980,7 +450852,7 @@
 <!--803045 AD_REFERENCE_ID-->
 <!--803045-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803045 FIELDLENGTH-->
-<!--803045-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803045-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803045 ISKEY-->
 <!--803045-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803045 ISPARENT-->
@@ -451045,7 +450917,7 @@
 <!--803046 AD_REFERENCE_ID-->
 <!--803046-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803046 FIELDLENGTH-->
-<!--803046-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803046-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803046 ISKEY-->
 <!--803046-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803046 ISPARENT-->
@@ -451110,7 +450982,7 @@
 <!--803047 AD_REFERENCE_ID-->
 <!--803047-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803047 FIELDLENGTH-->
-<!--803047-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803047-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803047 ISKEY-->
 <!--803047-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803047 ISPARENT-->
@@ -451175,7 +451047,7 @@
 <!--803048 AD_REFERENCE_ID-->
 <!--803048-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803048 FIELDLENGTH-->
-<!--803048-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803048-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803048 ISKEY-->
 <!--803048-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803048 ISPARENT-->
@@ -452441,7 +452313,7 @@
 <!--803067 AD_REFERENCE_ID-->
 <!--803067-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803067 FIELDLENGTH-->
-<!--803067-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803067-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803067 ISKEY-->
 <!--803067-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803067 ISPARENT-->
@@ -453107,7 +452979,7 @@
 <!--803077 AD_REFERENCE_ID-->
 <!--803077-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803077 FIELDLENGTH-->
-<!--803077-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803077-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803077 ISKEY-->
 <!--803077-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803077 ISPARENT-->
@@ -453773,7 +453645,7 @@
 <!--803087 AD_REFERENCE_ID-->
 <!--803087-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803087 FIELDLENGTH-->
-<!--803087-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803087-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803087 ISKEY-->
 <!--803087-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803087 ISPARENT-->
@@ -455905,7 +455777,7 @@
 <!--803121 AD_REFERENCE_ID-->
 <!--803121-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803121 FIELDLENGTH-->
-<!--803121-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803121-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803121 ISKEY-->
 <!--803121-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803121 ISPARENT-->
@@ -456770,7 +456642,7 @@
 <!--803134 AD_REFERENCE_ID-->
 <!--803134-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803134 FIELDLENGTH-->
-<!--803134-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803134-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803134 ISKEY-->
 <!--803134-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803134 ISPARENT-->
@@ -457034,7 +456906,7 @@
 <!--803142 AD_REFERENCE_ID-->
 <!--803142-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803142 FIELDLENGTH-->
-<!--803142-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803142-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803142 ISKEY-->
 <!--803142-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803142 ISPARENT-->
@@ -457761,7 +457633,7 @@
 <!--803153 AD_REFERENCE_ID-->
 <!--803153-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803153 FIELDLENGTH-->
-<!--803153-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803153-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803153 ISKEY-->
 <!--803153-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803153 ISPARENT-->
@@ -458488,7 +458360,7 @@
 <!--803164 AD_REFERENCE_ID-->
 <!--803164-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803164 FIELDLENGTH-->
-<!--803164-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803164-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803164 ISKEY-->
 <!--803164-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803164 ISPARENT-->
@@ -459286,7 +459158,7 @@
 <!--803176 AD_REFERENCE_ID-->
 <!--803176-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803176 FIELDLENGTH-->
-<!--803176-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803176-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803176 ISKEY-->
 <!--803176-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803176 ISPARENT-->
@@ -460015,7 +459887,7 @@
 <!--803187 AD_REFERENCE_ID-->
 <!--803187-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803187 FIELDLENGTH-->
-<!--803187-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803187-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803187 ISKEY-->
 <!--803187-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803187 ISPARENT-->
@@ -461073,7 +460945,7 @@
 <!--803212 AD_REFERENCE_ID-->
 <!--803212-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803212 FIELDLENGTH-->
-<!--803212-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803212-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803212 ISKEY-->
 <!--803212-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803212 ISPARENT-->
@@ -461873,7 +461745,7 @@
 <!--803224 AD_REFERENCE_ID-->
 <!--803224-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803224 FIELDLENGTH-->
-<!--803224-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803224-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803224 ISKEY-->
 <!--803224-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803224 ISPARENT-->
@@ -463790,7 +463662,7 @@
 <!--803253 AD_REFERENCE_ID-->
 <!--803253-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803253 FIELDLENGTH-->
-<!--803253-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803253-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803253 ISKEY-->
 <!--803253-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803253 ISPARENT-->
@@ -464652,7 +464524,7 @@
 <!--803269 AD_REFERENCE_ID-->
 <!--803269-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803269 FIELDLENGTH-->
-<!--803269-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803269-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803269 ISKEY-->
 <!--803269-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803269 ISPARENT-->
@@ -465385,7 +465257,7 @@
 <!--803280 AD_REFERENCE_ID-->
 <!--803280-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803280 FIELDLENGTH-->
-<!--803280-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803280-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803280 ISKEY-->
 <!--803280-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803280 ISPARENT-->
@@ -466378,7 +466250,7 @@
 <!--803307 AD_REFERENCE_ID-->
 <!--803307-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803307 FIELDLENGTH-->
-<!--803307-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803307-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803307 ISKEY-->
 <!--803307-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803307 ISPARENT-->
@@ -467107,7 +466979,7 @@
 <!--803318 AD_REFERENCE_ID-->
 <!--803318-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803318 FIELDLENGTH-->
-<!--803318-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803318-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803318 ISKEY-->
 <!--803318-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803318 ISPARENT-->
@@ -467905,7 +467777,7 @@
 <!--803330 AD_REFERENCE_ID-->
 <!--803330-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803330 FIELDLENGTH-->
-<!--803330-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803330-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803330 ISKEY-->
 <!--803330-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803330 ISPARENT-->
@@ -468634,7 +468506,7 @@
 <!--803342 AD_REFERENCE_ID-->
 <!--803342-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803342 FIELDLENGTH-->
-<!--803342-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803342-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803342 ISKEY-->
 <!--803342-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803342 ISPARENT-->
@@ -469298,7 +469170,7 @@
 <!--803352 AD_REFERENCE_ID-->
 <!--803352-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803352 FIELDLENGTH-->
-<!--803352-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803352-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803352 ISKEY-->
 <!--803352-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803352 ISPARENT-->
@@ -473228,7 +473100,7 @@
 <!--803451 AD_REFERENCE_ID-->
 <!--803451-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803451 FIELDLENGTH-->
-<!--803451-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803451-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803451 ISKEY-->
 <!--803451-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803451 ISPARENT-->
@@ -473894,7 +473766,7 @@
 <!--803461 AD_REFERENCE_ID-->
 <!--803461-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803461 FIELDLENGTH-->
-<!--803461-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803461-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803461 ISKEY-->
 <!--803461-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803461 ISPARENT-->
@@ -474621,7 +474493,7 @@
 <!--803472 AD_REFERENCE_ID-->
 <!--803472-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803472 FIELDLENGTH-->
-<!--803472-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803472-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803472 ISKEY-->
 <!--803472-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803472 ISPARENT-->
@@ -475348,7 +475220,7 @@
 <!--803483 AD_REFERENCE_ID-->
 <!--803483-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803483 FIELDLENGTH-->
-<!--803483-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803483-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803483 ISKEY-->
 <!--803483-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803483 ISPARENT-->
@@ -476077,7 +475949,7 @@
 <!--803494 AD_REFERENCE_ID-->
 <!--803494-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803494 FIELDLENGTH-->
-<!--803494-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803494-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803494 ISKEY-->
 <!--803494-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803494 ISPARENT-->
@@ -476873,7 +476745,7 @@
 <!--803506 AD_REFERENCE_ID-->
 <!--803506-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803506 FIELDLENGTH-->
-<!--803506-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803506-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803506 ISKEY-->
 <!--803506-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803506 ISPARENT-->
@@ -477606,7 +477478,7 @@
 <!--803517 AD_REFERENCE_ID-->
 <!--803517-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803517 FIELDLENGTH-->
-<!--803517-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803517-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803517 ISKEY-->
 <!--803517-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803517 ISPARENT-->
@@ -478402,7 +478274,7 @@
 <!--803529 AD_REFERENCE_ID-->
 <!--803529-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803529 FIELDLENGTH-->
-<!--803529-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803529-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803529 ISKEY-->
 <!--803529-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803529 ISPARENT-->
@@ -479270,7 +479142,7 @@
 <!--803542 AD_REFERENCE_ID-->
 <!--803542-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803542 FIELDLENGTH-->
-<!--803542-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803542-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803542 ISKEY-->
 <!--803542-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803542 ISPARENT-->
@@ -480135,7 +480007,7 @@
 <!--803559 AD_REFERENCE_ID-->
 <!--803559-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803559 FIELDLENGTH-->
-<!--803559-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803559-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803559 ISKEY-->
 <!--803559-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803559 ISPARENT-->
@@ -480801,7 +480673,7 @@
 <!--803569 AD_REFERENCE_ID-->
 <!--803569-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803569 FIELDLENGTH-->
-<!--803569-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803569-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803569 ISKEY-->
 <!--803569-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803569 ISPARENT-->
@@ -481727,7 +481599,7 @@
 <!--803601 AD_REFERENCE_ID-->
 <!--803601-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803601 FIELDLENGTH-->
-<!--803601-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803601-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803601 ISKEY-->
 <!--803601-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803601 ISPARENT-->
@@ -483183,7 +483055,7 @@
 <!--803623 AD_REFERENCE_ID-->
 <!--803623-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803623 FIELDLENGTH-->
-<!--803623-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803623-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803623 ISKEY-->
 <!--803623-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803623 ISPARENT-->
@@ -484499,7 +484371,7 @@
 <!--803644 AD_REFERENCE_ID-->
 <!--803644-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803644 FIELDLENGTH-->
-<!--803644-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803644-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803644 ISKEY-->
 <!--803644-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803644 ISPARENT-->
@@ -485888,7 +485760,7 @@
 <!--803666 AD_REFERENCE_ID-->
 <!--803666-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803666 FIELDLENGTH-->
-<!--803666-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803666-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803666 ISKEY-->
 <!--803666-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803666 ISPARENT-->
@@ -488884,7 +488756,7 @@
 <!--803714 AD_TABLE_ID-->
 <!--803714-->              <AD_TABLE_ID><![CDATA[164]]></AD_TABLE_ID>
 <!--803714 AD_REFERENCE_ID-->
-<!--803714-->              <AD_REFERENCE_ID><![CDATA[19]]></AD_REFERENCE_ID>
+<!--803714-->              <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
 <!--803714 FIELDLENGTH-->
 <!--803714-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
 <!--803714 ISKEY-->
@@ -489014,7 +488886,7 @@
 <!--803716 AD_REFERENCE_ID-->
 <!--803716-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803716 FIELDLENGTH-->
-<!--803716-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803716-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803716 ISKEY-->
 <!--803716-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803716 ISPARENT-->
@@ -491655,7 +491527,7 @@
 <!--803759 AD_REFERENCE_ID-->
 <!--803759-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803759 FIELDLENGTH-->
-<!--803759-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803759-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803759 ISKEY-->
 <!--803759-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803759 ISPARENT-->
@@ -491720,7 +491592,7 @@
 <!--803760 AD_REFERENCE_ID-->
 <!--803760-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803760 FIELDLENGTH-->
-<!--803760-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803760-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803760 ISKEY-->
 <!--803760-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803760 ISPARENT-->
@@ -492384,7 +492256,7 @@
 <!--803770 AD_REFERENCE_ID-->
 <!--803770-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803770 FIELDLENGTH-->
-<!--803770-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803770-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803770 ISKEY-->
 <!--803770-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803770 ISPARENT-->
@@ -493251,7 +493123,7 @@
 <!--803783 AD_REFERENCE_ID-->
 <!--803783-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803783 FIELDLENGTH-->
-<!--803783-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803783-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803783 ISKEY-->
 <!--803783-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803783 ISPARENT-->
@@ -494047,7 +493919,7 @@
 <!--803795 AD_REFERENCE_ID-->
 <!--803795-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803795 FIELDLENGTH-->
-<!--803795-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803795-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803795 ISKEY-->
 <!--803795-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803795 ISPARENT-->
@@ -495111,7 +494983,7 @@
 <!--803811 AD_REFERENCE_ID-->
 <!--803811-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803811 FIELDLENGTH-->
-<!--803811-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803811-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803811 ISKEY-->
 <!--803811-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803811 ISPARENT-->
@@ -495846,7 +495718,7 @@
 <!--803823 AD_REFERENCE_ID-->
 <!--803823-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803823 FIELDLENGTH-->
-<!--803823-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--803823-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803823 ISKEY-->
 <!--803823-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803823 ISPARENT-->
@@ -497505,7 +497377,7 @@
 <!--803849 AD_REFERENCE_ID-->
 <!--803849-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--803849 FIELDLENGTH-->
-<!--803849-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
+<!--803849-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--803849 ISKEY-->
 <!--803849-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--803849 ISPARENT-->
@@ -500584,7 +500456,7 @@
 <!--1000600012 AD_REFERENCE_ID-->
 <!--1000600012-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1000600012 FIELDLENGTH-->
-<!--1000600012-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--1000600012-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1000600012 ISKEY-->
 <!--1000600012-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1000600012 ISPARENT-->
@@ -503204,7 +503076,7 @@
 <!--1002100025 AD_REFERENCE_ID-->
 <!--1002100025-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1002100025 FIELDLENGTH-->
-<!--1002100025-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--1002100025-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1002100025 ISKEY-->
 <!--1002100025-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1002100025 ISPARENT-->
@@ -504747,7 +504619,7 @@
 <!--1002100065 AD_REFERENCE_ID-->
 <!--1002100065-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1002100065 FIELDLENGTH-->
-<!--1002100065-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--1002100065-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1002100065 ISKEY-->
 <!--1002100065-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1002100065 ISPARENT-->
@@ -505807,7 +505679,7 @@
 <!--1002100082 AD_REFERENCE_ID-->
 <!--1002100082-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1002100082 FIELDLENGTH-->
-<!--1002100082-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--1002100082-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1002100082 ISKEY-->
 <!--1002100082-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1002100082 ISPARENT-->
@@ -506733,7 +506605,7 @@
 <!--1002100096 AD_REFERENCE_ID-->
 <!--1002100096-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1002100096 FIELDLENGTH-->
-<!--1002100096-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--1002100096-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1002100096 ISKEY-->
 <!--1002100096-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1002100096 ISPARENT-->
@@ -507192,7 +507064,7 @@
 <!--1002100104 AD_REFERENCE_ID-->
 <!--1002100104-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1002100104 FIELDLENGTH-->
-<!--1002100104-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--1002100104-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1002100104 ISKEY-->
 <!--1002100104-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1002100104 ISPARENT-->
@@ -507711,6 +507583,8 @@
 <!--1002100112-->              <AD_TABLE_ID><![CDATA[1002100002]]></AD_TABLE_ID>
 <!--1002100112 AD_REFERENCE_ID-->
 <!--1002100112-->              <AD_REFERENCE_ID><![CDATA[28]]></AD_REFERENCE_ID>
+<!--1002100112 FIELDLENGTH-->
+<!--1002100112-->              <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
 <!--1002100112 ISKEY-->
 <!--1002100112-->              <ISKEY><![CDATA[N]]></ISKEY>
 <!--1002100112 ISPARENT-->
@@ -508908,7 +508782,7 @@
 <!--1004400006 AD_REFERENCE_ID-->
 <!--1004400006-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1004400006 FIELDLENGTH-->
-<!--1004400006-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--1004400006-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1004400006 ISKEY-->
 <!--1004400006-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1004400006 ISPARENT-->
@@ -511289,7 +511163,7 @@
 <!--1005100000 AD_REFERENCE_ID-->
 <!--1005100000-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1005100000 FIELDLENGTH-->
-<!--1005100000-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--1005100000-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1005100000 ISKEY-->
 <!--1005100000-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1005100000 ISPARENT-->
@@ -512018,7 +511892,7 @@
 <!--1005400215 AD_REFERENCE_ID-->
 <!--1005400215-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1005400215 FIELDLENGTH-->
-<!--1005400215-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--1005400215-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1005400215 ISKEY-->
 <!--1005400215-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1005400215 ISPARENT-->
@@ -513472,7 +513346,7 @@
 <!--1005400237 AD_REFERENCE_ID-->
 <!--1005400237-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1005400237 FIELDLENGTH-->
-<!--1005400237-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--1005400237-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1005400237 ISKEY-->
 <!--1005400237-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1005400237 ISPARENT-->
@@ -515306,7 +515180,7 @@
 <!--1005400265 AD_REFERENCE_ID-->
 <!--1005400265-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
 <!--1005400265 FIELDLENGTH-->
-<!--1005400265-->              <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
+<!--1005400265-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
 <!--1005400265 ISKEY-->
 <!--1005400265-->              <ISKEY><![CDATA[Y]]></ISKEY>
 <!--1005400265 ISPARENT-->
@@ -516277,71 +516151,6 @@
 <!--1005400283-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--1005400283**************--></AD_COLUMN>
 
-<!--1005400284**************--><AD_COLUMN>
-<!--1005400284 AD_COLUMN_ID-->
-<!--1005400284-->              <AD_COLUMN_ID><![CDATA[1005400284]]></AD_COLUMN_ID>
-<!--1005400284 AD_CLIENT_ID-->
-<!--1005400284-->              <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--1005400284 AD_ORG_ID-->
-<!--1005400284-->              <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--1005400284 ISACTIVE-->
-<!--1005400284-->              <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1005400284 CREATED-->
-<!--1005400284-->              <CREATED><![CDATA[2008-04-07 18:05:19.0]]></CREATED>
-<!--1005400284 UPDATED-->
-<!--1005400284-->              <UPDATED><![CDATA[2008-04-07 18:17:35.0]]></UPDATED>
-<!--1005400284 CREATEDBY-->
-<!--1005400284-->              <CREATEDBY><![CDATA[0]]></CREATEDBY>
-<!--1005400284 UPDATEDBY-->
-<!--1005400284-->              <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-<!--1005400284 NAME-->
-<!--1005400284-->              <NAME><![CDATA[Yearly Revenue]]></NAME>
-<!--1005400284 DESCRIPTION-->
-<!--1005400284-->              <DESCRIPTION><![CDATA[The amount of revenue the company earns per annum.]]></DESCRIPTION>
-<!--1005400284 HELP-->
-<!--1005400284-->              <HELP><![CDATA[The amount of revenue the company earns per annum.]]></HELP>
-<!--1005400284 COLUMNNAME-->
-<!--1005400284-->              <COLUMNNAME><![CDATA[Companyrevenue]]></COLUMNNAME>
-<!--1005400284 AD_TABLE_ID-->
-<!--1005400284-->              <AD_TABLE_ID><![CDATA[1005400007]]></AD_TABLE_ID>
-<!--1005400284 AD_REFERENCE_ID-->
-<!--1005400284-->              <AD_REFERENCE_ID><![CDATA[10]]></AD_REFERENCE_ID>
-<!--1005400284 FIELDLENGTH-->
-<!--1005400284-->              <FIELDLENGTH><![CDATA[10]]></FIELDLENGTH>
-<!--1005400284 ISKEY-->
-<!--1005400284-->              <ISKEY><![CDATA[N]]></ISKEY>
-<!--1005400284 ISPARENT-->
-<!--1005400284-->              <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--1005400284 ISMANDATORY-->
-<!--1005400284-->              <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--1005400284 ISUPDATEABLE-->
-<!--1005400284-->              <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--1005400284 ISIDENTIFIER-->
-<!--1005400284-->              <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--1005400284 SEQNO-->
-<!--1005400284-->              <SEQNO><![CDATA[200]]></SEQNO>
-<!--1005400284 ISTRANSLATED-->
-<!--1005400284-->              <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--1005400284 ISENCRYPTED-->
-<!--1005400284-->              <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--1005400284 ISSELECTIONCOLUMN-->
-<!--1005400284-->              <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--1005400284 AD_ELEMENT_ID-->
-<!--1005400284-->              <AD_ELEMENT_ID><![CDATA[1005400027]]></AD_ELEMENT_ID>
-<!--1005400284 ISSYNCDATABASE-->
-<!--1005400284-->              <ISSYNCDATABASE><![CDATA[N]]></ISSYNCDATABASE>
-<!--1005400284 ISSESSIONATTR-->
-<!--1005400284-->              <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--1005400284 ISSECONDARYKEY-->
-<!--1005400284-->              <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--1005400284 ISDESENCRYPTABLE-->
-<!--1005400284-->              <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--1005400284 DEVELOPMENTSTATUS-->
-<!--1005400284-->              <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--1005400284 AD_MODULE_ID-->
-<!--1005400284-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--1005400284**************--></AD_COLUMN>
-
 <!--1005400285**************--><AD_COLUMN>
 <!--1005400285 AD_COLUMN_ID-->
 <!--1005400285-->              <AD_COLUMN_ID><![CDATA[1005400285]]></AD_COLUMN_ID>
@@ -525350,4 +525159,63 @@
 <!--569E7164AA3DAC7FE040007F01003003-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--569E7164AA3DAC7FE040007F01003003**************--></AD_COLUMN>
 
+<!--6217AF039B3F49558724CB01D01B59F5**************--><AD_COLUMN>
+<!--6217AF039B3F49558724CB01D01B59F5 AD_COLUMN_ID-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <AD_COLUMN_ID><![CDATA[6217AF039B3F49558724CB01D01B59F5]]></AD_COLUMN_ID>
+<!--6217AF039B3F49558724CB01D01B59F5 AD_CLIENT_ID-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6217AF039B3F49558724CB01D01B59F5 AD_ORG_ID-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6217AF039B3F49558724CB01D01B59F5 ISACTIVE-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6217AF039B3F49558724CB01D01B59F5 CREATED-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <CREATED><![CDATA[2008-08-01 13:29:51.0]]></CREATED>
+<!--6217AF039B3F49558724CB01D01B59F5 UPDATED-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <UPDATED><![CDATA[2008-08-01 13:29:51.0]]></UPDATED>
+<!--6217AF039B3F49558724CB01D01B59F5 CREATEDBY-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <CREATEDBY><![CDATA[100]]></CREATEDBY>
+<!--6217AF039B3F49558724CB01D01B59F5 UPDATEDBY-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+<!--6217AF039B3F49558724CB01D01B59F5 NAME-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <NAME><![CDATA[R_ContactInterest_ID]]></NAME>
+<!--6217AF039B3F49558724CB01D01B59F5 COLUMNNAME-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <COLUMNNAME><![CDATA[R_ContactInterest_ID]]></COLUMNNAME>
+<!--6217AF039B3F49558724CB01D01B59F5 AD_TABLE_ID-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <AD_TABLE_ID><![CDATA[528]]></AD_TABLE_ID>
+<!--6217AF039B3F49558724CB01D01B59F5 AD_REFERENCE_ID-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <AD_REFERENCE_ID><![CDATA[13]]></AD_REFERENCE_ID>
+<!--6217AF039B3F49558724CB01D01B59F5 FIELDLENGTH-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <FIELDLENGTH><![CDATA[32]]></FIELDLENGTH>
+<!--6217AF039B3F49558724CB01D01B59F5 ISKEY-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <ISKEY><![CDATA[Y]]></ISKEY>
+<!--6217AF039B3F49558724CB01D01B59F5 ISPARENT-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--6217AF039B3F49558724CB01D01B59F5 ISMANDATORY-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--6217AF039B3F49558724CB01D01B59F5 ISUPDATEABLE-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--6217AF039B3F49558724CB01D01B59F5 ISIDENTIFIER-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--6217AF039B3F49558724CB01D01B59F5 SEQNO-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <SEQNO><![CDATA[12]]></SEQNO>
+<!--6217AF039B3F49558724CB01D01B59F5 ISTRANSLATED-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--6217AF039B3F49558724CB01D01B59F5 ISENCRYPTED-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6217AF039B3F49558724CB01D01B59F5 ISSELECTIONCOLUMN-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--6217AF039B3F49558724CB01D01B59F5 ISSYNCDATABASE-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <ISSYNCDATABASE><![CDATA[N]]></ISSYNCDATABASE>
+<!--6217AF039B3F49558724CB01D01B59F5 ISSESSIONATTR-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--6217AF039B3F49558724CB01D01B59F5 ISSECONDARYKEY-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--6217AF039B3F49558724CB01D01B59F5 ISDESENCRYPTABLE-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--6217AF039B3F49558724CB01D01B59F5 DEVELOPMENTSTATUS-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--6217AF039B3F49558724CB01D01B59F5 AD_MODULE_ID-->
+<!--6217AF039B3F49558724CB01D01B59F5-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6217AF039B3F49558724CB01D01B59F5**************--></AD_COLUMN>
+
 </data>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Wed Oct 01 12:34:44 2008 +0000
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Wed Oct 01 12:57:20 2008 +0000
@@ -168974,57 +168974,6 @@
 <!--6184-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6184**************--></AD_FIELD>
 
-<!--6185**************--><AD_FIELD>
-<!--6185 AD_FIELD_ID-->
-<!--6185-->              <AD_FIELD_ID><![CDATA[6185]]></AD_FIELD_ID>
-<!--6185 AD_CLIENT_ID-->
-<!--6185-->              <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--6185 AD_ORG_ID-->
-<!--6185-->              <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--6185 ISACTIVE-->
-<!--6185-->              <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6185 CREATED-->
-<!--6185-->              <CREATED><![CDATA[2003-01-23 01:17:11.0]]></CREATED>
-<!--6185 CREATEDBY-->
-<!--6185-->              <CREATEDBY><![CDATA[0]]></CREATEDBY>
-<!--6185 UPDATED-->
-<!--6185-->              <UPDATED><![CDATA[2003-02-09 14:26:33.0]]></UPDATED>
-<!--6185 UPDATEDBY-->
-<!--6185-->              <UPDATEDBY><![CDATA[0]]></UPDATEDBY>
-<!--6185 NAME-->
-<!--6185-->              <NAME><![CDATA[Owned]]></NAME>
-<!--6185 DESCRIPTION-->
-<!--6185-->              <DESCRIPTION><![CDATA[The asset is owned by the organization]]></DESCRIPTION>
-<!--6185 HELP-->
-<!--6185-->              <HELP><![CDATA[The asset may not be in possession, but the asset is legally owned by the organization]]></HELP>
-<!--6185 ISCENTRALLYMAINTAINED-->
-<!--6185-->              <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--6185 AD_TAB_ID-->
-<!--6185-->              <AD_TAB_ID><![CDATA[452]]></AD_TAB_ID>
-<!--6185 AD_COLUMN_ID-->
-<!--6185-->              <AD_COLUMN_ID><![CDATA[8108]]></AD_COLUMN_ID>
-<!--6185 ISDISPLAYED-->
-<!--6185-->              <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--6185 DISPLAYLENGTH-->
-<!--6185-->              <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
-<!--6185 ISREADONLY-->
-<!--6185-->              <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--6185 SEQNO-->
-<!--6185-->              <SEQNO><![CDATA[70]]></SEQNO>
-<!--6185 ISSAMELINE-->
-<!--6185-->              <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--6185 ISFIELDONLY-->
-<!--6185-->              <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--6185 ISENCRYPTED-->
-<!--6185-->              <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6185 SHOWINRELATION-->
-<!--6185-->              <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
-<!--6185 ISFIRSTFOCUSEDFIELD-->
-<!--6185-->              <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--6185 AD_MODULE_ID-->
-<!--6185-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6185**************--></AD_FIELD>
-
 <!--6186**************--><AD_FIELD>
 <!--6186 AD_FIELD_ID-->
 <!--6186-->              <AD_FIELD_ID><![CDATA[6186]]></AD_FIELD_ID>
@@ -405765,4 +405714,98 @@
 <!--569E7164AA3BAC7FE040007F01003003-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--569E7164AA3BAC7FE040007F01003003**************--></AD_FIELD>
 
+<!--6A93D7E4DEE246488ED145DB1C3D99BC**************--><AD_FIELD>
+<!--6A93D7E4DEE246488ED145DB1C3D99BC AD_FIELD_ID-->
+<!--6A93D7E4DEE246488ED145DB1C3D99BC-->              <AD_FIELD_ID><![CDATA[6A93D7E4DEE246488ED145DB1C3D99BC]]></AD_FIELD_ID>
+<!--6A93D7E4DEE246488ED145DB1C3D99BC AD_CLIENT_ID-->
+<!--6A93D7E4DEE246488ED145DB1C3D99BC-->              <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6A93D7E4DEE246488ED145DB1C3D99BC AD_ORG_ID-->
+<!--6A93D7E4DEE246488ED145DB1C3D99BC-->              <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6A93D7E4DEE246488ED145DB1C3D99BC ISACTIVE-->
+<!--6A93D7E4DEE246488ED145DB1C3D99BC-->              <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6A93D7E4DEE246488ED145DB1C3D99BC CREATED-->
+<!--6A93D7E4DEE246488ED145DB1C3D99BC-->              <CREATED><![CDATA[2008-08-05 16:18:08.0]]></CREATED>
+<!--6A93D7E4DEE246488ED145DB1C3D99BC CREATEDBY-->
+<!--6A93D7E4DEE246488ED145DB1C3D99BC-->              <CREATEDBY><![CDATA[100]]></CREATEDBY>
+<!--6A93D7E4DEE246488ED145DB1C3D99BC UPDATED-->
+<!--6A93D7E4DEE246488ED145DB1C3D99BC-->              <UPDATED><![CDATA[2008-08-05 16:18:28.0]]></UPDATED>
+<!--6A93D7E4DEE246488ED145DB1C3D99BC UPDATEDBY-->
+<!--6A93D7E4DEE246488ED145DB1C3D99BC-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+<!--6A93D7E4DEE246488ED145DB1C3D99BC NAME-->
+<!--6A93D7E4DEE246488ED145DB1C3D99BC-->              <NAME><![CDATA[Contact Interest ID]]></NAME>
+<!--6A93D7E4DEE246488ED145DB1C3D99BC ISCENTRALLYMAINTAINED-->
+<!--6A93D7E4DEE246488ED145DB1C3D99BC-->              <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--6A93D7E4DEE246488ED145DB1C3D99BC AD_TAB_ID-->
+<!--6A93D7E4DEE246488ED145DB1C3D99BC-->              <AD_TAB_ID><![CDATA[536]]></AD_TAB_ID>
+<!--6A93D7E4DEE246488ED145DB1C3D99BC AD_COLUMN_ID-->
+<!--6A93D7E4DEE246488ED145DB1C3D99BC-->              <AD_COLUMN_ID><![CDATA[6217AF039B3F49558724CB01D01B59F5]]></AD_COLUMN_ID>
+<!--6A93D7E4DEE246488ED145DB1C3D99BC ISDISPLAYED-->
+<!--6A93D7E4DEE246488ED145DB1C3D99BC-->              <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--6A93D7E4DEE246488ED145DB1C3D99BC DISPLAYLENGTH-->
+<!--6A93D7E4DEE246488ED145DB1C3D99BC-->              <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--6A93D7E4DEE246488ED145DB1C3D99BC ISREADONLY-->
+<!--6A93D7E4DEE246488ED145DB1C3D99BC-->              <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--6A93D7E4DEE246488ED145DB1C3D99BC SEQNO-->
+<!--6A93D7E4DEE246488ED145DB1C3D99BC-->              <SEQNO><![CDATA[80]]></SEQNO>
+<!--6A93D7E4DEE246488ED145DB1C3D99BC ISSAMELINE-->
+<!--6A93D7E4DEE246488ED145DB1C3D99BC-->              <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--6A93D7E4DEE246488ED145DB1C3D99BC ISFIELDONLY-->
+<!--6A93D7E4DEE246488ED145DB1C3D99BC-->              <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--6A93D7E4DEE246488ED145DB1C3D99BC ISENCRYPTED-->
+<!--6A93D7E4DEE246488ED145DB1C3D99BC-->              <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6A93D7E4DEE246488ED145DB1C3D99BC SHOWINRELATION-->
+<!--6A93D7E4DEE246488ED145DB1C3D99BC-->              <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--6A93D7E4DEE246488ED145DB1C3D99BC ISFIRSTFOCUSEDFIELD-->
+<!--6A93D7E4DEE246488ED145DB1C3D99BC-->              <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--6A93D7E4DEE246488ED145DB1C3D99BC AD_MODULE_ID-->
+<!--6A93D7E4DEE246488ED145DB1C3D99BC-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6A93D7E4DEE246488ED145DB1C3D99BC**************--></AD_FIELD>
+
+<!--EDEC7EAAD2854230B4A332DF18F38CF2**************--><AD_FIELD>
+<!--EDEC7EAAD2854230B4A332DF18F38CF2 AD_FIELD_ID-->
+<!--EDEC7EAAD2854230B4A332DF18F38CF2-->              <AD_FIELD_ID><![CDATA[EDEC7EAAD2854230B4A332DF18F38CF2]]></AD_FIELD_ID>
+<!--EDEC7EAAD2854230B4A332DF18F38CF2 AD_CLIENT_ID-->
+<!--EDEC7EAAD2854230B4A332DF18F38CF2-->              <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--EDEC7EAAD2854230B4A332DF18F38CF2 AD_ORG_ID-->
+<!--EDEC7EAAD2854230B4A332DF18F38CF2-->              <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--EDEC7EAAD2854230B4A332DF18F38CF2 ISACTIVE-->
+<!--EDEC7EAAD2854230B4A332DF18F38CF2-->              <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--EDEC7EAAD2854230B4A332DF18F38CF2 CREATED-->
+<!--EDEC7EAAD2854230B4A332DF18F38CF2-->              <CREATED><![CDATA[2008-09-19 11:20:35.0]]></CREATED>
+<!--EDEC7EAAD2854230B4A332DF18F38CF2 CREATEDBY-->
+<!--EDEC7EAAD2854230B4A332DF18F38CF2-->              <CREATEDBY><![CDATA[100]]></CREATEDBY>
+<!--EDEC7EAAD2854230B4A332DF18F38CF2 UPDATED-->
+<!--EDEC7EAAD2854230B4A332DF18F38CF2-->              <UPDATED><![CDATA[2008-09-19 11:21:04.0]]></UPDATED>
+<!--EDEC7EAAD2854230B4A332DF18F38CF2 UPDATEDBY-->
+<!--EDEC7EAAD2854230B4A332DF18F38CF2-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
+<!--EDEC7EAAD2854230B4A332DF18F38CF2 NAME-->
+<!--EDEC7EAAD2854230B4A332DF18F38CF2-->              <NAME><![CDATA[R_ContactInterest_ID]]></NAME>
+<!--EDEC7EAAD2854230B4A332DF18F38CF2 ISCENTRALLYMAINTAINED-->
+<!--EDEC7EAAD2854230B4A332DF18F38CF2-->              <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--EDEC7EAAD2854230B4A332DF18F38CF2 AD_TAB_ID-->
+<!--EDEC7EAAD2854230B4A332DF18F38CF2-->              <AD_TAB_ID><![CDATA[439]]></AD_TAB_ID>
+<!--EDEC7EAAD2854230B4A332DF18F38CF2 AD_COLUMN_ID-->
+<!--EDEC7EAAD2854230B4A332DF18F38CF2-->              <AD_COLUMN_ID><![CDATA[6217AF039B3F49558724CB01D01B59F5]]></AD_COLUMN_ID>
+<!--EDEC7EAAD2854230B4A332DF18F38CF2 ISDISPLAYED-->
+<!--EDEC7EAAD2854230B4A332DF18F38CF2-->              <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--EDEC7EAAD2854230B4A332DF18F38CF2 DISPLAYLENGTH-->
+<!--EDEC7EAAD2854230B4A332DF18F38CF2-->              <DISPLAYLENGTH><![CDATA[0]]></DISPLAYLENGTH>
+<!--EDEC7EAAD2854230B4A332DF18F38CF2 ISREADONLY-->
+<!--EDEC7EAAD2854230B4A332DF18F38CF2-->              <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--EDEC7EAAD2854230B4A332DF18F38CF2 SEQNO-->
+<!--EDEC7EAAD2854230B4A332DF18F38CF2-->              <SEQNO><![CDATA[80]]></SEQNO>
+<!--EDEC7EAAD2854230B4A332DF18F38CF2 ISSAMELINE-->
+<!--EDEC7EAAD2854230B4A332DF18F38CF2-->              <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--EDEC7EAAD2854230B4A332DF18F38CF2 ISFIELDONLY-->
+<!--EDEC7EAAD2854230B4A332DF18F38CF2-->              <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--EDEC7EAAD2854230B4A332DF18F38CF2 ISENCRYPTED-->
+<!--EDEC7EAAD2854230B4A332DF18F38CF2-->              <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--EDEC7EAAD2854230B4A332DF18F38CF2 SHOWINRELATION-->
+<!--EDEC7EAAD2854230B4A332DF18F38CF2-->              <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--EDEC7EAAD2854230B4A332DF18F38CF2 ISFIRSTFOCUSEDFIELD-->
+<!--EDEC7EAAD2854230B4A332DF18F38CF2-->              <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--EDEC7EAAD2854230B4A332DF18F38CF2 AD_MODULE_ID-->
+<!--EDEC7EAAD2854230B4A332DF18F38CF2-->              <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--EDEC7EAAD2854230B4A332DF18F38CF2**************--></AD_FIELD>
+
 </data>
--- a/src-db/database/sourcedata/AD_REF_SEARCH.xml	Wed Oct 01 12:34:44 2008 +0000
+++ b/src-db/database/sourcedata/AD_REF_SEARCH.xml	Wed Oct 01 12:57:20 2008 +0000
@@ -200,31 +200,6 @@
 <!--800007-->              <AD_COLUMN_ID><![CDATA[3529]]></AD_COLUMN_ID>
 <!--800007**************--></AD_REF_SEARCH>
 
-<!--800008**************--><AD_REF_SEARCH>
-<!--800008 AD_REF_SEARCH_ID-->
-<!--800008-->              <AD_REF_SEARCH_ID><![CDATA[800008]]></AD_REF_SEARCH_ID>
-<!--800008 AD_CLIENT_ID-->
-<!--800008-->              <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--800008 AD_ORG_ID-->
-<!--800008-->              <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--800008 ISACTIVE-->
-<!--800008-->              <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--800008 CREATED-->
-<!--800008-->              <CREATED><![CDATA[2006-12-21 13:46:52.0]]></CREATED>
-<!--800008 CREATEDBY-->
-<!--800008-->              <CREATEDBY><![CDATA[100]]></CREATEDBY>
-<!--800008 UPDATED-->
-<!--800008-->              <UPDATED><![CDATA[2006-12-21 13:46:52.0]]></UPDATED>
-<!--800008 UPDATEDBY-->
-<!--800008-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
-<!--800008 AD_REFERENCE_ID-->
-<!--800008-->              <AD_REFERENCE_ID><![CDATA[800094]]></AD_REFERENCE_ID>
-<!--800008 AD_TABLE_ID-->
-<!--800008-->              <AD_TABLE_ID><![CDATA[800019]]></AD_TABLE_ID>
-<!--800008 AD_COLUMN_ID-->
-<!--800008-->              <AD_COLUMN_ID><![CDATA[800325]]></AD_COLUMN_ID>
-<!--800008**************--></AD_REF_SEARCH>
-
 <!--800009**************--><AD_REF_SEARCH>
 <!--800009 AD_REF_SEARCH_ID-->
 <!--800009-->              <AD_REF_SEARCH_ID><![CDATA[800009]]></AD_REF_SEARCH_ID>
--- a/src-db/database/sourcedata/AD_TAB.xml	Wed Oct 01 12:34:44 2008 +0000
+++ b/src-db/database/sourcedata/AD_TAB.xml	Wed Oct 01 12:57:20 2008 +0000
@@ -11219,7 +11219,7 @@
 <!--439 CREATEDBY-->
 <!--439-->              <CREATEDBY><![CDATA[100]]></CREATEDBY>
 <!--439 UPDATED-->
-<!--439-->              <UPDATED><![CDATA[2008-08-08 00:56:02.0]]></UPDATED>
+<!--439-->              <UPDATED><![CDATA[2008-09-19 11:08:17.0]]></UPDATED>
 <!--439 UPDATEDBY-->
 <!--439-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
 <!--439 NAME-->
@@ -11244,8 +11244,6 @@
 <!--439-->              <ISTRANSLATIONTAB><![CDATA[N]]></ISTRANSLATIONTAB>
 <!--439 ISREADONLY-->
 <!--439-->              <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--439 AD_COLUMN_ID-->
-<!--439-->              <AD_COLUMN_ID><![CDATA[7768]]></AD_COLUMN_ID>
 <!--439 HASTREE-->
 <!--439-->              <HASTREE><![CDATA[N]]></HASTREE>
 <!--439 PROCESSING-->
@@ -14480,7 +14478,7 @@
 <!--536 CREATEDBY-->
 <!--536-->              <CREATEDBY><![CDATA[100]]></CREATEDBY>
 <!--536 UPDATED-->
-<!--536-->              <UPDATED><![CDATA[2008-08-08 00:59:38.0]]></UPDATED>
+<!--536-->              <UPDATED><![CDATA[2008-09-19 10:35:38.0]]></UPDATED>
 <!--536 UPDATEDBY-->
 <!--536-->              <UPDATEDBY><![CDATA[100]]></UPDATEDBY>
 <!--536 NAME-->
@@ -14505,8 +14503,6 @@
 <!--536-->              <ISTRANSLATIONTAB><![CDATA[N]]></ISTRANSLATIONTAB>
 <!--536 ISREADONLY-->
 <!--536-->              <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--536 AD_COLUMN_ID-->
-<!--536-->              <AD_COLUMN_ID><![CDATA[7768]]></AD_COLUMN_ID>
 <!--536 HASTREE-->
 <!--536-->              <HASTREE><![CDATA[N]]></HASTREE>
 <!--536 PROCESSING-->
--- a/src-trl/.classpath	Wed Oct 01 12:34:44 2008 +0000
+++ b/src-trl/.classpath	Wed Oct 01 12:57:20 2008 +0000
@@ -4,11 +4,11 @@
 	<classpathentry kind="src" path="build/javasqlc/src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/OpenbravoCore"/>
-	<classpathentry kind="lib" path="/openbravo/lib/servlet-api.jar"/>
-	<classpathentry kind="lib" path="/openbravo/lib/log4j-1.3alpha-8.jar"/>
-	<classpathentry kind="lib" path="/openbravo/lib/nekohtml.jar"/>
-	<classpathentry kind="lib" path="/openbravo/lib/xercesImpl.jar"/>
-	<classpathentry kind="lib" path="/openbravo/lib/jdbc3-postgresql.jar"/>
-	<classpathentry kind="lib" path="/openbravo/lib/ojdbc14.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/servlet-api.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-1.3alpha-8.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/nekohtml.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/xercesImpl.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/jdbc3-postgresql.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/ojdbc14.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
--- a/src-wad/.classpath	Wed Oct 01 12:34:44 2008 +0000
+++ b/src-wad/.classpath	Wed Oct 01 12:57:20 2008 +0000
@@ -4,10 +4,10 @@
 	<classpathentry kind="src" path="build/javasqlc/src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/OpenbravoCore"/>
-	<classpathentry kind="lib" path="/openbravo/lib/log4j-1.3alpha-8.jar"/>
-	<classpathentry kind="lib" path="/openbravo/lib/xercesImpl.jar"/>
-	<classpathentry kind="lib" path="/openbravo/lib/jdbc3-postgresql.jar"/>
-	<classpathentry kind="lib" path="/openbravo/lib/ojdbc14.jar"/>
-	<classpathentry kind="lib" path="/openbravo/lib/servlet-api.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/log4j-1.3alpha-8.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/xercesImpl.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/jdbc3-postgresql.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/ojdbc14.jar"/>
+	<classpathentry kind="lib" path="/openbravo/lib/runtime/servlet-api.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
--- a/src-wad/src/org/openbravo/wad/web.xml	Wed Oct 01 12:34:44 2008 +0000
+++ b/src-wad/src/org/openbravo/wad/web.xml	Wed Oct 01 12:57:20 2008 +0000
@@ -28,6 +28,9 @@
   <listener>
       <listener-class>org.openbravo.base.PeriodicBackgroundContextListener</listener-class>
   </listener>
+  <listener>
+      <listener-class>org.openbravo.dal.core.DalContextListener</listener-class>
+  </listener>
 
   <filter>
     <filter-name>Charset Filter</filter-name>
@@ -48,6 +51,16 @@
   </filter>
 
   <filter>
+    <filter-name>dalFilter</filter-name>
+    <filter-class>org.openbravo.dal.core.DalRequestFilter</filter-class>
+  </filter>
+
+  <filter-mapping>
+    <filter-name>dalFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <filter>
     <filter-name>Session Expiration Filter</filter-name>
     <filter-class>org.openbravo.utils.SessionExpirationFilter</filter-class>
   </filter>
--- a/src/build.xml	Wed Oct 01 12:34:44 2008 +0000
+++ b/src/build.xml	Wed Oct 01 12:57:20 2008 +0000
@@ -20,7 +20,7 @@
 -->
 
 <!--
-List of methods inside:
+List of methods infside:
 
 init: creates all the folders.
 trl.clean: clean the AD_TEXTINTERFACES table
@@ -51,252 +51,272 @@
 -->
 
 <project name="openbravo sources" default="compile" basedir=".">
-  <property name="webTab" value="all"/>
-  <property name="tab" value="%"/>
-  <property name="base.translate.structure" value="org/openbravo/erpWindows"/>
-  <property name="client.web.xml" value="${base.client.src}/web.xml"/>
-  <property name="package" value=""/>
-  <property name="extension" value="html"/>
-  <property name="src" value="."/>
-  <property name="tr" value="yes"/>
-  <condition property="translation">
-    <not> 
-      <equals arg1="no" arg2="${tr}"/>
-    </not>
-  </condition>
-  <target name="init">
-    <mkdir dir="${build}"/>
-    <mkdir dir="${base.design}/design"/>
-    <mkdir dir="${build.sqlc}"/>
-    <mkdir dir="${build.sqlc}/src"/>
-    <mkdir dir="${build.sqlc}/srcAD"/>
-    <mkdir dir="${build.AD}"/>
-    <mkdir dir="${build.AD}/org/openbravo/erpWindows"/>
-    <mkdir dir="${build.AD}/org/openbravo/erpCommon/ad_actionButton"/>
-    <mkdir dir="${build.AD}/org/openbravo/erpCommon/ad_callouts"/>
-    <mkdir dir="${build.AD}/org/openbravo/erpCommon/reference"/>
-    <mkdir dir="${build.docs}"/>
-  </target>
+	<property name="webTab" value="all" />
+	<property name="tab" value="%" />
+	<property name="base.translate.structure" value="org/openbravo/erpWindows" />
+	<property name="client.web.xml" value="${base.client.src}/web.xml" />
+	<property name="package" value="" />
+	<property name="extension" value="html" />
+	<property name="src" value="." />
+	<property name="tr" value="yes" />
+	<condition property="translation">
+		<not>
+			<equals arg1="no" arg2="${tr}" />
+		</not>
+	</condition>
+	<target name="init">
+		<mkdir dir="${build}" />
+		<mkdir dir="${base.design}/design" />
+		<mkdir dir="${build.sqlc}" />
+		<mkdir dir="${build.sqlc}/src" />
+		<mkdir dir="${build.sqlc}/srcAD" />
+		<mkdir dir="${build.AD}" />
+		<mkdir dir="${build.AD}/org/openbravo/erpWindows" />
+		<mkdir dir="${build.AD}/org/openbravo/erpCommon/ad_actionButton" />
+		<mkdir dir="${build.AD}/org/openbravo/erpCommon/ad_callouts" />
+		<mkdir dir="${build.AD}/org/openbravo/erpCommon/reference" />
+		<mkdir dir="${build.docs}" />
+	</target>
 
-  <target name="trl.clean" if="translation">
-    <java classname="org.openbravo.translate.Translate" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
-      <arg line="clean ${base.config}/Openbravo.properties"/>
-      <classpath refid="project.class.path"/>
-    </java>
-  </target>
-  
-  <target name="clean" depends="trl.clean">
-    <property name="complete" value="true"/>
-    <delete includeEmptyDirs="true" failonerror="false">
-      <fileset dir="${base.design}"/>
-      <fileset dir="${build}"/>
-      <fileset dir="${build.docs}"/>
-      <fileset dir="${build.AD}"/>
-      <fileset dir="${build.sqlc}"/>
-    </delete>
-  </target>
+	<target name="trl.clean" if="translation">
+		<java classname="org.openbravo.translate.Translate" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
+			<arg line="clean ${base.config}/Openbravo.properties" />
+			<classpath refid="project.class.path" />
+		</java>
+	</target>
 
-  <target name="copy.srcClient">
-    <mkdir dir="${base.client.src}"/>
-    <copy todir="${basedir}" overwrite="true" failonerror="false">
-      <fileset dir="${base.client.src}">
-        <exclude name="**/web.xml"/>
-      </fileset>
-    </copy>
-  </target>
+	<target name="clean" depends="trl.clean">
+		<property name="complete" value="true" />
+		<delete includeEmptyDirs="true" failonerror="false">
+			<fileset dir="${base.design}" />
+			<fileset dir="${build}" />
+			<fileset dir="${build.docs}" />
+			<fileset dir="${build.AD}" />
+			<fileset dir="${build.sqlc}" />
+		</delete>
+	</target>
 
-  <target name="sqlc" depends="copy.srcClient">
-    <java classname="org.openbravo.data.Sqlc" fork="yes" jvm="${env.JAVA_HOME}/bin/java" maxmemory="${build.maxmemory}">
-      <arg line="'${base.config}'/Openbravo.properties .xsql . '${build.sqlc}'/src"/>
-      <classpath refid="project.class.path"/>
-    </java>
-    <copy file="${base.src}/buildAD.xml" tofile="${build.AD}/build.xml"/>
-    <copy file="${base.src}/log4j.lcf" tofile="${build.AD}/log4j.lcf"/>
-    <ant dir="${build.AD}" target="buildAD" inheritAll="true" inheritRefs="true"/>
-  </target>
+	<target name="copy.srcClient">
+		<mkdir dir="${base.client.src}" />
+		<copy todir="${basedir}" overwrite="true" failonerror="false">
+			<fileset dir="${base.client.src}">
+				<exclude name="**/web.xml" />
+			</fileset>
+		</copy>
+	</target>
 
-  <target name="compileSqlc" depends="sqlc">
-    <javac srcdir="${build.sqlc}/src:${basedir}:${build.sqlc}/srcAD/org/openbravo/erpCommon/reference" destdir="${build}" encoding="UTF-8" fork="true" memorymaximumsize="${build.maxmemory}" debug="${debug.level}" deprecation="on">
-      <classpath refid="project.class.path"/>
-    </javac>
-    <javac srcdir="${build.sqlc}/srcAD" destdir="${build}" encoding="UTF-8" fork="true" memorymaximumsize="${build.maxmemory}" debug="${debug.level}" deprecation="on">
-      <classpath refid="project.class.path"/>
-    </javac>
-    <javac srcdir="${build.AD}" destdir="${build}" encoding="UTF-8" fork="true" memorymaximumsize="${build.maxmemory}" debug="${debug.level}" deprecation="on">
-      <classpath refid="project.class.path"/>
-    </javac>
-  </target>
+	<target name="sqlc" depends="copy.srcClient">
+		<java classname="org.openbravo.data.Sqlc" fork="yes" jvm="${env.JAVA_HOME}/bin/java" maxmemory="${build.maxmemory}">
+			<arg line="'${base.config}'/Openbravo.properties .xsql . '${build.sqlc}'/src" />
+			<classpath refid="project.class.path" />
+		</java>
+		<copy file="${base.src}/buildAD.xml" tofile="${build.AD}/build.xml" />
+		<copy file="${base.src}/log4j.lcf" tofile="${build.AD}/log4j.lcf" />
+		<ant dir="${build.AD}" target="buildAD" inheritAll="true" inheritRefs="true" />
+	</target>
 
-  <target name="wad" depends="init">
-    <java classname="org.openbravo.wad.Wad" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
-      <arg line="'${base.config}' '${tab}' '${build.AD}/org/openbravo/erpWindows' '${build.AD}/org/openbravo/erpCommon' '${build.sqlc}/src' '${webTab}' '${build.AD}/org/openbravo/erpCommon/ad_actionButton' '${base.design}' '${base.translate.structure}' '${client.web.xml}' '..' '${attach.path}' '${web.url}' '${base.src}' '${complete}'"/>
-      <classpath refid="project.class.path"/>
-    </java>
-    <antcall target="postwad" inheritall="true" inheritrefs="true"/>
-  </target>
+	<target name="compile.src.gen" depends="init">
+		<javac srcdir="${base.src}/org/openbravo/base/exception:${base.src}/org/openbravo/base/gen:${base.src}/org/openbravo/base/security:${base.src}/org/openbravo/base/model:${base.src}/org/openbravo/base/session::${base.src}/org/openbravo/base/validation:${base.src}/org/openbravo/base/util" destdir="${build}" encoding="UTF-8" fork="true" memorymaximumsize="${build.maxmemory}" debug="${debug.level}" deprecation="on">
+			<classpath refid="project.class.path" />
+		</javac>
+	</target>
 
-  <target name="postwad">
-    <copy todir="${base.design}/design" >
-      <fileset dir="${build.AD}" includes="**/*.xml"/>
-    </copy>
-    <copy todir="${base.design}/design" >
-      <fileset dir="${build.AD}" includes="**/*.fo"/>
-    </copy>
-    <copy todir="${base.design}/design" >
-      <fileset dir="${build.AD}" includes="**/*.html"/>
-    </copy>
-    <copy todir="${base.design}/design" >
-      <fileset dir="${build.AD}" includes="**/*.srpt"/>
-    </copy>
-    <copy todir="${base.design}/design" >
-      <fileset dir="${build.AD}" includes="**/*.jrxml"/>
-    </copy>
-    <copy todir="${base.design}/design" >
-      <fileset dir="${build.AD}" includes="**/*.jasper"/>
-    </copy>
-  </target>
+	<target name="generate.entities" depends="compile.src.gen">
+		<taskdef name="workflow" classpathref="project.class.path" classname="org.openarchitectureware.workflow.ant.WorkflowAntTask" />
+		<workflow file="${base.src}/org/openbravo/base/gen/gen_entity.oaw">
+			<param name="ob.properties.location" value="${base.config}/Openbravo.properties" />
+			<param name="base.src.gen" value="${base.src.gen}" />
+			<classpath>
+				<path refid="project.class.path" />
+			</classpath>
+		</workflow>
+	</target>
 
-  <target name="postsrc">
-    <copy todir="${base.design}/design" >
-      <fileset dir="${basedir}" includes="**/*.xml"/>
-    </copy>
-    <copy todir="${base.design}/design" >
-      <fileset dir="${basedir}" includes="**/*.fo"/>
-    </copy>
-    <copy todir="${base.design}/design" >
-      <fileset dir="${basedir}" includes="**/*.html"/>
-    </copy>
-    <copy todir="${base.design}/design" >
-      <fileset dir="${basedir}" includes="**/*.srpt"/>
-    </copy>
-    <copy todir="${base.design}/design" >
-      <fileset dir="${basedir}" includes="**/*.jrxml"/>
-    </copy>
-    <copy todir="${base.design}/design" >
-      <fileset dir="${basedir}" includes="**/*.jasper"/>
-    </copy>
-    <java classname="org.openbravo.translate.CommandLine_CopyFiles" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
-      <arg line="'${base.config}/Openbravo.properties' '${basedir}' '${base.design}' '.xml' 'true' 'false'"/>
-      <classpath refid="project.class.path"/>
-    </java>
-    <java classname="org.openbravo.translate.CommandLine_CopyFiles" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
-      <arg line="'${base.config}/Openbravo.properties' '${basedir}' '${base.design}' 'jasper' 'true' 'false'"/>
-      <classpath refid="project.class.path"/>
-    </java>
-    <antcall target="build.local.context"/>
-  </target>
+	<target name="compileSqlc" depends="sqlc">
+		<javac srcdir="${build.sqlc}/src:${basedir}:${build.sqlc}/srcAD/org/openbravo/erpCommon/reference:${base.src.gen}" destdir="${build}" encoding="UTF-8" fork="true" memorymaximumsize="${build.maxmemory}" debug="${debug.level}" deprecation="on">
+			<classpath refid="project.class.path" />
+		</javac>
+		<javac srcdir="${build.sqlc}/srcAD" destdir="${build}" encoding="UTF-8" fork="true" memorymaximumsize="${build.maxmemory}" debug="${debug.level}" deprecation="on">
+			<classpath refid="project.class.path" />
+		</javac>
+		<javac srcdir="${build.AD}" destdir="${build}" encoding="UTF-8" fork="true" memorymaximumsize="${build.maxmemory}" debug="${debug.level}" deprecation="on">
+			<classpath refid="project.class.path" />
+		</javac>
+	</target>
 
-  <target name="build.local.context">
-    <copy todir="${base.context}"  encoding="UTF-8">
-      <fileset file="${basedir}/index.html"/>
-    </copy>
-    <copy todir="${base.context}/WEB-INF"  encoding="UTF-8">
-      <fileset file="${build.sqlc}/src/web.xml"/>
-       <fileset dir="${base.config}">
-        <exclude name="**/setup-tool/**"/>
-        <exclude name="*.template"/>
-      </fileset>
-    </copy>
-    <copy todir="${base.context}/WEB-INF/lib"  encoding="UTF-8">
-      <fileset dir="${base.lib}">
-        <exclude name="openbravo-wad.jar"/>
-        <exclude name="openbravo-trl.jar"/>
-        <exclude name="servlet-api.jar"/>
-        <exclude name="*.war"/>
-      </fileset>
-    </copy>
-    <mkdir dir="${base.context}/web"/>
-    <copy todir="${base.context}/web"  encoding="UTF-8">
-      <fileset dir="${base.web}"/>
-    </copy>
-    <chmod dir="${base.context}" perm="775"/>
-  </target>   
+	<target name="wad" depends="init">
+		<java classname="org.openbravo.wad.Wad" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
+			<arg line="'${base.config}' '${tab}' '${build.AD}/org/openbravo/erpWindows' '${build.AD}/org/openbravo/erpCommon' '${build.sqlc}/src' '${webTab}' '${build.AD}/org/openbravo/erpCommon/ad_actionButton' '${base.design}' '${base.translate.structure}' '${client.web.xml}' '..' '${attach.path}' '${web.url}' '${base.src}' '${complete}'" />
+			<classpath refid="project.class.path" />
+		</java>
+		<antcall target="postwad" inheritall="true" inheritrefs="true" />
+	</target>
 
-  <target name="compile.src" depends="compileSqlc, postsrc, copy.files">
-  </target>
+	<target name="postwad">
+		<copy todir="${base.design}/design">
+			<fileset dir="${build.AD}" includes="**/*.xml" />
+		</copy>
+		<copy todir="${base.design}/design">
+			<fileset dir="${build.AD}" includes="**/*.fo" />
+		</copy>
+		<copy todir="${base.design}/design">
+			<fileset dir="${build.AD}" includes="**/*.html" />
+		</copy>
+		<copy todir="${base.design}/design">
+			<fileset dir="${build.AD}" includes="**/*.srpt" />
+		</copy>
+		<copy todir="${base.design}/design">
+			<fileset dir="${build.AD}" includes="**/*.jrxml" />
+		</copy>
+		<copy todir="${base.design}/design">
+			<fileset dir="${build.AD}" includes="**/*.jasper" />
+		</copy>
+	</target>
 
-  <target name="eclipse.compile" depends="wad,sqlc, postsrc, translate">
-  </target>
+	<target name="postsrc">
+		<copy todir="${build}">
+			<fileset dir="${basedir}" includes="**/*.hbm.xml" />
+		</copy>
+		<copy todir="${base.design}/design">
+			<fileset dir="${basedir}" includes="**/*.xml" />
+		</copy>
+		<copy todir="${base.design}/design">
+			<fileset dir="${basedir}" includes="**/*.fo" />
+		</copy>
+		<copy todir="${base.design}/design">
+			<fileset dir="${basedir}" includes="**/*.html" />
+		</copy>
+		<copy todir="${base.design}/design">
+			<fileset dir="${basedir}" includes="**/*.srpt" />
+		</copy>
+		<copy todir="${base.design}/design">
+			<fileset dir="${basedir}" includes="**/*.jrxml" />
+		</copy>
+		<copy todir="${base.design}/design">
+			<fileset dir="${basedir}" includes="**/*.jasper" />
+		</copy>
+		<java classname="org.openbravo.translate.CommandLine_CopyFiles" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
+			<arg line="'${base.config}/Openbravo.properties' '${basedir}' '${base.design}' '.xml' 'true' 'false'" />
+			<classpath refid="project.class.path" />
+		</java>
+		<java classname="org.openbravo.translate.CommandLine_CopyFiles" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
+			<arg line="'${base.config}/Openbravo.properties' '${basedir}' '${base.design}' 'jasper' 'true' 'false'" />
+			<classpath refid="project.class.path" />
+		</java>
+		<antcall target="build.local.context" />
+	</target>
 
-  <target name="eclipse.compile.complete" depends="clean,wad,sqlc, postsrc, translate">
-  </target>
+	<target name="build.local.context">
+		<copy todir="${base.context}" encoding="UTF-8">
+			<fileset file="${basedir}/index.html" />
+		</copy>
+		<copy todir="${base.context}/WEB-INF" encoding="UTF-8">
+			<fileset file="${build.sqlc}/src/web.xml" />
+			<fileset dir="${base.config}">
+				<exclude name="**/setup-tool/**" />
+				<exclude name="*.template" />
+			</fileset>
+		</copy>
+		<copy todir="${base.context}/WEB-INF/lib" encoding="UTF-8">
+			<fileset dir="${base.lib}/runtime">
+				<exclude name="openbravo-wad.jar" />
+				<exclude name="openbravo-trl.jar" />
+				<exclude name="servlet-api.jar" />
+				<exclude name="*.war" />
+			</fileset>
+		</copy>
+		<mkdir dir="${base.context}/web" />
+		<copy todir="${base.context}/web" encoding="UTF-8">
+			<fileset dir="${base.web}" />
+		</copy>
+		<chmod dir="${base.context}" perm="775" />
+	</target>
 
-  <target name="compile" depends="wad,compileSqlc, postsrc, translate">
-  </target>
+	<target name="compile.src" depends="compileSqlc, postsrc, copy.files">
+	</target>
 
-  <target name="compile.complete" depends="clean,wad,compileSqlc,postsrc, translate">
-  </target>
+	<target name="eclipse.compile" depends="wad,sqlc, postsrc, translate">
+	</target>
 
-  <target name="translate" if="translation">
-    <antcall inheritall="true" inheritrefs="true" target="compile.translate">
-      <param name="extension" value="html"/>
-    </antcall>
-    <antcall inheritall="true" inheritrefs="true" target="compile.translate">
-      <param name="extension" value="fo"/>
-    </antcall>
-    <antcall inheritall="true" inheritrefs="true" target="compile.translate">
-      <param name="extension" value="srpt"/>
-    </antcall>
-    <antcall inheritall="true" inheritrefs="true" target="compile.translate">
-      <param name="extension" value="jrxml"/>
-    </antcall>
-  </target>
+	<target name="eclipse.compile.complete" depends="clean,generate.entities,wad,sqlc,postsrc,translate">
+	</target>
 
-  <target name="compile.translate">
-    <java classname="org.openbravo.translate.Translate" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
-      <arg line="'${base.config}'/Openbravo.properties ${extension} ${basedir} '${base.design}' ${package}"/>
-      <classpath refid="project.class.path"/>
-    </java>
-  </target>
+	<target name="compile" depends="wad,compileSqlc, postsrc, translate">
+	</target>
 
-  <target name="installWebService" depends="init" if="wsdd">
-    <java classname="org.apache.axis.client.AdminClient" fork="yes" jvm="${env.JAVA_HOME}/bin/java" maxmemory="${build.maxmemory}">
-      <arg line="-l${context.url}/servlet/AxisServlet ${src}/deploy.wsdd"/>
-      <classpath refid="project.class.path"/>
-    </java>
-  </target>
+	<target name="compile.complete" depends="clean,generate.entities,wad,compileSqlc,postsrc,translate">
+	</target>
 
-  <target name="uninstallWebService" depends="init">
-    <java classname="org.apache.axis.client.AdminClient" fork="yes" jvm="${env.JAVA_HOME}/bin/java" maxmemory="${build.maxmemory}">
-      <arg line="-l${context.url}/servlet/AxisServlet ${src}/undeploy.wsdd"/>
-      <classpath refid="project.class.path"/>
-    </java>
-  </target>
+	<target name="translate" if="translation">
+		<antcall inheritall="true" inheritrefs="true" target="compile.translate">
+			<param name="extension" value="html" />
+		</antcall>
+		<antcall inheritall="true" inheritrefs="true" target="compile.translate">
+			<param name="extension" value="fo" />
+		</antcall>
+		<antcall inheritall="true" inheritrefs="true" target="compile.translate">
+			<param name="extension" value="srpt" />
+		</antcall>
+		<antcall inheritall="true" inheritrefs="true" target="compile.translate">
+			<param name="extension" value="jrxml" />
+		</antcall>
+	</target>
 
-  <target name="copy.files">
-    <chmod dir="${build}" perm="755"/>
-    <mkdir dir="${jakarta.base}/webapps/${context.name}"/>
-    <copy todir="${jakarta.base}/webapps/${context.name}"  encoding="UTF-8">
-      <fileset dir="${base.context}"/>
-    </copy>
-    <mkdir dir="${jakarta.base}/webapps/${context.name}/WEB-INF/classes"/>
-    <copy todir="${jakarta.base}/webapps/${context.name}/WEB-INF/classes" encoding="UTF-8">
-      <fileset dir="${build}"/>
-    </copy> 
-    <chmod dir="${jakarta.base}/webapps/${context.name}" perm="775"/>
-  </target>
+	<target name="compile.translate">
+		<java classname="org.openbravo.translate.Translate" jvm="${env.JAVA_HOME}/bin/java" fork="yes" maxmemory="${build.maxmemory}">
+			<arg line="'${base.config}'/Openbravo.properties ${extension} ${basedir} '${base.design}' ${package}" />
+			<classpath refid="project.class.path" />
+		</java>
+	</target>
 
-  <target name="compile.development" depends="compile, copy.files">
-    <mkdir dir="${jakarta.base}/webapps/${context.name}/WEB-INF/lib"/>
-    <copy todir="${jakarta.base}/webapps/${context.name}/WEB-INF/lib" file="${build.core.lib}/openbravo-core.jar" encoding="UTF-8">
-    </copy>
-  </target>
+	<target name="installWebService" depends="init" if="wsdd">
+		<java classname="org.apache.axis.client.AdminClient" fork="yes" jvm="${env.JAVA_HOME}/bin/java" maxmemory="${build.maxmemory}">
+			<arg line="-l${context.url}/servlet/AxisServlet ${src}/deploy.wsdd" />
+			<classpath refid="project.class.path" />
+		</java>
+	</target>
 
-  <target name="compile.complete.development" depends="compile.complete, copy.files">
-    <mkdir dir="${jakarta.base}/webapps/${context.name}/WEB-INF/lib"/>
-    <copy todir="${jakarta.base}/webapps/${context.name}/WEB-INF/lib" file="${build.core.lib}/openbravo-core.jar" encoding="UTF-8">
-    </copy>
-  </target>
+	<target name="uninstallWebService" depends="init">
+		<java classname="org.apache.axis.client.AdminClient" fork="yes" jvm="${env.JAVA_HOME}/bin/java" maxmemory="${build.maxmemory}">
+			<arg line="-l${context.url}/servlet/AxisServlet ${src}/undeploy.wsdd" />
+			<classpath refid="project.class.path" />
+		</java>
+	</target>
 
-  <target name="build.war">
-    <chmod dir="${build}" perm="755"/>
-    <delete failonerror="false" file="${base.lib}/${context.name}.war"/>
-    <war compress="true" destfile="${base.lib}/${context.name}.war" encoding="UTF-8" webxml="${base.context}/WEB-INF/web.xml">
-      <zipfileset dir="${base.context}">
-	<exclude name="**/WEB-INF/web.xml"/>
-	<exclude name="**/WEB-INF/lib/servlet-api.jar"/>
-      </zipfileset>
-      <classes dir="${build}"/>
-    </war>
-  </target>
+	<target name="copy.files">
+		<chmod dir="${build}" perm="755" />
+		<mkdir dir="${jakarta.base}/webapps/${context.name}" />
+		<copy todir="${jakarta.base}/webapps/${context.name}" encoding="UTF-8">
+			<fileset dir="${base.context}" />
+		</copy>
+		<mkdir dir="${jakarta.base}/webapps/${context.name}/WEB-INF/classes" />
+		<copy todir="${jakarta.base}/webapps/${context.name}/WEB-INF/classes" encoding="UTF-8">
+			<fileset dir="${build}" />
+		</copy>
+		<chmod dir="${jakarta.base}/webapps/${context.name}" perm="775" />
+	</target>
+
+	<target name="compile.development" depends="compile, copy.files">
+		<mkdir dir="${jakarta.base}/webapps/${context.name}/WEB-INF/lib" />
+		<copy todir="${jakarta.base}/webapps/${context.name}/WEB-INF/lib" file="${build.core.lib}/openbravo-core.jar" encoding="UTF-8">
+		</copy>
+	</target>
+
+	<target name="compile.complete.development" depends="compile.complete, copy.files">
+		<mkdir dir="${jakarta.base}/webapps/${context.name}/WEB-INF/lib" />
+		<copy todir="${jakarta.base}/webapps/${context.name}/WEB-INF/lib" file="${build.core.lib}/openbravo-core.jar" encoding="UTF-8">
+		</copy>
+	</target>
+
+	<target name="build.war">
+		<chmod dir="${build}" perm="755" />
+		<delete failonerror="false" file="${base.lib}/${context.name}.war" />
+		<war compress="true" destfile="${base.lib}/${context.name}.war" encoding="UTF-8" webxml="${base.context}/WEB-INF/web.xml">
+			<zipfileset dir="${base.context}">
+				<exclude name="**/WEB-INF/web.xml" />
+				<exclude name="**/WEB-INF/lib/servlet-api.jar" />
+			</zipfileset>
+			<classes dir="${build}" />
+		</war>
+	</target>
 </project>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/ehcache.xml	Wed Oct 01 12:57:20 2008 +0000
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * ***********************************************************************************
+ * Copyright (C) 2001-2008 Openbravo S.L. Licensed under the Apache Software
+ * License version 2.0 You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+ * or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ * ***********************************************************************************
+ -->
+<ehcache>
+
+    <diskStore path="java.io.tmpdir"/>
+
+    <defaultCache
+        maxElementsInMemory="10000"
+        eternal="true"
+        timeToIdleSeconds="3600"
+        timeToLiveSeconds="7200"
+        overflowToDisk="false"
+        diskPersistent="false"
+        diskExpiryThreadIntervalSeconds="120"
+        memoryStoreEvictionPolicy="LRU"
+        />
+        
+    <cache name="com.wakaleo.articles.caching.businessobjects.Country"
+        maxElementsInMemory="300"
+        eternal="true"
+        overflowToDisk="false"
+        />
+
+</ehcache>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/base/exception/OBException.java	Wed Oct 01 12:57:20 2008 +0000
@@ -0,0 +1,55 @@
+/*
+ * 
+ * Copyright (C) 2001-2008 Openbravo S.L. Licensed under the Apache Software
+ * License version 2.0 You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+ * or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.openbravo.base.exception;
+
+import org.apache.log4j.Logger;
+
+/**
+ * Unchecked exception which also logs itself.
+ * 
+ * @author mtaal
+ */
+public class OBException extends RuntimeException {
+  
+  /**
+   * Default serial
+   */
+  private static final long serialVersionUID = 1L;
+  
+  /** Call super constructor and log the cause. */
+  public OBException() {
+    super();
+    getLogger().error(this);
+  }
+  
+  /** Call super constructor and log the cause. */
+  public OBException(String message, Throwable cause) {
+    super(message, cause);
+    getLogger().error(message, cause);
+  }
+  
+  /** Call super constructor and log the cause. */
+  public OBException(String message) {
+    super(message);
+    getLogger().error(message, this);
+  }
+  
+  /** Call super constructor and log the cause. */
+  public OBException(Throwable cause) {
+    super(cause);
+    getLogger().error(cause);
+  }
+  
+  /** @return class specific log */
+  private Logger getLogger() {
+    return Logger.getLogger(this.getClass());
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/base/exception/OBSecurityException.java	Wed Oct 01 12:57:20 2008 +0000
@@ -0,0 +1,37 @@
+/*
+ * 
+ * Copyright (C) 2001-2008 Openbravo S.L. Licensed under the Apache Software
+ * License version 2.0 You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+ * or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.openbravo.base.exception;
+
+/**
+ * Unchecked exception which also logs itself.
+ * 
+ * @author mtaal
+ */
+public class OBSecurityException extends OBException {
+  
+  private static final long serialVersionUID = 1L;
+  
+  public OBSecurityException() {
+    super();
+  }
+  
+  public OBSecurityException(String message, Throwable cause) {
+    super(message, cause);
+  }
+  
+  public OBSecurityException(String message) {
+    super(message);
+  }
+  
+  public OBSecurityException(Throwable cause) {
+    super(cause);
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/base/gen/ModelProviderComponent.java	Wed Oct 01 12:57:20 2008 +0000
@@ -0,0 +1,64 @@
+/*
+ * 
+ * Copyright (C) 2001-2008 Openbravo S.L. Licensed under the Apache Software
+ * License version 2.0 You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+ * or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+package org.openbravo.base.gen;
+
+
+import org.openarchitectureware.workflow.WorkflowComponent;
+import org.openarchitectureware.workflow.WorkflowContext;
+import org.openarchitectureware.workflow.ast.parser.Location;
+import org.openarchitectureware.workflow.container.CompositeComponent;
+import org.openarchitectureware.workflow.issues.Issues;
+import org.openarchitectureware.workflow.monitor.ProgressMonitor;
+import org.openbravo.base.model.ModelProvider;
+import org.openbravo.base.session.OBPropertiesProvider;
+
+/**
+ * Sets the model in the work flow context, so that the generator can pick it
+ * up.
+ * 
+ * @author mtaal
+ */
+
+public class ModelProviderComponent implements WorkflowComponent {
+  
+  private String propFile;
+	
+  public void checkConfiguration(Issues arg0) {
+  }
+  
+  public CompositeComponent getContainer() {
+    return null;
+  }
+  
+  public Location getLocation() {
+    return null;
+  }
+  
+  public void invoke(WorkflowContext wc, ProgressMonitor pm, Issues issues) {
+    wc.set("model", ModelProvider.getInstance());
+  }
+  
+  public void setContainer(CompositeComponent arg0) {
+  }
+  
+  public void setLocation(Location arg0) {
+  }
+  
+  public void setPropFile(String propFile) {	  	  
+	  OBPropertiesProvider.getInstance().setProperties(propFile);
+	  this.propFile = propFile;
+  }
+  
+  public String getPropFile() {
+	  return propFile;
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/base/gen/entity.xpt	Wed Oct 01 12:57:20 2008 +0000
@@ -0,0 +1,168 @@
+«IMPORT org::openbravo::base::model»
+ 
+«EXTENSION org::openbravo::base::gen::gen_util» 
+ 
+«DEFINE root FOR ModelProvider»
+  «EXPAND EntityTemplate FOREACH model»
+«ENDDEFINE» 
+
+«DEFINE EntityTemplate FOR Entity»
+	«FILE classFileName(this)-»
+/*   
+ *  
+ * Copyright (C) 2001-2008 Openbravo S.L. Licensed under the Apache Software
+ * License version 2.0 You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+ * or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package «packageName»;
+
+/** 
+ * Entity class for entity «name» (stored in table «tableName»).
+ *
+ * NOTE: This class should not be instantiated directly. To instantiate this
+ * class the OBFactory should be used. 
+ */
+public class «simpleClassName» extends org.openbravo.base.structure.BaseOBObject «implementsStatement» {
+
+	public final static String ENTITYNAME = "«name»";
+
+	«FOREACH properties AS p-»
+		«IF ((Property)p).hasDefaultValue()»
+	private «((Property)p).typeName» «((Property)p).name» = «((Property)p).formattedDefaultValue»;
+	«ELSEIF !((Property)p).partOfCompositeId-»
+	private «((Property)p).typeName» «((Property)p).name»;
+		«ENDIF-»
+	«ENDFOREACH-»
+	
+	public String getEntityName() {
+		return ENTITYNAME;
+	}
+	
+	«FOREACH properties AS p-»
+	public «((Property)p).typeName» «getter((Property)p)»() {
+	«IF ((Property)p).partOfCompositeId-»
+		return ((Id)getId()).«getter((Property)p)»();
+	«ELSE-»
+		return «((Property)p).name»;
+	«ENDIF-»
+	}
+	
+	public void set«((Property)p).name.toFirstUpper()»(«((Property)p).typeName» «((Property)p).name.toFirstLower()») {
+	«IF ((Property)p).partOfCompositeId-»
+		((Id)getId()).set«((Property)p).name.toFirstUpper()»(«((Property)p).name»);
+	«ELSE-»
+		this.«((Property)p).name» = «((Property)p).name»;
+	«ENDIF-»
+	}
+	
+	«ENDFOREACH-»
+	
+	public Object get(String featureName) {
+	«FOREACH properties AS p-»
+		if ("«((Property)p).name»".equals(featureName)) {
+			return «getter((Property)p)»();
+		}
+	«ENDFOREACH-»
+		return super.get(featureName);
+	}
+	
+	public void set(String featureName, Object value) {
+	«FOREACH properties AS p-»
+		if ("«((Property)p).name»".equals(featureName)) {
+		«IF !((Property)p).allowNullValues()-»
+			// the Openbravo db contains null values for primitivetypes
+			if (value == null) {
+				return;
+			}
+		«ENDIF-»
+			set«((Property)p).name.toFirstUpper()»((«((Property)p).objectTypeName»)value);
+			return;
+		}
+	«ENDFOREACH-»
+		super.set(featureName, value);		
+	}
+
+	«IF hasCompositeId()»
+	public static class Id implements java.io.Serializable {
+	    private static final long serialVersionUID = 1L;
+
+		«FOREACH properties AS p-»
+		«IF ((Property)p).partOfCompositeId-»
+		«IF ((Property)p).hasDefaultValue()»
+		private «((Property)p).typeName» «((Property)p).name» = «((Property)p).formattedDefaultValue»;
+		«ELSE-»
+		private «((Property)p).typeName» «((Property)p).name»;
+		«ENDIF-»
+		«ENDIF-»
+		«ENDFOREACH-»
+
+		«FOREACH properties AS p-»
+		«IF ((Property)p).partOfCompositeId-»
+		public «((Property)p).typeName» «getter((Property)p)»() {
+			return «((Property)p).name»;
+		}
+		
+		public void set«((Property)p).name.toFirstUpper()»(«((Property)p).typeName» «((Property)p).name.toFirstLower()») {
+			this.«((Property)p).name» = «((Property)p).name»;
+		}
+		«ENDIF»
+		«ENDFOREACH-»
+		
+	    public boolean equals(Object obj) {
+			if (this == obj) {
+    			return true;
+			}
+			if (!(obj instanceof Id)) {
+				return false;
+			}
+			final Id otherId = (Id)obj;
+		«FOREACH properties AS p-»
+		«IF ((Property)p).partOfCompositeId-»
+			if (!areEqual(«getter((Property)p)»(), otherId.«getter((Property)p)»())) {
+				return false;
+			} 
+		«ENDIF»
+		«ENDFOREACH-»
+			return true;
+		}
+
+		// hashCode assumes that keys can not change!
+    	public int hashCode() {
+    		int result = 0;
+    		«FOREACH properties AS p-»
+			«IF ((Property)p).partOfCompositeId-»
+			if («getter((Property)p)»() instanceof Object) {
+				result +=«getter((Property)p)»().hashCode(); 
+			}
+			«ENDIF-»
+			«ENDFOREACH-»
+    		
+    		if (result == 0) {
+    			return super.hashCode();
+    		}
+    		return result;
+    	}
+
+		private boolean areEqual(Object v1, Object v2) {
+			if (v1 == null || v2 == null) {
+				return v1 == v2;
+			}
+			return v1.equals(v2);
+		}		
+	}
+	«ENDIF»
+}
+	«ENDFILE»
+«ENDDEFINE»
+
+# this define is there to get rid of the error
+# displayed by the editor because for the 
+# statement EXPAND Entity FOREACH model
+# it can determine the type for model
+«DEFINE EntityTemplate FOR Object»
+«ENDDEFINE»
+ 
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/base/gen/gen_entity.oaw	Wed Oct 01 12:57:20 2008 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workflow>
+	<!-- sets the list of Tables in the model slot -->
+	<component class="org.openbravo.base.gen.ModelProviderComponent">
+		<propFile value="${ob.properties.location}" />
+	</component>	
+	<component class="oaw.xpand2.Generator">
+		 <metaModel class="oaw.type.impl.java.JavaMetaModel"/>
+		 <expand value="org::openbravo::base::gen::entity::root FOR model"/>
+	
+		 <!--  output configuration -->
+		 <outlet path="${base.src.gen}"/>
+		 <beautifier class="org.hybridlabs.source.formatter.JavaImportBeautifier"
+			organizeImports="true" format="true"/>
+
+		 <!--<beautifier class="oaw.xpand2.output.JavaBeautifier"/>-->
+	 
+		 <!-- TBD: protected regions configuration -->
+	</component>
+</workflow> 
+ 
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/base/gen/gen_util.ext	Wed Oct 01 12:57:20 2008 +0000
@@ -0,0 +1,6 @@
+import org::openbravo::base::model;
+
+classFileName( Entity this ): className.replaceAll("\\.","/")+".java";	
+
+getter(Property this) :
+ 	boolean ? "is" + name.toFirstUpper() : "get" + name.toFirstUpper();
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/base/model/BaseOBObjectDef.java	Wed Oct 01 12:57:20 2008 +0000
@@ -0,0 +1,27 @@
+/*
+ * 
+ * Copyright (C) 2001-2008 Openbravo S.L. Licensed under the Apache Software
+ * License version 2.0 You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+ * or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.openbravo.base.model;
+
+/**
+ * Defines the BaseOBObject interface, this interface has been introduced to
+ * prevent cyclic references between generated code and model code which is used
+ * by the generator. This interface only contains the minimally required methods
+ * to prevent this cycle.
+ * 
+ * @author mtaal
+ */
+
+public interface BaseOBObjectDef {
+  
+  public Object get(String featureName);
+  
+  public void set(String featureName, Object value);
+}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/base/model/Column.hbm.xml	Wed Oct 01 12:57:20 2008 +0000
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * ***********************************************************************************
+ * Copyright (C) 2001-2008 Openbravo S.L. Licensed under the Apache Software
+ * License version 2.0 You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+ * or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ * ***********************************************************************************
+ -->
+<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+	<class name="org.openbravo.base.model.Column" lazy="false" table="ad_column">
+		<cache usage="read-write"/>
+		
+		<id name="id" type="string" column="ad_column_id">
+			<generator class="uuid" />
+		</id>
+
+		<property name="active" type="yes_no" not-null="true" column="isactive"/>				
+		<property name="name" not-null="true"/>
+		
+		<property name="columnName"/>
+		<property name="fieldLength"/>
+		<property name="defaultValue"/>
+		<property name="key" type="yes_no" column="iskey"/>
+		<property name="secondaryKey" type="yes_no" column="issecondarykey"/>
+		<property name="parent" type="yes_no" column="isparent"/>
+		<property name="updatable" type="yes_no" column="isupdateable"/>
+		<property name="identifier" type="yes_no" column="isidentifier"/>
+		<property name="mandatory" type="yes_no" column="ismandatory"/>
+		<property name="valueMin"/>
+		<property name="valueMax"/>
+		<property name="developmentStatus"/>
+		
+		<many-to-one name="table" not-null="true" class="org.openbravo.base.model.Table" column="ad_table_id"/>
+		 
+		<many-to-one name="reference" not-null="true" class="org.openbravo.base.model.Reference" column="ad_reference_id" />
+		
+		<many-to-one name="referenceValue" class="org.openbravo.base.model.Reference" column="ad_reference_value_id" />
+		
+	</class>
+</hibernate-mapping>
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/base/model/Column.java	Wed Oct 01 12:57:20 2008 +0000
@@ -0,0 +1,319 @@
+/*
+ * 
+ * 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) 2008 Openbravo SL All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ */
+package org.openbravo.base.model;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.log4j.Logger;
+import org.openbravo.base.util.NamingUtil;
+
+public class Column extends ModelObject {
+  private static final Logger log = Logger.getLogger(Column.class);
+  
+  private Property property;
+  private String columnName;
+  private Table table;
+  private Reference reference;
+  private Reference referenceValue;
+  private Column referenceType = null;
+  private int fieldLength;
+  private String defaultValue;
+  private boolean key;
+  private boolean secondaryKey;
+  private boolean parent;
+  private boolean mandatory;
+  private boolean updatable;
+  private boolean identifier;
+  private String valueMin;
+  private String valueMax;
+  private String mappingName = null;
+  private String developmentStatus;
+  
+  public boolean isBoolean() {
+    return isPrimitiveType() && (getPrimitiveType().getName().compareTo("boolean") == 0 || Boolean.class == getPrimitiveType());
+  }
+  
+  public String getColumnName() {
+    return columnName;
+  }
+  
+  public void setColumnName(String columnName) {
+    this.columnName = columnName;
+  }
+  
+  public Table getTable() {
+    return table;
+  }
+  
+  public void setTable(Table table) {
+    this.table = table;
+  }
+  
+  public Reference getReference() {
+    return reference;
+  }
+  
+  public void setReference(Reference reference) {
+    this.reference = reference;
+  }
+  
+  public Reference getReferenceValue() {
+    return referenceValue;
+  }
+  
+  public void setReferenceValue(Reference referenceValue) {
+    this.referenceValue = referenceValue;
+  }
+  
+  public int getFieldLength() {
+    return fieldLength;
+  }
+  
+  public void setFieldLength(int fieldLength) {
+    this.fieldLength = fieldLength;
+  }
+  
+  public String getDefaultValue() {
+    return defaultValue;
+  }
+  
+  public void setDefaultValue(String defaultValue) {
+    this.defaultValue = defaultValue;
+  }
+  
+  public boolean isKey() {
+    return key;
+  }
+  
+  public void setKey(Boolean key) {
+    this.key = key;
+  }
+  
+  public boolean isSecondaryKey() {
+    return secondaryKey;
+  }
+  
+  public void setSecondaryKey(boolean secondaryKey) {
+    this.secondaryKey = secondaryKey;
+  }
+  
+  public boolean isParent() {
+    return parent;
+  }
+  
+  public void setParent(Boolean parent) {
+    this.parent = parent;
+  }
+  
+  public boolean isMandatory() {
+    return mandatory;
+  }
+  
+  public void setMandatory(Boolean mandatory) {
+    this.mandatory = mandatory;
+  }
+  
+  public boolean isUpdatable() {
+    return updatable;
+  }
+  
+  public void setUpdatable(Boolean updatable) {
+    this.updatable = updatable;
+  }
+  
+  public boolean isIdentifier() {
+    return identifier;
+  }
+  
+  public void setIdentifier(Boolean identifier) {
+    this.identifier = identifier;
+  }
+  
+  public String getValueMin() {
+    return valueMin;
+  }
+  
+  public void setValueMin(String valueMin) {
+    this.valueMin = valueMin;
+  }
+  
+  public String getValueMax() {
+    return valueMax;
+  }
+  
+  public void setValueMax(String valueMax) {
+    this.valueMax = valueMax;
+  }
+  
+  public String getDevelopmentStatus() {
+    return developmentStatus;
+  }
+  
+  public void setDevelopmentStatus(String developmentStatus) {
+    this.developmentStatus = developmentStatus;
+  }
+  
+  public String getMappingName() {
+    // TODO: check the mappingname of an pk is always id
+    if (isKey() && getTable().getPrimaryKeyColumns().size() == 1) {
+      return "id";
+    }
+    if (mappingName == null)
+      mappingName = NamingUtil.getColumnMappingName(this);
+    return mappingName;
+  }
+  
+  public boolean isPrimitiveType() {
+    if (!reference.getId().equals(Reference.TABLE) && !reference.getId().equals(Reference.TABLEDIR) && !reference.getId().equals(Reference.SEARCH) && !reference.getId().equals(Reference.IMAGE) && !reference.getId().equals(Reference.PRODUCT_ATTRIBUTE) && !reference.getId().equals(Reference.RESOURCE_ASSIGNMENT))
+      return true;
+    return false;
+  }
+  
+  @SuppressWarnings("unchecked")
+  public Class getPrimitiveType() {
+    if (isPrimitiveType())
+      return Reference.getPrimitiveType(reference.getId());
+    return null;
+  }
+  
+  public Column getReferenceType() {
+    if (!isPrimitiveType())
+      return referenceType;
+    return null;
+  }
+  
+  public void setReferenceType(Column column) {
+    this.referenceType = column;
+  }
+  
+  @Override
+  public boolean isActive() {
+    if (super.isActive() && !isPrimitiveType()) {
+      final Column thatColumn = getReferenceType();
+      
+      if (thatColumn != null && (!thatColumn.isActive() || !thatColumn.getTable().isActive() || thatColumn.getTable().isView())) {
+        log.error("Column " + this + " refers to a non active table or column or to a view" + thatColumn);
+        System.err.println("Column " + this + " refers to a non active table or column or to a view" + thatColumn);
+        return false;
+      }
+    }
+    return super.isActive();
+  }
+  
+  protected void setReferenceType(ModelProvider modelProvider) {
+    
+    // reference type does not need to be set
+    if (isPrimitiveType()) {
+      return;
+    }
+    
+    try {
+      String referenceId = reference.getId();
+      String referenceValueId = (referenceValue != null ? referenceValue.getId() : Reference.NO_REFERENCE);
+      char validationType = (referenceValue != null ? referenceValue.getValidationType() : reference.getValidationType());
+      Column c = modelProvider.getColumnByReference(referenceId, referenceValueId, validationType, getColumnName());
+      if (c != null)
+        setReferenceType(c);
+    } catch (Exception e) {
+      System.out.println("Error >> tableName: " + table.getTableName() + " - columnName: " + getColumnName());
+      e.printStackTrace();
+    }
+  }
+  
+  // returns the primitive type name or the class of the
+  // referenced type
+  public String getTypeName() {
+    final String typeName;
+    if (isPrimitiveType()) {
+      typeName = getPrimitiveType().getName();
+    } else if (getReferenceType() == null) {
+      System.err.println("ERROR NO REFERENCETYPE " + getTable().getMappingName() + "." + getColumnName());
+      return "java.lang.Object";
+    } else {
+      typeName = getReferenceType().getTable().getClassName();
+    }
+    return typeName;
+  }
+  
+  // the last part of the class name
+  public String getSimpleTypeName() {
+    final String typeName = getTypeName();
+    if (typeName.indexOf(".") == -1) {
+      return typeName;
+    }
+    return typeName.substring(1 + typeName.lastIndexOf("."));
+  }
+  
+  // returns the typename as an object variant
+  public String getObjectTypeName() {
+    if (isPrimitiveType()) {
+      final String typeName = getTypeName();
+      if (typeName.indexOf('.') != -1) {
+        return typeName;
+      }
+      if ("boolean".equals(typeName)) {
+        return Boolean.class.getName();
+      }
+      if ("int".equals(typeName)) {
+        return Integer.class.getName();
+      }
+      if ("long".equals(typeName)) {
+        return Long.class.getName();
+      }
+      if ("byte".equals(typeName)) {
+        return Byte.class.getName();
+      }
+      if ("float".equals(typeName)) {
+        return Float.class.getName();
+      }
+      if ("double".equals(typeName)) {
+        return Double.class.getName();
+      }
+      // TODO: maybe throw an exception
+      return typeName;
+    } else {
+      return getTypeName();
+    }
+  }
+  
+  // method added for oaw template
+  public boolean allowNullValues() {
+    if (!isPrimitiveType()) {
+      return true;
+    }
+    return (getPrimitiveType().getName().indexOf('.') != -1);
+  }
+  
+  public Property getProperty() {
+    return property;
+  }
+  
+  public void setProperty(Property property) {
+    this.property = property;
+  }
+  
+  @Override
+  public String toString() {
+    return getTable() + "." + getColumnName();
+  }
+  
+  public Set<String> getAllowedValues() {
+    if (getReferenceValue() != null) {
+      return getReferenceValue().getAllowedValues();
+    }
+    return new HashSet<String>();
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/base/model/Entity.java	Wed Oct 01 12:57:20 2008 +0000
@@ -0,0 +1,287 @@
+/*
+ * 
+ * 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) 2008 Openbravo SL All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ */
+package org.openbravo.base.model;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.openbravo.base.exception.OBException;
+import org.openbravo.base.security.AccessLevelChecker;
+import org.openbravo.base.util.Check;
+import org.openbravo.base.util.OBClassLoader;
+import org.openbravo.base.validation.EntityValidator;
+
+public class Entity {
+  private List<Property> properties;
+  private Map<String, Property> propertiesByName;
+  private List<Property> idProperties;
+  private List<Property> identifierProperties;
+  
+  private String name = null;
+  private String tableName;
+  private Class<?> mappingClass = null;
+  private String className;
+  private boolean isTraceable;
+  private boolean isActiveEnabled;
+  private boolean isOrganisationEnabled;
+  private boolean isClientEnabled;
+  private boolean isMutable;
+  private boolean isDeletable;
+  
+  private EntityValidator entityValidator;
+  private AccessLevelChecker accessLevelChecker;
+  
+  // translates the columns of the table to a set of attributes
+  public void initialize(Table t) {
+    t.setEntity(this);
+    setTableName(t.getTableName());
+    setClassName(t.getClassName());
+    setName(t.getMappingName());
+    setDeletable(t.isDeletable());
+    setMutable(!t.isView());
+    
+    properties = new ArrayList<Property>();
+    idProperties = new ArrayList<Property>();
+    identifierProperties = new ArrayList<Property>();
+    propertiesByName = new HashMap<String, Property>();
+    
+    for (Column c : t.getColumns()) {
+      // non active columns are not mapped!
+      if (!c.isActive()) {
+        continue;
+      }
+      
+      final Property p = new Property();
+      p.setEntity(this);
+      p.initialize(c);
+      properties.add(p);
+      propertiesByName.put(p.getName(), p);
+      if (p.isId()) {
+        idProperties.add(p);
+      }
+      if (p.isIdentifier()) {
+        identifierProperties.add(p);
+      }
+    }
+    
+    setTraceable(hasProperty("createdby"));
+    setActiveEnabled(hasProperty("active"));
+    setOrganisationEnabled(hasProperty("org"));
+    setClientEnabled(hasProperty("client"));
+    
+    entityValidator = new EntityValidator();
+    entityValidator.initialize(this);
+    
+    if (t.getAccessLevel().equals("1")) {
+      accessLevelChecker = AccessLevelChecker.ORGANISATION;
+    } else if (t.getAccessLevel().equals("3")) {
+      accessLevelChecker = AccessLevelChecker.CLIENT_ORGANISATION;
+    } else if (t.getAccessLevel().equals("4")) {
+      accessLevelChecker = AccessLevelChecker.SYSTEM;
+    } else if (t.getAccessLevel().equals("6")) {
+      accessLevelChecker = AccessLevelChecker.SYSTEM_CLIENT;
+    } else if (t.getAccessLevel().equals("7")) {
+      accessLevelChecker = AccessLevelChecker.ALL;
+    } else {
+      Check.fail("Access level " + t.getAccessLevel() + " for table " + t.getName() + " is not supported");
+    }
+  }
+  
+  public void checkAccessLevel(String clientId, String orgId) {
+    accessLevelChecker.checkAccessLevel(getName(), clientId, orgId);
+  }
+  
+  public void validate(Object o) {
+    entityValidator.validate(o);
+  }
+  
+  public String getName() {
+    return name;
+  }
+  
+  public void setName(String name) {
+    this.name = name;
+  }
+  
+  public String getClassName() {
+    return className;
+  }
+  
+  protected void setClassName(String className) {
+    this.className = className;
+  }
+  
+  public Class<?> getMappingClass() {
+    if (mappingClass == null) {
+      try {
+        // the context class loader is the safest one
+        mappingClass = OBClassLoader.getInstance().loadClass(getClassName());
+      } catch (Exception e) {
+        throw new OBException(e);
+      }
+    }
+    return mappingClass;
+  }
+  
+  public void setTraceable(boolean isTraceable) {
+    this.isTraceable = isTraceable;
+  }
+  
+  public void setActiveEnabled(boolean isActiveEnabled) {
+    this.isActiveEnabled = isActiveEnabled;
+  }
+  
+  public void setOrganisationEnabled(boolean isOrganisationEnabled) {
+    this.isOrganisationEnabled = isOrganisationEnabled;
+  }
+  
+  public void setClientEnabled(boolean isClientEnabled) {
+    this.isClientEnabled = isClientEnabled;
+  }
+  
+  public String getImplementsStatement() {
+    
+    // NOTE not using the direct reference to the class for the interface names
+    // to prevent binary dependency
+    final StringBuilder sb = new StringBuilder();
+    if (isTraceable()) {
+      sb.append("org.openbravo.base.structure.Traceable");
+    }
+    if (isClientEnabled()) {
+      if (sb.length() > 0) {
+        sb.append(", ");
+      }
+      sb.append("org.openbravo.base.structure.ClientEnabled");
+    }
+    if (isOrganisationEnabled()) {
+      if (sb.length() > 0) {
+        sb.append(", ");
+      }
+      sb.append("org.openbravo.base.structure.OrganisationEnabled");
+    }
+    if (isActiveEnabled()) {
+      if (sb.length() > 0) {
+        sb.append(", ");
+      }
+      sb.append("org.openbravo.base.structure.ActiveEnabled");
+    }
+    if (sb.length() == 0) {
+      return "";
+    }
+    return "implements " + sb.toString();
+  }
+  
+  // checks for a certain attribute
+  // todo: it is saver to also check for the type!
+  private boolean hasProperty(String checkMappingName) {
+    for (Property p : getProperties()) {
+      if (!p.isId() && p.getName().compareTo(checkMappingName) == 0) {
+        return true;
+      }
+    }
+    return false;
+  }
+  
+  public Property getProperty(String propName) {
+    final Property prop = propertiesByName.get(propName);
+    Check.isNotNull(prop, "Property " + propName + " does not exist for entity " + this);
+    return prop;
+  }
+  
+  public String getPackageName() {
+    final int lastIndexOf = getClassName().lastIndexOf('.');
+    return getClassName().substring(0, lastIndexOf);
+  }
+  
+  public String getSimpleClassName() {
+    final int lastIndexOf = getClassName().lastIndexOf('.');
+    return getClassName().substring(1 + lastIndexOf);
+  }
+  
+  public boolean isTraceable() {
+    return isTraceable;
+  }
+  
+  public boolean isActiveEnabled() {
+    return isActiveEnabled;
+  }
+  
+  public boolean isOrganisationEnabled() {
+    return isOrganisationEnabled;
+  }
+  
+  public boolean isClientEnabled() {
+    return isClientEnabled;
+  }
+  
+  public List<Property> getProperties() {
+    return properties;
+  }
+  
+  public void setProperties(List<Property> properties) {
+    this.properties = properties;
+  }
+  
+  public List<Property> getIdentifierProperties() {
+    return identifierProperties;
+  }
+  
+  public void setIdentifierProperties(List<Property> identifierProperties) {
+    this.identifierProperties = identifierProperties;
+  }
+  
+  public List<Property> getIdProperties() {
+    return idProperties;
+  }
+  
+  public void setIdProperties(List<Property> idProperties) {
+    this.idProperties = idProperties;
+  }
+  
+  public String getTableName() {
+    return tableName;
+  }
+  
+  public void setTableName(String tableName) {
+    this.tableName = tableName;
+  }
+  
+  @Override
+  public String toString() {
+    return getName();
+  }
+  
+  public boolean isMutable() {
+    return isMutable;
+  }
+  
+  public void setMutable(boolean isMutable) {
+    this.isMutable = isMutable;
+  }
+  
+  public boolean isDeletable() {
+    return isDeletable;
+  }
+  
+  public void setDeletable(boolean isDeletable) {
+    this.isDeletable = isDeletable;
+  }
+  
+  public boolean hasCompositeId() {
+    return getIdProperties().size() == 1 && getIdProperties().get(0).isCompositeId();
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/base/model/ModelObject.java	Wed Oct 01 12:57:20 2008 +0000
@@ -0,0 +1,86 @@
+/*
+ * 
+ * Copyright (C) 2001-2008 Openbravo S.L. Licensed under the Apache Software
+ * License version 2.0 You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+ * or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.openbravo.base.model;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * The root class for the model types. Used for the bootstrap model.
+ * 
+ * @author mtaal
+ */
+
+public class ModelObject {
+  
+  private String id = null;
+  private boolean active = true;
+  private String name;
+  
+  private Map<String, Object> data = new HashMap<String, Object>();
+  
+  public void set(String propertyName, Object value) {
+    // TODO: externalise the strings
+    if (propertyName.compareTo("id") == 0) {
+      setId((String) value);
+      return;
+    } else if (propertyName.compareTo("active") == 0) {
+      setActive((Boolean) value);
+      return;
+    }
+    data.put(propertyName, value);
+  }
+  
+  public Object get(String propertyName) {
+    // TODO: externalise the strings
+    if (propertyName.compareTo("id") == 0)
+      return getId();
+    else if (propertyName.compareTo("active") == 0)
+      return isActive();
+    return data.get(propertyName);
+  }
+  
+  public boolean isNew() {
+    return id == null;
+  }
+  
+  public boolean isActive() {
+    return active;
+  }
+  
+  public void setActive(boolean active) {
+    this.active = active;
+  }
+  
+  public String getId() {
+    return id;
+  }
+  
+  public void setId(String id) {
+    this.id = id;
+  }
+  
+  public Map<String, Object> getData() {
+    return data;
+  }
+  
+  public String getIdentifier() {
+    return getClass().getName() + "(" + getId() + ")";
+  }
+  
+  public String getName() {
+    return name;
+  }
+  
+  public void setName(String name) {
+    this.name = name;
+  }
+}
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/base/model/ModelProvider.java	Wed Oct 01 12:57:20 2008 +0000
@@ -0,0 +1,343 @@
+/*
+ * 
+ * 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) 2008 Openbravo SL All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ */
+
+package org.openbravo.base.model;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+import org.hibernate.Criteria;
+import org.hibernate.Transaction;
+import org.hibernate.classic.Session;
+import org.openbravo.base.session.SessionFactoryController;
+import org.openbravo.base.util.Check;
+import org.openbravo.base.util.CheckException;
+
+public class ModelProvider {
+  private static final Logger log = Logger.getLogger(ModelProvider.class);
+  
+  private static ModelProvider instance = new ModelProvider();
+  private List<Entity> model = null;
+  private List<Table> tables = null;
+  private HashMap<String, Table> tablesByTableName = null;
+  private List<RefTable> refTable = null;
+  private List<RefSearch> refSearch = null;
+  private Map<String, RefTable> refTableMap = new HashMap<String, RefTable>();
+  private Map<String, RefSearch> refSearchMap = new HashMap<String, RefSearch>();
+  private List<RefList> refList = null;
+  private HashMap<String, Entity> entitiesByName = null;
+  private HashMap<String, Entity> entitiesByClassName = null;
+  private HashMap<String, Entity> entitiesByTableName = null;
+  
+  public static ModelProvider getInstance() {
+    return instance;
+  }
+  
+  public static void setInstance(ModelProvider instance) {
+    ModelProvider.instance = instance;
+  }
+  
+  public List<Table> getTables() {
+    getModel();
+    return tables;
+  }
+  
+  public List<Entity> getModel() {
+    if (model == null) {
+      log.info("Building runtime model");
+      
+      // Caching model (tables, table-references, search-references)
+      // Changed to use the SessionHandler directly because the dal
+      // layer uses the ModelProvider, so otherwise there will be a
+      // cyclic relation.
+      final SessionFactoryController sfc = new ModelSessionFactoryController();
+      final Session s = sfc.getSessionFactory().openSession();
+      final Transaction tx = s.beginTransaction();
+      try {
+        tables = list(s, Table.class);
+        refTable = list(s, RefTable.class);
+        refSearch = list(s, RefSearch.class);
+        refList = list(s, RefList.class);
+        
+        for (RefTable rt : refTable) {
+          refTableMap.put(rt.getId(), rt);
+        }
+        for (RefSearch rs : refSearch) {
+          // note mapped by reference id
+          refSearchMap.put(rs.getReference(), rs);
+        }
+        
+        log.debug("Read model from db");
+        
+        model = new ArrayList<Entity>();
+        entitiesByName = new HashMap<String, Entity>();
+        entitiesByClassName = new HashMap<String, Entity>();
+        entitiesByTableName = new HashMap<String, Entity>();
+        
+        // this map stores the mapped tables
+        tablesByTableName = new HashMap<String, Table>();
+        
+        // the views have to be removed from the overall list
+        // otherwise they reappear in the mapping
+        final List<Table> toRemove = new ArrayList<Table>();
+        
+        for (Table t : tables) {
+          if (!t.isActive()) {
+            log.debug("Table " + t.getName() + " is not active ignoring it");
+            toRemove.add(t);
+            continue;
+          }
+          
+          if (t.getPrimaryKeyColumns().size() == 0) {
+            log.warn("Ignoring table " + t.getName() + " because it has no primary key columns");
+            toRemove.add(t);
+            continue;
+          }
+          // tables are stored case insensitive!
+          tablesByTableName.put(t.getTableName().toLowerCase(), t);
+        }
+        
+        tables.removeAll(toRemove);
+        
+        log.debug("Setting referencetypes for columns");
+        for (Table t : tablesByTableName.values()) {
+          t.setReferenceTypes(ModelProvider.instance);
+        }
+        
+        log.debug("Setting List Values for columns");
+        for (RefList rl : refList) {
+          rl.setAllowedValue();
+        }
+        
+        for (Table t : tablesByTableName.values()) {
+          log.debug("Building model for table " + t.getTableName());
+          final Entity e = new Entity();
+          e.initialize(t);
+          model.add(e);
+          entitiesByClassName.put(e.getClassName(), e);
+          entitiesByName.put(e.getName(), e);
+          entitiesByTableName.put(t.getName(), e);
+        }
+        
+        // in the second pass set all the referenceProperties
+        // and targetEntities
+        log.debug("Setting reference property");
+        for (Table t : tablesByTableName.values()) {
+          for (Column c : t.getColumns()) {
+            if (!c.isActive()) {
+              continue;
+            }
+            if (!c.isPrimitiveType()) {
+              final Property thisProp = c.getProperty();
+              log.debug("Setting targetEntity and reference Property for " + thisProp);
+              final Column thatColumn = c.getReferenceType();
+              if (thatColumn == null) {
+                log.error("Property " + thisProp + " is mapped incorrectly, there is no reference column for it, removing from the mapping");
+                thisProp.getEntity().getProperties().remove(thisProp);
+                if (thisProp.getEntity().getIdProperties().remove(thisProp)) {
+                  Check.fail("Incorrect mapping for property " + thisProp + " which is an id, mapping fails, stopping here");
+                }
+                thisProp.getEntity().getIdentifierProperties().remove(thisProp);
+                continue;
+              }
+              // targetentity is set within setReferencedProperty
+              final Property thatProperty = thatColumn.getProperty();
+              thisProp.setReferencedProperty(thatProperty);
+            }
+          }
+        }
+        
+        // add virtual property for the case that the
+        // id property is also a reference (a foreign key)
+        // In this case hibernate requires two mappings
+        // one for the id (a string) and for the reference
+        // in addition the id generation strategy should be set
+        // to foreign.
+        log.debug("Setting virtual property for many-to-one id's");
+        for (Entity e : entitiesByName.values()) {
+          if (e.getIdProperties().size() == 1 && !e.getIdProperties().get(0).isPrimitive()) {
+            createIdReferenceProperty(e);
+          } else if (e.getIdProperties().size() > 1) {
+            createCompositeId(e);
+          }
+        }
+      } finally {
+        log.debug("Closing session and sessionfactory used during model read");
+        tx.commit();
+        s.close();
+        sfc.getSessionFactory().close();
+      }
+    }
+    return model;
+  }
+  
+  // expects that there is only one property
+  private void createIdReferenceProperty(Entity e) {
+    Check.isTrue(e.getIdProperties().size() == 1 && !e.getIdProperties().get(0).isPrimitive(), "Expect one id property for the entity and it should be a reference type");
+    final Property p = e.getIdProperties().get(0);
+    log.debug("Handling many-to-one reference for " + p);
+    Check.isTrue(e.getIdProperties().size() == 1, "Foreign-key id-properties are only handled if there is one in an entity " + e.getName());
+    // create a reference property
+    final Property newProp = new Property();
+    newProp.setEntity(e);
+    newProp.setId(false);
+    newProp.setIdentifier(p.isIdentifier());
+    newProp.setMandatory(true);
+    newProp.setPrimitive(false);
+    newProp.setTargetEntity(p.getTargetEntity());
+    newProp.setOneToOne(true);
+    
+    // the name is the name of the class of the target without
+    // the package part and with the first character lowercased
+    final String propName = p.getSimpleTypeName().substring(0, 1).toLowerCase() + p.getSimpleTypeName().substring(1);
+    newProp.setName(propName);
+    e.getProperties().add(newProp);
+    if (newProp.isIdentifier()) {
+      e.getIdentifierProperties().add(newProp);
+    }
+    
+    // and change the old id property to a primitive one
+    final Property targetIdProp = p.getTargetEntity().getIdProperties().get(0);
+    Check.isTrue(targetIdProp.isPrimitive(), "Entity " + e + ", The ID property of the referenced class should be primitive, an other case is not supported");
+    p.setPrimitive(true);
+    p.setIdBasedOnProperty(newProp);
+    p.setIdentifier(false);
+    p.setTargetEntity(null);
+    p.setPrimitiveType(targetIdProp.getPrimitiveType());
+  }
+  
+  private void createCompositeId(Entity e) {
+    Check.isTrue(e.getIdProperties().size() > 1, "Expect that entity " + e + " has more than one id property ");
+    final Property compId = new Property();
+    compId.setEntity(e);
+    compId.setId(true);
+    compId.setIdentifier(false);
+    compId.setMandatory(true);
+    compId.setPrimitive(false);
+    compId.setCompositeId(true);
+    compId.setName("id");
+    e.getProperties().add(compId);
+    
+    final List<Property> toRemove = new ArrayList<Property>();
+    for (Property p : e.getIdProperties()) {
+      compId.getIdParts().add(p);
+      p.setPartOfCompositeId(true);
+      p.setId(false);
+      toRemove.add(p);
+    }
+    e.getIdProperties().removeAll(toRemove);
+    Check.isTrue(e.getIdProperties().size() == 0, "There should not be any id properties (entity " + e + ") at this point");
+    e.getIdProperties().add(compId);
+  }
+  
+  @SuppressWarnings("unchecked")
+  public <T extends Object> List<T> list(Session s, Class<T> clazz) {
+    final Criteria c = s.createCriteria(clazz);
+    return c.list();
+  }
+  
+  public Table getTable(String tableName) throws CheckException {
+    if (model == null)
+      getModel();
+    // search case insensitive!
+    final Table table = tablesByTableName.get(tableName.toLowerCase());
+    if (table == null)
+      Check.fail("Table: " + tableName + " not found in runtime model, is it maybe inactive?");
+    return table;
+  }
+  
+  public Entity getEntity(String entityName) throws CheckException {
+    if (model == null)
+      getModel();
+    final Entity entity = entitiesByName.get(entityName);
+    if (entity == null)
+      Check.fail("Mapping name: " + entityName + " not found in runtime model");
+    return entity;
+  }
+  
+  public Entity getEntityByTableName(String tableName) {
+    if (model == null)
+      getModel();
+    final Entity entity = entitiesByTableName.get(tableName);
+    if (entity == null) {
+      log.warn("Table name: " + tableName + " not found in runtime model");
+    }
+    return entity;
+  }
+  
+  public Entity getEntity(Class<?> clz) throws CheckException {
+    if (model == null)
+      getModel();
+    // TODO: handle subclasses, so if not found then try to find superclass!
+    final Entity entity = entitiesByClassName.get(clz.getName());
+    if (entity == null)
+      Check.fail("Class name: " + clz.getName() + " not found in runtime model");
+    return entity;
+  }
+  
+  public Column getColumnByReference(String reference, String referenceValue, char validationType, String columnName) throws CheckException {
+    Column c = null;
+    
+    if (model == null)
+      getModel();
+    
+    if (reference.equals(Reference.TABLEDIR) || (reference.equals(Reference.SEARCH) && referenceValue.equals(Reference.NO_REFERENCE)) || reference.equals(Reference.IMAGE) || reference.equals(Reference.PRODUCT_ATTRIBUTE) || reference.equals(Reference.RESOURCE_ASSIGNMENT)) {
+      
+      // Removing _ID from tableName based on Openbravo naming convention
+      String sTable = columnName.substring(0, columnName.length() - 3);
+      
+      // TODO: solve references in the application dictionary
+      // Special Cases
+      if (sTable.equals("Ref_OrderLine"))
+        sTable = "C_OrderLine";
+      
+      if (columnName.equals("C_Settlement_Cancel_ID") || columnName.equals("C_Settlement_Generate_ID"))
+        sTable = "C_Settlement";
+      
+      if (columnName.equals("Fact_Acct_Ref_ID"))
+        sTable = "Fact_Acct";
+      
+      if (columnName.equals("Account_ID"))
+        sTable = "C_ElementValue";
+      
+      try {
+        c = getTable(sTable).getPrimaryKeyColumns().get(0);
+      } catch (Exception e) {
+        e.printStackTrace();
+      }
+      
+    } else if (reference.equals(Reference.TABLE)) {
+      if (validationType == Reference.TABLE_VALIDATION) {
+        final RefTable rt = refTableMap.get(referenceValue);
+        if (rt != null) {
+          c = rt.getColumn();
+        }
+      }
+    } else if (reference.equals(Reference.SEARCH) && !referenceValue.equals(Reference.NO_REFERENCE)) {
+      if (validationType == Reference.SEARCH_VALIDATION) {
+        final RefSearch rs = refSearchMap.get(referenceValue);
+        if (rs != null) {
+          c = rs.getColumn();
+        }
+      }
+    }
+    if (c == null)
+      Check.fail("Reference column for " + columnName + " not found in runtime model [ref: " + reference + ", refval: " + referenceValue + "]");
+    return c;
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/base/model/ModelSessionFactoryController.java	Wed Oct 01 12:57:20 2008 +0000
@@ -0,0 +1,35 @@
+/*
+ * 
+ * Copyright (C) 2001-2008 Openbravo S.L. Licensed under the Apache Software
+ * License version 2.0 You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law
+ * or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+
+package org.openbravo.base.model;
+
+import org.hibernate.cfg.Configuration;
+import org.openbravo.base.session.SessionFactoryController;
+
+/**
+ * Initializes and provides the session factory for the model layer. It uses
+ * fixed mappings for Table, Column etc..
+ * 
+ * @author mtaal
+ */
+
+public class ModelSessionFactoryController extends SessionFactoryController {
+  
+  @Override
+  protected void mapModel(Configuration cfg) {
+    cfg.addClass(Table.class);
+    cfg.addClass(Column.class);
+    cfg.addClass(Reference.class);
+    cfg.addClass(RefSearch.class);
+    cfg.addClass(RefTable.class);
+    cfg.addClass(RefList.class);
+  }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/org/openbravo/base/model/Property.java	Wed Oct 01 12:57:20 2008 +0000
@@ -0,0 +1,427 @@
+/*
+ * 
+ * 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) 2008 Openbravo SL All Rights Reserved.
+ * Contributor(s): ______________________________________.
+ */
+package org.openbravo.base.model;