[IMP] improved code for set tax policy
bzr revid: tpa@tinyerp.com-20120307071641-1ok6n783wnwmf2rq
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -40,6 +40,8 @@
|
||||
<group col="2" colspan="1">
|
||||
<field name="tax_policy" on_change="onchange_tax_policy(tax_policy)"/>
|
||||
</group>
|
||||
<field name="group_sale_taxes_global_on_order" invisible="1"/>
|
||||
<field name="group_sale_taxes_on_order_line" invisible="1"/>
|
||||
<newline/>
|
||||
<field name="module_sale_margin"/>
|
||||
<newline/>
|
||||
|
||||
@@ -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'),
|
||||
])]"/>
|
||||
</record>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user