pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch 8.0 up to 75692bc988

Browse Source
This commit is contained in:
Christophe Simonis
2017-01-06 17:27:06 +01:00
parent 7be1a1c55b 75692bc988
commit 9ba3762a32
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/wizard/account_report_common.py
+2 -2
View File
@@ -36,7 +36,7 @@ class account_common_report(osv.osv_memory):
if chart_account_id:
company_id = self.pool.get('account.account').browse(cr, uid, chart_account_id, context=context).company_id.id
now = time.strftime('%Y-%m-%d')
domain = [('company_id', '=', company_id), ('date_start', '<', now), ('date_stop', '>', now)]
domain = [('company_id', '=', company_id), ('date_start', '<=', now), ('date_stop', '>=', now)]
fiscalyears = self.pool.get('account.fiscalyear').search(cr, uid, domain, limit=1)
res['value'] = {'company_id': company_id, 'fiscalyear_id': fiscalyears and fiscalyears[0] or False}
return res
@@ -132,7 +132,7 @@ class account_common_report(osv.osv_memory):
company_id = self.pool.get('account.account').browse(cr, uid, ids[0], context=context).company_id.id
else: # use current company id
company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
domain = [('company_id', '=', company_id), ('date_start', '<', now), ('date_stop', '>', now)]
domain = [('company_id', '=', company_id), ('date_start', '<=', now), ('date_stop', '>=', now)]
fiscalyears = self.pool.get('account.fiscalyear').search(cr, uid, domain, limit=1)
return fiscalyears and fiscalyears[0] or False