Merge stable changesets from int to main
authorRM packaging bot <staff.rm@openbravo.com>
Mon, 01 Feb 2010 17:51:41 +0100
changeset 6008 59c5b81673a9
parent 6007 7407fb3f9687 (current diff)
parent 5989 badd6aad2076 (diff)
child 6009 3d5bd712a24b
Merge stable changesets from int to main
src-db/database/sourcedata/AD_MESSAGE.xml
--- a/build.xml	Thu Jan 28 18:25:57 2010 +0100
+++ b/build.xml	Mon Feb 01 17:51:41 2010 +0100
@@ -352,20 +352,26 @@
   </target>
 
   <target name="eclipse.compile" depends="init">
+    <fail unless="eclipse.running" message="eclipse.* tasks must be executed inside Eclipse" />
     <ant dir="${base.src.core}" target="build.jar" inheritAll="true" inheritRefs="true" />
     <ant dir="${base.src.trl}" target="build.jar" inheritAll="true" inheritRefs="true" />
     <ant dir="${base.src.wad}" target="build.jar" inheritAll="true" inheritRefs="true" />
     <ant dir="${base.src}" target="eclipse.compile" inheritAll="true" inheritRefs="true" />
+    <echo message="Refreshing project..." level="info" />
     <eclipse.refreshLocal resource="openbravo" depth="infinite" />
+    <echo message="Building project..." level="info" />
     <eclipse.incrementalBuild project="openbravo" kind="incremental" />
   </target>
 
   <target name="eclipse.compile.complete" depends="init">
+    <fail unless="eclipse.running" message="eclipse.* tasks must be executed inside Eclipse" />
     <ant dir="${base.src.core}" target="build.jar" inheritAll="true" inheritRefs="true" />
     <ant dir="${base.src.trl}" target="build.jar" inheritAll="true" inheritRefs="true" />
     <ant dir="${base.src.wad}" target="build.jar" inheritAll="true" inheritRefs="true" />
     <ant dir="${base.src}" target="eclipse.compile.complete" inheritAll="true" inheritRefs="true" />
+    <echo message="Refreshing project..." level="info" />
     <eclipse.refreshLocal resource="openbravo" depth="infinite" />
+    <echo message="Building project..." level="info" />
     <eclipse.incrementalBuild project="openbravo" kind="full" />
   </target>
 
@@ -528,6 +534,8 @@
   </target>
 
   <target name="eclipse.install.source" depends="init, create.database">
+    <fail unless="eclipse.running" message="eclipse.* tasks must be executed inside Eclipse" />
+    <echo message="Building OpenbravoCore project..." level="info" />
     <eclipse.incrementalBuild project="OpenbravoCore" kind="full"/>
     <antcall target="eclipse.wad.lib"/>
     <antcall target="eclipse.trl.lib"/>
--- a/src-db/database/model/functions/C_PERIOD_PROCESS.xml	Thu Jan 28 18:25:57 2010 +0100
+++ b/src-db/database/model/functions/C_PERIOD_PROCESS.xml	Mon Feb 01 17:51:41 2010 +0100
@@ -35,6 +35,7 @@
   v_Record_ID VARCHAR2(32);
   v_Record_ID_Log VARCHAR2(32);
   v_Count NUMBER:=0;
+  v_Count2 NUMBER:=0;
   -- Parameter
   TYPE RECORD IS REF CURSOR;
     Cur_Document RECORD;
@@ -76,6 +77,14 @@
       WHERE C_PeriodControl_Log_ID=v_Record_ID_Log;   
       -- Action: Open if not permanently closed
       IF(p_PeriodAction='O') THEN
+
+        SELECT COUNT(DISTINCT C_YEAR.YEAR) INTO v_Count2 FROM C_PERIOD, C_PERIODCONTROL, C_YEAR WHERE
+          C_PERIODCONTROL.C_PERIOD_ID=C_PERIOD.C_PERIOD_ID AND C_PERIOD.C_YEAR_ID=C_YEAR.C_YEAR_ID AND C_PERIODCONTROL.PERIODSTATUS IN ('C') AND C_YEAR.YEAR>p_YearName
+          AND C_PERIODCONTROL.AD_CLIENT_ID = v_AD_Client_ID AND C_YEAR.C_CALENDAR_ID = p_Calendar;
+        IF (v_Count2>=1) THEN
+          RAISE_APPLICATION_ERROR(-20000, '@FeatureYearClosed@');
+        END IF;
+        
               
         IF (p_IsRecursive='N') THEN
           FOR Cur_Document IN
--- a/src-db/database/model/tables/C_INVOICELINE.xml	Thu Jan 28 18:25:57 2010 +0100
+++ b/src-db/database/model/tables/C_INVOICELINE.xml	Mon Feb 01 17:51:41 2010 +0100
@@ -137,6 +137,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="ISEDITLINENETAMT" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="C_INVOICELINE_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
--- a/src-db/database/model/tables/C_ORDERLINE.xml	Thu Jan 28 18:25:57 2010 +0100
+++ b/src-db/database/model/tables/C_ORDERLINE.xml	Mon Feb 01 17:51:41 2010 +0100
@@ -185,6 +185,10 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="ISEDITLINENETAMT" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false">
+        <default><![CDATA[N]]></default>
+        <onCreateDefault/>
+      </column>
       <foreign-key foreignTable="AD_CLIENT" name="C_ORDERLINE_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Thu Jan 28 18:25:57 2010 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Mon Feb 01 17:51:41 2010 +0100
@@ -31271,7 +31271,7 @@
 <!--2200-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--2200-->  <NAME><![CDATA[Summed Line Amount]]></NAME>
 <!--2200-->  <DESCRIPTION><![CDATA[The final sum of all line totals made to a specified document or transaction (not including taxes).]]></DESCRIPTION>
-<!--2200-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency]]></HELP>
+<!--2200-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency.]]></HELP>
 <!--2200-->  <COLUMNNAME><![CDATA[TotalLines]]></COLUMNNAME>
 <!--2200-->  <AD_TABLE_ID><![CDATA[259]]></AD_TABLE_ID>
 <!--2200-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
@@ -31284,7 +31284,7 @@
 <!--2200-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--2200-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--2200-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--2200-->  <AD_ELEMENT_ID><![CDATA[598]]></AD_ELEMENT_ID>
+<!--2200-->  <AD_ELEMENT_ID><![CDATA[F3BF680089754BAC858ECFF2D5D0F232]]></AD_ELEMENT_ID>
 <!--2200-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--2200-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--2200-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -31315,7 +31315,7 @@
 <!--2201-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--2201-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--2201-->  <ISSELECTIONCOLUMN><![CDATA[Y]]></ISSELECTIONCOLUMN>
-<!--2201-->  <AD_ELEMENT_ID><![CDATA[316]]></AD_ELEMENT_ID>
+<!--2201-->  <AD_ELEMENT_ID><![CDATA[E46619B0FD944516A50C9B18E0E4E727]]></AD_ELEMENT_ID>
 <!--2201-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--2201-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--2201-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -32162,7 +32162,7 @@
 <!--2231-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--2231-->  <CALLOUT><![CDATA[SL_Order_Amt]]></CALLOUT>
 <!--2231-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--2231-->  <AD_ELEMENT_ID><![CDATA[520]]></AD_ELEMENT_ID>
+<!--2231-->  <AD_ELEMENT_ID><![CDATA[3C8963BA09134DA48BF3B762216A6FFB]]></AD_ELEMENT_ID>
 <!--2231-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--2231-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--2231-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -32196,7 +32196,7 @@
 <!--2232-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--2232-->  <CALLOUT><![CDATA[SL_Order_Amt]]></CALLOUT>
 <!--2232-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--2232-->  <AD_ELEMENT_ID><![CDATA[519]]></AD_ELEMENT_ID>
+<!--2232-->  <AD_ELEMENT_ID><![CDATA[9F815073C39E4506A1C74BB3667C6B57]]></AD_ELEMENT_ID>
 <!--2232-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--2232-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--2232-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -53580,7 +53580,7 @@
 <!--3506-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3506-->  <NAME><![CDATA[Summed Line Amount]]></NAME>
 <!--3506-->  <DESCRIPTION><![CDATA[The final sum of all line totals made to a specified document or transaction (not including taxes).]]></DESCRIPTION>
-<!--3506-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency]]></HELP>
+<!--3506-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency.]]></HELP>
 <!--3506-->  <COLUMNNAME><![CDATA[TotalLines]]></COLUMNNAME>
 <!--3506-->  <AD_TABLE_ID><![CDATA[318]]></AD_TABLE_ID>
 <!--3506-->  <AD_REFERENCE_ID><![CDATA[12]]></AD_REFERENCE_ID>
@@ -53593,7 +53593,7 @@
 <!--3506-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--3506-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--3506-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--3506-->  <AD_ELEMENT_ID><![CDATA[598]]></AD_ELEMENT_ID>
+<!--3506-->  <AD_ELEMENT_ID><![CDATA[F3BF680089754BAC858ECFF2D5D0F232]]></AD_ELEMENT_ID>
 <!--3506-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--3506-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--3506-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -53624,7 +53624,7 @@
 <!--3507-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--3507-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--3507-->  <ISSELECTIONCOLUMN><![CDATA[Y]]></ISSELECTIONCOLUMN>
-<!--3507-->  <AD_ELEMENT_ID><![CDATA[316]]></AD_ELEMENT_ID>
+<!--3507-->  <AD_ELEMENT_ID><![CDATA[E46619B0FD944516A50C9B18E0E4E727]]></AD_ELEMENT_ID>
 <!--3507-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--3507-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--3507-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -57914,7 +57914,8 @@
 <!--3723-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--3723-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--3723-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--3723-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--3723-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--3723-->  <READONLYLOGIC><![CDATA[@Iseditlinenetamt@='N']]></READONLYLOGIC>
 <!--3723-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
 <!--3723-->  <SEQNO><![CDATA[3]]></SEQNO>
 <!--3723-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -60118,7 +60119,7 @@
 <!--3842-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--3842-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--3842-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--3842-->  <AD_ELEMENT_ID><![CDATA[520]]></AD_ELEMENT_ID>
+<!--3842-->  <AD_ELEMENT_ID><![CDATA[3C8963BA09134DA48BF3B762216A6FFB]]></AD_ELEMENT_ID>
 <!--3842-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--3842-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--3842-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -60150,7 +60151,7 @@
 <!--3843-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--3843-->  <CALLOUT><![CDATA[SL_Invoice_Amt]]></CALLOUT>
 <!--3843-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--3843-->  <AD_ELEMENT_ID><![CDATA[519]]></AD_ELEMENT_ID>
+<!--3843-->  <AD_ELEMENT_ID><![CDATA[9F815073C39E4506A1C74BB3667C6B57]]></AD_ELEMENT_ID>
 <!--3843-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--3843-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--3843-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -60176,7 +60177,8 @@
 <!--3844-->  <ISKEY><![CDATA[N]]></ISKEY>
 <!--3844-->  <ISPARENT><![CDATA[N]]></ISPARENT>
 <!--3844-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--3844-->  <ISUPDATEABLE><![CDATA[N]]></ISUPDATEABLE>
+<!--3844-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--3844-->  <READONLYLOGIC><![CDATA[@Iseditlinenetamt@='N']]></READONLYLOGIC>
 <!--3844-->  <ISIDENTIFIER><![CDATA[Y]]></ISIDENTIFIER>
 <!--3844-->  <SEQNO><![CDATA[3]]></SEQNO>
 <!--3844-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
@@ -180598,7 +180600,7 @@
 <!--801166-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
 <!--801166-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--801166-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--801166-->  <AD_ELEMENT_ID><![CDATA[957]]></AD_ELEMENT_ID>
+<!--801166-->  <AD_ELEMENT_ID><![CDATA[CD57A1DBADD440EC9551AE6BC51E8643]]></AD_ELEMENT_ID>
 <!--801166-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--801166-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--801166-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
@@ -267307,6 +267309,70 @@
 <!--7AD1D1A49C5D11DD9476001B388C05F0-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--7AD1D1A49C5D11DD9476001B388C05F0--></AD_COLUMN>
 
+<!--7E011D1981B1E366E040007F01013030--><AD_COLUMN>
+<!--7E011D1981B1E366E040007F01013030-->  <AD_COLUMN_ID><![CDATA[7E011D1981B1E366E040007F01013030]]></AD_COLUMN_ID>
+<!--7E011D1981B1E366E040007F01013030-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E011D1981B1E366E040007F01013030-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E011D1981B1E366E040007F01013030-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E011D1981B1E366E040007F01013030-->  <NAME><![CDATA[Edit Line Amount]]></NAME>
+<!--7E011D1981B1E366E040007F01013030-->  <DESCRIPTION><![CDATA[A flag used to allow the end-user to edit Line Net Amount field.]]></DESCRIPTION>
+<!--7E011D1981B1E366E040007F01013030-->  <HELP><![CDATA[A flag used to allow the end-user to edit Line Net Amount field.]]></HELP>
+<!--7E011D1981B1E366E040007F01013030-->  <COLUMNNAME><![CDATA[Iseditlinenetamt]]></COLUMNNAME>
+<!--7E011D1981B1E366E040007F01013030-->  <AD_TABLE_ID><![CDATA[333]]></AD_TABLE_ID>
+<!--7E011D1981B1E366E040007F01013030-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--7E011D1981B1E366E040007F01013030-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--7E011D1981B1E366E040007F01013030-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--7E011D1981B1E366E040007F01013030-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E011D1981B1E366E040007F01013030-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E011D1981B1E366E040007F01013030-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--7E011D1981B1E366E040007F01013030-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7E011D1981B1E366E040007F01013030-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E011D1981B1E366E040007F01013030-->  <SEQNO><![CDATA[63]]></SEQNO>
+<!--7E011D1981B1E366E040007F01013030-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E011D1981B1E366E040007F01013030-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E011D1981B1E366E040007F01013030-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E011D1981B1E366E040007F01013030-->  <AD_ELEMENT_ID><![CDATA[7E011D1981B3E366E040007F01013030]]></AD_ELEMENT_ID>
+<!--7E011D1981B1E366E040007F01013030-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E011D1981B1E366E040007F01013030-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E011D1981B1E366E040007F01013030-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E011D1981B1E366E040007F01013030-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E011D1981B1E366E040007F01013030-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E011D1981B1E366E040007F01013030-->  <POSITION><![CDATA[35]]></POSITION>
+<!--7E011D1981B1E366E040007F01013030-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E011D1981B1E366E040007F01013030--></AD_COLUMN>
+
+<!--7E011D1981B2E366E040007F01013030--><AD_COLUMN>
+<!--7E011D1981B2E366E040007F01013030-->  <AD_COLUMN_ID><![CDATA[7E011D1981B2E366E040007F01013030]]></AD_COLUMN_ID>
+<!--7E011D1981B2E366E040007F01013030-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E011D1981B2E366E040007F01013030-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E011D1981B2E366E040007F01013030-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E011D1981B2E366E040007F01013030-->  <NAME><![CDATA[Edit Line Amount]]></NAME>
+<!--7E011D1981B2E366E040007F01013030-->  <DESCRIPTION><![CDATA[A flag used to allow the end-user to edit Line Net Amount field.]]></DESCRIPTION>
+<!--7E011D1981B2E366E040007F01013030-->  <HELP><![CDATA[A flag used to allow the end-user to edit Line Net Amount field.]]></HELP>
+<!--7E011D1981B2E366E040007F01013030-->  <COLUMNNAME><![CDATA[Iseditlinenetamt]]></COLUMNNAME>
+<!--7E011D1981B2E366E040007F01013030-->  <AD_TABLE_ID><![CDATA[260]]></AD_TABLE_ID>
+<!--7E011D1981B2E366E040007F01013030-->  <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--7E011D1981B2E366E040007F01013030-->  <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--7E011D1981B2E366E040007F01013030-->  <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE>
+<!--7E011D1981B2E366E040007F01013030-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--7E011D1981B2E366E040007F01013030-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--7E011D1981B2E366E040007F01013030-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--7E011D1981B2E366E040007F01013030-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--7E011D1981B2E366E040007F01013030-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--7E011D1981B2E366E040007F01013030-->  <SEQNO><![CDATA[63]]></SEQNO>
+<!--7E011D1981B2E366E040007F01013030-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--7E011D1981B2E366E040007F01013030-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--7E011D1981B2E366E040007F01013030-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--7E011D1981B2E366E040007F01013030-->  <AD_ELEMENT_ID><![CDATA[7E011D1981B3E366E040007F01013030]]></AD_ELEMENT_ID>
+<!--7E011D1981B2E366E040007F01013030-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--7E011D1981B2E366E040007F01013030-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--7E011D1981B2E366E040007F01013030-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--7E011D1981B2E366E040007F01013030-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--7E011D1981B2E366E040007F01013030-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E011D1981B2E366E040007F01013030-->  <POSITION><![CDATA[47]]></POSITION>
+<!--7E011D1981B2E366E040007F01013030-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--7E011D1981B2E366E040007F01013030--></AD_COLUMN>
+
 <!--7E32BAEA996311DDA0B6001D09C4A2FE--><AD_COLUMN>
 <!--7E32BAEA996311DDA0B6001D09C4A2FE-->  <AD_COLUMN_ID><![CDATA[7E32BAEA996311DDA0B6001D09C4A2FE]]></AD_COLUMN_ID>
 <!--7E32BAEA996311DDA0B6001D09C4A2FE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Jan 28 18:25:57 2010 +0100
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Mon Feb 01 17:51:41 2010 +0100
@@ -22036,6 +22036,19 @@
 <!--3B584D993CCF41B698DBE642AFC21AE4-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--3B584D993CCF41B698DBE642AFC21AE4--></AD_ELEMENT>
 
+<!--3C8963BA09134DA48BF3B762216A6FFB--><AD_ELEMENT>
+<!--3C8963BA09134DA48BF3B762216A6FFB-->  <AD_ELEMENT_ID><![CDATA[3C8963BA09134DA48BF3B762216A6FFB]]></AD_ELEMENT_ID>
+<!--3C8963BA09134DA48BF3B762216A6FFB-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--3C8963BA09134DA48BF3B762216A6FFB-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--3C8963BA09134DA48BF3B762216A6FFB-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--3C8963BA09134DA48BF3B762216A6FFB-->  <COLUMNNAME><![CDATA[PriceList]]></COLUMNNAME>
+<!--3C8963BA09134DA48BF3B762216A6FFB-->  <NAME><![CDATA[Net List Price]]></NAME>
+<!--3C8963BA09134DA48BF3B762216A6FFB-->  <PRINTNAME><![CDATA[Net List Price]]></PRINTNAME>
+<!--3C8963BA09134DA48BF3B762216A6FFB-->  <DESCRIPTION><![CDATA[The official price of a product in a specified currency.]]></DESCRIPTION>
+<!--3C8963BA09134DA48BF3B762216A6FFB-->  <HELP><![CDATA[The List Price is the official price stated by the selected pricelist and the currency of the document.]]></HELP>
+<!--3C8963BA09134DA48BF3B762216A6FFB-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--3C8963BA09134DA48BF3B762216A6FFB--></AD_ELEMENT>
+
 <!--3DD3F280A13211DDAEA4BF49C7DAED58--><AD_ELEMENT>
 <!--3DD3F280A13211DDAEA4BF49C7DAED58-->  <AD_ELEMENT_ID><![CDATA[3DD3F280A13211DDAEA4BF49C7DAED58]]></AD_ELEMENT_ID>
 <!--3DD3F280A13211DDAEA4BF49C7DAED58-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -24867,6 +24880,19 @@
 <!--7C152B5C9EBC4E74B75C469A8A473D34-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--7C152B5C9EBC4E74B75C469A8A473D34--></AD_ELEMENT>
 
+<!--7E011D1981B3E366E040007F01013030--><AD_ELEMENT>
+<!--7E011D1981B3E366E040007F01013030-->  <AD_ELEMENT_ID><![CDATA[7E011D1981B3E366E040007F01013030]]></AD_ELEMENT_ID>
+<!--7E011D1981B3E366E040007F01013030-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--7E011D1981B3E366E040007F01013030-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--7E011D1981B3E366E040007F01013030-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--7E011D1981B3E366E040007F01013030-->  <COLUMNNAME><![CDATA[Iseditlinenetamt]]></COLUMNNAME>
+<!--7E011D1981B3E366E040007F01013030-->  <NAME><![CDATA[Edit Line Net Amount]]></NAME>
+<!--7E011D1981B3E366E040007F01013030-->  <PRINTNAME><![CDATA[Edit Line Net Amount]]></PRINTNAME>
+<!--7E011D1981B3E366E040007F01013030-->  <DESCRIPTION><![CDATA[A flag used to allow the end-user to edit Line Net Amount field.]]></DESCRIPTION>
+<!--7E011D1981B3E366E040007F01013030-->  <HELP><![CDATA[A flag used to allow the end-user to edit Line Net Amount field.]]></HELP>
+<!--7E011D1981B3E366E040007F01013030-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--7E011D1981B3E366E040007F01013030--></AD_ELEMENT>
+
 <!--80044AA0505611DEBC12001CC0B8EF99--><AD_ELEMENT>
 <!--80044AA0505611DEBC12001CC0B8EF99-->  <AD_ELEMENT_ID><![CDATA[80044AA0505611DEBC12001CC0B8EF99]]></AD_ELEMENT_ID>
 <!--80044AA0505611DEBC12001CC0B8EF99-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -24992,6 +25018,19 @@
 <!--9D376EF8B99B40C88E4D2D2A172DE6A8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--9D376EF8B99B40C88E4D2D2A172DE6A8--></AD_ELEMENT>
 
+<!--9F815073C39E4506A1C74BB3667C6B57--><AD_ELEMENT>
+<!--9F815073C39E4506A1C74BB3667C6B57-->  <AD_ELEMENT_ID><![CDATA[9F815073C39E4506A1C74BB3667C6B57]]></AD_ELEMENT_ID>
+<!--9F815073C39E4506A1C74BB3667C6B57-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9F815073C39E4506A1C74BB3667C6B57-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9F815073C39E4506A1C74BB3667C6B57-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9F815073C39E4506A1C74BB3667C6B57-->  <COLUMNNAME><![CDATA[PriceActual]]></COLUMNNAME>
+<!--9F815073C39E4506A1C74BB3667C6B57-->  <NAME><![CDATA[Net Unit Price]]></NAME>
+<!--9F815073C39E4506A1C74BB3667C6B57-->  <PRINTNAME><![CDATA[Net Unit Price]]></PRINTNAME>
+<!--9F815073C39E4506A1C74BB3667C6B57-->  <DESCRIPTION><![CDATA[The price that will be paid for a specified item.]]></DESCRIPTION>
+<!--9F815073C39E4506A1C74BB3667C6B57-->  <HELP><![CDATA[The actual price indicates the price for a product in source currency.]]></HELP>
+<!--9F815073C39E4506A1C74BB3667C6B57-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9F815073C39E4506A1C74BB3667C6B57--></AD_ELEMENT>
+
 <!--A73AEF8F123F4B46A9265790ABF61737--><AD_ELEMENT>
 <!--A73AEF8F123F4B46A9265790ABF61737-->  <AD_ELEMENT_ID><![CDATA[A73AEF8F123F4B46A9265790ABF61737]]></AD_ELEMENT_ID>
 <!--A73AEF8F123F4B46A9265790ABF61737-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -25133,6 +25172,19 @@
 <!--BEADA4ABFE544524B69FEC20E82F2D95-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--BEADA4ABFE544524B69FEC20E82F2D95--></AD_ELEMENT>
 
+<!--CD57A1DBADD440EC9551AE6BC51E8643--><AD_ELEMENT>
+<!--CD57A1DBADD440EC9551AE6BC51E8643-->  <AD_ELEMENT_ID><![CDATA[CD57A1DBADD440EC9551AE6BC51E8643]]></AD_ELEMENT_ID>
+<!--CD57A1DBADD440EC9551AE6BC51E8643-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CD57A1DBADD440EC9551AE6BC51E8643-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CD57A1DBADD440EC9551AE6BC51E8643-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CD57A1DBADD440EC9551AE6BC51E8643-->  <COLUMNNAME><![CDATA[PriceStd]]></COLUMNNAME>
+<!--CD57A1DBADD440EC9551AE6BC51E8643-->  <NAME><![CDATA[Net Standard Price]]></NAME>
+<!--CD57A1DBADD440EC9551AE6BC51E8643-->  <PRINTNAME><![CDATA[Net Standard Price]]></PRINTNAME>
+<!--CD57A1DBADD440EC9551AE6BC51E8643-->  <DESCRIPTION><![CDATA[The regular or normal price of a product in the respective price list.]]></DESCRIPTION>
+<!--CD57A1DBADD440EC9551AE6BC51E8643-->  <HELP><![CDATA[The Standard Price indicates the standard or normal price for a product on this price list]]></HELP>
+<!--CD57A1DBADD440EC9551AE6BC51E8643-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--CD57A1DBADD440EC9551AE6BC51E8643--></AD_ELEMENT>
+
 <!--D498E8A6CB6711DDBAC06BA41F5FDE11--><AD_ELEMENT>
 <!--D498E8A6CB6711DDBAC06BA41F5FDE11-->  <AD_ELEMENT_ID><![CDATA[D498E8A6CB6711DDBAC06BA41F5FDE11]]></AD_ELEMENT_ID>
 <!--D498E8A6CB6711DDBAC06BA41F5FDE11-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -25198,6 +25250,19 @@
 <!--E0AAAEDD15444468A96DDAF14AF227F2-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--E0AAAEDD15444468A96DDAF14AF227F2--></AD_ELEMENT>
 
+<!--E46619B0FD944516A50C9B18E0E4E727--><AD_ELEMENT>
+<!--E46619B0FD944516A50C9B18E0E4E727-->  <AD_ELEMENT_ID><![CDATA[E46619B0FD944516A50C9B18E0E4E727]]></AD_ELEMENT_ID>
+<!--E46619B0FD944516A50C9B18E0E4E727-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E46619B0FD944516A50C9B18E0E4E727-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E46619B0FD944516A50C9B18E0E4E727-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E46619B0FD944516A50C9B18E0E4E727-->  <COLUMNNAME><![CDATA[GrandTotal]]></COLUMNNAME>
+<!--E46619B0FD944516A50C9B18E0E4E727-->  <NAME><![CDATA[Total Gross Amount]]></NAME>
+<!--E46619B0FD944516A50C9B18E0E4E727-->  <PRINTNAME><![CDATA[Total Gross Amount]]></PRINTNAME>
+<!--E46619B0FD944516A50C9B18E0E4E727-->  <DESCRIPTION><![CDATA[The final monetary amount (including taxes) charge listed in a document.]]></DESCRIPTION>
+<!--E46619B0FD944516A50C9B18E0E4E727-->  <HELP><![CDATA[The Grand Total displays the total amount including Tax and Freight in document currency]]></HELP>
+<!--E46619B0FD944516A50C9B18E0E4E727-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--E46619B0FD944516A50C9B18E0E4E727--></AD_ELEMENT>
+
 <!--F197B6D6CCCE4C2F8EB42C34B560428E--><AD_ELEMENT>
 <!--F197B6D6CCCE4C2F8EB42C34B560428E-->  <AD_ELEMENT_ID><![CDATA[F197B6D6CCCE4C2F8EB42C34B560428E]]></AD_ELEMENT_ID>
 <!--F197B6D6CCCE4C2F8EB42C34B560428E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -25211,6 +25276,19 @@
 <!--F197B6D6CCCE4C2F8EB42C34B560428E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--F197B6D6CCCE4C2F8EB42C34B560428E--></AD_ELEMENT>
 
+<!--F3BF680089754BAC858ECFF2D5D0F232--><AD_ELEMENT>
+<!--F3BF680089754BAC858ECFF2D5D0F232-->  <AD_ELEMENT_ID><![CDATA[F3BF680089754BAC858ECFF2D5D0F232]]></AD_ELEMENT_ID>
+<!--F3BF680089754BAC858ECFF2D5D0F232-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F3BF680089754BAC858ECFF2D5D0F232-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F3BF680089754BAC858ECFF2D5D0F232-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F3BF680089754BAC858ECFF2D5D0F232-->  <COLUMNNAME><![CDATA[TotalLines]]></COLUMNNAME>
+<!--F3BF680089754BAC858ECFF2D5D0F232-->  <NAME><![CDATA[Total Net Amount]]></NAME>
+<!--F3BF680089754BAC858ECFF2D5D0F232-->  <PRINTNAME><![CDATA[Total Net Amount]]></PRINTNAME>
+<!--F3BF680089754BAC858ECFF2D5D0F232-->  <DESCRIPTION><![CDATA[The final sum of all line totals made to a specified document or transaction (not including taxes).]]></DESCRIPTION>
+<!--F3BF680089754BAC858ECFF2D5D0F232-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency.]]></HELP>
+<!--F3BF680089754BAC858ECFF2D5D0F232-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--F3BF680089754BAC858ECFF2D5D0F232--></AD_ELEMENT>
+
 <!--F6D57D6135DA4C4B9FF73062A73E020E--><AD_ELEMENT>
 <!--F6D57D6135DA4C4B9FF73062A73E020E-->  <AD_ELEMENT_ID><![CDATA[F6D57D6135DA4C4B9FF73062A73E020E]]></AD_ELEMENT_ID>
 <!--F6D57D6135DA4C4B9FF73062A73E020E-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Thu Jan 28 18:25:57 2010 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Mon Feb 01 17:51:41 2010 +0100
@@ -14081,9 +14081,9 @@
 <!--1112-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--1112-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--1112-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1112-->  <NAME><![CDATA[Summed Line Amount]]></NAME>
+<!--1112-->  <NAME><![CDATA[Total Net Amount]]></NAME>
 <!--1112-->  <DESCRIPTION><![CDATA[The final sum of all line totals made to a specified document or transaction (not including taxes).]]></DESCRIPTION>
-<!--1112-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency]]></HELP>
+<!--1112-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency.]]></HELP>
 <!--1112-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--1112-->  <AD_TAB_ID><![CDATA[186]]></AD_TAB_ID>
 <!--1112-->  <AD_COLUMN_ID><![CDATA[2200]]></AD_COLUMN_ID>
@@ -14105,7 +14105,7 @@
 <!--1113-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--1113-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--1113-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1113-->  <NAME><![CDATA[Grand Total Amount]]></NAME>
+<!--1113-->  <NAME><![CDATA[Total Gross Amount]]></NAME>
 <!--1113-->  <DESCRIPTION><![CDATA[The final monetary amount (including taxes) charge listed in a document.]]></DESCRIPTION>
 <!--1113-->  <HELP><![CDATA[The Grand Total displays the total amount including Tax and Freight in document currency]]></HELP>
 <!--1113-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -14601,7 +14601,7 @@
 <!--1137-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--1137-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--1137-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1137-->  <NAME><![CDATA[List Price]]></NAME>
+<!--1137-->  <NAME><![CDATA[Net List Price]]></NAME>
 <!--1137-->  <DESCRIPTION><![CDATA[The official price of a product in a specified currency.]]></DESCRIPTION>
 <!--1137-->  <HELP><![CDATA[The List Price is the official price stated by the selected pricelist and the currency of the document.]]></HELP>
 <!--1137-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -14625,7 +14625,7 @@
 <!--1138-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--1138-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--1138-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--1138-->  <NAME><![CDATA[Unit Price]]></NAME>
+<!--1138-->  <NAME><![CDATA[Net Unit Price]]></NAME>
 <!--1138-->  <DESCRIPTION><![CDATA[The price that will be paid for a specified item.]]></DESCRIPTION>
 <!--1138-->  <HELP><![CDATA[The actual price indicates the price for a product in source currency.]]></HELP>
 <!--1138-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -31943,7 +31943,7 @@
 <!--2780-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--2780-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2780-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--2780-->  <NAME><![CDATA[Grand Total Amount]]></NAME>
+<!--2780-->  <NAME><![CDATA[Total Gross Amount]]></NAME>
 <!--2780-->  <DESCRIPTION><![CDATA[The final monetary amount (including taxes) charge listed in a document.]]></DESCRIPTION>
 <!--2780-->  <HELP><![CDATA[The Grand Total displays the total amount including Tax and Freight in document currency]]></HELP>
 <!--2780-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -32035,9 +32035,9 @@
 <!--2786-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--2786-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2786-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--2786-->  <NAME><![CDATA[Summed Line Amount]]></NAME>
+<!--2786-->  <NAME><![CDATA[Total Net Amount]]></NAME>
 <!--2786-->  <DESCRIPTION><![CDATA[The final sum of all line totals made to a specified document or transaction (not including taxes).]]></DESCRIPTION>
-<!--2786-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency]]></HELP>
+<!--2786-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency.]]></HELP>
 <!--2786-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--2786-->  <AD_TAB_ID><![CDATA[263]]></AD_TAB_ID>
 <!--2786-->  <AD_COLUMN_ID><![CDATA[3506]]></AD_COLUMN_ID>
@@ -32203,10 +32203,10 @@
 <!--2880-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--2880-->  <AD_TAB_ID><![CDATA[187]]></AD_TAB_ID>
 <!--2880-->  <AD_COLUMN_ID><![CDATA[3723]]></AD_COLUMN_ID>
-<!--2880-->  <AD_FIELDGROUP_ID><![CDATA[101]]></AD_FIELDGROUP_ID>
+<!--2880-->  <AD_FIELDGROUP_ID><![CDATA[103]]></AD_FIELDGROUP_ID>
 <!--2880-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--2880-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
-<!--2880-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--2880-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--2880-->  <SEQNO><![CDATA[310]]></SEQNO>
 <!--2880-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--2880-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
@@ -33838,10 +33838,10 @@
 <!--2995-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--2995-->  <AD_TAB_ID><![CDATA[270]]></AD_TAB_ID>
 <!--2995-->  <AD_COLUMN_ID><![CDATA[3844]]></AD_COLUMN_ID>
-<!--2995-->  <AD_FIELDGROUP_ID><![CDATA[101]]></AD_FIELDGROUP_ID>
+<!--2995-->  <AD_FIELDGROUP_ID><![CDATA[103]]></AD_FIELDGROUP_ID>
 <!--2995-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--2995-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
-<!--2995-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--2995-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--2995-->  <SEQNO><![CDATA[180]]></SEQNO>
 <!--2995-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--2995-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
@@ -33879,7 +33879,7 @@
 <!--2997-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--2997-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2997-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--2997-->  <NAME><![CDATA[Unit Price]]></NAME>
+<!--2997-->  <NAME><![CDATA[Net Unit Price]]></NAME>
 <!--2997-->  <DESCRIPTION><![CDATA[The price that will be paid for a specified item.]]></DESCRIPTION>
 <!--2997-->  <HELP><![CDATA[The actual price indicates the price for a product in source currency.]]></HELP>
 <!--2997-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -33903,7 +33903,7 @@
 <!--2998-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--2998-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2998-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--2998-->  <NAME><![CDATA[List Price]]></NAME>
+<!--2998-->  <NAME><![CDATA[Net List Price]]></NAME>
 <!--2998-->  <DESCRIPTION><![CDATA[The official price of a product in a specified currency.]]></DESCRIPTION>
 <!--2998-->  <HELP><![CDATA[The List Price is the official price stated by the selected pricelist and the currency of the document.]]></HELP>
 <!--2998-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -38543,7 +38543,7 @@
 <!--3337-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--3337-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3337-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--3337-->  <NAME><![CDATA[Grand Total Amount]]></NAME>
+<!--3337-->  <NAME><![CDATA[Total Gross Amount]]></NAME>
 <!--3337-->  <DESCRIPTION><![CDATA[The final monetary amount (including taxes) charge listed in a document.]]></DESCRIPTION>
 <!--3337-->  <HELP><![CDATA[The Grand Total displays the total amount including Tax and Freight in document currency]]></HELP>
 <!--3337-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -38636,9 +38636,9 @@
 <!--3343-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--3343-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3343-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--3343-->  <NAME><![CDATA[Summed Line Amount]]></NAME>
+<!--3343-->  <NAME><![CDATA[Total Net Amount]]></NAME>
 <!--3343-->  <DESCRIPTION><![CDATA[The final sum of all line totals made to a specified document or transaction (not including taxes).]]></DESCRIPTION>
-<!--3343-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency]]></HELP>
+<!--3343-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency.]]></HELP>
 <!--3343-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--3343-->  <AD_TAB_ID><![CDATA[290]]></AD_TAB_ID>
 <!--3343-->  <AD_COLUMN_ID><![CDATA[3506]]></AD_COLUMN_ID>
@@ -39220,12 +39220,12 @@
 <!--3370-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--3370-->  <AD_TAB_ID><![CDATA[291]]></AD_TAB_ID>
 <!--3370-->  <AD_COLUMN_ID><![CDATA[3844]]></AD_COLUMN_ID>
-<!--3370-->  <AD_FIELDGROUP_ID><![CDATA[101]]></AD_FIELDGROUP_ID>
+<!--3370-->  <AD_FIELDGROUP_ID><![CDATA[103]]></AD_FIELDGROUP_ID>
 <!--3370-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--3370-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
-<!--3370-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--3370-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--3370-->  <SEQNO><![CDATA[170]]></SEQNO>
-<!--3370-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
+<!--3370-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--3370-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3370-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--3370-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
@@ -39261,7 +39261,7 @@
 <!--3372-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--3372-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3372-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--3372-->  <NAME><![CDATA[Unit Price]]></NAME>
+<!--3372-->  <NAME><![CDATA[Net Unit Price]]></NAME>
 <!--3372-->  <DESCRIPTION><![CDATA[The price that will be paid for a specified item.]]></DESCRIPTION>
 <!--3372-->  <HELP><![CDATA[The actual price indicates the price for a product in source currency.]]></HELP>
 <!--3372-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -39285,7 +39285,7 @@
 <!--3373-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--3373-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3373-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--3373-->  <NAME><![CDATA[List Price]]></NAME>
+<!--3373-->  <NAME><![CDATA[Net List Price]]></NAME>
 <!--3373-->  <DESCRIPTION><![CDATA[The official price of a product in a specified currency.]]></DESCRIPTION>
 <!--3373-->  <HELP><![CDATA[The List Price is the official price stated by the selected pricelist and the currency of the document.]]></HELP>
 <!--3373-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -39760,7 +39760,7 @@
 <!--3395-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--3395-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3395-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--3395-->  <NAME><![CDATA[List Price]]></NAME>
+<!--3395-->  <NAME><![CDATA[Net List Price]]></NAME>
 <!--3395-->  <DESCRIPTION><![CDATA[The official price of a product in a specified currency.]]></DESCRIPTION>
 <!--3395-->  <HELP><![CDATA[The List Price is the official price stated by the selected pricelist and the currency of the document.]]></HELP>
 <!--3395-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -39784,7 +39784,7 @@
 <!--3396-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--3396-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3396-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--3396-->  <NAME><![CDATA[Unit Price]]></NAME>
+<!--3396-->  <NAME><![CDATA[Net Unit Price]]></NAME>
 <!--3396-->  <DESCRIPTION><![CDATA[The price that will be paid for a specified item.]]></DESCRIPTION>
 <!--3396-->  <HELP><![CDATA[The actual price indicates the price for a product in source currency.]]></HELP>
 <!--3396-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -40229,10 +40229,10 @@
 <!--3416-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--3416-->  <AD_TAB_ID><![CDATA[293]]></AD_TAB_ID>
 <!--3416-->  <AD_COLUMN_ID><![CDATA[3723]]></AD_COLUMN_ID>
-<!--3416-->  <AD_FIELDGROUP_ID><![CDATA[101]]></AD_FIELDGROUP_ID>
+<!--3416-->  <AD_FIELDGROUP_ID><![CDATA[103]]></AD_FIELDGROUP_ID>
 <!--3416-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--3416-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
-<!--3416-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--3416-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--3416-->  <SEQNO><![CDATA[300]]></SEQNO>
 <!--3416-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--3416-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
@@ -40917,9 +40917,9 @@
 <!--3449-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--3449-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3449-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--3449-->  <NAME><![CDATA[Summed Line Amount]]></NAME>
+<!--3449-->  <NAME><![CDATA[Total Net Amount]]></NAME>
 <!--3449-->  <DESCRIPTION><![CDATA[The final sum of all line totals made to a specified document or transaction (not including taxes).]]></DESCRIPTION>
-<!--3449-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency]]></HELP>
+<!--3449-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency.]]></HELP>
 <!--3449-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--3449-->  <AD_TAB_ID><![CDATA[294]]></AD_TAB_ID>
 <!--3449-->  <AD_COLUMN_ID><![CDATA[2200]]></AD_COLUMN_ID>
@@ -40941,7 +40941,7 @@
 <!--3450-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--3450-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--3450-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--3450-->  <NAME><![CDATA[Grand Total Amount]]></NAME>
+<!--3450-->  <NAME><![CDATA[Total Gross Amount]]></NAME>
 <!--3450-->  <DESCRIPTION><![CDATA[The final monetary amount (including taxes) charge listed in a document.]]></DESCRIPTION>
 <!--3450-->  <HELP><![CDATA[The Grand Total displays the total amount including Tax and Freight in document currency]]></HELP>
 <!--3450-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -79098,13 +79098,15 @@
 <!--6430-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--6430-->  <AD_TAB_ID><![CDATA[291]]></AD_TAB_ID>
 <!--6430-->  <AD_COLUMN_ID><![CDATA[8549]]></AD_COLUMN_ID>
-<!--6430-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--6430-->  <AD_FIELDGROUP_ID><![CDATA[103]]></AD_FIELDGROUP_ID>
+<!--6430-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--6430-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--6430-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--6430-->  <SEQNO><![CDATA[180]]></SEQNO>
 <!--6430-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--6430-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--6430-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6430-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--6430-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--6430-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6430-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6430--></AD_FIELD>
@@ -79120,13 +79122,15 @@
 <!--6431-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--6431-->  <AD_TAB_ID><![CDATA[270]]></AD_TAB_ID>
 <!--6431-->  <AD_COLUMN_ID><![CDATA[8549]]></AD_COLUMN_ID>
-<!--6431-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--6431-->  <AD_FIELDGROUP_ID><![CDATA[103]]></AD_FIELDGROUP_ID>
+<!--6431-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--6431-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--6431-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--6431-->  <SEQNO><![CDATA[190]]></SEQNO>
 <!--6431-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--6431-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--6431-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--6431-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--6431-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--6431-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--6431-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6431--></AD_FIELD>
@@ -79419,7 +79423,7 @@
 <!--6448-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--6448-->  <NAME><![CDATA[Summed Line Amount]]></NAME>
 <!--6448-->  <DESCRIPTION><![CDATA[The final sum of all line totals made to a specified document or transaction (not including taxes).]]></DESCRIPTION>
-<!--6448-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency]]></HELP>
+<!--6448-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency.]]></HELP>
 <!--6448-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--6448-->  <AD_TAB_ID><![CDATA[470]]></AD_TAB_ID>
 <!--6448-->  <AD_COLUMN_ID><![CDATA[3506]]></AD_COLUMN_ID>
@@ -86678,7 +86682,7 @@
 <!--6901-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--6901-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--6901-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6901-->  <NAME><![CDATA[Grand Total Amount]]></NAME>
+<!--6901-->  <NAME><![CDATA[Total Gross Amount]]></NAME>
 <!--6901-->  <DESCRIPTION><![CDATA[The final monetary amount (including taxes) charge listed in a document.]]></DESCRIPTION>
 <!--6901-->  <HELP><![CDATA[The Grand Total displays the total amount including Tax and Freight in document currency]]></HELP>
 <!--6901-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -87049,9 +87053,9 @@
 <!--6919-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--6919-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--6919-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--6919-->  <NAME><![CDATA[Summed Line Amount]]></NAME>
+<!--6919-->  <NAME><![CDATA[Total Net Amount]]></NAME>
 <!--6919-->  <DESCRIPTION><![CDATA[The final sum of all line totals made to a specified document or transaction (not including taxes).]]></DESCRIPTION>
-<!--6919-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency]]></HELP>
+<!--6919-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency.]]></HELP>
 <!--6919-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--6919-->  <AD_TAB_ID><![CDATA[501]]></AD_TAB_ID>
 <!--6919-->  <AD_COLUMN_ID><![CDATA[3506]]></AD_COLUMN_ID>
@@ -101545,9 +101549,9 @@
 <!--7886-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--7886-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7886-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7886-->  <NAME><![CDATA[Summed Line Amount]]></NAME>
+<!--7886-->  <NAME><![CDATA[Total Net Amount]]></NAME>
 <!--7886-->  <DESCRIPTION><![CDATA[The final sum of all line totals made to a specified document or transaction (not including taxes).]]></DESCRIPTION>
-<!--7886-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency]]></HELP>
+<!--7886-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency.]]></HELP>
 <!--7886-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--7886-->  <AD_TAB_ID><![CDATA[551]]></AD_TAB_ID>
 <!--7886-->  <AD_COLUMN_ID><![CDATA[2200]]></AD_COLUMN_ID>
@@ -101568,7 +101572,7 @@
 <!--7887-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--7887-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7887-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7887-->  <NAME><![CDATA[Grand Total Amount]]></NAME>
+<!--7887-->  <NAME><![CDATA[Total Gross Amount]]></NAME>
 <!--7887-->  <DESCRIPTION><![CDATA[The final monetary amount (including taxes) charge listed in a document.]]></DESCRIPTION>
 <!--7887-->  <HELP><![CDATA[The Grand Total displays the total amount including Tax and Freight in document currency]]></HELP>
 <!--7887-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -103507,7 +103511,7 @@
 <!--7975-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--7975-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7975-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7975-->  <NAME><![CDATA[Grand Total Amount]]></NAME>
+<!--7975-->  <NAME><![CDATA[Total Gross Amount]]></NAME>
 <!--7975-->  <DESCRIPTION><![CDATA[The final monetary amount (including taxes) charge listed in a document.]]></DESCRIPTION>
 <!--7975-->  <HELP><![CDATA[The Grand Total displays the total amount including Tax and Freight in document currency]]></HELP>
 <!--7975-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -103879,9 +103883,9 @@
 <!--7993-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--7993-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--7993-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--7993-->  <NAME><![CDATA[Summed Line Amount]]></NAME>
+<!--7993-->  <NAME><![CDATA[Total Net Amount]]></NAME>
 <!--7993-->  <DESCRIPTION><![CDATA[The final sum of all line totals made to a specified document or transaction (not including taxes).]]></DESCRIPTION>
-<!--7993-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency]]></HELP>
+<!--7993-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency.]]></HELP>
 <!--7993-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--7993-->  <AD_TAB_ID><![CDATA[553]]></AD_TAB_ID>
 <!--7993-->  <AD_COLUMN_ID><![CDATA[3506]]></AD_COLUMN_ID>
@@ -113545,9 +113549,9 @@
 <!--800283-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--800283-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--800283-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--800283-->  <NAME><![CDATA[Summed Line Amount]]></NAME>
+<!--800283-->  <NAME><![CDATA[Total Net Amount]]></NAME>
 <!--800283-->  <DESCRIPTION><![CDATA[The final sum of all line totals made to a specified document or transaction (not including taxes).]]></DESCRIPTION>
-<!--800283-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency]]></HELP>
+<!--800283-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency.]]></HELP>
 <!--800283-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--800283-->  <AD_TAB_ID><![CDATA[800020]]></AD_TAB_ID>
 <!--800283-->  <AD_COLUMN_ID><![CDATA[2200]]></AD_COLUMN_ID>
@@ -113569,7 +113573,7 @@
 <!--800284-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--800284-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--800284-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--800284-->  <NAME><![CDATA[Grand Total Amount]]></NAME>
+<!--800284-->  <NAME><![CDATA[Total Gross Amount]]></NAME>
 <!--800284-->  <DESCRIPTION><![CDATA[The final monetary amount (including taxes) charge listed in a document.]]></DESCRIPTION>
 <!--800284-->  <HELP><![CDATA[The Grand Total displays the total amount including Tax and Freight in document currency]]></HELP>
 <!--800284-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -115231,7 +115235,7 @@
 <!--800364-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--800364-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--800364-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--800364-->  <NAME><![CDATA[List Price]]></NAME>
+<!--800364-->  <NAME><![CDATA[Net List Price]]></NAME>
 <!--800364-->  <DESCRIPTION><![CDATA[The official price of a product in a specified currency.]]></DESCRIPTION>
 <!--800364-->  <HELP><![CDATA[The List Price is the official price stated by the selected pricelist and the currency of the document.]]></HELP>
 <!--800364-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -115254,7 +115258,7 @@
 <!--800365-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--800365-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--800365-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--800365-->  <NAME><![CDATA[Unit Price]]></NAME>
+<!--800365-->  <NAME><![CDATA[Net Unit Price]]></NAME>
 <!--800365-->  <DESCRIPTION><![CDATA[The price that will be paid for a specified item.]]></DESCRIPTION>
 <!--800365-->  <HELP><![CDATA[The actual price indicates the price for a product in source currency.]]></HELP>
 <!--800365-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -115632,10 +115636,10 @@
 <!--800382-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--800382-->  <AD_TAB_ID><![CDATA[800022]]></AD_TAB_ID>
 <!--800382-->  <AD_COLUMN_ID><![CDATA[3723]]></AD_COLUMN_ID>
-<!--800382-->  <AD_FIELDGROUP_ID><![CDATA[101]]></AD_FIELDGROUP_ID>
+<!--800382-->  <AD_FIELDGROUP_ID><![CDATA[103]]></AD_FIELDGROUP_ID>
 <!--800382-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--800382-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
-<!--800382-->  <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--800382-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--800382-->  <SEQNO><![CDATA[110]]></SEQNO>
 <!--800382-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--800382-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
@@ -129197,7 +129201,7 @@
 <!--801141-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--801141-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--801141-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--801141-->  <NAME><![CDATA[Grand Total Amount]]></NAME>
+<!--801141-->  <NAME><![CDATA[Total Gross Amount]]></NAME>
 <!--801141-->  <DESCRIPTION><![CDATA[The final monetary amount (including taxes) charge listed in a document.]]></DESCRIPTION>
 <!--801141-->  <HELP><![CDATA[The Grand Total displays the total amount including Tax and Freight in document currency]]></HELP>
 <!--801141-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -129311,9 +129315,9 @@
 <!--801146-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--801146-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--801146-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--801146-->  <NAME><![CDATA[Summed Line Amount]]></NAME>
+<!--801146-->  <NAME><![CDATA[Total Net Amount]]></NAME>
 <!--801146-->  <DESCRIPTION><![CDATA[The final sum of all line totals made to a specified document or transaction (not including taxes).]]></DESCRIPTION>
-<!--801146-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency]]></HELP>
+<!--801146-->  <HELP><![CDATA[The Total amount displays the total of all lines in document currency.]]></HELP>
 <!--801146-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--801146-->  <AD_TAB_ID><![CDATA[800065]]></AD_TAB_ID>
 <!--801146-->  <AD_COLUMN_ID><![CDATA[3506]]></AD_COLUMN_ID>
@@ -135799,7 +135803,7 @@
 <!--801510-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--801510-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--801510-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--801510-->  <NAME><![CDATA[Standard Price]]></NAME>
+<!--801510-->  <NAME><![CDATA[Net Standard Price]]></NAME>
 <!--801510-->  <DESCRIPTION><![CDATA[The regular or normal price of a product in the respective price list.]]></DESCRIPTION>
 <!--801510-->  <HELP><![CDATA[The Standard Price indicates the standard or normal price for a product on this price list]]></HELP>
 <!--801510-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -135844,7 +135848,7 @@
 <!--801513-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--801513-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--801513-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--801513-->  <NAME><![CDATA[Standard Price]]></NAME>
+<!--801513-->  <NAME><![CDATA[Net Standard Price]]></NAME>
 <!--801513-->  <DESCRIPTION><![CDATA[The regular or normal price of a product in the respective price list.]]></DESCRIPTION>
 <!--801513-->  <HELP><![CDATA[The Standard Price indicates the standard or normal price for a product on this price list]]></HELP>
 <!--801513-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -135889,7 +135893,7 @@
 <!--801516-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--801516-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--801516-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--801516-->  <NAME><![CDATA[Standard Price]]></NAME>
+<!--801516-->  <NAME><![CDATA[Net Standard Price]]></NAME>
 <!--801516-->  <DESCRIPTION><![CDATA[The regular or normal price of a product in the respective price list.]]></DESCRIPTION>
 <!--801516-->  <HELP><![CDATA[The Standard Price indicates the standard or normal price for a product on this price list]]></HELP>
 <!--801516-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
@@ -191217,6 +191221,30 @@
 <!--617A25F4EF00D703E040007F0101562B-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--617A25F4EF00D703E040007F0101562B--></AD_FIELD>
 
+<!--61B11EA6D16C4948910D06E49A728085--><AD_FIELD>
+<!--61B11EA6D16C4948910D06E49A728085-->  <AD_FIELD_ID><![CDATA[61B11EA6D16C4948910D06E49A728085]]></AD_FIELD_ID>
+<!--61B11EA6D16C4948910D06E49A728085-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--61B11EA6D16C4948910D06E49A728085-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--61B11EA6D16C4948910D06E49A728085-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--61B11EA6D16C4948910D06E49A728085-->  <NAME><![CDATA[Edit Line Net Amount]]></NAME>
+<!--61B11EA6D16C4948910D06E49A728085-->  <DESCRIPTION><![CDATA[A flag used to allow the end-user to edit Line Net Amount field.]]></DESCRIPTION>
+<!--61B11EA6D16C4948910D06E49A728085-->  <HELP><![CDATA[A flag used to allow the end-user to edit Line Net Amount field.]]></HELP>
+<!--61B11EA6D16C4948910D06E49A728085-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--61B11EA6D16C4948910D06E49A728085-->  <AD_TAB_ID><![CDATA[293]]></AD_TAB_ID>
+<!--61B11EA6D16C4948910D06E49A728085-->  <AD_COLUMN_ID><![CDATA[7E011D1981B2E366E040007F01013030]]></AD_COLUMN_ID>
+<!--61B11EA6D16C4948910D06E49A728085-->  <AD_FIELDGROUP_ID><![CDATA[103]]></AD_FIELDGROUP_ID>
+<!--61B11EA6D16C4948910D06E49A728085-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--61B11EA6D16C4948910D06E49A728085-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--61B11EA6D16C4948910D06E49A728085-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--61B11EA6D16C4948910D06E49A728085-->  <SEQNO><![CDATA[295]]></SEQNO>
+<!--61B11EA6D16C4948910D06E49A728085-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--61B11EA6D16C4948910D06E49A728085-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--61B11EA6D16C4948910D06E49A728085-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--61B11EA6D16C4948910D06E49A728085-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--61B11EA6D16C4948910D06E49A728085-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--61B11EA6D16C4948910D06E49A728085-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--61B11EA6D16C4948910D06E49A728085--></AD_FIELD>
+
 <!--61F239DF0C68FB81E040007F010172C7--><AD_FIELD>
 <!--61F239DF0C68FB81E040007F010172C7-->  <AD_FIELD_ID><![CDATA[61F239DF0C68FB81E040007F010172C7]]></AD_FIELD_ID>
 <!--61F239DF0C68FB81E040007F010172C7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -191582,6 +191610,30 @@
 <!--6BDD5BBDFE623D4BE040007F01013540-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--6BDD5BBDFE623D4BE040007F01013540--></AD_FIELD>
 
+<!--6C50F0BA9E0C43F0813C0D2F9E0D70A8--><AD_FIELD>
+<!--6C50F0BA9E0C43F0813C0D2F9E0D70A8-->  <AD_FIELD_ID><![CDATA[6C50F0BA9E0C43F0813C0D2F9E0D70A8]]></AD_FIELD_ID>
+<!--6C50F0BA9E0C43F0813C0D2F9E0D70A8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--6C50F0BA9E0C43F0813C0D2F9E0D70A8-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--6C50F0BA9E0C43F0813C0D2F9E0D70A8-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--6C50F0BA9E0C43F0813C0D2F9E0D70A8-->  <NAME><![CDATA[Edit Line Net Amount]]></NAME>
+<!--6C50F0BA9E0C43F0813C0D2F9E0D70A8-->  <DESCRIPTION><![CDATA[A flag used to allow the end-user to edit Line Net Amount field.]]></DESCRIPTION>
+<!--6C50F0BA9E0C43F0813C0D2F9E0D70A8-->  <HELP><![CDATA[A flag used to allow the end-user to edit Line Net Amount field.]]></HELP>
+<!--6C50F0BA9E0C43F0813C0D2F9E0D70A8-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--6C50F0BA9E0C43F0813C0D2F9E0D70A8-->  <AD_TAB_ID><![CDATA[291]]></AD_TAB_ID>
+<!--6C50F0BA9E0C43F0813C0D2F9E0D70A8-->  <AD_COLUMN_ID><![CDATA[7E011D1981B1E366E040007F01013030]]></AD_COLUMN_ID>
+<!--6C50F0BA9E0C43F0813C0D2F9E0D70A8-->  <AD_FIELDGROUP_ID><![CDATA[103]]></AD_FIELDGROUP_ID>
+<!--6C50F0BA9E0C43F0813C0D2F9E0D70A8-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--6C50F0BA9E0C43F0813C0D2F9E0D70A8-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--6C50F0BA9E0C43F0813C0D2F9E0D70A8-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--6C50F0BA9E0C43F0813C0D2F9E0D70A8-->  <SEQNO><![CDATA[165]]></SEQNO>
+<!--6C50F0BA9E0C43F0813C0D2F9E0D70A8-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--6C50F0BA9E0C43F0813C0D2F9E0D70A8-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--6C50F0BA9E0C43F0813C0D2F9E0D70A8-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--6C50F0BA9E0C43F0813C0D2F9E0D70A8-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--6C50F0BA9E0C43F0813C0D2F9E0D70A8-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--6C50F0BA9E0C43F0813C0D2F9E0D70A8-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--6C50F0BA9E0C43F0813C0D2F9E0D70A8--></AD_FIELD>
+
 <!--6CB07FBC8A50435ABCE5E5D5A612B56F--><AD_FIELD>
 <!--6CB07FBC8A50435ABCE5E5D5A612B56F-->  <AD_FIELD_ID><![CDATA[6CB07FBC8A50435ABCE5E5D5A612B56F]]></AD_FIELD_ID>
 <!--6CB07FBC8A50435ABCE5E5D5A612B56F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -192638,6 +192690,30 @@
 <!--80C65FD7819B43638FB4A0413A91A65D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--80C65FD7819B43638FB4A0413A91A65D--></AD_FIELD>
 
+<!--8329181A30D547FBB01E0CD7013069E6--><AD_FIELD>
+<!--8329181A30D547FBB01E0CD7013069E6-->  <AD_FIELD_ID><![CDATA[8329181A30D547FBB01E0CD7013069E6]]></AD_FIELD_ID>
+<!--8329181A30D547FBB01E0CD7013069E6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8329181A30D547FBB01E0CD7013069E6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8329181A30D547FBB01E0CD7013069E6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8329181A30D547FBB01E0CD7013069E6-->  <NAME><![CDATA[Edit Line Net Amount]]></NAME>
+<!--8329181A30D547FBB01E0CD7013069E6-->  <DESCRIPTION><![CDATA[A flag used to allow the end-user to edit Line Net Amount field.]]></DESCRIPTION>
+<!--8329181A30D547FBB01E0CD7013069E6-->  <HELP><![CDATA[A flag used to allow the end-user to edit Line Net Amount field.]]></HELP>
+<!--8329181A30D547FBB01E0CD7013069E6-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--8329181A30D547FBB01E0CD7013069E6-->  <AD_TAB_ID><![CDATA[187]]></AD_TAB_ID>
+<!--8329181A30D547FBB01E0CD7013069E6-->  <AD_COLUMN_ID><![CDATA[7E011D1981B2E366E040007F01013030]]></AD_COLUMN_ID>
+<!--8329181A30D547FBB01E0CD7013069E6-->  <AD_FIELDGROUP_ID><![CDATA[103]]></AD_FIELDGROUP_ID>
+<!--8329181A30D547FBB01E0CD7013069E6-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--8329181A30D547FBB01E0CD7013069E6-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--8329181A30D547FBB01E0CD7013069E6-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--8329181A30D547FBB01E0CD7013069E6-->  <SEQNO><![CDATA[305]]></SEQNO>
+<!--8329181A30D547FBB01E0CD7013069E6-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--8329181A30D547FBB01E0CD7013069E6-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--8329181A30D547FBB01E0CD7013069E6-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--8329181A30D547FBB01E0CD7013069E6-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--8329181A30D547FBB01E0CD7013069E6-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--8329181A30D547FBB01E0CD7013069E6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8329181A30D547FBB01E0CD7013069E6--></AD_FIELD>
+
 <!--83424218E05542989EF92FD3E5B5181A--><AD_FIELD>
 <!--83424218E05542989EF92FD3E5B5181A-->  <AD_FIELD_ID><![CDATA[83424218E05542989EF92FD3E5B5181A]]></AD_FIELD_ID>
 <!--83424218E05542989EF92FD3E5B5181A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -192662,6 +192738,30 @@
 <!--83424218E05542989EF92FD3E5B5181A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--83424218E05542989EF92FD3E5B5181A--></AD_FIELD>
 
+<!--86E59478FE6B4DC68BA401230C3DFC17--><AD_FIELD>
+<!--86E59478FE6B4DC68BA401230C3DFC17-->  <AD_FIELD_ID><![CDATA[86E59478FE6B4DC68BA401230C3DFC17]]></AD_FIELD_ID>
+<!--86E59478FE6B4DC68BA401230C3DFC17-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--86E59478FE6B4DC68BA401230C3DFC17-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--86E59478FE6B4DC68BA401230C3DFC17-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--86E59478FE6B4DC68BA401230C3DFC17-->  <NAME><![CDATA[Edit Line Net Amount]]></NAME>
+<!--86E59478FE6B4DC68BA401230C3DFC17-->  <DESCRIPTION><![CDATA[A flag used to allow the end-user to edit Line Net Amount field.]]></DESCRIPTION>
+<!--86E59478FE6B4DC68BA401230C3DFC17-->  <HELP><![CDATA[A flag used to allow the end-user to edit Line Net Amount field.]]></HELP>
+<!--86E59478FE6B4DC68BA401230C3DFC17-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--86E59478FE6B4DC68BA401230C3DFC17-->  <AD_TAB_ID><![CDATA[270]]></AD_TAB_ID>
+<!--86E59478FE6B4DC68BA401230C3DFC17-->  <AD_COLUMN_ID><![CDATA[7E011D1981B1E366E040007F01013030]]></AD_COLUMN_ID>
+<!--86E59478FE6B4DC68BA401230C3DFC17-->  <AD_FIELDGROUP_ID><![CDATA[103]]></AD_FIELDGROUP_ID>
+<!--86E59478FE6B4DC68BA401230C3DFC17-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--86E59478FE6B4DC68BA401230C3DFC17-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--86E59478FE6B4DC68BA401230C3DFC17-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--86E59478FE6B4DC68BA401230C3DFC17-->  <SEQNO><![CDATA[175]]></SEQNO>
+<!--86E59478FE6B4DC68BA401230C3DFC17-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--86E59478FE6B4DC68BA401230C3DFC17-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--86E59478FE6B4DC68BA401230C3DFC17-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--86E59478FE6B4DC68BA401230C3DFC17-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--86E59478FE6B4DC68BA401230C3DFC17-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--86E59478FE6B4DC68BA401230C3DFC17-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--86E59478FE6B4DC68BA401230C3DFC17--></AD_FIELD>
+
 <!--8ACBE3091A9E4CF3835A397D1ADC1E16--><AD_FIELD>
 <!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <AD_FIELD_ID><![CDATA[8ACBE3091A9E4CF3835A397D1ADC1E16]]></AD_FIELD_ID>
 <!--8ACBE3091A9E4CF3835A397D1ADC1E16-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -193376,6 +193476,30 @@
 <!--D1517C0C996311DDBA74001D09C4A2FE-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--D1517C0C996311DDBA74001D09C4A2FE--></AD_FIELD>
 
+<!--D39B86FD6ECD42A8AC850B435CAEE75C--><AD_FIELD>
+<!--D39B86FD6ECD42A8AC850B435CAEE75C-->  <AD_FIELD_ID><![CDATA[D39B86FD6ECD42A8AC850B435CAEE75C]]></AD_FIELD_ID>
+<!--D39B86FD6ECD42A8AC850B435CAEE75C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D39B86FD6ECD42A8AC850B435CAEE75C-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D39B86FD6ECD42A8AC850B435CAEE75C-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D39B86FD6ECD42A8AC850B435CAEE75C-->  <NAME><![CDATA[Edit Line Net Amount]]></NAME>
+<!--D39B86FD6ECD42A8AC850B435CAEE75C-->  <DESCRIPTION><![CDATA[A flag used to allow the end-user to edit Line Net Amount field.]]></DESCRIPTION>
+<!--D39B86FD6ECD42A8AC850B435CAEE75C-->  <HELP><![CDATA[A flag used to allow the end-user to edit Line Net Amount field.]]></HELP>
+<!--D39B86FD6ECD42A8AC850B435CAEE75C-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--D39B86FD6ECD42A8AC850B435CAEE75C-->  <AD_TAB_ID><![CDATA[800022]]></AD_TAB_ID>
+<!--D39B86FD6ECD42A8AC850B435CAEE75C-->  <AD_COLUMN_ID><![CDATA[7E011D1981B2E366E040007F01013030]]></AD_COLUMN_ID>
+<!--D39B86FD6ECD42A8AC850B435CAEE75C-->  <AD_FIELDGROUP_ID><![CDATA[103]]></AD_FIELDGROUP_ID>
+<!--D39B86FD6ECD42A8AC850B435CAEE75C-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--D39B86FD6ECD42A8AC850B435CAEE75C-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--D39B86FD6ECD42A8AC850B435CAEE75C-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--D39B86FD6ECD42A8AC850B435CAEE75C-->  <SEQNO><![CDATA[105]]></SEQNO>
+<!--D39B86FD6ECD42A8AC850B435CAEE75C-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--D39B86FD6ECD42A8AC850B435CAEE75C-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--D39B86FD6ECD42A8AC850B435CAEE75C-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--D39B86FD6ECD42A8AC850B435CAEE75C-->  <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--D39B86FD6ECD42A8AC850B435CAEE75C-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--D39B86FD6ECD42A8AC850B435CAEE75C-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--D39B86FD6ECD42A8AC850B435CAEE75C--></AD_FIELD>
+
 <!--D61CA8E515D14D6F9B92A47DD14E1EDD--><AD_FIELD>
 <!--D61CA8E515D14D6F9B92A47DD14E1EDD-->  <AD_FIELD_ID><![CDATA[D61CA8E515D14D6F9B92A47DD14E1EDD]]></AD_FIELD_ID>
 <!--D61CA8E515D14D6F9B92A47DD14E1EDD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_MESSAGE.xml	Thu Jan 28 18:25:57 2010 +0100
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml	Mon Feb 01 17:51:41 2010 +0100
@@ -31239,6 +31239,17 @@
 <!--9CD7364917F6403B8354C9D75EE4C53E-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--9CD7364917F6403B8354C9D75EE4C53E--></AD_MESSAGE>
 
+<!--9CE26D0AE4D446898CEADA0A23DCA147--><AD_MESSAGE>
+<!--9CE26D0AE4D446898CEADA0A23DCA147-->  <AD_MESSAGE_ID><![CDATA[9CE26D0AE4D446898CEADA0A23DCA147]]></AD_MESSAGE_ID>
+<!--9CE26D0AE4D446898CEADA0A23DCA147-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9CE26D0AE4D446898CEADA0A23DCA147-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9CE26D0AE4D446898CEADA0A23DCA147-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9CE26D0AE4D446898CEADA0A23DCA147-->  <VALUE><![CDATA[FeatureYearClosed]]></VALUE>
+<!--9CE26D0AE4D446898CEADA0A23DCA147-->  <MSGTEXT><![CDATA[a period can only be open if none of the periods of future years is closed.]]></MSGTEXT>
+<!--9CE26D0AE4D446898CEADA0A23DCA147-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--9CE26D0AE4D446898CEADA0A23DCA147-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--9CE26D0AE4D446898CEADA0A23DCA147--></AD_MESSAGE>
+
 <!--9D295DA584704A8C85459E14061EC2F0--><AD_MESSAGE>
 <!--9D295DA584704A8C85459E14061EC2F0-->  <AD_MESSAGE_ID><![CDATA[9D295DA584704A8C85459E14061EC2F0]]></AD_MESSAGE_ID>
 <!--9D295DA584704A8C85459E14061EC2F0-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-test/org/openbravo/test/dal/DalStoredProcedureTest.java	Thu Jan 28 18:25:57 2010 +0100
+++ b/src-test/org/openbravo/test/dal/DalStoredProcedureTest.java	Mon Feb 01 17:51:41 2010 +0100
@@ -22,24 +22,97 @@
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
+import org.openbravo.base.provider.OBProvider;
 import org.openbravo.base.structure.BaseOBObject;
 import org.openbravo.dal.service.OBDal;
+import org.openbravo.model.ad.process.ProcessInstance;
+import org.openbravo.model.ad.utility.ATTest;
+import org.openbravo.model.ad.utility.Line;
 import org.openbravo.model.common.businesspartner.Location;
 import org.openbravo.model.common.enterprise.Organization;
 import org.openbravo.model.common.enterprise.Warehouse;
 import org.openbravo.model.common.plm.Product;
+import org.openbravo.service.db.CallProcess;
 import org.openbravo.service.db.CallStoredProcedure;
 import org.openbravo.test.base.BaseTest;
 
 /**
- * Tests the {@link CallStoredProcedure} class.
+ * Tests the {@link CallStoredProcedure} class and the {@link CallProcess} class.
  * 
  * @author mtaal
  */
 
 public class DalStoredProcedureTest extends BaseTest {
+
+  private final static int NUM_OF_TEST_LINES = 5;
+
+  /**
+   * Tests the {@link CallProcess} class
+   */
+  public void testCallProcess() {
+    setSystemAdministratorContext();
+    final ATTest attest = OBProvider.getInstance().get(ATTest.class);
+    attest.setName("junittest");
+    attest.setDescription("junittest");
+    attest.setFileName("junittest");
+    attest.setCopyLines(true);
+    attest.setDeleted(false);
+    attest.setIntroduction("junittest");
+    attest.setType("M");
+
+    for (int i = 0; i < NUM_OF_TEST_LINES; i++) {
+      final Line line = OBProvider.getInstance().get(Line.class);
+      line.setTest(attest);
+      line.setArg1(i + "_arg1");
+      line.setArg2(i + "_arg2");
+      line.setArg3(i + "_arg3");
+      line.setArgNo(new Long(i));
+      line.setSequenceNumber(new Long(i));
+      line.setHelp1(i + "_H1");
+      line.setHelp2(i + "_H2");
+      line.setHelp3(i + "_H3");
+      line.setType("T");
+      attest.getLineList().add(line);
+    }
+    OBDal.getInstance().save(attest);
+
+    final ATTest copyToTest = OBProvider.getInstance().get(ATTest.class);
+    copyToTest.setName("copyToTest");
+    copyToTest.setDescription("copyToTest");
+    copyToTest.setFileName("copyToTest");
+    copyToTest.setCopyLines(true);
+    copyToTest.setDeleted(false);
+    copyToTest.setIntroduction("copyToTest");
+    copyToTest.setType("M");
+    OBDal.getInstance().save(copyToTest);
+
+    OBDal.getInstance().flush();
+
+    final Map<String, String> parameters = new HashMap<String, String>();
+    parameters.put("AT_Test_ID", attest.getId());
+
+    final org.openbravo.model.ad.ui.Process process = OBDal.getInstance().get(
+        org.openbravo.model.ad.ui.Process.class, "800096");
+    assertNotNull("No copy test line process defined with id 800096", process);
+    assertNotNull("id of attest not set", attest.getId());
+    assertEquals(NUM_OF_TEST_LINES, attest.getLineList().size());
+    assertEquals(0, copyToTest.getLineList().size());
+    final ProcessInstance pInstance = CallProcess.getInstance().call(process, copyToTest.getId(),
+        parameters);
+    OBDal.getInstance().getSession().refresh(attest);
+    OBDal.getInstance().getSession().refresh(copyToTest);
+    assertEquals("@Copied@=5 lines", pInstance.getErrorMsg());
+    assertEquals(NUM_OF_TEST_LINES, attest.getLineList().size());
+    assertEquals(NUM_OF_TEST_LINES, copyToTest.getLineList().size());
+
+    // always rollback to prevent updating the db
+    OBDal.getInstance().rollbackAndClose();
+  }
+
   /**
    * Tests calling database procedures using the dal connection provider
    */
--- a/src-test/org/openbravo/test/model/RuntimeModelTest.java	Thu Jan 28 18:25:57 2010 +0100
+++ b/src-test/org/openbravo/test/model/RuntimeModelTest.java	Mon Feb 01 17:51:41 2010 +0100
@@ -200,6 +200,20 @@
   }
 
   /**
+   * Tests that all non-one-to-many/not-one-to-one/not-composite id columns have a column
+   */
+  public void testColumnIdSet() {
+    for (Entity entity : ModelProvider.getInstance().getModel()) {
+      for (Property property : entity.getProperties()) {
+        if (property.isOneToMany() || property.isOneToOne() || property.isCompositeId()) {
+          continue;
+        }
+        assertNotNull("Property " + property + " does not have a columnid ", property.getColumnId());
+      }
+    }
+  }
+
+  /**
    * Tests that parent references are only allowed for specific reference types.
    * 
    * @see Column#getReference()
--- a/src/org/openbravo/base/model/Property.java	Thu Jan 28 18:25:57 2010 +0100
+++ b/src/org/openbravo/base/model/Property.java	Mon Feb 01 17:51:41 2010 +0100
@@ -52,6 +52,7 @@
   private Property referencedProperty;
   private String name;
   private String columnName;
+  private String columnId;
   private boolean isActiveColumn = false;
   private String nameOfColumn; // AD_COLUMN.NAME
   // note defaultValue contains the value as it exists in the db, for booleans
@@ -108,7 +109,7 @@
     setParent(fromColumn.isParent());
     setColumnName(fromColumn.getColumnName());
     setNameOfColumn(fromColumn.getName());
-
+    setColumnId(fromColumn.getId());
     setDefaultValue(fromColumn.getDefaultValue());
 
     // use of the mandatory is restricted because there are many cases whereby it is set to
@@ -953,4 +954,12 @@
   public void setActiveColumn(boolean isActiveColumn) {
     this.isActiveColumn = isActiveColumn;
   }
+
+  public String getColumnId() {
+    return columnId;
+  }
+
+  public void setColumnId(String columnId) {
+    this.columnId = columnId;
+  }
 }
--- a/src/org/openbravo/erpCommon/ad_actionButton/CreateVatRegisters.java	Thu Jan 28 18:25:57 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_actionButton/CreateVatRegisters.java	Mon Feb 01 17:51:41 2010 +0100
@@ -11,7 +11,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) 2008-2009 Openbravo SL 
+ * All portions are Copyright (C) 2008-2010 Openbravo SL 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -128,7 +128,8 @@
     if (strProcessed.equalsIgnoreCase("N")) {
       // check for already used periods)
       BigDecimal CrossPeriodCount = new BigDecimal(TaxPayment.selectCrossPeriodCount(this, vars
-          .getClient(), strDatefrom, strDateto));
+          .getClient(), Tree.getMembers(this, TreeData.getTreeOrg(this, vars.getClient()),
+          taxpayment[0].adOrgId), strDatefrom, strDateto));
       if (CrossPeriodCount.intValue() > 0) {
         myMessage = Utility.translateError(this, vars, vars.getLanguage(), Utility.messageBD(this,
             "PeriodsDontMatch", vars.getLanguage()));
--- a/src/org/openbravo/erpCommon/ad_actionButton/TaxPayment.xsql	Thu Jan 28 18:25:57 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_actionButton/TaxPayment.xsql	Mon Feb 01 17:51:41 2010 +0100
@@ -12,7 +12,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) 2008 Openbravo SL 
+ * All portions are Copyright (C) 2008-2010 Openbravo SL 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -94,6 +94,7 @@
   <![CDATA[
      SELECT COUNT(*) FROM C_TAXPAYMENT WHERE PROCESSED='Y' 
      AND AD_CLIENT_ID = ?
+     AND AD_Org_ID IN ('1')
      AND ((DATEFROM <= TO_DATE(?) AND DATETO >=TO_DATE(?)
      OR DATEFROM <= TO_DATE(?) AND DATETO >=TO_DATE(?))
      OR 
@@ -102,6 +103,7 @@
       ]]>
   </Sql>
   <Parameter name="adClientId"/>
+  <Parameter name="adUserOrg" type="replace" optional="true" after="AND AD_Org_ID IN (" text="'1'"/>
   <Parameter name="DateFrom"/>
   <Parameter name="DateFrom"/>
   <Parameter name="DateTo"/>
--- a/src/org/openbravo/erpCommon/ad_callouts/SE_Expense_Product.java	Thu Jan 28 18:25:57 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SE_Expense_Product.java	Mon Feb 01 17:51:41 2010 +0100
@@ -11,7 +11,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2009 Openbravo SL 
+ * All portions are Copyright (C) 2001-2010 Openbravo SL 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -181,7 +181,8 @@
       if (convAmount.scale() > stdPrecisionConv)
         convAmount = convAmount.setScale(stdPrecisionConv, BigDecimal.ROUND_HALF_UP);
       resultado.append(", new Array(\"inpconvertedamt\", "
-          + (convAmount.compareTo(BigDecimal.ZERO) == 0 ? "" : convAmount.toPlainString()) + ")");
+          + (convAmount.compareTo(BigDecimal.ZERO) == 0 ? "\"\"" : convAmount.toPlainString())
+          + ")");
     }
     if (strChanged.equals("inpmProductId") && !cCurrencyID.equals("")) {
       resultado.append(", new Array(\"inpcCurrencyId\", \"" + cCurrencyID + "\")");
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_SequenceProduct_Product.java	Thu Jan 28 18:25:57 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_SequenceProduct_Product.java	Mon Feb 01 17:51:41 2010 +0100
@@ -11,7 +11,7 @@
  * under the License. 
  * The Original Code is Openbravo ERP. 
  * The Initial Developer of the Original Code is Openbravo SL 
- * All portions are Copyright (C) 2001-2009 Openbravo SL 
+ * All portions are Copyright (C) 2001-2010 Openbravo SL 
  * All Rights Reserved. 
  * Contributor(s):  ______________________________________.
  ************************************************************************
@@ -97,8 +97,8 @@
       if (tld != null && tld.length > 0) {
         resultado.append("new Array(");
         for (int i = 0; i < tld.length; i++) {
-          resultado.append("new Array(" + tld[i].getField("id") + ", \""
-              + FormatUtilities.replaceJS(tld[i].getField("name")) + "\", \""
+          resultado.append("new Array(" + "\"" + FormatUtilities.replaceJS(tld[i].getField("id"))
+              + "\"" + ", \"" + FormatUtilities.replaceJS(tld[i].getField("name")) + "\", \""
               + (tld[i].getField("id").equalsIgnoreCase(strmProductUOMId) ? "true" : "false")
               + "\")");
           if (i < tld.length - 1)
@@ -125,8 +125,8 @@
       if (tld != null && tld.length > 0) {
         resultado.append("new Array(");
         for (int i = 0; i < tld.length; i++) {
-          resultado.append("new Array(" + tld[i].getField("id") + ", \""
-              + FormatUtilities.replaceJS(tld[i].getField("name")) + "\", \""
+          resultado.append("new Array(" + "\"" + FormatUtilities.replaceJS(tld[i].getField("id"))
+              + "\"" + ", \"" + FormatUtilities.replaceJS(tld[i].getField("name")) + "\", \""
               + (tld[i].getField("id").equalsIgnoreCase(strmProductUOMId) ? "true" : "false")
               + "\")");
           if (i < tld.length - 1)
--- a/src/org/openbravo/erpCommon/ad_process/ApplyModules.html	Thu Jan 28 18:25:57 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_process/ApplyModules.html	Mon Feb 01 17:51:41 2010 +0100
@@ -54,50 +54,53 @@
 
     //Changes the status of one node (corresponding icon, ...)
     function progList_changeNode(node, newStatus, text) {
-      node=node.toString();
-      if (newStatus == "Success") {
-        document.getElementById("processing_" + node).innerHTML = " ";
-        document.getElementById("processing_" + node).style.display = "none";
-        document.getElementById("error_" + node).style.display = "none";
-        document.getElementById("exception_" + node).style.display = "none";
-        document.getElementById("warning_" + node).style.display = "none";
-      } else if (newStatus == "Error") {
-        document.getElementById("processing_" + node).innerHTML = " ";
-        document.getElementById("processing_" + node).style.display = "none";
-        document.getElementById("error_" + node).style.display = "";
-        document.getElementById("exception_" + node).style.display = "none";
-        document.getElementById("warning_" + node).style.display = "none";
-      } else if (newStatus == "Exception") {
-        document.getElementById("processing_" + node).innerHTML = " ";
-        document.getElementById("processing_" + node).style.display = "none";
-        document.getElementById("error_" + node).style.display = "none";
-        document.getElementById("exception_" + node).style.display = "";
-        document.getElementById("warning_" + node).style.display = "none";
-      } else if (newStatus == "Warning") {
-        document.getElementById("processing_" + node).innerHTML = " ";
-        document.getElementById("processing_" + node).style.display = "none";
-        document.getElementById("error_" + node).style.display = "none";
-        document.getElementById("exception_" + node).style.display = "none";
-        document.getElementById("warning_" + node).style.display = "";
-      } else if (newStatus == "Pending") {
-        document.getElementById("processing_" + node).innerHTML = " ";
-        document.getElementById("processing_" + node).style.display = "none";
-        document.getElementById("error_" + node).style.display = "none";
-        document.getElementById("exception_" + node).style.display = "none";
-        document.getElementById("warning_" + node).style.display = "none";
-      } else if (newStatus == "Processing") {
-        if (text) {
-          document.getElementById("processing_" + node).innerHTML = text;
-        } else {
-          document.getElementById("processing_" + node).innerHTML = " ";
+      try {
+        node=node.toString();
+        if (newStatus == "Success") {
+          document.getElementById("processing_" + node).innerHTML = " ";
+          document.getElementById("processing_" + node).style.display = "none";
+          document.getElementById("error_" + node).style.display = "none";
+          document.getElementById("exception_" + node).style.display = "none";
+          document.getElementById("warning_" + node).style.display = "none";
+        } else if (newStatus == "Error") {
+          document.getElementById("processing_" + node).innerHTML = " ";
+          document.getElementById("processing_" + node).style.display = "none";
+          document.getElementById("error_" + node).style.display = "";
+          document.getElementById("exception_" + node).style.display = "none";
+          document.getElementById("warning_" + node).style.display = "none";
+        } else if (newStatus == "Exception") {
+          document.getElementById("processing_" + node).innerHTML = " ";
+          document.getElementById("processing_" + node).style.display = "none";
+          document.getElementById("error_" + node).style.display = "none";
+          document.getElementById("exception_" + node).style.display = "";
+          document.getElementById("warning_" + node).style.display = "none";
+        } else if (newStatus == "Warning") {
+          document.getElementById("processing_" + node).innerHTML = " ";
+          document.getElementById("processing_" + node).style.display = "none";
+          document.getElementById("error_" + node).style.display = "none";
+          document.getElementById("exception_" + node).style.display = "none";
+          document.getElementById("warning_" + node).style.display = "";
+        } else if (newStatus == "Pending") {
+          document.getElementById("processing_" + node).innerHTML = " ";
+          document.getElementById("processing_" + node).style.display = "none";
+          document.getElementById("error_" + node).style.display = "none";
+          document.getElementById("exception_" + node).style.display = "none";
+          document.getElementById("warning_" + node).style.display = "none";
+        } else if (newStatus == "Processing") {
+          if (text) {
+            document.getElementById("processing_" + node).innerHTML = text;
+          } else {
+            document.getElementById("processing_" + node).innerHTML = " ";
+          }
+          document.getElementById("processing_" + node).style.display = "";
+          document.getElementById("error_" + node).style.display = "none";
+          document.getElementById("exception_" + node).style.display = "none";
+          document.getElementById("warning_" + node).style.display = "none";
         }
-        document.getElementById("processing_" + node).style.display = "";
-        document.getElementById("error_" + node).style.display = "none";
-        document.getElementById("exception_" + node).style.display = "none";
-        document.getElementById("warning_" + node).style.display = "none";
-      }
+      } catch(e) {}
     }
     function progList_changeIcon(node, newStatus, text) {
+      try {
         node=node.toString();
         if (newStatus == "Success") {
           document.getElementById("icon_" + node).className = "CheckList_Icon_Success";
@@ -112,11 +115,14 @@
         } else if (newStatus == "Processing") {
           document.getElementById("icon_" + node).className = "CheckList_Icon_Processing";
         }
-      }
+      } catch(e) {}
+    }
 
     //Sets text of textarea
     function progList_setTextToTextArea(text) {
-      document.getElementById('warningsAndErrors').innerHTML = text;
+      try {
+        document.getElementById('warningsAndErrors').innerHTML = text;
+      } catch(e) {}
     }
 
     //Adds text to the textarea
@@ -217,6 +223,7 @@
           showJSMessage(22);
         } else {
           //Expecting msg in JSON format
+          strText = strText.toString();
           var msg = eval("("+strText+")");
           initialize_MessageBox('messageBoxID');
           setValues_MessageBox('messageBoxID',msg.OBError.type, msg.OBError.title, msg.OBError.message);
@@ -318,6 +325,7 @@
         }
         pending_states=pending_states-1;
         if(start===true){
+          strText = strText.toString();
           var msg = eval("("+strText+")");
  
           var state=msg.Response.state;
@@ -362,7 +370,7 @@
         if (XMLHttpRequestObj.responseText) {
           strText = XMLHttpRequestObj.responseText;
         }
-
+        strText = strText.toString();
         var msg = eval("("+strText+")");
           
         var state=msg.Response.state;
--- a/src/org/openbravo/erpCommon/ad_process/ImportOrder_data.xsql	Thu Jan 28 18:25:57 2010 +0100
+++ b/src/org/openbravo/erpCommon/ad_process/ImportOrder_data.xsql	Mon Feb 01 17:51:41 2010 +0100
@@ -1287,7 +1287,7 @@
         FROM I_Order
 				WHERE I_IsImported='N'
 				AND AD_Client_ID = ?
-				ORDER BY AD_Org_ID, DocTypeName, DocumentNo, DateOrdered, C_BPartner_ID, BillTo_ID, C_BPartner_Location_ID, I_Order_ID
+				ORDER BY DateOrdered,DocumentNo,AD_Org_ID, DocTypeName, C_BPartner_ID, BillTo_ID, C_BPartner_Location_ID, I_Order_ID
 			]]>
 		</Sql>
 		<Parameter name="ad_client_id"/>
--- a/src/org/openbravo/erpCommon/security/Login_F1.html	Thu Jan 28 18:25:57 2010 +0100
+++ b/src/org/openbravo/erpCommon/security/Login_F1.html	Mon Feb 01 17:51:41 2010 +0100
@@ -78,7 +78,7 @@
       clearForm();
     } catch (e) {}
     setWindowElementFocus('firstElement');
-    if ((!revisionControl('5959')) || (isOpsInstance() != isOpsInstanceCached())) {
+    if ((!revisionControl('5983')) || (isOpsInstance() != isOpsInstanceCached())) {
       alert("Your browser's cache has outdated files. Please clean it and reload the page.");
     }
   }
--- a/src/org/openbravo/scheduling/ProcessMonitor.java	Thu Jan 28 18:25:57 2010 +0100
+++ b/src/org/openbravo/scheduling/ProcessMonitor.java	Mon Feb 01 17:51:41 2010 +0100
@@ -119,8 +119,8 @@
     final ProcessContext ctx = bundle.getContext();
     try {
       final String executionId = (String) jec.get(EXECUTION_ID);
-      final String executionLog = bundle.getLog().length() >= 4000 ? bundle.getLog().substring(0, 3999)
-          : bundle.getLog();
+      final String executionLog = bundle.getLog().length() >= 4000 ? bundle.getLog().substring(0,
+          3999) : bundle.getLog();
       if (jee == null) {
         ProcessRunData.update(getConnection(), ctx.getUser(), SUCCESS, getDuration(jec
             .getJobRunTime()), executionLog, executionId);
@@ -134,16 +134,9 @@
     }
   }
 
-  public static void main(String... args) {
-    final StringBuilder sb = new StringBuilder(10);
-    sb.append("12345678901");
-    System.out.println(sb.toString());
-  }
-
   public void triggerFinalized(Trigger trigger) {
     try {
       ProcessRequestData.update(getConnection(), COMPLETE, trigger.getName());
-
     } catch (final ServletException e) {
       log.error(e.getMessage(), e);
     }
--- a/src/org/openbravo/scheduling/ProcessRequest_data.xsql	Thu Jan 28 18:25:57 2010 +0100
+++ b/src/org/openbravo/scheduling/ProcessRequest_data.xsql	Mon Feb 01 17:51:41 2010 +0100
@@ -71,7 +71,7 @@
       <SqlMethodComment></SqlMethodComment>
       <Sql><![CDATA[
       	UPDATE AD_Process_Request
-      	SET Updated = NOW(), Status = ?
+      	SET Status = ?
       	WHERE AD_Process_Request_ID = ?
     ]]></Sql>
     <Parameter name="status"/>
@@ -81,7 +81,7 @@
       <SqlMethodComment></SqlMethodComment>
       <Sql><![CDATA[
       	UPDATE AD_Process_Request
-      	SET Updated = NOW(), Status = ?,
+      	SET Status = ?,
       	Next_Fire_Time = TO_TIMESTAMP(?, 'DD-MM-YYYY HH24:MI:SS'),
       	Scheduled_Finish = TO_TIMESTAMP(?, 'DD-MM-YYYY HH24:MI:SS')
       	WHERE AD_Process_Request_ID = ?
@@ -95,7 +95,7 @@
       <SqlMethodComment></SqlMethodComment>
       <Sql><![CDATA[
       	UPDATE AD_Process_Request
-      	SET Updated = NOW(), Status = ?, Channel = ?,
+      	SET Status = ?, Channel = ?,
       	Previous_Fire_Time = TO_TIMESTAMP(?, 'DD-MM-YYYY HH24:MI:SS'),
       	Next_Fire_Time = TO_TIMESTAMP(?, 'DD-MM-YYYY HH24:MI:SS'),
       	Scheduled_Finish = TO_TIMESTAMP(?, 'DD-MM-YYYY HH24:MI:SS')
@@ -112,7 +112,7 @@
       <SqlMethodComment></SqlMethodComment>
       <Sql><![CDATA[
       	UPDATE AD_Process_Request
-      	SET Updated = NOW(), Updatedby = ?, AD_User_ID = ?, Status = ?, Channel = ?, 
+      	SET Updatedby = ?, AD_User_ID = ?, Status = ?, Channel = ?,
       	Previous_Fire_Time = TO_TIMESTAMP(?, 'DD-MM-YYYY HH24:MI:SS'),
       	Next_Fire_Time = TO_TIMESTAMP(?, 'DD-MM-YYYY HH24:MI:SS'),
       	Scheduled_Finish = TO_TIMESTAMP(?, 'DD-MM-YYYY HH24:MI:SS'),
--- a/web/js/genericTree.js	Thu Jan 28 18:25:57 2010 +0100
+++ b/web/js/genericTree.js	Mon Feb 01 17:51:41 2010 +0100
@@ -413,9 +413,11 @@
 
   function gt_checkToggleNode(element, type) {
     var node = gt_returnNodeObject(element, type);
-    var nodeId = node.getAttribute('id').replace('node_','');
-    if (document.getElementById('inpNodes_' + nodeId)) {
-      document.getElementById('inpNodes_' + nodeId).checked = !document.getElementById('inpNodes_' + nodeId).checked;
+    if (typeof node != "undefined") {
+      var nodeId = node.getAttribute('id').replace('node_','');
+      if (document.getElementById('inpNodes_' + nodeId)) {
+        document.getElementById('inpNodes_' + nodeId).checked = !document.getElementById('inpNodes_' + nodeId).checked;
+      }
     }
   }
 
--- a/web/js/utils.js	Thu Jan 28 18:25:57 2010 +0100
+++ b/web/js/utils.js	Mon Feb 01 17:51:41 2010 +0100
@@ -70,7 +70,7 @@
 * Return a number that would be checked at the Login screen to know if the file is cached with the correct version
 */
 function getCurrentRevision() {
-  var number = '5959';
+  var number = '5983';
   return number;
 }
 
@@ -790,6 +790,9 @@
 function openPopUp(url, _name, height, width, top, left, checkChanges, target, doSubmit, closeControl, parameters, hasLoading) {
   var adds = "";
   var isPopup = null;
+  if (navigator.userAgent.toUpperCase().indexOf("MSIE") != -1) {
+    _name = _name.replace(/ /g,"_"); //To fix strange issue with IE8 that window name declared as var xx = window.open can not have spaces
+  }
   // Deprecated in 2.50, search for the old frameAplication and the new appFrame
   if (_name!='appFrame' && _name!='frameAplicacion' && _name!='frameMenu') isPopup =  true;
   else isPopup = false;
@@ -1486,8 +1489,10 @@
     return false;
   }
   if (isKeyboardLocked==false && !isCtrlPressed && !isAltPressed && pushedKey.type=='keydown' && pressedKeyCode!='16' && pressedKeyCode!='17' && pressedKeyCode!='18') {
-    if (focusedWindowElement.tagName == 'SELECT') {
-      if (focusedWindowElement.getAttribute('onchange') && navigator.userAgent.toUpperCase().indexOf("MSIE") == -1) setTimeout("focusedWindowElement.onchange();",50);
+    if (typeof focusedWindowElement != "undefined") {
+      if (focusedWindowElement.tagName == 'SELECT') {
+        if (focusedWindowElement.getAttribute('onchange') && navigator.userAgent.toUpperCase().indexOf("MSIE") == -1) setTimeout("focusedWindowElement.onchange();",50);
+      }
     }
   }
   return true;
@@ -3169,6 +3174,7 @@
   obj = getReference(id);
   className = obj.className;
   var onchange_combo = null;
+  var newOnChange_combo = null;
  
   if (readonly) {
     obj.className = className.replace("ReadOnly","");
@@ -3182,31 +3188,17 @@
       }
       setObjAttribute(obj, 'onclick', onclickTextA);
     }
-    if (className.indexOf("Combo ")!=-1) {
-      obj.className = className.replace("Combo","ComboReadOnly");
+    if (className.indexOf("Combo ")!=-1 || className.indexOf("ComboKey ")!=-1) {
+      if (className.indexOf("Combo ")!=-1) obj.className = className.replace("Combo","ComboReadOnly");
+      else if (className.indexOf("ComboKey ")!=-1) obj.className = className.replace("ComboKey","ComboKeyReadOnly");
+      disableAttributeWithFunction(obj, 'obj', 'onChange');
       if (obj.getAttribute("onChange")) {
-        onchange_combo = obj.getAttribute("onChange").toString();
-        onchange_combo = onchange_combo.replace("function anonymous()\n","");
-        onchange_combo = onchange_combo.replace("function onchange()\n","");
-        onchange_combo = onchange_combo.replace("{\n","");
-        onchange_combo = onchange_combo.replace("\n}","");
+        onchange_combo = getObjAttribute(obj, 'onChange');
       } else {
         onchange_combo = "";
       }
-      obj.setAttribute("onChange", "selectCombo(this, '"+obj.value+"');"+onchange_combo);
-     }
-    if (className.indexOf("ComboKey ")!=-1) {
-      obj.className = className.replace("ComboKey","ComboKeyReadOnly");
-      if (obj.getAttribute("onChange")) {
-        onchange_combo = obj.getAttribute("onChange").toString();
-        onchange_combo = onchange_combo.replace("function anonymous()\n","");
-        onchange_combo = onchange_combo.replace("function onchange()\n","");
-        onchange_combo = onchange_combo.replace("{\n","");
-        onchange_combo = onchange_combo.replace("\n}","");
-      } else {
-        onchange_combo = "";
-      }
-      obj.setAttribute("onChange", "selectCombo(this, '"+obj.value+"');"+onchange_combo);
+      newOnChange_combo = "selectCombo(this, '"+obj.value+"');" + onchange_combo;
+      setObjAttribute(obj, 'onChange', newOnChange_combo);
     }
     if (className.indexOf("LabelText ")!=-1)
       obj.className = className.replace("LabelText","LabelTextReadOnly");
@@ -3230,20 +3222,16 @@
       setObjAttribute(obj, 'onclick', onclickTextB);
     }
 
-
     if (obj.className.indexOf("Combo")!=-1) {
+      enableAttributeWithFunction(obj, 'obj', 'onChange');
       if (obj.getAttribute("onChange")) {
-        onchange_combo = obj.getAttribute("onChange").toString();
-        onchange_combo = onchange_combo.replace("function anonymous()\n","");
-        onchange_combo = onchange_combo.replace("function onchange()\n","");
-        onchange_combo = onchange_combo.replace("{\n","");
-        onchange_combo = onchange_combo.replace("\n}","");
+        onchange_combo = getObjAttribute(obj, 'onChange');
       } else {
         onchange_combo = "";
       }
       if (onchange_combo.indexOf("selectCombo")!=-1) {
-        var newOnChange_combo = onchange_combo.substring(0,onchange_combo.indexOf("selectCombo"))+onchange_combo.substring(onchange_combo.indexOf(";",onchange_combo.indexOf("selectCombo"))+1, onchange_combo.length);
-        obj.setAttribute("onChange",newOnChange_combo); 
+        newOnChange_combo = onchange_combo.substring(0,onchange_combo.indexOf("selectCombo"))+onchange_combo.substring(onchange_combo.indexOf(";",onchange_combo.indexOf("selectCombo"))+1, onchange_combo.length);
+        setObjAttribute(obj, 'onChange', newOnChange_combo);
       }
     }
     if ((obj.className.indexOf("TextBox_")!=-1)||(obj.className.indexOf("TextArea_")!=-1)) {
@@ -4191,6 +4179,13 @@
   if (groupSeparator == null || groupSeparator == "") groupSeparator = getGlobalGroupSeparator();
   if (groupInterval == null || groupInterval == "") groupInterval = getGlobalGroupInterval();
 
+  var isTextSelected = false;
+  if (obj.value.length > 0) {
+    if (getCaretPosition(obj).start !=  getCaretPosition(obj).end && getCaretPosition(obj).end == obj.value.length) {
+      isTextSelected = true;
+    }
+  }
+
   var oldCaretPosition = getCaretPosition(obj).start;
   var newCaretPosition = returnNewCaretPosition(obj, oldCaretPosition, groupSeparator);
 
@@ -4202,6 +4197,9 @@
   var plainNumber = returnPlainNumber(number, decSeparator, groupSeparator);
   obj.value = plainNumber;
   setCaretToPos(obj, newCaretPosition);
+  if (isTextSelected == true && selectInputTextOnTab) {
+    obj.select();
+  }
 }
 
 /**
--- a/web/js/windowKeyboard.js	Thu Jan 28 18:25:57 2010 +0100
+++ b/web/js/windowKeyboard.js	Mon Feb 01 17:51:41 2010 +0100
@@ -505,7 +505,7 @@
         obj.focus();
       }
     }
-    if(selectInputTextOnTab) obj.select();
+    if(selectInputTextOnTab && event!='onclick' && event!='onmousedown') obj.select();
   } catch (e) {
   }
 }