From 879f279dc79512944fba2e5312c9a9fd532bc8f7 Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 7 Mar 2012 12:46:41 +0530 Subject: [PATCH] [IMP] improved code for set tax policy bzr revid: tpa@tinyerp.com-20120307071641-1ok6n783wnwmf2rq --- addons/sale/res_config.py | 5 ++++- addons/sale/res_config_view.xml | 2 ++ addons/sale/security/sale_security.xml | 1 - 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py index a00d701f97c..59afbb7c8de 100644 --- a/addons/sale/res_config.py +++ b/addons/sale/res_config.py @@ -180,12 +180,15 @@ class sale_configuration(osv.osv_memory): self.set_tax_policy(cr, uid, ids, context=context) if tax_policy == 'global_on_order': res['value'].update({'group_sale_taxes_global_on_order': True}) + res['value'].update({'group_sale_taxes_on_order_line': False}) + elif tax_policy == 'on_order_line': res['value'].update({'group_sale_taxes_on_order_line': True}) + res['value'].update({'group_sale_taxes_global_on_order': False}) else: res['value'].update({'group_sale_taxes_on_order_line': False, 'group_sale_taxes_global_on_order': False}) return res - + def set_default_taxes(self, cr, uid, ids, context=None): ir_values_obj = self.pool.get('ir.values') taxes = self._check_default_tax(cr, uid, context=context) diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml index e27b33ccdc7..61d1207b779 100644 --- a/addons/sale/res_config_view.xml +++ b/addons/sale/res_config_view.xml @@ -40,6 +40,8 @@ + + diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml index 7e2d58d32f8..b5e681b6f13 100644 --- a/addons/sale/security/sale_security.xml +++ b/addons/sale/security/sale_security.xml @@ -45,7 +45,6 @@ ref('base.group_sale_delivery_address'), ref('base.group_sale_disc_per_sale_order_line'), ref('base.group_sale_taxes_global_on_order'), - ref('base.group_sale_taxes_on_order_line'), ])]"/>