[IMP] sale, purchase: remove option 'taxes' from config wizards

bzr revid: rco@openerp.com-20120330120730-dilz5owc82s3yrl0

8 files changed, 8 insertions, 77 deletions

diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 1b0c4c0acb4..0507afacb2e 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -189,8 +189,8 @@
                                 <!-- default form view -->
                             </field>
                             <group col="7" colspan="4">
-                                <field name="amount_untaxed" sum="Untaxed amount" groups="purchase.group_taxes_on_order_line,purchase.group_taxes_global_on_order"/>
-                                <field name="amount_tax" groups="purchase.group_taxes_on_order_line,purchase.group_taxes_global_on_order"/>
+                                <field name="amount_untaxed" sum="Untaxed amount"/>
+                                <field name="amount_tax"/>
                                 <field name="amount_total" sum="Total amount"/>
                                 <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
                             </group>
@@ -367,7 +367,7 @@
                             <field name="price_unit"/>
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <field name="account_analytic_id" colspan="4" groups="purchase.group_analytic_accounting" domain="[('parent_id','!=',False)]" />
-                            <group colspan="4" col="4" groups="purchase.group_taxes_on_order_line">
+                            <group colspan="4" col="4">
                                 <separator colspan="4" string="Taxes"/>
                                 <field colspan="4" nolabel="1" name="taxes_id"
                                     domain="[('parent_id','=',False),('type_tax_use','!=','sale')]"/>
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 61b12284507..7ef8d1b3b11 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -62,35 +62,12 @@ class purchase_config_settings(osv.osv_memory):
             help="""When a purchase order is created, you have the opportunity to save the related requisition.
                 This object regroups and allows you to keep track and order all your purchase orders.
                 This installs the module purchase_requisition."""),
-        'tax_policy': fields.selection(
-            [('no_tax', 'No Tax'), ('global_on_order', 'Global On Order'), ('on_order_line', 'On Order Lines')],
-            'Taxes', required=True,
-            help="""Choose between either applying global taxes on a purchase order, or applying different taxes on purchase order lines, or applying no tax at all."""),
-        'group_purchase_taxes_global_on_order':fields.boolean("Global on order",
-            implied_group='purchase.group_taxes_global_on_order'),
-        'group_purchase_taxes_on_order_line':fields.boolean("On order line",
-            implied_group='purchase.group_taxes_on_order_line'),
     }
 
-    def default_get(self, cr, uid, fields, context=None):
-        res = super(purchase_config_settings, self).default_get(cr, uid, fields, context)
-        res['tax_policy'] = \
-            (res.get('group_purchase_taxes_global_on_order') and 'global_on_order') or \
-            (res.get('group_purchase_taxes_on_order_line') and 'on_order_line') or \
-            'no_tax'
-        return res
-
     _defaults = {
         'default_invoice_method': 'manual',
-        'tax_policy': 'no_tax',
     }
 
-    def onchange_tax_policy(self, cr, uid, ids, tax_policy, context=None):
-        return {'value': {
-            'group_purchase_taxes_global_on_order': tax_policy == 'global_on_order',
-            'group_purchase_taxes_on_order_line': tax_policy == 'on_order_line',
-        }}
-
 
 
 class account_config_settings(osv.osv_memory):
diff --git a/addons/purchase/res_config_view.xml b/addons/purchase/res_config_view.xml
index 7fe1458afc0..74078014322 100644
--- a/addons/purchase/res_config_view.xml
+++ b/addons/purchase/res_config_view.xml
@@ -13,11 +13,8 @@
 
                         <separator string="Purchase Order" colspan="6"/>
                         <field name="group_purchase_pricelist"/>
-                        <field name="group_purchase_taxes_global_on_order" invisible="1"/>
-                        <field name="group_purchase_taxes_on_order_line" invisible="1"/>
                         <field name="group_uom"/>
                         <newline/>
-                        <field name="tax_policy" on_change="onchange_tax_policy(tax_policy)"/>
                         <field name="module_purchase_double_validation"/>
                         <newline/>
                         <field name="module_warning"/>
diff --git a/addons/purchase/security/purchase_security.xml b/addons/purchase/security/purchase_security.xml
index cbf03cd32c7..ba59522552c 100644
--- a/addons/purchase/security/purchase_security.xml
+++ b/addons/purchase/security/purchase_security.xml
@@ -13,16 +13,6 @@
         <field name="implied_ids" eval="[(4, ref('group_purchase_user'))]"/>
     </record>
 
-    <record id="group_taxes_global_on_order" model="res.groups">
-        <field name="name">Purchase Taxes Global on Order</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-
-    <record id="group_taxes_on_order_line" model="res.groups">
-        <field name="name">Purchase Taxes on Order Lines</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-
     <record id="group_analytic_accounting" model="res.groups">
         <field name="name">Analytic Accounting for Purchases</field>
         <field name="category_id" ref="base.module_category_hidden"/>
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index fd271cef345..d81ed34e1cb 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -87,14 +87,6 @@ class sale_configuration(osv.osv_memory):
         'module_analytic_journal_billing_rate': fields.boolean("Billing rates by contracts",
             help="""Allows you to define the default invoicing rate for a specific journal on a given account.
                 This installs the module analytic_journal_billing_rate."""),
-        'tax_policy': fields.selection(
-            [('no_tax', 'No Tax'), ('global_on_order', 'Global On Order'), ('on_order_line', 'On Order Lines')],
-            'Taxes', required=True,
-            help="""Choose between either applying global taxes on a sale order, or applying different taxes on sale order lines, or applying no tax at all."""),
-        'group_sale_taxes_global_on_order': fields.boolean("Global on order",
-            implied_group='sale.group_taxes_global_on_order'),
-        'group_sale_taxes_on_order_line': fields.boolean("On order line",
-            implied_group='sale.group_taxes_on_order_line'),
         'module_project_timesheet': fields.boolean("Project Timesheet"),
         'module_project_mrp': fields.boolean("Project MRP"),
     }
@@ -102,15 +94,11 @@ class sale_configuration(osv.osv_memory):
     def default_get(self, cr, uid, fields, context=None):
         ir_model_data = self.pool.get('ir.model.data')
         res = super(sale_configuration, self).default_get(cr, uid, fields, context)
-        # task_work, time_unit and tax_policy depend on other fields
+        # task_work, time_unit depend on other fields
         res['task_work'] = res.get('module_project_mrp') and res.get('module_project_timesheet')
         if res.get('module_account_analytic_analysis'):
             product = ir_model_data.get_object(cr, uid, 'product', 'product_consultant')
             res['time_unit'] = product.uom_id.id
-        res['tax_policy'] = \
-            (res.get('group_sale_taxes_global_on_order') and 'global_on_order') or \
-            (res.get('group_sale_taxes_on_order_line') and 'on_order_line') or \
-            'no_tax'
         return res
 
     def get_default_sale_config(self, cr, uid, ids, context=None):
@@ -127,7 +115,6 @@ class sale_configuration(osv.osv_memory):
     _defaults = {
         'default_order_policy': 'manual',
         'time_unit': _get_default_time_unit,
-        'tax_policy': 'no_tax',
     }
 
     def set_sale_defaults(self, cr, uid, ids, context=None):
@@ -154,12 +141,6 @@ class sale_configuration(osv.osv_memory):
             'module_project_mrp': task_work,
         }}
 
-    def onchange_tax_policy(self, cr, uid, ids, tax_policy, context=None):
-        return {'value': {
-            'group_sale_taxes_global_on_order': tax_policy == 'global_on_order',
-            'group_sale_taxes_on_order_line': tax_policy == 'on_order_line',
-        }}
-
 
 
 class account_config_settings(osv.osv_memory):
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index e2e950b10dc..efbd34edf42 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -28,9 +28,6 @@
                     <field name="group_sale_pricelist"/>
                     <field name="group_uom"/>
                     <newline/>
-                    <field name="tax_policy" on_change="onchange_tax_policy(tax_policy)"/>
-                    <field name="group_sale_taxes_global_on_order" invisible="1"/>
-                    <field name="group_sale_taxes_on_order_line" invisible="1"/>
                     <field name="group_sale_delivery_address"/>
                     <newline/>
                     <field name="module_sale_margin"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index f4408af5e87..b2883fb0b2f 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -152,9 +152,8 @@
                                             <field name="discount" groups="sale.group_discount_per_so_line"/>
                                             <separator colspan="5" string="Notes" groups="base.group_sale_notes_subtotal"/>
                                             <field colspan="5" name="notes" nolabel="1" groups="base.group_sale_notes_subtotal"/>
-                                            <separator colspan="5" string="Taxes" groups="sale.group_taxes_on_order_line"/>
-                                            <field colspan="5" name="tax_id" nolabel="1" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]" 
-                                                groups="sale.group_taxes_on_order_line" />
+                                            <separator colspan="5" string="Taxes"/>
+                                            <field colspan="5" name="tax_id" nolabel="1" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                                             <group colspan="5" col="5" groups="base.group_extended">
                                                 <separator colspan="5" string="States"/>
                                                 <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done" statusbar_colors='{"exception":"red","cancel":"red"}'/>
@@ -194,8 +193,8 @@
                             </field>
                             <newline/>
                             <group col="13" colspan="10">
-                                <field name="amount_untaxed" sum="Untaxed amount" groups="sale.group_taxes_on_order_line,sale.group_taxes_global_on_order"/>
-                                <field name="amount_tax" groups="sale.group_taxes_on_order_line,sale.group_taxes_global_on_order"/>
+                                <field name="amount_untaxed" sum="Untaxed amount"/>
+                                <field name="amount_tax"/>
                                 <field name="amount_total"/>
                                 <button name="button_dummy" states="draft" string="Compute" type="object" icon="gtk-execute"/>
                                 <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual" groups="base.group_extended"/>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 52b2af50ea8..b01e460f8af 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -40,16 +40,6 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
-    <record id="group_taxes_global_on_order" model="res.groups">
-        <field name="name">Sales Taxes Global on Order</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-
-    <record id="group_taxes_on_order_line" model="res.groups">
-        <field name="name">Sales Taxes on Order Lines</field>
-        <field name="category_id" ref="base.module_category_hidden"/>
-    </record>
-
     <record id="group_analytic_accounting" model="res.groups">
         <field name="name">Analytic Accounting for Sales</field>
         <field name="category_id" ref="base.module_category_hidden"/>