BO/Unit Test for tax calculation and callouts for Purchase Order for Inclusive of TaX
authormeeravalli <meeravalli.r@promantia.com>
Thu, 12 Apr 2012 17:19:13 +0530
changeset 17308 9365ff4776be
parent 15627 832db276d7a4
child 17309 d5f19fb96d5b
BO/Unit Test for tax calculation and callouts for Purchase Order for Inclusive of TaX
src-db/database/model/tables/C_ORDERLINE.xml
src-db/database/sourcedata/AD_AUXILIARINPUT.xml
src-db/database/sourcedata/AD_CALLOUT.xml
src-db/database/sourcedata/AD_COLUMN.xml
src-db/database/sourcedata/AD_DATASET.xml
src-db/database/sourcedata/AD_DATASET_COLUMN.xml
src-db/database/sourcedata/AD_DATASET_TABLE.xml
src-db/database/sourcedata/AD_ELEMENT.xml
src-db/database/sourcedata/AD_EXTENSION_POINTS.xml
src-db/database/sourcedata/AD_FIELD.xml
src-db/database/sourcedata/AD_FIELDGROUP.xml
src-db/database/sourcedata/AD_FORM.xml
src-db/database/sourcedata/AD_MENU.xml
src-db/database/sourcedata/AD_MESSAGE.xml
src-db/database/sourcedata/AD_MODEL_OBJECT.xml
src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
src-db/database/sourcedata/AD_MODEL_OBJECT_PARA.xml
src-db/database/sourcedata/AD_MODULE.xml
src-db/database/sourcedata/AD_MODULE_DBPREFIX.xml
src-db/database/sourcedata/AD_PACKAGE.xml
src-db/database/sourcedata/AD_PREFERENCE.xml
src-db/database/sourcedata/AD_PROCESS.xml
src-db/database/sourcedata/AD_PROCESS_PARA.xml
src-db/database/sourcedata/AD_REFERENCE.xml
src-db/database/sourcedata/AD_REF_LIST.xml
src-db/database/sourcedata/AD_REF_SEARCH.xml
src-db/database/sourcedata/AD_REF_SEARCH_COLUMN.xml
src-db/database/sourcedata/AD_REF_TABLE.xml
src-db/database/sourcedata/AD_TAB.xml
src-db/database/sourcedata/AD_TABLE.xml
src-db/database/sourcedata/AD_TEXTINTERFACES.xml
src-db/database/sourcedata/AD_TREENODE.xml
src-db/database/sourcedata/AD_VAL_RULE.xml
src-db/database/sourcedata/AD_WINDOW.xml
src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml
src-db/database/sourcedata/OBUIAPP_PARAMETER.xml
src-db/database/sourcedata/OBUIAPP_PROCESS.xml
src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml
src-db/database/sourcedata/OBUISEL_SELECTOR.xml
src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml
src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java
--- a/src-db/database/model/tables/C_ORDERLINE.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/model/tables/C_ORDERLINE.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -201,6 +201,14 @@
         <default/>
         <onCreateDefault/>
       </column>
+      <column name="GROSSPRICE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+        <default><![CDATA[0]]></default>
+        <onCreateDefault/>
+      </column>
+      <column name="TAXINCLUSIVE" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+        <default><![CDATA[0]]></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_AUXILIARINPUT.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--1--><AD_AUXILIARINPUT>
 <!--1-->  <AD_AUXILIARINPUT_ID><![CDATA[1]]></AD_AUXILIARINPUT_ID>
--- a/src-db/database/sourcedata/AD_CALLOUT.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_CALLOUT.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--100--><AD_CALLOUT>
 <!--100-->  <AD_CALLOUT_ID><![CDATA[100]]></AD_CALLOUT_ID>
@@ -898,6 +898,15 @@
 <!--C252244131684EE28DB86DDFD278DB85-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--C252244131684EE28DB86DDFD278DB85--></AD_CALLOUT>
 
+<!--C2B20C29C43549D980C1537ECA883E06--><AD_CALLOUT>
+<!--C2B20C29C43549D980C1537ECA883E06-->  <AD_CALLOUT_ID><![CDATA[C2B20C29C43549D980C1537ECA883E06]]></AD_CALLOUT_ID>
+<!--C2B20C29C43549D980C1537ECA883E06-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C2B20C29C43549D980C1537ECA883E06-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C2B20C29C43549D980C1537ECA883E06-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C2B20C29C43549D980C1537ECA883E06-->  <NAME><![CDATA[SL_TaxRate_Order]]></NAME>
+<!--C2B20C29C43549D980C1537ECA883E06-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C2B20C29C43549D980C1537ECA883E06--></AD_CALLOUT>
+
 <!--CBCAD8F8AEF6465DABA8B13B93EC746C--><AD_CALLOUT>
 <!--CBCAD8F8AEF6465DABA8B13B93EC746C-->  <AD_CALLOUT_ID><![CDATA[CBCAD8F8AEF6465DABA8B13B93EC746C]]></AD_CALLOUT_ID>
 <!--CBCAD8F8AEF6465DABA8B13B93EC746C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--100--><AD_COLUMN>
 <!--100-->  <AD_COLUMN_ID><![CDATA[100]]></AD_COLUMN_ID>
@@ -31442,6 +31442,7 @@
 <!--2235-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--2235-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--2235-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--2235-->  <AD_CALLOUT_ID><![CDATA[C2B20C29C43549D980C1537ECA883E06]]></AD_CALLOUT_ID>
 <!--2235-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--2235-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--2235-->  <POSITION><![CDATA[36]]></POSITION>
@@ -244697,7 +244698,7 @@
 <!--6769A5EF62DF47F3A68B04AF8298AA5A-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--6769A5EF62DF47F3A68B04AF8298AA5A-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--6769A5EF62DF47F3A68B04AF8298AA5A-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--6769A5EF62DF47F3A68B04AF8298AA5A-->  <POSITION><![CDATA[52]]></POSITION>
+<!--6769A5EF62DF47F3A68B04AF8298AA5A-->  <POSITION><![CDATA[50]]></POSITION>
 <!--6769A5EF62DF47F3A68B04AF8298AA5A-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--6769A5EF62DF47F3A68B04AF8298AA5A-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--6769A5EF62DF47F3A68B04AF8298AA5A-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -278242,6 +278243,41 @@
 <!--ACD6E6D9F125445C97E22C05EBA0A346-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--ACD6E6D9F125445C97E22C05EBA0A346--></AD_COLUMN>
 
+<!--ACDEEB083FB54AC196639C983BEDCE31--><AD_COLUMN>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <AD_COLUMN_ID><![CDATA[ACDEEB083FB54AC196639C983BEDCE31]]></AD_COLUMN_ID>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <NAME><![CDATA[Grossprice]]></NAME>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <COLUMNNAME><![CDATA[Grossprice]]></COLUMNNAME>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <AD_TABLE_ID><![CDATA[260]]></AD_TABLE_ID>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <AD_REFERENCE_ID><![CDATA[800008]]></AD_REFERENCE_ID>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <DEFAULTVALUE><![CDATA[0]]></DEFAULTVALUE>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <SEQNO><![CDATA[114]]></SEQNO>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <AD_ELEMENT_ID><![CDATA[464DDB15B20D4325B97036EE7C7FBFA6]]></AD_ELEMENT_ID>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <POSITION><![CDATA[51]]></POSITION>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--ACDEEB083FB54AC196639C983BEDCE31-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--ACDEEB083FB54AC196639C983BEDCE31--></AD_COLUMN>
+
 <!--AD58859226F648569B51EA63B05DE83D--><AD_COLUMN>
 <!--AD58859226F648569B51EA63B05DE83D-->  <AD_COLUMN_ID><![CDATA[AD58859226F648569B51EA63B05DE83D]]></AD_COLUMN_ID>
 <!--AD58859226F648569B51EA63B05DE83D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -279786,7 +279822,7 @@
 <!--AF2B81C4FC82B807E040007F01006F3D-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--AF2B81C4FC82B807E040007F01006F3D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
 <!--AF2B81C4FC82B807E040007F01006F3D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--AF2B81C4FC82B807E040007F01006F3D-->  <POSITION><![CDATA[50]]></POSITION>
+<!--AF2B81C4FC82B807E040007F01006F3D-->  <POSITION><![CDATA[49]]></POSITION>
 <!--AF2B81C4FC82B807E040007F01006F3D-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
 <!--AF2B81C4FC82B807E040007F01006F3D-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
 <!--AF2B81C4FC82B807E040007F01006F3D-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
@@ -285914,6 +285950,42 @@
 <!--CC754B47555D4F66974371B151632F41-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--CC754B47555D4F66974371B151632F41--></AD_COLUMN>
 
+<!--CDECA3E7A2D74DD09E1F1B13609F071D--><AD_COLUMN>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <AD_COLUMN_ID><![CDATA[CDECA3E7A2D74DD09E1F1B13609F071D]]></AD_COLUMN_ID>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <NAME><![CDATA[Taxinclusive]]></NAME>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <COLUMNNAME><![CDATA[Taxinclusive]]></COLUMNNAME>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <AD_TABLE_ID><![CDATA[260]]></AD_TABLE_ID>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <AD_REFERENCE_ID><![CDATA[800008]]></AD_REFERENCE_ID>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <DEFAULTVALUE><![CDATA[0]]></DEFAULTVALUE>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <READONLYLOGIC><![CDATA[@Processed@='Y']]></READONLYLOGIC>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <SEQNO><![CDATA[124]]></SEQNO>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <AD_ELEMENT_ID><![CDATA[8745C5A3D96647CC9C748A19A8015DA5]]></AD_ELEMENT_ID>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <AD_CALLOUT_ID><![CDATA[138]]></AD_CALLOUT_ID>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <POSITION><![CDATA[52]]></POSITION>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--CDECA3E7A2D74DD09E1F1B13609F071D--></AD_COLUMN>
+
 <!--CEC2AA7C93F4423A97CE96BDD1C4B49F--><AD_COLUMN>
 <!--CEC2AA7C93F4423A97CE96BDD1C4B49F-->  <AD_COLUMN_ID><![CDATA[CEC2AA7C93F4423A97CE96BDD1C4B49F]]></AD_COLUMN_ID>
 <!--CEC2AA7C93F4423A97CE96BDD1C4B49F-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_DATASET.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_DATASET.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--0--><AD_DATASET>
 <!--0-->  <AD_DATASET_ID><![CDATA[0]]></AD_DATASET_ID>
--- a/src-db/database/sourcedata/AD_DATASET_COLUMN.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_DATASET_COLUMN.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--00F9F94AA5D811DD9010001B388C61A4--><AD_DATASET_COLUMN>
 <!--00F9F94AA5D811DD9010001B388C61A4-->  <AD_DATASET_COLUMN_ID><![CDATA[00F9F94AA5D811DD9010001B388C61A4]]></AD_DATASET_COLUMN_ID>
--- a/src-db/database/sourcedata/AD_DATASET_TABLE.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_DATASET_TABLE.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--0004648349C24CBB8BDE8127BBE35C99--><AD_DATASET_TABLE>
 <!--0004648349C24CBB8BDE8127BBE35C99-->  <AD_DATASET_TABLE_ID><![CDATA[0004648349C24CBB8BDE8127BBE35C99]]></AD_DATASET_TABLE_ID>
--- a/src-db/database/sourcedata/AD_ELEMENT.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--102--><AD_ELEMENT>
 <!--102-->  <AD_ELEMENT_ID><![CDATA[102]]></AD_ELEMENT_ID>
@@ -21541,6 +21541,18 @@
 <!--4610869898EF4298BCD9B313FFAD160A-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--4610869898EF4298BCD9B313FFAD160A--></AD_ELEMENT>
 
+<!--464DDB15B20D4325B97036EE7C7FBFA6--><AD_ELEMENT>
+<!--464DDB15B20D4325B97036EE7C7FBFA6-->  <AD_ELEMENT_ID><![CDATA[464DDB15B20D4325B97036EE7C7FBFA6]]></AD_ELEMENT_ID>
+<!--464DDB15B20D4325B97036EE7C7FBFA6-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--464DDB15B20D4325B97036EE7C7FBFA6-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--464DDB15B20D4325B97036EE7C7FBFA6-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--464DDB15B20D4325B97036EE7C7FBFA6-->  <COLUMNNAME><![CDATA[Grossprice]]></COLUMNNAME>
+<!--464DDB15B20D4325B97036EE7C7FBFA6-->  <NAME><![CDATA[Gross Price]]></NAME>
+<!--464DDB15B20D4325B97036EE7C7FBFA6-->  <PRINTNAME><![CDATA[Gross Price]]></PRINTNAME>
+<!--464DDB15B20D4325B97036EE7C7FBFA6-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--464DDB15B20D4325B97036EE7C7FBFA6-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--464DDB15B20D4325B97036EE7C7FBFA6--></AD_ELEMENT>
+
 <!--46C995886E534B6BA240599DACD8240B--><AD_ELEMENT>
 <!--46C995886E534B6BA240599DACD8240B-->  <AD_ELEMENT_ID><![CDATA[46C995886E534B6BA240599DACD8240B]]></AD_ELEMENT_ID>
 <!--46C995886E534B6BA240599DACD8240B-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -26157,6 +26169,18 @@
 <!--86DF1B3B331B03FEE040007F0101757D-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--86DF1B3B331B03FEE040007F0101757D--></AD_ELEMENT>
 
+<!--8745C5A3D96647CC9C748A19A8015DA5--><AD_ELEMENT>
+<!--8745C5A3D96647CC9C748A19A8015DA5-->  <AD_ELEMENT_ID><![CDATA[8745C5A3D96647CC9C748A19A8015DA5]]></AD_ELEMENT_ID>
+<!--8745C5A3D96647CC9C748A19A8015DA5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--8745C5A3D96647CC9C748A19A8015DA5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--8745C5A3D96647CC9C748A19A8015DA5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--8745C5A3D96647CC9C748A19A8015DA5-->  <COLUMNNAME><![CDATA[Taxinclusive]]></COLUMNNAME>
+<!--8745C5A3D96647CC9C748A19A8015DA5-->  <NAME><![CDATA[Tax Inclusive Unit Price]]></NAME>
+<!--8745C5A3D96647CC9C748A19A8015DA5-->  <PRINTNAME><![CDATA[Tax Inclusive Unit Price]]></PRINTNAME>
+<!--8745C5A3D96647CC9C748A19A8015DA5-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--8745C5A3D96647CC9C748A19A8015DA5-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--8745C5A3D96647CC9C748A19A8015DA5--></AD_ELEMENT>
+
 <!--8769BF2DBAED417E95CB5F5B31DC851A--><AD_ELEMENT>
 <!--8769BF2DBAED417E95CB5F5B31DC851A-->  <AD_ELEMENT_ID><![CDATA[8769BF2DBAED417E95CB5F5B31DC851A]]></AD_ELEMENT_ID>
 <!--8769BF2DBAED417E95CB5F5B31DC851A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_EXTENSION_POINTS.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_EXTENSION_POINTS.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--1117A5F3D17F4B7E85B41838C9F31DE4--><AD_EXTENSION_POINTS>
 <!--1117A5F3D17F4B7E85B41838C9F31DE4-->  <AD_EXTENSION_POINTS_ID><![CDATA[1117A5F3D17F4B7E85B41838C9F31DE4]]></AD_EXTENSION_POINTS_ID>
--- a/src-db/database/sourcedata/AD_FIELD.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--100--><AD_FIELD>
 <!--100-->  <AD_FIELD_ID><![CDATA[100]]></AD_FIELD_ID>
@@ -34478,7 +34478,7 @@
 <!--2873-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--2873-->  <AD_TAB_ID><![CDATA[191]]></AD_TAB_ID>
 <!--2873-->  <AD_COLUMN_ID><![CDATA[3696]]></AD_COLUMN_ID>
-<!--2873-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--2873-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--2873-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--2873-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--2873-->  <SEQNO><![CDATA[90]]></SEQNO>
@@ -41689,7 +41689,7 @@
 <!--3383-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--3383-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--3383-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--3383-->  <SEQNO><![CDATA[100]]></SEQNO>
+<!--3383-->  <SEQNO><![CDATA[110]]></SEQNO>
 <!--3383-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--3383-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3383-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -41966,7 +41966,7 @@
 <!--3395-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--3395-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--3395-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--3395-->  <SEQNO><![CDATA[90]]></SEQNO>
+<!--3395-->  <SEQNO><![CDATA[100]]></SEQNO>
 <!--3395-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--3395-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3395-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -41993,14 +41993,14 @@
 <!--3396-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--3396-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--3396-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--3396-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--3396-->  <SEQNO><![CDATA[70]]></SEQNO>
 <!--3396-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--3396-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3396-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--3396-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--3396-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--3396-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--3396-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
+<!--3396-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
 <!--3396-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--3396-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--3396-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -42021,14 +42021,14 @@
 <!--3397-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--3397-->  <DISPLAYLENGTH><![CDATA[44]]></DISPLAYLENGTH>
 <!--3397-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--3397-->  <SEQNO><![CDATA[80]]></SEQNO>
+<!--3397-->  <SEQNO><![CDATA[90]]></SEQNO>
 <!--3397-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--3397-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3397-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--3397-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--3397-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--3397-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--3397-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
+<!--3397-->  <GRID_SEQNO><![CDATA[90]]></GRID_SEQNO>
 <!--3397-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--3397-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--3397-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -42049,7 +42049,7 @@
 <!--3398-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--3398-->  <DISPLAYLENGTH><![CDATA[60]]></DISPLAYLENGTH>
 <!--3398-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--3398-->  <SEQNO><![CDATA[110]]></SEQNO>
+<!--3398-->  <SEQNO><![CDATA[120]]></SEQNO>
 <!--3398-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--3398-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3398-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -42505,14 +42505,14 @@
 <!--3416-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--3416-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--3416-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--3416-->  <SEQNO><![CDATA[70]]></SEQNO>
+<!--3416-->  <SEQNO><![CDATA[80]]></SEQNO>
 <!--3416-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--3416-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3416-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--3416-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
 <!--3416-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
 <!--3416-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--3416-->  <GRID_SEQNO><![CDATA[70]]></GRID_SEQNO>
+<!--3416-->  <GRID_SEQNO><![CDATA[80]]></GRID_SEQNO>
 <!--3416-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
 <!--3416-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
 <!--3416-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
@@ -46754,16 +46754,17 @@
 <!--3672-->  <AD_FIELD_ID><![CDATA[3672]]></AD_FIELD_ID>
 <!--3672-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--3672-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--3672-->  <ISACTIVE><![CDATA[N]]></ISACTIVE>
+<!--3672-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3672-->  <NAME><![CDATA[Price includes Tax]]></NAME>
 <!--3672-->  <DESCRIPTION><![CDATA[Tax is included in the price]]></DESCRIPTION>
-<!--3672-->  <HELP><![CDATA[The Tax Included checkbox indicates if the prices include tax.  This is also known as the gross price.]]></HELP>
+<!--3672-->  <HELP><![CDATA[The Tax Included checkbox indicates if the prices include ta]]></HELP>
 <!--3672-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--3672-->  <AD_TAB_ID><![CDATA[294]]></AD_TAB_ID>
 <!--3672-->  <AD_COLUMN_ID><![CDATA[4651]]></AD_COLUMN_ID>
-<!--3672-->  <ISDISPLAYED><![CDATA[N]]></ISDISPLAYED>
+<!--3672-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
 <!--3672-->  <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
 <!--3672-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--3672-->  <SEQNO><![CDATA[450]]></SEQNO>
 <!--3672-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
 <!--3672-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--3672-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -169618,6 +169619,32 @@
 <!--0D17F7CA8BDE48158063E02A5911DB4F-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--0D17F7CA8BDE48158063E02A5911DB4F--></AD_FIELD>
 
+<!--0D847EB6DFEF4D34933CB994D524E744--><AD_FIELD>
+<!--0D847EB6DFEF4D34933CB994D524E744-->  <AD_FIELD_ID><![CDATA[0D847EB6DFEF4D34933CB994D524E744]]></AD_FIELD_ID>
+<!--0D847EB6DFEF4D34933CB994D524E744-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--0D847EB6DFEF4D34933CB994D524E744-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--0D847EB6DFEF4D34933CB994D524E744-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--0D847EB6DFEF4D34933CB994D524E744-->  <NAME><![CDATA[Tax Inclusive Unit Price]]></NAME>
+<!--0D847EB6DFEF4D34933CB994D524E744-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--0D847EB6DFEF4D34933CB994D524E744-->  <AD_TAB_ID><![CDATA[293]]></AD_TAB_ID>
+<!--0D847EB6DFEF4D34933CB994D524E744-->  <AD_COLUMN_ID><![CDATA[CDECA3E7A2D74DD09E1F1B13609F071D]]></AD_COLUMN_ID>
+<!--0D847EB6DFEF4D34933CB994D524E744-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--0D847EB6DFEF4D34933CB994D524E744-->  <DISPLAYLENGTH><![CDATA[22]]></DISPLAYLENGTH>
+<!--0D847EB6DFEF4D34933CB994D524E744-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--0D847EB6DFEF4D34933CB994D524E744-->  <SEQNO><![CDATA[65]]></SEQNO>
+<!--0D847EB6DFEF4D34933CB994D524E744-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--0D847EB6DFEF4D34933CB994D524E744-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--0D847EB6DFEF4D34933CB994D524E744-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--0D847EB6DFEF4D34933CB994D524E744-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--0D847EB6DFEF4D34933CB994D524E744-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--0D847EB6DFEF4D34933CB994D524E744-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--0D847EB6DFEF4D34933CB994D524E744-->  <GRID_SEQNO><![CDATA[65]]></GRID_SEQNO>
+<!--0D847EB6DFEF4D34933CB994D524E744-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--0D847EB6DFEF4D34933CB994D524E744-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--0D847EB6DFEF4D34933CB994D524E744-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--0D847EB6DFEF4D34933CB994D524E744-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--0D847EB6DFEF4D34933CB994D524E744--></AD_FIELD>
+
 <!--0DD33819894E498CA0DA60FDA02F37DD--><AD_FIELD>
 <!--0DD33819894E498CA0DA60FDA02F37DD-->  <AD_FIELD_ID><![CDATA[0DD33819894E498CA0DA60FDA02F37DD]]></AD_FIELD_ID>
 <!--0DD33819894E498CA0DA60FDA02F37DD-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -194234,7 +194261,7 @@
 <!--7E37B8136CC575EFE040007F0100360F-->  <DISPLAYLOGIC><![CDATA[@UsesAlternate@='Y']]></DISPLAYLOGIC>
 <!--7E37B8136CC575EFE040007F0100360F-->  <DISPLAYLENGTH><![CDATA[12]]></DISPLAYLENGTH>
 <!--7E37B8136CC575EFE040007F0100360F-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--7E37B8136CC575EFE040007F0100360F-->  <SEQNO><![CDATA[120]]></SEQNO>
+<!--7E37B8136CC575EFE040007F0100360F-->  <SEQNO><![CDATA[130]]></SEQNO>
 <!--7E37B8136CC575EFE040007F0100360F-->  <ISSAMELINE><![CDATA[Y]]></ISSAMELINE>
 <!--7E37B8136CC575EFE040007F0100360F-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
 <!--7E37B8136CC575EFE040007F0100360F-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
@@ -220090,6 +220117,32 @@
 <!--C6BC1AE3F69B4F45AC12D2932DF0FD03-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--C6BC1AE3F69B4F45AC12D2932DF0FD03--></AD_FIELD>
 
+<!--C7059F37CA9348E3B9FF08F516016EA1--><AD_FIELD>
+<!--C7059F37CA9348E3B9FF08F516016EA1-->  <AD_FIELD_ID><![CDATA[C7059F37CA9348E3B9FF08F516016EA1]]></AD_FIELD_ID>
+<!--C7059F37CA9348E3B9FF08F516016EA1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C7059F37CA9348E3B9FF08F516016EA1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C7059F37CA9348E3B9FF08F516016EA1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C7059F37CA9348E3B9FF08F516016EA1-->  <NAME><![CDATA[Gross Price]]></NAME>
+<!--C7059F37CA9348E3B9FF08F516016EA1-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--C7059F37CA9348E3B9FF08F516016EA1-->  <AD_TAB_ID><![CDATA[293]]></AD_TAB_ID>
+<!--C7059F37CA9348E3B9FF08F516016EA1-->  <AD_COLUMN_ID><![CDATA[ACDEEB083FB54AC196639C983BEDCE31]]></AD_COLUMN_ID>
+<!--C7059F37CA9348E3B9FF08F516016EA1-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--C7059F37CA9348E3B9FF08F516016EA1-->  <DISPLAYLENGTH><![CDATA[22]]></DISPLAYLENGTH>
+<!--C7059F37CA9348E3B9FF08F516016EA1-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--C7059F37CA9348E3B9FF08F516016EA1-->  <SEQNO><![CDATA[60]]></SEQNO>
+<!--C7059F37CA9348E3B9FF08F516016EA1-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--C7059F37CA9348E3B9FF08F516016EA1-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--C7059F37CA9348E3B9FF08F516016EA1-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--C7059F37CA9348E3B9FF08F516016EA1-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--C7059F37CA9348E3B9FF08F516016EA1-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--C7059F37CA9348E3B9FF08F516016EA1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
+<!--C7059F37CA9348E3B9FF08F516016EA1-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
+<!--C7059F37CA9348E3B9FF08F516016EA1-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--C7059F37CA9348E3B9FF08F516016EA1-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--C7059F37CA9348E3B9FF08F516016EA1-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--C7059F37CA9348E3B9FF08F516016EA1-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--C7059F37CA9348E3B9FF08F516016EA1--></AD_FIELD>
+
 <!--C75A92B7C068426395CFB10D5CAF12F7--><AD_FIELD>
 <!--C75A92B7C068426395CFB10D5CAF12F7-->  <AD_FIELD_ID><![CDATA[C75A92B7C068426395CFB10D5CAF12F7]]></AD_FIELD_ID>
 <!--C75A92B7C068426395CFB10D5CAF12F7-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_FIELDGROUP.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_FIELDGROUP.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--101--><AD_FIELDGROUP>
 <!--101-->  <AD_FIELDGROUP_ID><![CDATA[101]]></AD_FIELDGROUP_ID>
--- a/src-db/database/sourcedata/AD_FORM.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_FORM.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--100--><AD_FORM>
 <!--100-->  <AD_FORM_ID><![CDATA[100]]></AD_FORM_ID>
--- a/src-db/database/sourcedata/AD_MENU.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_MENU.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--102--><AD_MENU>
 <!--102-->  <AD_MENU_ID><![CDATA[102]]></AD_MENU_ID>
--- a/src-db/database/sourcedata/AD_MESSAGE.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--101--><AD_MESSAGE>
 <!--101-->  <AD_MESSAGE_ID><![CDATA[101]]></AD_MESSAGE_ID>
--- a/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--576--><AD_MODEL_OBJECT>
 <!--576-->  <AD_MODEL_OBJECT_ID><![CDATA[576]]></AD_MODEL_OBJECT_ID>
@@ -3101,6 +3101,18 @@
 <!--18DA249486964F65818793F51AF50058-->  <LOADONSTARTUP><![CDATA[1]]></LOADONSTARTUP>
 <!--18DA249486964F65818793F51AF50058--></AD_MODEL_OBJECT>
 
+<!--1B51E7128AC843E88363C14F0CAEDA1A--><AD_MODEL_OBJECT>
+<!--1B51E7128AC843E88363C14F0CAEDA1A-->  <AD_MODEL_OBJECT_ID><![CDATA[1B51E7128AC843E88363C14F0CAEDA1A]]></AD_MODEL_OBJECT_ID>
+<!--1B51E7128AC843E88363C14F0CAEDA1A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--1B51E7128AC843E88363C14F0CAEDA1A-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--1B51E7128AC843E88363C14F0CAEDA1A-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--1B51E7128AC843E88363C14F0CAEDA1A-->  <ACTION><![CDATA[C]]></ACTION>
+<!--1B51E7128AC843E88363C14F0CAEDA1A-->  <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_callouts.SL_TaxRate_Order]]></CLASSNAME>
+<!--1B51E7128AC843E88363C14F0CAEDA1A-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
+<!--1B51E7128AC843E88363C14F0CAEDA1A-->  <AD_CALLOUT_ID><![CDATA[C2B20C29C43549D980C1537ECA883E06]]></AD_CALLOUT_ID>
+<!--1B51E7128AC843E88363C14F0CAEDA1A-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--1B51E7128AC843E88363C14F0CAEDA1A--></AD_MODEL_OBJECT>
+
 <!--1EC03C207CB741AE8C94DBF0340E2429--><AD_MODEL_OBJECT>
 <!--1EC03C207CB741AE8C94DBF0340E2429-->  <AD_MODEL_OBJECT_ID><![CDATA[1EC03C207CB741AE8C94DBF0340E2429]]></AD_MODEL_OBJECT_ID>
 <!--1EC03C207CB741AE8C94DBF0340E2429-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--1524--><AD_MODEL_OBJECT_MAPPING>
 <!--1524-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[1524]]></AD_MODEL_OBJECT_MAPPING_ID>
@@ -4070,6 +4070,16 @@
 <!--8FFBEAE4CF644D3D98B19722BAE14E64-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
 <!--8FFBEAE4CF644D3D98B19722BAE14E64--></AD_MODEL_OBJECT_MAPPING>
 
+<!--98636BBE6CA24096A5ED364E81932D69--><AD_MODEL_OBJECT_MAPPING>
+<!--98636BBE6CA24096A5ED364E81932D69-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[98636BBE6CA24096A5ED364E81932D69]]></AD_MODEL_OBJECT_MAPPING_ID>
+<!--98636BBE6CA24096A5ED364E81932D69-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--98636BBE6CA24096A5ED364E81932D69-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--98636BBE6CA24096A5ED364E81932D69-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--98636BBE6CA24096A5ED364E81932D69-->  <AD_MODEL_OBJECT_ID><![CDATA[1B51E7128AC843E88363C14F0CAEDA1A]]></AD_MODEL_OBJECT_ID>
+<!--98636BBE6CA24096A5ED364E81932D69-->  <MAPPINGNAME><![CDATA[/ad_callouts/SL_TaxRate_Order.html]]></MAPPINGNAME>
+<!--98636BBE6CA24096A5ED364E81932D69-->  <ISDEFAULT><![CDATA[Y]]></ISDEFAULT>
+<!--98636BBE6CA24096A5ED364E81932D69--></AD_MODEL_OBJECT_MAPPING>
+
 <!--9C7DDC171D20464A9FA79C71B1516DE3--><AD_MODEL_OBJECT_MAPPING>
 <!--9C7DDC171D20464A9FA79C71B1516DE3-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[9C7DDC171D20464A9FA79C71B1516DE3]]></AD_MODEL_OBJECT_MAPPING_ID>
 <!--9C7DDC171D20464A9FA79C71B1516DE3-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_MODEL_OBJECT_PARA.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_PARA.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--19E4495DEA8B482ABC0042327F303BBE--><AD_MODEL_OBJECT_PARA>
 <!--19E4495DEA8B482ABC0042327F303BBE-->  <AD_MODEL_OBJECT_PARA_ID><![CDATA[19E4495DEA8B482ABC0042327F303BBE]]></AD_MODEL_OBJECT_PARA_ID>
--- a/src-db/database/sourcedata/AD_MODULE.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_MODULE.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--0--><AD_MODULE>
 <!--0-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
--- a/src-db/database/sourcedata/AD_MODULE_DBPREFIX.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_MODULE_DBPREFIX.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--00834104948711DDA17E001B388C61A4--><AD_MODULE_DBPREFIX>
 <!--00834104948711DDA17E001B388C61A4-->  <AD_MODULE_DBPREFIX_ID><![CDATA[00834104948711DDA17E001B388C61A4]]></AD_MODULE_DBPREFIX_ID>
--- a/src-db/database/sourcedata/AD_PACKAGE.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_PACKAGE.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--5A3ED54AB1C84B84E040007F01006125--><AD_PACKAGE>
 <!--5A3ED54AB1C84B84E040007F01006125-->  <AD_PACKAGE_ID><![CDATA[5A3ED54AB1C84B84E040007F01006125]]></AD_PACKAGE_ID>
--- a/src-db/database/sourcedata/AD_PREFERENCE.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_PREFERENCE.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--3C42AC69917D411999A63E214B4A1E77--><AD_PREFERENCE>
 <!--3C42AC69917D411999A63E214B4A1E77-->  <AD_PREFERENCE_ID><![CDATA[3C42AC69917D411999A63E214B4A1E77]]></AD_PREFERENCE_ID>
--- a/src-db/database/sourcedata/AD_PROCESS.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_PROCESS.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--100--><AD_PROCESS>
 <!--100-->  <AD_PROCESS_ID><![CDATA[100]]></AD_PROCESS_ID>
--- a/src-db/database/sourcedata/AD_PROCESS_PARA.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_PROCESS_PARA.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--123--><AD_PROCESS_PARA>
 <!--123-->  <AD_PROCESS_PARA_ID><![CDATA[123]]></AD_PROCESS_PARA_ID>
--- a/src-db/database/sourcedata/AD_REFERENCE.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_REFERENCE.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--1--><AD_REFERENCE>
 <!--1-->  <AD_REFERENCE_ID><![CDATA[1]]></AD_REFERENCE_ID>
--- a/src-db/database/sourcedata/AD_REF_LIST.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--51--><AD_REF_LIST>
 <!--51-->  <AD_REF_LIST_ID><![CDATA[51]]></AD_REF_LIST_ID>
--- a/src-db/database/sourcedata/AD_REF_SEARCH.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_REF_SEARCH.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--800000--><AD_REF_SEARCH>
 <!--800000-->  <AD_REF_SEARCH_ID><![CDATA[800000]]></AD_REF_SEARCH_ID>
--- a/src-db/database/sourcedata/AD_REF_SEARCH_COLUMN.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_REF_SEARCH_COLUMN.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--800000--><AD_REF_SEARCH_COLUMN>
 <!--800000-->  <AD_REF_SEARCH_COLUMN_ID><![CDATA[800000]]></AD_REF_SEARCH_COLUMN_ID>
--- a/src-db/database/sourcedata/AD_REF_TABLE.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_REF_TABLE.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--1--><AD_REF_TABLE>
 <!--1-->  <AD_REFERENCE_ID><![CDATA[1]]></AD_REFERENCE_ID>
--- a/src-db/database/sourcedata/AD_TAB.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_TAB.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--100--><AD_TAB>
 <!--100-->  <AD_TAB_ID><![CDATA[100]]></AD_TAB_ID>
--- a/src-db/database/sourcedata/AD_TABLE.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_TABLE.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--100--><AD_TABLE>
 <!--100-->  <AD_TABLE_ID><![CDATA[100]]></AD_TABLE_ID>
--- a/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--800007--><AD_TEXTINTERFACES>
 <!--800007-->  <AD_TEXTINTERFACES_ID><![CDATA[800007]]></AD_TEXTINTERFACES_ID>
--- a/src-db/database/sourcedata/AD_TREENODE.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_TREENODE.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--29C956E61F0811DE98DB8F290236BC17--><AD_TREENODE>
 <!--29C956E61F0811DE98DB8F290236BC17-->  <AD_TREENODE_ID><![CDATA[29C956E61F0811DE98DB8F290236BC17]]></AD_TREENODE_ID>
--- a/src-db/database/sourcedata/AD_VAL_RULE.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_VAL_RULE.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--100--><AD_VAL_RULE>
 <!--100-->  <AD_VAL_RULE_ID><![CDATA[100]]></AD_VAL_RULE_ID>
--- a/src-db/database/sourcedata/AD_WINDOW.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/AD_WINDOW.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--100--><AD_WINDOW>
 <!--100-->  <AD_WINDOW_ID><![CDATA[100]]></AD_WINDOW_ID>
--- a/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--5689322B3F104A19A15ACDB331052991--><OBCLKER_UIDEFINITION>
 <!--5689322B3F104A19A15ACDB331052991-->  <OBCLKER_UIDEFINITION_ID><![CDATA[5689322B3F104A19A15ACDB331052991]]></OBCLKER_UIDEFINITION_ID>
--- a/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--5B14DD5B00AD445F93281640C6385BA4--><OBUIAPP_PARAMETER>
 <!--5B14DD5B00AD445F93281640C6385BA4-->  <OBUIAPP_PARAMETER_ID><![CDATA[5B14DD5B00AD445F93281640C6385BA4]]></OBUIAPP_PARAMETER_ID>
--- a/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--4AD70293357245AB96E59C2CDB43A35D--><OBUIAPP_PROCESS>
 <!--4AD70293357245AB96E59C2CDB43A35D-->  <OBUIAPP_PROCESS_ID><![CDATA[4AD70293357245AB96E59C2CDB43A35D]]></OBUIAPP_PROCESS_ID>
--- a/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--0866490047484A12A58A5D09A7157C80--><OBUIAPP_REF_WINDOW>
 <!--0866490047484A12A58A5D09A7157C80-->  <OBUIAPP_REF_WINDOW_ID><![CDATA[0866490047484A12A58A5D09A7157C80]]></OBUIAPP_REF_WINDOW_ID>
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--2E64F551C7C4470C80C29DBA24B34A5F--><OBUISEL_SELECTOR>
 <!--2E64F551C7C4470C80C29DBA24B34A5F-->  <OBUISEL_SELECTOR_ID><![CDATA[2E64F551C7C4470C80C29DBA24B34A5F]]></OBUISEL_SELECTOR_ID>
--- a/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Mon Feb 27 17:37:24 2012 +0100
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Thu Apr 12 17:19:13 2012 +0530
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <data>
 <!--01C1FF0DFB3643EEA2AF93128A057BEF--><OBUISEL_SELECTOR_FIELD>
 <!--01C1FF0DFB3643EEA2AF93128A057BEF-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[01C1FF0DFB3643EEA2AF93128A057BEF]]></OBUISEL_SELECTOR_FIELD_ID>
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java	Mon Feb 27 17:37:24 2012 +0100
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Amt.java	Thu Apr 12 17:19:13 2012 +0530
@@ -29,6 +29,7 @@
 
 import org.openbravo.base.secureApp.HttpSecureAppServlet;
 import org.openbravo.base.secureApp.VariablesSecureApp;
+import org.openbravo.common.businessObject.TaxCalculator;
 import org.openbravo.erpCommon.utility.Utility;
 import org.openbravo.utils.FormatUtilities;
 import org.openbravo.xmlEngine.XmlDocument;
@@ -59,6 +60,7 @@
       String strPriceList = vars.getNumericParameter("inppricelist");
       String strPriceStd = vars.getNumericParameter("inppricestd");
       String strCOrderId = vars.getStringParameter("inpcOrderId");
+      String strCOrderlineId = vars.getStringParameter("inpcOrderlineId");
       String strProduct = vars.getStringParameter("inpmProductId");
       String strUOM = vars.getStringParameter("inpcUomId");
       String strAttribute = vars.getStringParameter("inpmAttributesetinstanceId");
@@ -66,11 +68,14 @@
       String strQty = vars.getNumericParameter("inpqtyordered");
       String cancelPriceAd = vars.getStringParameter("inpcancelpricead");
       String strLineNetAmt = vars.getNumericParameter("inplinenetamt");
+      String strTaxId = vars.getStringParameter("inpcTaxId");
+      String strTaxInclusive = vars.getNumericParameter("inptaxinclusive");
 
       try {
         printPage(response, vars, strChanged, strQtyOrdered, strPriceActual, strDiscount,
-            strPriceLimit, strPriceList, strCOrderId, strProduct, strUOM, strAttribute, strTabId,
-            strQty, strPriceStd, cancelPriceAd, strLineNetAmt);
+            strPriceLimit, strPriceList, strCOrderId, strCOrderlineId, strProduct, strUOM,
+            strAttribute, strTabId, strQty, strPriceStd, cancelPriceAd, strLineNetAmt, strTaxId,
+            strTaxInclusive);
       } catch (ServletException ex) {
         pageErrorCallOut(response);
       }
@@ -80,9 +85,10 @@
 
   private void printPage(HttpServletResponse response, VariablesSecureApp vars, String strChanged,
       String strQtyOrdered, String strPriceActual, String strDiscount, String strPriceLimit,
-      String strPriceList, String strCOrderId, String strProduct, String strUOM,
-      String strAttribute, String strTabId, String strQty, String strPriceStd,
-      String cancelPriceAd, String strLineNetAmt) throws IOException, ServletException {
+      String strPriceList, String strCOrderId, String strCOrderlineId, String strProduct,
+      String strUOM, String strAttribute, String strTabId, String strQty, String strPriceStd,
+      String cancelPriceAd, String strLineNetAmt, String strTaxId, String strTaxInclusive)
+      throws IOException, ServletException {
     if (log4j.isDebugEnabled()) {
       log4j.debug("Output: dataSheet");
       log4j.debug("CHANGED:" + strChanged);
@@ -245,8 +251,8 @@
         priceStd = priceList.subtract(priceList.multiply(discount).divide(new BigDecimal("100"),
             12, BigDecimal.ROUND_HALF_EVEN));
         priceActual = new BigDecimal(SLOrderProductData.getOffersPrice(this,
-            dataOrder[0].dateordered, dataOrder[0].cBpartnerId, strProduct,
-            priceStd.toPlainString(), strQty, dataOrder[0].mPricelistId, dataOrder[0].id));
+            dataOrder[0].dateordered, dataOrder[0].cBpartnerId, strProduct, priceStd
+                .toPlainString(), strQty, dataOrder[0].mPricelistId, dataOrder[0].id));
         if (priceStd.scale() > PricePrecision)
           priceStd = priceStd.setScale(PricePrecision, BigDecimal.ROUND_HALF_UP);
         if (priceActual.scale() > PricePrecision)
@@ -265,8 +271,8 @@
             resultStock = stockNoAttribute.subtract(qtyOrdered);
             if (stockSecurity.compareTo(resultStock) > 0) {
               resultado.append("new Array('MESSAGE', \""
-                  + FormatUtilities.replaceJS(Utility.messageBD(this, "StockLimit",
-                      vars.getLanguage())) + "\"),");
+                  + FormatUtilities.replaceJS(Utility.messageBD(this, "StockLimit", vars
+                      .getLanguage())) + "\"),");
             }
           } else {
             if (!strAttribute.equals("") && strAttribute != null) {
@@ -276,8 +282,8 @@
               resultStock = stockAttribute.subtract(qtyOrdered);
               if (stockSecurity.compareTo(resultStock) > 0) {
                 resultado.append("new Array('MESSAGE', \""
-                    + FormatUtilities.replaceJS(Utility.messageBD(this, "StockLimit",
-                        vars.getLanguage())) + "\"),");
+                    + FormatUtilities.replaceJS(Utility.messageBD(this, "StockLimit", vars
+                        .getLanguage())) + "\"),");
               }
             }
           }
@@ -306,6 +312,30 @@
           LineNetAmt = LineNetAmt.setScale(StdPrecision, BigDecimal.ROUND_HALF_UP);
       }
     }
+    // if taxinclusive field is changed then modify net unit price and gross price
+    if (strChanged.equals("inptaxinclusive")) {
+      // SL_InclusiveTaxPrice_Generator generator;
+      BigDecimal tax = new BigDecimal(strTaxInclusive.trim());
+      TaxCalculator generator;
+      generator = new TaxCalculator(strTaxId);
+      priceActual = generator.taxCalculationFromOrder(strCOrderId, tax);
+      resultado.append("new Array(\"inpgrossprice\",\"" + priceActual.add(tax) + "\"),");
+      resultado.append("new Array(\"inppriceactual\",\"" + priceActual + "\"),");
+
+    }
+
+    // if net unit price changed then modify tax inclusive unit price
+    if (strChanged.equals("inppriceactual")) {
+      BigDecimal TaxInclusive = new BigDecimal(0);
+      priceActual = new BigDecimal(vars.getStringParameter("inppriceactual").trim());
+      TaxCalculator generator;
+      generator = new TaxCalculator(strTaxId);
+      TaxInclusive = generator.taxCalculationFromOrder(strCOrderId, priceActual);
+      resultado.append("new Array(\"inptaxinclusive\",\"" + TaxInclusive + "\"),");
+      resultado.append("new Array(\"inpgrossprice\",\"" + priceActual.add(TaxInclusive) + "\"),");
+      log4j.debug("Net unit price results: " + resultado.toString());
+
+    }
     if (strChanged.equals("inplinenetamt"))
       resultado.append("new Array(\"inppriceactual\", " + priceActual.toString() + "),");
     if (!strChanged.equals("inplinenetamt") || priceActual.compareTo(BigDecimal.ZERO) == 0)