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

[FIX] mis_builder: fix date type for fiscal year date start computation 

plus a bit of pep 8 and idiom to get ids from a recordset
pull/189/head
Stéphane Bidoul 2016-04-27 19:30:32 +02:00
parent b1ac0fe630
commit f0a6ae0f03
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mis_builder/models/aep.py
View File

@ -5,6 +5,7 @@
import re import re
from collections import defaultdict from collections import defaultdict
from openerp import fields
from openerp.models import expression from openerp.models import expression
from openerp.tools.safe_eval import safe_eval from openerp.tools.safe_eval import safe_eval
from .accounting_none import AccountingNone from .accounting_none import AccountingNone
@ -81,12 +82,12 @@ class AccountingExpressionProcessor(object):
if account_code is None: if account_code is None:
# None means we want all accounts # None means we want all accounts
account_ids = account_model.\ account_ids = account_model.\
search([]).mapped('id') search([]).ids
self._account_ids_by_code[account_code].update(account_ids) self._account_ids_by_code[account_code].update(account_ids)
elif '%' in account_code: elif '%' in account_code:
account_ids = account_model.\ account_ids = account_model.\
search([('code', 'like', account_code), search([('code', 'like', account_code),
('company_id', '=', company.id)]).mapped('id') ('company_id', '=', company.id)]).ids
self._account_ids_by_code[account_code].update(account_ids) self._account_ids_by_code[account_code].update(account_ids)
else: else:
# search exact codes after the loop to do less queries # search exact codes after the loop to do less queries
@ -186,8 +187,9 @@ class AccountingExpressionProcessor(object):
else: else:
# for income and expense account, get balance from the beginning # for income and expense account, get balance from the beginning
# of the current fiscal year # of the current fiscal year
date_from_date = fields.Date.from_string(date_from)
fy_date_from = \ fy_date_from = \
company.compute_fiscalyear_dates(date_from)['date_from'] company.compute_fiscalyear_dates(date_from_date)['date_from']
domain = ['|', domain = ['|',
('date', '>=', fy_date_from), ('date', '>=', fy_date_from),
('account_id.user_type_id.include_initial_balance', '=', ('account_id.user_type_id.include_initial_balance', '=',