Techsystech
/
account-financial-reporting
mirror of https://github.com/OCA/account-financial-reporting.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6 from akretion/8.0-mis_builder-small-enhancements 

8.0 small enhancements on mis_builder
pull/86/head
Stéphane Bidoul (ACSONE) 2015-08-22 11:10:38 +02:00
parent bbebd34e3f feb11730a5
commit f6b3f21b85
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mis_builder/models/aep.py
View File

@ -292,7 +292,7 @@ class AccountingExpressionProcessor(object):
if opening_period and \ if opening_period and \
self._period_has_moves(opening_period[0]): self._period_has_moves(opening_period[0]):
# found opening period with moves # found opening period with moves
if opening_period.date_start == period_from.date_start and \ if opening_period.date_start == period_from.date_start and\
mode == MODE_INITIAL: mode == MODE_INITIAL:
# if the opening period has the same start date as # if the opening period has the same start date as
# period_from, then we'll find the initial balance # period_from, then we'll find the initial balance

4
mis_builder/models/mis_builder.py
View File

@ -447,7 +447,9 @@ class MisReportInstancePeriod(models.Model):
res = {} res = {}
for query in self.report_instance_id.report_id.query_ids: for query in self.report_instance_id.report_id.query_ids:
model = self.env[query.model_id.model] model = self.env[query.model_id.model]
domain = query.domain and safe_eval(query.domain) or [] domain = query.domain and safe_eval(
query.domain,
{'uid': self._uid, 'context': self._context}) or []
if query.date_field.ttype == 'date': if query.date_field.ttype == 'date':
domain.extend([(query.date_field.name, '>=', self.date_from), domain.extend([(query.date_field.name, '>=', self.date_from),
(query.date_field.name, '<=', self.date_to)]) (query.date_field.name, '<=', self.date_to)])