From c23f29281cc40e689bf68b4cc09623c99e20cdbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Tue, 20 Apr 2021 09:18:57 +0200 Subject: [PATCH] Remove contextual domain on company issue10302 review338141004 --- fiscalyear.py | 7 ++----- tax.py | 14 ++++---------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/fiscalyear.py b/fiscalyear.py index 6ae9e2011d..ced7415a75 100644 --- a/fiscalyear.py +++ b/fiscalyear.py @@ -51,11 +51,8 @@ class FiscalYear(Workflow, ModelSQL, ModelView): ('company', '=', Eval('company')), ], depends=['company']) - company = fields.Many2One('company.company', 'Company', required=True, - domain=[ - ('id', If(Eval('context', {}).contains('company'), '=', '!='), - Eval('context', {}).get('company', -1)), - ], select=True) + company = fields.Many2One( + 'company.company', "Company", required=True, select=True) icon = fields.Function(fields.Char("Icon"), 'get_icon') @classmethod diff --git a/tax.py b/tax.py index 953113a2c3..29dd7730ce 100644 --- a/tax.py +++ b/tax.py @@ -722,11 +722,8 @@ class Tax(sequence_ordered(), ModelSQL, ModelView, DeactivableMixin): parent = fields.Many2One('account.tax', 'Parent', ondelete='CASCADE', states=_states) childs = fields.One2Many('account.tax', 'parent', 'Children') - company = fields.Many2One('company.company', 'Company', required=True, - domain=[ - ('id', If(Eval('context', {}).contains('company'), '=', '!='), - Eval('context', {}).get('company', -1)), - ], select=True) + company = fields.Many2One( + 'company.company', "Company", required=True, select=True) invoice_account = fields.Many2One('account.account', 'Invoice Account', domain=[ ('company', '=', Eval('company')), @@ -1386,11 +1383,8 @@ class TaxRule(ModelSQL, ModelView): } name = fields.Char('Name', required=True, states=_states) kind = fields.Selection(KINDS, 'Kind', required=True, states=_states) - company = fields.Many2One('company.company', 'Company', required=True, - select=True, domain=[ - ('id', If(Eval('context', {}).contains('company'), '=', '!='), - Eval('context', {}).get('company', -1)), - ]) + company = fields.Many2One( + 'company.company', "Company", required=True, select=True) lines = fields.One2Many('account.tax.rule.line', 'rule', 'Lines') template = fields.Many2One('account.tax.rule.template', 'Template') template_override = fields.Boolean("Override Template",