[MERGE]: Merged with tpa's branch.

bzr revid: uco@tinyerp.com-20120301120854-12tmtfdsrv9p3lhs

diff --cc addons/sale/res_config.py
Simple merge

diff --cc addons/sale/res_config_view.xml
index a2e3572,5eb77ee..1011ddb
--- 1/addons/sale/res_config_view.xml
--- 2/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@@ -37,11 -37,15 +37,11 @@@
                              <group  colspan="4" col="4">
                                 <field name="group_sale_pricelist_per_customer"/>
                                 <newline/>
 -                               <group colspan="4" col="4">
 -                                    <field name="tax_policy" on_change="onchange_tax_policy(tax_policy,tax_value)"/>
 -                                    <field name="tax_value" nolabel="1" attrs="{'invisible':[('tax_policy','=','no_tax')]}"
 -                                                            on_change="onchange_tax_policy(tax_policy,tax_value)"/>
 -                               </group>
 +                               <field name="tax_policy" on_change="onchange_tax_policy(tax_policy)"/>
                                 <newline/>
-                                <field name="sale_margin"/>
+                                <field name="module_sale_margin"/>
                                 <newline/>
-                                <field name="warning"/>
+                                <field name="module_warning"/>
                                 <newline/>
                              </group>
                              <group colspan="4" col="4">