diff --git a/addons/account/account.py b/addons/account/account.py index e35676e08a5..03d9397df75 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2454,7 +2454,8 @@ class account_tax_template(osv.osv): 'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."), 'include_base_amount': fields.boolean('Include in Base Amount', help="Set if the amount of tax must be included in the base amount before computing the next taxes."), 'description': fields.char('Internal Name', size=32), - 'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase'),('all','All')], 'Tax Use In', required=True,) + 'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase'),('all','All')], 'Tax Use In', required=True,), + 'price_include': fields.boolean('Tax Included in Price', help="Check this if the price you use on the product and invoices includes this tax."), } def name_get(self, cr, uid, ids, context={}): @@ -2485,6 +2486,7 @@ class account_tax_template(osv.osv): 'base_sign': 1, 'include_base_amount': False, 'type_tax_use': 'all', + 'price_include': 0, } _order = 'sequence' @@ -2658,7 +2660,8 @@ class wizard_multi_charts_accounts(osv.osv_memory): 'include_base_amount': tax.include_base_amount, 'description':tax.description, 'company_id': company_id, - 'type_tax_use': tax.type_tax_use + 'type_tax_use': tax.type_tax_use, + 'price_include': tax.price_include } new_tax = obj_acc_tax.create(cr, uid, vals_tax) tax_template_to_tax[tax.id] = new_tax diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 6fe2081c696..0a35300c11c 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -2258,6 +2258,7 @@ + diff --git a/addons/account/installer.py b/addons/account/installer.py index aa9a022d0c1..b1be04f7c70 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -188,7 +188,8 @@ class account_installer(osv.osv_memory): 'include_base_amount': tax.include_base_amount, 'description': tax.description, 'company_id': company_id.id, - 'type_tax_use': tax.type_tax_use + 'type_tax_use': tax.type_tax_use, + 'price_include': tax.price_include } new_tax = obj_acc_tax.create(cr, uid, vals_tax, context=context) #as the accounts have not been created yet, we have to wait before filling these fields