Fix company context domain when company is not in context

(transplanted from c9ac47a6fea863c54cb8501a22564a3e5b519628)
This commit is contained in:
Cédric Krier committed 2009-11-02 10:16:40 +01:00
1 parent a239f54c61
commit 9d24217a9f
2 files changed
+6 -3

No files matched your search

+2 -1
View File
@@ -36,7 +36,8 @@ class FiscalYear(ModelSQL, ModelView):
context="{'code': 'account.move', 'company': company}",
depends=['company'])
company = fields.Many2One('company.company', 'Company', required=True,
domain=["('id', '=', context.get('company', False))"])
domain=["('id', 'company' in context and '=' or '!=', " \
"context.get('company', 0))"])
def __init__(self):
super(FiscalYear, self).__init__()
+4 -2
View File
@@ -616,7 +616,8 @@ class Tax(ModelSQL, ModelView):
parent = fields.Many2One('account.tax', 'Parent', ondelete='CASCADE')
childs = fields.One2Many('account.tax', 'parent', 'Children')
company = fields.Many2One('company.company', 'Company', required=True,
domain=["('id', '=', context.get('company', 0))"])
domain=["('id', 'company' in context and '=' or '!=', " \
"context.get('company', 0))"])
invoice_account = fields.Many2One('account.account', 'Invoice Account',
domain=["('company', '=', company)",
('kind', '!=', 'view')],
@@ -1043,7 +1044,8 @@ class Rule(ModelSQL, ModelView):
_description = __doc__
name = fields.Char('Name', required=True, translate=True)
company = fields.Many2One('company.company', 'Company', required=True,
select=1, domain=["('id', '=', context.get('company', 0))"])
select=1, domain=["('id', 'company' in context and '=' or '!=', " \
"context.get('company', 0))"])
lines = fields.One2Many('account.tax.rule.line', 'rule', 'Lines')
template = fields.Many2One('account.tax.rule.template', 'Template')