audrius/account-financial-tools
1
0
Fork 0
mirror of https://github.com/OCA/account-financial-tools.git synced 2025-02-02 12:47:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #599 from acsone/10.0-fiscal_month_year-cpi

Browse Source 
[10.0] account_fiscal_year + account_fiscal_month: prevent to declare fiscal month and/or year for all companies in a multi-company context
This commit is contained in:
Pedro M. Baeza
2018-02-14 09:38:45 +01:00
committed by GitHub
parent 471cad75de 2a41432c20
commit 5f13ac44cb
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
account_fiscal_month/models/res_company.py
View File

@@ -17,5 +17,7 @@ class ResCompany(models.Model):
('type_id', '=', fm_id.id),
('date_start', '<=', date_str),
('date_end', '>=', date_str),
'|',
('company_id', '=', self.id),
])
('company_id', '=', False),
], limit=1, order='company_id asc')

6
account_fiscal_year/models/res_company.py
View File

@@ -19,9 +19,13 @@ class ResCompany(models.Model):
('type_id', '=', fy_id.id),
('date_start', '<=', date_str),
('date_end', '>=', date_str),
'|',
('company_id', '=', self.id),
('company_id', '=', False),
]
date_range = self.env['date.range'].search(s_args)
date_range = self.env['date.range'].search(s_args,
limit=1,
order='company_id asc')
return date_range
@api.multi