Remove GrossPrice column from ProductPrice.Fix quotes issue in xml files.
authorGorka Ion Damián <gorkaion.damian@openbravo.com>
Tue, 12 Jun 2012 17:39:10 +0200
changeset 17328 6c54dd7b7b4a
parent 17327 5517336c5dde
child 17329 aa5233a34d85
Remove GrossPrice column from ProductPrice.Fix quotes issue in xml files.
src-db/database/model/tables/M_PRODUCTPRICE.xml
src-db/database/model/views/M_PRODUCT_PRICE_WAREHOUSE_V.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_Product.java
--- a/src-db/database/model/tables/M_PRODUCTPRICE.xml	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/model/tables/M_PRODUCTPRICE.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -53,10 +53,6 @@
         <default><![CDATA[0]]></default>
         <onCreateDefault/>
       </column>
-      <column name="PRICEGROSS" primaryKey="false" required="true" type="DECIMAL" autoIncrement="false">
-        <default><![CDATA[0]]></default>
-        <onCreateDefault/>
-      </column>
       <foreign-key foreignTable="AD_CLIENT" name="M_PRODUCTPRICE_AD_CLIENT">
         <reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
       </foreign-key>
--- a/src-db/database/model/views/M_PRODUCT_PRICE_WAREHOUSE_V.xml	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/model/views/M_PRODUCT_PRICE_WAREHOUSE_V.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -16,27 +16,9 @@
 CASE
 WHEN p.producttype <> 'I' OR p.isstocked = 'N' THEN 0
 ELSE COALESCE(pwq.qtyordered, 0)
-END AS qty_ordered, 
-CASE
-WHEN pl.istaxincluded = 'Y' THEN 0
-ELSE pp.pricelist
-END AS pricelist, 
-CASE
-WHEN pl.istaxincluded = 'Y' THEN 0
-ELSE pp.pricestd
-END AS pricestd, 
-CASE
-WHEN pl.istaxincluded = 'Y' THEN 0
-ELSE pp.pricelimit
-END AS pricelimit, 
-CASE
-WHEN pl.istaxincluded = 'N' THEN NULL
-ELSE pp.pricegross
-END AS pricegross
+END AS qty_ordered, pp.pricelist, pp.pricestd, pp.pricelimit
 FROM m_productprice pp
-JOIN m_pricelist_version pv ON pp.m_pricelist_version_id = pv.m_pricelist_version_id
-JOIN m_pricelist pl ON pv.m_pricelist_id = pl.m_pricelist_id
 LEFT JOIN m_warehouse w ON pp.ad_client_id = w.ad_client_id
 LEFT JOIN m_product p ON p.m_product_id = pp.m_product_id
-LEFT JOIN m_product_warehouse_qtys_v pwq ON pwq.m_product_id = pp.m_product_id]]></view>
+LEFT JOIN m_product_warehouse_qtys_v pwq ON pwq.m_product_id = pp.m_product_id AND pwq.m_warehouse_id = w.m_warehouse_id]]></view>
   </database>
--- a/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_AUXILIARINPUT.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_CALLOUT.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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>
--- a/src-db/database/sourcedata/AD_COLUMN.xml	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_COLUMN.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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>
@@ -46709,7 +46709,7 @@
 <!--3028-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--3028-->  <NAME><![CDATA[Standard Price]]></NAME>
 <!--3028-->  <DESCRIPTION><![CDATA[The regular or normal price of a product in the respective price list.]]></DESCRIPTION>
-<!--3028-->  <HELP><![CDATA[The Standard Price indicates the standard or normal price for a product on this price list]]></HELP>
+<!--3028-->  <HELP><![CDATA[The Standard Price indicates the standard or normal price for a product on this price list. This price might be net or gross depending on its price list configuration.]]></HELP>
 <!--3028-->  <COLUMNNAME><![CDATA[PriceStd]]></COLUMNNAME>
 <!--3028-->  <AD_TABLE_ID><![CDATA[251]]></AD_TABLE_ID>
 <!--3028-->  <AD_REFERENCE_ID><![CDATA[800008]]></AD_REFERENCE_ID>
@@ -59998,7 +59998,7 @@
 <!--3696-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
 <!--3696-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
 <!--3696-->  <AD_ELEMENT_ID><![CDATA[1065]]></AD_ELEMENT_ID>
-<!--3696-->  <ISSESSIONATTR><![CDATA[Y]]></ISSESSIONATTR>
+<!--3696-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
 <!--3696-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
 <!--3696-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
 <!--3696-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
@@ -286092,41 +286092,6 @@
 <!--D0029DD2D6314D83BFE6141C3DBAA8E1-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--D0029DD2D6314D83BFE6141C3DBAA8E1--></AD_COLUMN>
 
-<!--D13E8C41E8984C5C85AF15B70DD24DB1--><AD_COLUMN>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <AD_COLUMN_ID><![CDATA[D13E8C41E8984C5C85AF15B70DD24DB1]]></AD_COLUMN_ID>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <NAME><![CDATA[Gross Price]]></NAME>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <DESCRIPTION><![CDATA[The total price ( including tax ) for the item]]></DESCRIPTION>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <HELP><![CDATA[Gross Price is the total price inclusive of tax for the item. The sale price will be calculated after deducting the tax amount. It is also called Maximum Retail Price  ( MRP)]]></HELP>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <COLUMNNAME><![CDATA[Pricegross]]></COLUMNNAME>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <AD_TABLE_ID><![CDATA[FF8080812DFFA1CF012DFFB889F40016]]></AD_TABLE_ID>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <AD_REFERENCE_ID><![CDATA[800008]]></AD_REFERENCE_ID>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <FIELDLENGTH><![CDATA[12]]></FIELDLENGTH>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <SEQNO><![CDATA[190]]></SEQNO>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <AD_ELEMENT_ID><![CDATA[66B636405CF942289703BC2D11AA8831]]></AD_ELEMENT_ID>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <POSITION><![CDATA[19]]></POSITION>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--D13E8C41E8984C5C85AF15B70DD24DB1--></AD_COLUMN>
-
 <!--D160BFBF2CD74DAEB9FF7C425874E282--><AD_COLUMN>
 <!--D160BFBF2CD74DAEB9FF7C425874E282-->  <AD_COLUMN_ID><![CDATA[D160BFBF2CD74DAEB9FF7C425874E282]]></AD_COLUMN_ID>
 <!--D160BFBF2CD74DAEB9FF7C425874E282-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -286232,42 +286197,6 @@
 <!--D1B2113CC0504A0C8A29B2EEC76EE22A-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--D1B2113CC0504A0C8A29B2EEC76EE22A--></AD_COLUMN>
 
-<!--D1F984CBA7724A4DBC15963586320206--><AD_COLUMN>
-<!--D1F984CBA7724A4DBC15963586320206-->  <AD_COLUMN_ID><![CDATA[D1F984CBA7724A4DBC15963586320206]]></AD_COLUMN_ID>
-<!--D1F984CBA7724A4DBC15963586320206-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--D1F984CBA7724A4DBC15963586320206-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--D1F984CBA7724A4DBC15963586320206-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--D1F984CBA7724A4DBC15963586320206-->  <NAME><![CDATA[Gross Price]]></NAME>
-<!--D1F984CBA7724A4DBC15963586320206-->  <DESCRIPTION><![CDATA[The total price ( including tax ) for the item]]></DESCRIPTION>
-<!--D1F984CBA7724A4DBC15963586320206-->  <HELP><![CDATA[Gross Price is the total price inclusive of tax for the item. The sale price will be calculated after deducting the tax amount. It is also called Maximum Retail Price  ( MRP)]]></HELP>
-<!--D1F984CBA7724A4DBC15963586320206-->  <COLUMNNAME><![CDATA[PriceGross]]></COLUMNNAME>
-<!--D1F984CBA7724A4DBC15963586320206-->  <AD_TABLE_ID><![CDATA[251]]></AD_TABLE_ID>
-<!--D1F984CBA7724A4DBC15963586320206-->  <AD_REFERENCE_ID><![CDATA[800008]]></AD_REFERENCE_ID>
-<!--D1F984CBA7724A4DBC15963586320206-->  <FIELDLENGTH><![CDATA[22]]></FIELDLENGTH>
-<!--D1F984CBA7724A4DBC15963586320206-->  <DEFAULTVALUE><![CDATA[0]]></DEFAULTVALUE>
-<!--D1F984CBA7724A4DBC15963586320206-->  <ISKEY><![CDATA[N]]></ISKEY>
-<!--D1F984CBA7724A4DBC15963586320206-->  <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--D1F984CBA7724A4DBC15963586320206-->  <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--D1F984CBA7724A4DBC15963586320206-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--D1F984CBA7724A4DBC15963586320206-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--D1F984CBA7724A4DBC15963586320206-->  <SEQNO><![CDATA[12]]></SEQNO>
-<!--D1F984CBA7724A4DBC15963586320206-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--D1F984CBA7724A4DBC15963586320206-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--D1F984CBA7724A4DBC15963586320206-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--D1F984CBA7724A4DBC15963586320206-->  <AD_ELEMENT_ID><![CDATA[66B636405CF942289703BC2D11AA8831]]></AD_ELEMENT_ID>
-<!--D1F984CBA7724A4DBC15963586320206-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--D1F984CBA7724A4DBC15963586320206-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--D1F984CBA7724A4DBC15963586320206-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--D1F984CBA7724A4DBC15963586320206-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--D1F984CBA7724A4DBC15963586320206-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--D1F984CBA7724A4DBC15963586320206-->  <POSITION><![CDATA[14]]></POSITION>
-<!--D1F984CBA7724A4DBC15963586320206-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--D1F984CBA7724A4DBC15963586320206-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--D1F984CBA7724A4DBC15963586320206-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--D1F984CBA7724A4DBC15963586320206-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--D1F984CBA7724A4DBC15963586320206-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--D1F984CBA7724A4DBC15963586320206--></AD_COLUMN>
-
 <!--D330031212524D2CAA0C5ECEE52C20B8--><AD_COLUMN>
 <!--D330031212524D2CAA0C5ECEE52C20B8-->  <AD_COLUMN_ID><![CDATA[D330031212524D2CAA0C5ECEE52C20B8]]></AD_COLUMN_ID>
 <!--D330031212524D2CAA0C5ECEE52C20B8-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_DATASET.xml	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_DATASET.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_DATASET_COLUMN.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_DATASET_TABLE.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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>
@@ -5573,10 +5573,10 @@
 <!--957-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--957-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
 <!--957-->  <COLUMNNAME><![CDATA[PriceStd]]></COLUMNNAME>
-<!--957-->  <NAME><![CDATA[Net Unit Price]]></NAME>
-<!--957-->  <PRINTNAME><![CDATA[Net Unit Price]]></PRINTNAME>
+<!--957-->  <NAME><![CDATA[Unit Price]]></NAME>
+<!--957-->  <PRINTNAME><![CDATA[Unit Price]]></PRINTNAME>
 <!--957-->  <DESCRIPTION><![CDATA[The regular or normal price of a product in the respective price list.]]></DESCRIPTION>
-<!--957-->  <HELP><![CDATA[The Standard Price indicates the standard or normal price for a product on this price list]]></HELP>
+<!--957-->  <HELP><![CDATA[The Standard Price indicates the standard or normal price for a product on this price list. This price might be net or gross depending on its price list configuration.]]></HELP>
 <!--957-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
 <!--957-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--957--></AD_ELEMENT>
@@ -24205,20 +24205,6 @@
 <!--667AE26F6635E6A7E040007F01015B98-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--667AE26F6635E6A7E040007F01015B98--></AD_ELEMENT>
 
-<!--66B636405CF942289703BC2D11AA8831--><AD_ELEMENT>
-<!--66B636405CF942289703BC2D11AA8831-->  <AD_ELEMENT_ID><![CDATA[66B636405CF942289703BC2D11AA8831]]></AD_ELEMENT_ID>
-<!--66B636405CF942289703BC2D11AA8831-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--66B636405CF942289703BC2D11AA8831-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--66B636405CF942289703BC2D11AA8831-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--66B636405CF942289703BC2D11AA8831-->  <COLUMNNAME><![CDATA[PriceGross]]></COLUMNNAME>
-<!--66B636405CF942289703BC2D11AA8831-->  <NAME><![CDATA[Gross Price]]></NAME>
-<!--66B636405CF942289703BC2D11AA8831-->  <PRINTNAME><![CDATA[Gross Price]]></PRINTNAME>
-<!--66B636405CF942289703BC2D11AA8831-->  <DESCRIPTION><![CDATA[The total price ( including tax ) for the item]]></DESCRIPTION>
-<!--66B636405CF942289703BC2D11AA8831-->  <HELP><![CDATA[Gross Price is the total price inclusive of tax for the item. The sale price will be calculated after deducting the tax amount. It is also called Maximum Retail Price  ( MRP)]]></HELP>
-<!--66B636405CF942289703BC2D11AA8831-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--66B636405CF942289703BC2D11AA8831-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
-<!--66B636405CF942289703BC2D11AA8831--></AD_ELEMENT>
-
 <!--66E1860A46E045D4BD7F018323FA10D4--><AD_ELEMENT>
 <!--66E1860A46E045D4BD7F018323FA10D4-->  <AD_ELEMENT_ID><![CDATA[66E1860A46E045D4BD7F018323FA10D4]]></AD_ELEMENT_ID>
 <!--66E1860A46E045D4BD7F018323FA10D4-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_EXTENSION_POINTS.xml	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_EXTENSION_POINTS.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_FIELD.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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>
@@ -23530,9 +23530,9 @@
 <!--2102-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--2102-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2102-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--2102-->  <NAME><![CDATA[Net Unit Price]]></NAME>
+<!--2102-->  <NAME><![CDATA[Unit Price]]></NAME>
 <!--2102-->  <DESCRIPTION><![CDATA[The regular or normal price of a product in the respective price list.]]></DESCRIPTION>
-<!--2102-->  <HELP><![CDATA[The Standard Price indicates the standard or normal price for a product on this price list]]></HELP>
+<!--2102-->  <HELP><![CDATA[The Standard Price indicates the standard or normal price for a product on this price list. This price might be net or gross depending on its price list configuration.]]></HELP>
 <!--2102-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--2102-->  <AD_TAB_ID><![CDATA[183]]></AD_TAB_ID>
 <!--2102-->  <AD_COLUMN_ID><![CDATA[3028]]></AD_COLUMN_ID>
@@ -28463,7 +28463,6 @@
 <!--2398-->  <AD_TAB_ID><![CDATA[192]]></AD_TAB_ID>
 <!--2398-->  <AD_COLUMN_ID><![CDATA[3027]]></AD_COLUMN_ID>
 <!--2398-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--2398-->  <DISPLAYLOGIC><![CDATA[@IsTaxIncluded@='N']]></DISPLAYLOGIC>
 <!--2398-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--2398-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--2398-->  <SEQNO><![CDATA[30]]></SEQNO>
@@ -28485,14 +28484,13 @@
 <!--2399-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--2399-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--2399-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--2399-->  <NAME><![CDATA[Net Unit Price]]></NAME>
+<!--2399-->  <NAME><![CDATA[Unit Price]]></NAME>
 <!--2399-->  <DESCRIPTION><![CDATA[The regular or normal price of a product in the respective price list.]]></DESCRIPTION>
-<!--2399-->  <HELP><![CDATA[The Standard Price indicates the standard or normal price for a product on this price list]]></HELP>
+<!--2399-->  <HELP><![CDATA[The Standard Price indicates the standard or normal price for a product on this price list. This price might be net or gross depending on its price list configuration.]]></HELP>
 <!--2399-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--2399-->  <AD_TAB_ID><![CDATA[192]]></AD_TAB_ID>
 <!--2399-->  <AD_COLUMN_ID><![CDATA[3028]]></AD_COLUMN_ID>
 <!--2399-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--2399-->  <DISPLAYLOGIC><![CDATA[@IsTaxIncluded@='N']]></DISPLAYLOGIC>
 <!--2399-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
 <!--2399-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
 <!--2399-->  <SEQNO><![CDATA[20]]></SEQNO>
@@ -68870,9 +68868,9 @@
 <!--5609-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--5609-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--5609-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--5609-->  <NAME><![CDATA[Net Unit Price]]></NAME>
+<!--5609-->  <NAME><![CDATA[Unit Price]]></NAME>
 <!--5609-->  <DESCRIPTION><![CDATA[The regular or normal price of a product in the respective price list.]]></DESCRIPTION>
-<!--5609-->  <HELP><![CDATA[The Standard Price indicates the standard or normal price for a product on this price list]]></HELP>
+<!--5609-->  <HELP><![CDATA[The Standard Price indicates the standard or normal price for a product on this price list. This price might be net or gross depending on its price list configuration.]]></HELP>
 <!--5609-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--5609-->  <AD_TAB_ID><![CDATA[420]]></AD_TAB_ID>
 <!--5609-->  <AD_COLUMN_ID><![CDATA[3028]]></AD_COLUMN_ID>
@@ -69091,9 +69089,9 @@
 <!--5617-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
 <!--5617-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
 <!--5617-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--5617-->  <NAME><![CDATA[Net Unit Price]]></NAME>
+<!--5617-->  <NAME><![CDATA[Unit Price]]></NAME>
 <!--5617-->  <DESCRIPTION><![CDATA[The regular or normal price of a product in the respective price list.]]></DESCRIPTION>
-<!--5617-->  <HELP><![CDATA[The Standard Price indicates the standard or normal price for a product on this price list]]></HELP>
+<!--5617-->  <HELP><![CDATA[The Standard Price indicates the standard or normal price for a product on this price list. This price might be net or gross depending on its price list configuration.]]></HELP>
 <!--5617-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
 <!--5617-->  <AD_TAB_ID><![CDATA[421]]></AD_TAB_ID>
 <!--5617-->  <AD_COLUMN_ID><![CDATA[3028]]></AD_COLUMN_ID>
@@ -225668,35 +225666,6 @@
 <!--FA7B5A1AF9AE4B05AA935D59F2A5DC75-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--FA7B5A1AF9AE4B05AA935D59F2A5DC75--></AD_FIELD>
 
-<!--FB89DC967017451AAE804346AB235E17--><AD_FIELD>
-<!--FB89DC967017451AAE804346AB235E17-->  <AD_FIELD_ID><![CDATA[FB89DC967017451AAE804346AB235E17]]></AD_FIELD_ID>
-<!--FB89DC967017451AAE804346AB235E17-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FB89DC967017451AAE804346AB235E17-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FB89DC967017451AAE804346AB235E17-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FB89DC967017451AAE804346AB235E17-->  <NAME><![CDATA[Gross Price]]></NAME>
-<!--FB89DC967017451AAE804346AB235E17-->  <DESCRIPTION><![CDATA[The total price ( including tax ) for the item]]></DESCRIPTION>
-<!--FB89DC967017451AAE804346AB235E17-->  <HELP><![CDATA[Gross Price is the total price inclusive of tax for the item. The sale price will be calculated after deducting the tax amount. It is also called Maximum Retail Price  ( MRP)]]></HELP>
-<!--FB89DC967017451AAE804346AB235E17-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--FB89DC967017451AAE804346AB235E17-->  <AD_TAB_ID><![CDATA[192]]></AD_TAB_ID>
-<!--FB89DC967017451AAE804346AB235E17-->  <AD_COLUMN_ID><![CDATA[D1F984CBA7724A4DBC15963586320206]]></AD_COLUMN_ID>
-<!--FB89DC967017451AAE804346AB235E17-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--FB89DC967017451AAE804346AB235E17-->  <DISPLAYLOGIC><![CDATA[@IsTaxIncluded@='Y']]></DISPLAYLOGIC>
-<!--FB89DC967017451AAE804346AB235E17-->  <DISPLAYLENGTH><![CDATA[22]]></DISPLAYLENGTH>
-<!--FB89DC967017451AAE804346AB235E17-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--FB89DC967017451AAE804346AB235E17-->  <SEQNO><![CDATA[50]]></SEQNO>
-<!--FB89DC967017451AAE804346AB235E17-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--FB89DC967017451AAE804346AB235E17-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--FB89DC967017451AAE804346AB235E17-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--FB89DC967017451AAE804346AB235E17-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
-<!--FB89DC967017451AAE804346AB235E17-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--FB89DC967017451AAE804346AB235E17-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--FB89DC967017451AAE804346AB235E17-->  <GRID_SEQNO><![CDATA[40]]></GRID_SEQNO>
-<!--FB89DC967017451AAE804346AB235E17-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--FB89DC967017451AAE804346AB235E17-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--FB89DC967017451AAE804346AB235E17-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--FB89DC967017451AAE804346AB235E17-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--FB89DC967017451AAE804346AB235E17--></AD_FIELD>
-
 <!--FBBE5A4932DC4FF490AEC7714EB66676--><AD_FIELD>
 <!--FBBE5A4932DC4FF490AEC7714EB66676-->  <AD_FIELD_ID><![CDATA[FBBE5A4932DC4FF490AEC7714EB66676]]></AD_FIELD_ID>
 <!--FBBE5A4932DC4FF490AEC7714EB66676-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -226030,35 +225999,6 @@
 <!--FE2743CA355E424D84094B97255C839D-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--FE2743CA355E424D84094B97255C839D--></AD_FIELD>
 
-<!--FE69B0438FDD4EBCAA416508D0E2130D--><AD_FIELD>
-<!--FE69B0438FDD4EBCAA416508D0E2130D-->  <AD_FIELD_ID><![CDATA[FE69B0438FDD4EBCAA416508D0E2130D]]></AD_FIELD_ID>
-<!--FE69B0438FDD4EBCAA416508D0E2130D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--FE69B0438FDD4EBCAA416508D0E2130D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--FE69B0438FDD4EBCAA416508D0E2130D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--FE69B0438FDD4EBCAA416508D0E2130D-->  <NAME><![CDATA[Gross Price]]></NAME>
-<!--FE69B0438FDD4EBCAA416508D0E2130D-->  <DESCRIPTION><![CDATA[The total price ( including tax ) for the item]]></DESCRIPTION>
-<!--FE69B0438FDD4EBCAA416508D0E2130D-->  <HELP><![CDATA[Gross Price is the total price inclusive of tax for the item. The sale price will be calculated after deducting the tax amount. It is also called Maximum Retail Price  ( MRP)]]></HELP>
-<!--FE69B0438FDD4EBCAA416508D0E2130D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--FE69B0438FDD4EBCAA416508D0E2130D-->  <AD_TAB_ID><![CDATA[183]]></AD_TAB_ID>
-<!--FE69B0438FDD4EBCAA416508D0E2130D-->  <AD_COLUMN_ID><![CDATA[D1F984CBA7724A4DBC15963586320206]]></AD_COLUMN_ID>
-<!--FE69B0438FDD4EBCAA416508D0E2130D-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--FE69B0438FDD4EBCAA416508D0E2130D-->  <DISPLAYLOGIC><![CDATA[@IsTaxIncludedInPriceList@= 'Y']]></DISPLAYLOGIC>
-<!--FE69B0438FDD4EBCAA416508D0E2130D-->  <DISPLAYLENGTH><![CDATA[10]]></DISPLAYLENGTH>
-<!--FE69B0438FDD4EBCAA416508D0E2130D-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
-<!--FE69B0438FDD4EBCAA416508D0E2130D-->  <SEQNO><![CDATA[60]]></SEQNO>
-<!--FE69B0438FDD4EBCAA416508D0E2130D-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--FE69B0438FDD4EBCAA416508D0E2130D-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--FE69B0438FDD4EBCAA416508D0E2130D-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--FE69B0438FDD4EBCAA416508D0E2130D-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
-<!--FE69B0438FDD4EBCAA416508D0E2130D-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--FE69B0438FDD4EBCAA416508D0E2130D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--FE69B0438FDD4EBCAA416508D0E2130D-->  <GRID_SEQNO><![CDATA[60]]></GRID_SEQNO>
-<!--FE69B0438FDD4EBCAA416508D0E2130D-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--FE69B0438FDD4EBCAA416508D0E2130D-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--FE69B0438FDD4EBCAA416508D0E2130D-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--FE69B0438FDD4EBCAA416508D0E2130D-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--FE69B0438FDD4EBCAA416508D0E2130D--></AD_FIELD>
-
 <!--FED2044D7B8C47BA843A9A7EBFF7404A--><AD_FIELD>
 <!--FED2044D7B8C47BA843A9A7EBFF7404A-->  <AD_FIELD_ID><![CDATA[FED2044D7B8C47BA843A9A7EBFF7404A]]></AD_FIELD_ID>
 <!--FED2044D7B8C47BA843A9A7EBFF7404A-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
--- a/src-db/database/sourcedata/AD_FIELDGROUP.xml	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_FIELDGROUP.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_FORM.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_MENU.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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>
--- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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>
--- a/src-db/database/sourcedata/AD_MODEL_OBJECT_PARA.xml	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_PARA.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_MODULE.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_MODULE_DBPREFIX.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_PACKAGE.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_PREFERENCE.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_PROCESS.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_PROCESS_PARA.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_REFERENCE.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_REF_SEARCH.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_REF_SEARCH_COLUMN.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_REF_TABLE.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_TAB.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_TABLE.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_TEXTINTERFACES.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_TREENODE.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_VAL_RULE.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/AD_WINDOW.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/OBCLKER_UIDEFINITION.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/OBUIAPP_PARAMETER.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/OBUIAPP_PROCESS.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/OBUIAPP_REF_WINDOW.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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	Tue Jun 12 11:48:34 2012 +0530
+++ b/src-db/database/sourcedata/OBUISEL_SELECTOR_FIELD.xml	Tue Jun 12 17:39:10 2012 +0200
@@ -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>
@@ -1076,29 +1076,6 @@
 <!--EB0A95320BF845DD8146274BE02DABBC-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
 <!--EB0A95320BF845DD8146274BE02DABBC--></OBUISEL_SELECTOR_FIELD>
 
-<!--F033BFD063F34D949478FC47B72A4E0D--><OBUISEL_SELECTOR_FIELD>
-<!--F033BFD063F34D949478FC47B72A4E0D-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[F033BFD063F34D949478FC47B72A4E0D]]></OBUISEL_SELECTOR_FIELD_ID>
-<!--F033BFD063F34D949478FC47B72A4E0D-->  <OBUISEL_SELECTOR_ID><![CDATA[2E64F551C7C4470C80C29DBA24B34A5F]]></OBUISEL_SELECTOR_ID>
-<!--F033BFD063F34D949478FC47B72A4E0D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--F033BFD063F34D949478FC47B72A4E0D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--F033BFD063F34D949478FC47B72A4E0D-->  <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID>
-<!--F033BFD063F34D949478FC47B72A4E0D-->  <AD_COLUMN_ID><![CDATA[D13E8C41E8984C5C85AF15B70DD24DB1]]></AD_COLUMN_ID>
-<!--F033BFD063F34D949478FC47B72A4E0D-->  <NAME><![CDATA[Gross Price]]></NAME>
-<!--F033BFD063F34D949478FC47B72A4E0D-->  <DESCRIPTION><![CDATA[The total price ( including tax ) for the item]]></DESCRIPTION>
-<!--F033BFD063F34D949478FC47B72A4E0D-->  <HELP><![CDATA[Gross Price is the total price inclusive of tax for the item. The sale price will be calculated after deducting the tax amount. It is also called Maximum Retail Price  ( MRP)]]></HELP>
-<!--F033BFD063F34D949478FC47B72A4E0D-->  <PROPERTY><![CDATA[grossPrice]]></PROPERTY>
-<!--F033BFD063F34D949478FC47B72A4E0D-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--F033BFD063F34D949478FC47B72A4E0D-->  <SORT><![CDATA[Y]]></SORT>
-<!--F033BFD063F34D949478FC47B72A4E0D-->  <FILTER><![CDATA[Y]]></FILTER>
-<!--F033BFD063F34D949478FC47B72A4E0D-->  <SEARCHINSUGGESTIONBOX><![CDATA[N]]></SEARCHINSUGGESTIONBOX>
-<!--F033BFD063F34D949478FC47B72A4E0D-->  <SHOWINGRID><![CDATA[Y]]></SHOWINGRID>
-<!--F033BFD063F34D949478FC47B72A4E0D-->  <SORTNO><![CDATA[100]]></SORTNO>
-<!--F033BFD063F34D949478FC47B72A4E0D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--F033BFD063F34D949478FC47B72A4E0D-->  <ISOUTFIELD><![CDATA[Y]]></ISOUTFIELD>
-<!--F033BFD063F34D949478FC47B72A4E0D-->  <SUFFIX><![CDATA[_PGRS]]></SUFFIX>
-<!--F033BFD063F34D949478FC47B72A4E0D-->  <SHOWINPICKLIST><![CDATA[N]]></SHOWINPICKLIST>
-<!--F033BFD063F34D949478FC47B72A4E0D--></OBUISEL_SELECTOR_FIELD>
-
 <!--F0DB30CF17844041AE30FF506441B1A9--><OBUISEL_SELECTOR_FIELD>
 <!--F0DB30CF17844041AE30FF506441B1A9-->  <OBUISEL_SELECTOR_FIELD_ID><![CDATA[F0DB30CF17844041AE30FF506441B1A9]]></OBUISEL_SELECTOR_FIELD_ID>
 <!--F0DB30CF17844041AE30FF506441B1A9-->  <OBUISEL_SELECTOR_ID><![CDATA[4C8BC3E8E56441F4B8C98C684A0C9212]]></OBUISEL_SELECTOR_ID>
--- a/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java	Tue Jun 12 11:48:34 2012 +0530
+++ b/src/org/openbravo/erpCommon/ad_callouts/SL_Order_Product.java	Tue Jun 12 17:39:10 2012 +0200
@@ -60,7 +60,6 @@
       String strPriceStd = vars.getNumericParameter("inpmProductId_PSTD");
       String strPriceLimit = vars.getNumericParameter("inpmProductId_PLIM");
       String strCurrency = vars.getStringParameter("inpmProductId_CURR");
-      String strPriceGross = vars.getStringParameter("inpmProductId_PGRS");
       String strQty = vars.getNumericParameter("inpqtyordered");
 
       String strCBpartnerID = vars.getStringParameter("inpcBpartnerId");
@@ -78,8 +77,7 @@
       try {
         printPage(response, vars, strUOM, strPriceList, strPriceStd, strPriceLimit, strCurrency,
             strMProductID, strCBPartnerLocationID, strDateOrdered, strADOrgID, strMWarehouseID,
-            strCOrderId, strWindowId, strIsSOTrx, strCBpartnerID, strTabId, strQty, cancelPriceAd,
-            strPriceGross);
+            strCOrderId, strWindowId, strIsSOTrx, strCBpartnerID, strTabId, strQty, cancelPriceAd);
       } catch (ServletException ex) {
         pageErrorCallOut(response);
       }
@@ -91,8 +89,8 @@
       String strPriceList, String strPriceStd, String strPriceLimit, String strCurrency,
       String strMProductID, String strCBPartnerLocationID, String strDateOrdered,
       String strADOrgID, String strMWarehouseID, String strCOrderId, String strWindowId,
-      String strIsSOTrx, String strCBpartnerID, String strTabId, String strQty,
-      String cancelPriceAd, String strPriceGross) throws IOException, ServletException {
+      String strIsSOTrx, String strCBpartnerID, String strTabId, String strQty, String cancelPriceAd)
+      throws IOException, ServletException {
     if (log4j.isDebugEnabled())
       log4j.debug("Output: dataSheet");
     XmlDocument xmlDocument = xmlEngine.readXmlTemplate(
@@ -143,7 +141,7 @@
     resultado.append("new Array(\"inpcUomId\", \"" + strUOM + "\"),");
     if (isPriceTaxInclusive(strCOrderId)) {
       resultado.append("new Array(\"inpgrossUnitPrice\", "
-          + (strPriceActual.equals("") ? "0" : strPriceGross) + "),");
+          + (strPriceActual.equals("") ? "0" : strPriceList) + "),");
 
     } else {
       resultado.append("new Array(\"inppricelist\", "