diff --git a/addons/account/models/chart_template.py b/addons/account/models/chart_template.py index fee9c587ca6..cad8137ac8b 100644 --- a/addons/account/models/chart_template.py +++ b/addons/account/models/chart_template.py @@ -503,7 +503,6 @@ class AccountTaxTemplate(models.Model): amount_type = fields.Selection(default='percent', string="Tax Computation", required=True, selection=[('group', 'Group of Taxes'), ('fixed', 'Fixed'), ('percent', 'Percentage of Price'), ('division', 'Percentage of Price Tax Included')]) active = fields.Boolean(default=True, help="Set active to false to hide the tax without removing it.") - company_id = fields.Many2one('res.company', string='Company') children_tax_ids = fields.Many2many('account.tax.template', 'account_tax_template_filiation_rel', 'parent_tax', 'child_tax', string='Children Taxes') sequence = fields.Integer(required=True, default=1, help="The sequence field is used to define order in which the tax lines are applied.") @@ -540,7 +539,7 @@ class AccountTaxTemplate(models.Model): help='Account that will be set on lines created in cash basis journal entry and used to keep track of the tax base amount.') _sql_constraints = [ - ('name_company_uniq', 'unique(name, company_id, type_tax_use, chart_template_id)', 'Tax names must be unique !'), + ('name_company_uniq', 'unique(name, type_tax_use, chart_template_id)', 'Tax names must be unique !'), ] @api.multi diff --git a/addons/account/tests/test_templates_consistency.py b/addons/account/tests/test_templates_consistency.py index dcd631855b5..7969d222861 100644 --- a/addons/account/tests/test_templates_consistency.py +++ b/addons/account/tests/test_templates_consistency.py @@ -40,7 +40,7 @@ class AccountingTestTemplConsistency(HttpCase): '''Test fields consistency for ('account.tax', 'account.tax.template') ''' self.check_fields_consistency('account.tax.template', 'account.tax', exceptions=['chart_template_id']) - self.check_fields_consistency('account.tax', 'account.tax.template') + self.check_fields_consistency('account.tax', 'account.tax.template', exceptions=['company_id']) def test_fiscal_position_fields(self): '''Test fields consistency for ('account.fiscal.position', 'account.fiscal.position.template') diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml index fa2ff6d0bc7..f0ad11d069c 100644 --- a/addons/account/views/account_view.xml +++ b/addons/account/views/account_view.xml @@ -1957,7 +1957,6 @@ -