From: Denis Ledoux Date: Mon, 20 Oct 2014 15:50:22 +0000 (+0200) Subject: [FIX] account: default product taxes on product.template X-Git-Url: http://git.inspyration.org/?a=commitdiff_plain;h=285ba3d801507a937d65422e14dab46cd7b681aa;p=odoo%2Fodoo.git [FIX] account: default product taxes on product.template As product.template is now most commonly used than product.product This is related to fix 96dd8bf --- diff --git a/addons/account/res_config.py b/addons/account/res_config.py index 8e9679e..3f3e156 100644 --- a/addons/account/res_config.py +++ b/addons/account/res_config.py @@ -235,8 +235,8 @@ class account_config_settings(osv.osv_memory): }) # update taxes ir_values = self.pool.get('ir.values') - taxes_id = ir_values.get_default(cr, uid, 'product.product', 'taxes_id', company_id=company_id) - supplier_taxes_id = ir_values.get_default(cr, uid, 'product.product', 'supplier_taxes_id', company_id=company_id) + taxes_id = ir_values.get_default(cr, uid, 'product.template', 'taxes_id', company_id=company_id) + supplier_taxes_id = ir_values.get_default(cr, uid, 'product.template', 'supplier_taxes_id', company_id=company_id) values.update({ 'default_sale_tax': isinstance(taxes_id, list) and taxes_id[0] or taxes_id, 'default_purchase_tax': isinstance(supplier_taxes_id, list) and supplier_taxes_id[0] or supplier_taxes_id, @@ -305,9 +305,9 @@ class account_config_settings(osv.osv_memory): raise openerp.exceptions.AccessError(_("Only administrators can change the settings")) ir_values = self.pool.get('ir.values') config = self.browse(cr, uid, ids[0], context) - ir_values.set_default(cr, SUPERUSER_ID, 'product.product', 'taxes_id', + ir_values.set_default(cr, SUPERUSER_ID, 'product.template', 'taxes_id', config.default_sale_tax and [config.default_sale_tax.id] or False, company_id=config.company_id.id) - ir_values.set_default(cr, SUPERUSER_ID, 'product.product', 'supplier_taxes_id', + ir_values.set_default(cr, SUPERUSER_ID, 'product.template', 'supplier_taxes_id', config.default_purchase_tax and [config.default_purchase_tax.id] or False, company_id=config.company_id.id) def set_chart_of_accounts(self, cr, uid, ids, context=None):