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

in utc_midnight use timezone to compute it

pull/86/head
laetitia.gangloff@acsone.eu 2014-07-31 16:51:38 +02:00 committed by Stéphane Bidoul
parent 1acd8cbc75
commit 435aad50e4
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mis_builder/models/mis_builder.py
View File

@ -26,7 +26,7 @@ from datetime import datetime, timedelta
from dateutil import parser from dateutil import parser
import traceback import traceback
import re import re
import calendar import pytz
from openerp.osv import orm, fields from openerp.osv import orm, fields
from openerp.tools.safe_eval import safe_eval from openerp.tools.safe_eval import safe_eval
@ -49,13 +49,14 @@ def _get_selection_label(selection, value):
return '' return ''
def _utc_midnight(d, add_day=0): def _utc_midnight(d, tz_name, add_day=0):
d = datetime.strptime(d, tools.DEFAULT_SERVER_DATE_FORMAT) d = datetime.strptime(d, tools.DEFAULT_SERVER_DATE_FORMAT)
if add_day: if add_day:
d = d + timedelta(days=add_day) d = d + timedelta(days=add_day)
timestamp = calendar.timegm(d.timetuple()) utc = pytz.timezone('UTC')
d_utc_midnight = datetime.utcfromtimestamp(timestamp) context_tz = pytz.timezone(tz_name)
return datetime.strftime(d_utc_midnight, tools.DEFAULT_SERVER_DATETIME_FORMAT) utc_timestamp = utc.localize(d, is_dst=False)
return datetime.strftime(utc_timestamp.astimezone(context_tz), tools.DEFAULT_SERVER_DATETIME_FORMAT)
def _clean(varStr): def _clean(varStr):
@ -426,8 +427,8 @@ class mis_report_instance_period(orm.Model):
domain.extend([(query.date_field.name, '>=', c.date_from), domain.extend([(query.date_field.name, '>=', c.date_from),
(query.date_field.name, '<=', c.date_to)]) (query.date_field.name, '<=', c.date_to)])
else: else:
datetime_from = _utc_midnight(c.date_from) datetime_from = _utc_midnight(c.date_from, context.get('tz', 'UTC'))
datetime_to = _utc_midnight(c.date_to, add_day=1) datetime_to = _utc_midnight(c.date_to, context.get('tz', 'UTC'), add_day=1)
domain.extend([(query.date_field.name, '>=', datetime_from), domain.extend([(query.date_field.name, '>=', datetime_from),
(query.date_field.name, '<', datetime_to)]) (query.date_field.name, '<', datetime_to)])
if obj._columns.get('company_id', False): if obj._columns.get('company_id', False):