changeset 45ee2effc44c in modules/account:default
details: https://hg.tryton.org/modules/account?cmd=changeset;node=45ee2effc44c
description:
Add test on context of company multivalue target fields
issue10067
review333851026
diffstat:
account.py | 30 ++++++++++++++++++++++++++----
configuration.py | 6 +++++-
fiscalyear.py | 6 +++++-
journal.py | 6 +++++-
move.py | 26 +++++++++++++++++++++-----
move_template.py | 7 ++++++-
party.py | 6 +++++-
tests/test_account.py | 7 +++++--
8 files changed, 78 insertions(+), 16 deletions(-)
diffs (223 lines):
diff -r 9dcbd317650a -r 45ee2effc44c account.py
--- a/account.py Mon Mar 01 23:27:04 2021 +0100
+++ b/account.py Fri Mar 05 15:49:19 2021 +0100
@@ -1244,7 +1244,12 @@
"Account Party"
__name__ = 'account.account.party'
account = fields.Many2One('account.account', "Account")
- party = fields.Many2One('party.party', "Party")
+ party = fields.Many2One(
+ 'party.party', "Party",
+ context={
+ 'company': Eval('company', -1),
+ },
+ depends=['company'])
name = fields.Char("Name")
code = fields.Char("Code")
company = fields.Many2One('company.company', "Company")
@@ -1833,6 +1838,10 @@
posted = fields.Boolean('Posted Move', help="Only included posted moves.")
journal = fields.Many2One(
'account.journal', "Journal",
+ context={
+ 'company': Eval('company', -1),
+ },
+ depends=['company'],
help="Only included moves from the journal.")
@classmethod
@@ -1886,7 +1895,12 @@
"General Ledger Account Party"
__name__ = 'account.general_ledger.account.party'
- party = fields.Many2One('party.party', "Party")
+ party = fields.Many2One(
+ 'party.party', "Party",
+ context={
+ 'company': Eval('company', -1),
+ },
+ depends=['company'])
@classmethod
def __setup__(cls):
@@ -1944,7 +1958,10 @@
states={
'invisible': ~Eval('party_required', False),
},
- depends=['party_required'])
+ context={
+ 'company': Eval('company', -1),
+ },
+ depends=['party_required', 'company'])
party_required = fields.Boolean('Party Required')
company = fields.Many2One('company.company', 'Company')
debit = fields.Numeric('Debit',
@@ -2361,7 +2378,12 @@
'Aged Balance'
__name__ = 'account.aged_balance'
- party = fields.Many2One('party.party', 'Party')
+ party = fields.Many2One(
+ 'party.party', 'Party',
+ context={
+ 'company': Eval('company', -1),
+ },
+ depends=['company'])
company = fields.Many2One('company.company', 'Company')
term0 = fields.Numeric('Now',
digits=(16, Eval('currency_digits', 2)),
diff -r 9dcbd317650a -r 45ee2effc44c configuration.py
--- a/configuration.py Mon Mar 01 23:27:04 2021 +0100
+++ b/configuration.py Fri Mar 05 15:49:19 2021 +0100
@@ -106,7 +106,11 @@
'Account Configuration Tax Rounding'
__name__ = 'account.configuration.tax_rounding'
configuration = fields.Many2One('account.configuration', 'Configuration',
- required=True, ondelete='CASCADE')
+ required=True, ondelete='CASCADE',
+ context={
+ 'company': Eval('company', -1),
+ },
+ depends=['company'])
tax_rounding = fields.Selection(tax_roundings, 'Method', required=True)
@classmethod
diff -r 9dcbd317650a -r 45ee2effc44c fiscalyear.py
--- a/fiscalyear.py Mon Mar 01 23:27:04 2021 +0100
+++ b/fiscalyear.py Fri Mar 05 15:49:19 2021 +0100
@@ -352,7 +352,11 @@
journal = fields.Many2One('account.journal', 'Journal', required=True,
domain=[
('type', '=', 'situation'),
- ])
+ ],
+ context={
+ 'company': Eval('company', -1),
+ },
+ depends=['company'])
period = fields.Many2One('account.period', 'Period', required=True,
domain=[
('fiscalyear', '=', Eval('fiscalyear')),
diff -r 9dcbd317650a -r 45ee2effc44c journal.py
--- a/journal.py Mon Mar 01 23:27:04 2021 +0100
+++ b/journal.py Fri Mar 05 15:49:19 2021 +0100
@@ -154,7 +154,11 @@
"Journal Sequence"
__name__ = 'account.journal.sequence'
journal = fields.Many2One(
- 'account.journal', "Journal", ondelete='CASCADE', select=True)
+ 'account.journal', "Journal", ondelete='CASCADE', select=True,
+ context={
+ 'company': Eval('company', -1),
+ },
+ depends=['company'])
sequence = fields.Many2One(
'ir.sequence', "Sequence",
domain=[
diff -r 9dcbd317650a -r 45ee2effc44c move.py
--- a/move.py Mon Mar 01 23:27:04 2021 +0100
+++ b/move.py Fri Mar 05 15:49:19 2021 +0100
@@ -62,7 +62,10 @@
states={
'readonly': Eval('number') & Eval('journal'),
},
- depends=['number'])
+ context={
+ 'company': Eval('company', -1),
+ },
+ depends=['number', 'company'])
date = fields.Date('Effective Date', required=True, select=True,
states=_MOVE_STATES, depends=_MOVE_DEPENDS)
post_date = fields.Date('Post Date', readonly=True)
@@ -1317,7 +1320,11 @@
company = fields.Many2One('company.company', "Company", required=True)
name = fields.Char("Name", required=True, translate=True)
journal = fields.Many2One('account.journal', "Journal", required=True,
- domain=[('type', '=', 'write-off')])
+ domain=[('type', '=', 'write-off')],
+ context={
+ 'company': Eval('company', -1),
+ },
+ depends=['company'])
credit_account = fields.Many2One('account.account', "Credit Account",
required=True,
domain=[
@@ -1759,9 +1766,18 @@
accounts = fields.Many2Many('account.account', None, None, 'Account',
readonly=True)
account = fields.Many2One('account.account', 'Account', readonly=True)
- parties = fields.Many2Many('party.party', None, None, 'Parties',
- readonly=True)
- party = fields.Many2One('party.party', 'Party', readonly=True)
+ parties = fields.Many2Many(
+ 'party.party', None, None, 'Parties', readonly=True,
+ context={
+ 'company': Eval('company', -1),
+ },
+ depends=['company'])
+ party = fields.Many2One(
+ 'party.party', 'Party', readonly=True,
+ context={
+ 'company': Eval('company', -1),
+ },
+ depends=['company'])
lines = fields.Many2Many('account.move.line', None, None, 'Lines',
domain=[
('account', '=', Eval('account')),
diff -r 9dcbd317650a -r 45ee2effc44c move_template.py
--- a/move_template.py Mon Mar 01 23:27:04 2021 +0100
+++ b/move_template.py Fri Mar 05 15:49:19 2021 +0100
@@ -22,7 +22,12 @@
keywords = fields.One2Many('account.move.template.keyword', 'move',
'Keywords')
company = fields.Many2One('company.company', 'Company', required=True)
- journal = fields.Many2One('account.journal', 'Journal', required=True)
+ journal = fields.Many2One(
+ 'account.journal', 'Journal', required=True,
+ context={
+ 'company': Eval('company', -1),
+ },
+ depends=['company'])
date = fields.Char('Date', help='Leave empty for today.')
description = fields.Char('Description',
help="Keyword values substitutions are identified "
diff -r 9dcbd317650a -r 45ee2effc44c party.py
--- a/party.py Mon Mar 01 23:27:04 2021 +0100
+++ b/party.py Fri Mar 05 15:49:19 2021 +0100
@@ -280,7 +280,11 @@
"Party Account"
__name__ = 'party.party.account'
party = fields.Many2One(
- 'party.party', "Party", ondelete='CASCADE', select=True)
+ 'party.party', "Party", ondelete='CASCADE', select=True,
+ context={
+ 'company': Eval('company', -1),
+ },
+ depends=['company'])
account_payable = fields.Many2One(
'account.account', "Account Payable",
domain=[
diff -r 9dcbd317650a -r 45ee2effc44c tests/test_account.py
--- a/tests/test_account.py Mon Mar 01 23:27:04 2021 +0100
+++ b/tests/test_account.py Fri Mar 05 15:49:19 2021 +0100
@@ -15,7 +15,8 @@
from trytond.modules.account.tax import TaxableMixin
from trytond.modules.company.tests import (
- create_company, set_company, PartyCompanyCheckEraseMixin)
+ create_company, set_company, PartyCompanyCheckEraseMixin,
+ CompanyMultiValueTestMixin)
from trytond.modules.currency.tests import create_currency
@@ -168,7 +169,9 @@
FiscalYear.close([fiscalyear])
-class AccountTestCase(PartyCompanyCheckEraseMixin, ModuleTestCase):
+class AccountTestCase(
+ PartyCompanyCheckEraseMixin, CompanyMultiValueTestMixin,
+ ModuleTestCase):
'Test Account module'
module = 'account'
