NaNtic/trytond-analytic_line_state
1
0
Fork 0
mirror of https://github.com/NaN-tic/trytond-analytic_line_state.git synced 2023-12-14 03:33:02 +01:00
Code Issues Projects Releases Wiki Activity

Add company in domains because analytics is separated by company

Browse source
This commit is contained in:
Guillem Barba 2016-07-27 15:07:08 +02:00
parent 63ce1391bd
commit 473db2a209
2 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
account.py
View file

@ -24,29 +24,35 @@ class Account:
'analytic_account.account-required-account.account', 'account',
'analytic_account', 'Analytic Required', domain=[
('type', '=', 'root'),
('company', '=', Eval('company')),
('id', 'not in', Eval('analytic_forbidden')),
('id', 'not in', Eval('analytic_optional')),
], states={
'invisible': Eval('kind') == 'view',
}, depends=['analytic_forbidden', 'analytic_optional', 'kind'])
},
depends=['company', 'analytic_forbidden', 'analytic_optional', 'kind'])
analytic_forbidden = fields.Many2Many(
'analytic_account.account-forbidden-account.account', 'account',
'analytic_account', 'Analytic Forbidden', domain=[
('type', '=', 'root'),
('company', '=', Eval('company')),
('id', 'not in', Eval('analytic_required')),
('id', 'not in', Eval('analytic_optional')),
], states={
'invisible': Eval('kind') == 'view',
}, depends=['analytic_required', 'analytic_optional', 'kind'])
},
depends=['company', 'analytic_required', 'analytic_optional', 'kind'])
analytic_optional = fields.Many2Many(
'analytic_account.account-optional-account.account', 'account',
'analytic_account', 'Analytic Optional', domain=[
('type', '=', 'root'),
('company', '=', Eval('company')),
('id', 'not in', Eval('analytic_required')),
('id', 'not in', Eval('analytic_forbidden')),
], states={
'invisible': Eval('kind') == 'view',
}, depends=['analytic_required', 'analytic_forbidden', 'kind'])
},
depends=['company', 'analytic_required', 'analytic_forbidden', 'kind'])
analytic_pending_accounts = fields.Function(
fields.Many2Many('analytic_account.account', None, None,
'Pending Accounts', states={
@ -82,6 +88,7 @@ class Account:
current_accounts += map(int, self.analytic_optional)
pending_accounts = AnalyticAccount.search([
('type', '=', 'root'),
('company', '=', self.company),
('id', 'not in', current_accounts),
])
return map(int, pending_accounts)
@ -186,9 +193,9 @@ class MoveLine:
cls.analytic_lines.context = {}
for name in ('debit', 'credit', 'journal', 'move', 'party',
'description', 'move_description'):
if not name in cls.analytic_lines.context:
if name not in cls.analytic_lines.context:
cls.analytic_lines.context[name] = Eval(name)
if not 'date' in cls.analytic_lines.context:
if 'date' not in cls.analytic_lines.context:
cls.analytic_lines.context['date'] = (
Eval('_parent_move', {}).get('date')
)

17
analytic.py
View file

@ -24,29 +24,35 @@ class AnalyticAccount:
'analytic_account.account-required-account.account',
'analytic_account', 'account', 'Analytic Required', domain=[
('kind', '!=', 'view'),
('company', '=', Eval('company')),
('id', 'not in', Eval('analytic_forbidden')),
('id', 'not in', Eval('analytic_optional')),
], states={
'invisible': Eval('type') != 'root',
}, depends=['analytic_forbidden', 'analytic_optional', 'type'])
},
depends=['company', 'analytic_forbidden', 'analytic_optional', 'type'])
analytic_forbidden = fields.Many2Many(
'analytic_account.account-forbidden-account.account',
'analytic_account', 'account', 'Analytic Forbidden', domain=[
('kind', '!=', 'view'),
('company', '=', Eval('company')),
('id', 'not in', Eval('analytic_required')),
('id', 'not in', Eval('analytic_optional')),
], states={
'invisible': Eval('type') != 'root',
}, depends=['analytic_required', 'analytic_optional', 'type'])
},
depends=['company', 'analytic_required', 'analytic_optional', 'type'])
analytic_optional = fields.Many2Many(
'analytic_account.account-optional-account.account',
'analytic_account', 'account', 'Analytic Optional', domain=[
('kind', '!=', 'view'),
('company', '=', Eval('company')),
('id', 'not in', Eval('analytic_required')),
('id', 'not in', Eval('analytic_forbidden')),
], states={
'invisible': Eval('type') != 'root',
}, depends=['analytic_required', 'analytic_forbidden', 'type'])
},
depends=['company', 'analytic_required', 'analytic_forbidden', 'type'])
analytic_pending_accounts = fields.Function(fields.Many2Many(
'account.account', None, None, 'Pending Accounts', states={
'invisible': Eval('type') != 'root',
@ -82,6 +88,7 @@ class AnalyticAccount:
current_accounts += map(int, self.analytic_optional)
pending_accounts = Account.search([
('kind', '!=', 'view'),
('company', '=', self.company),
('id', 'not in', current_accounts),
])
return map(int, pending_accounts)
@ -342,6 +349,10 @@ class AnalyticLine:
if self.internal_company:
return self.internal_company.id
@classmethod
def search_company(cls, name, clause):
return [('internal_company',) + tuple(clause[1:])]
@staticmethod
def default_state():
return 'draft'