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: better locale-aware date headers

pull/86/head
Stéphane Bidoul 2015-06-07 17:22:47 +02:00
parent 7c3f0a53e6
commit 42fd267ffb
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mis_builder/models/mis_builder.py
View File

@ -665,17 +665,22 @@ class MisReportInstance(models.Model):
if not period.valid: if not period.valid:
continue continue
# add the column header # add the column header
# TODO: format period.date_from if period.duration > 1 or period.type == 'w':
header[0]['cols'].append(dict( # from, to
name=period.name, if period.period_from and period.period_to:
date=(period.duration > 1 or period.type == 'w') and date_from = period.period_from.name
_('from %s to %s' % date_to = period.period_to.name
(period.period_from and period.period_from.name else:
or self._format_date(lang_id, period.date_from), date_from = self._format_date(lang_id, period.date_from)
period.period_to and period.period_to.name date_to = self._format_date(lang_id, period.date_to)
or self._format_date(lang_id, period.date_to))) header_date = _('from %s to %s') % (date_from, date_to)
or period.period_from and period.period_from.name or else:
period.date_from)) # one period or one day
if period.period_from and period.period_to:
header_date = period.period_from.name
else:
header_date = self._format_date(lang_id, period.date_from)
header[0]['cols'].append(dict(name=period.name, date=header_date))
# add kpi values # add kpi values
kpi_values = kpi_values_by_period_ids[period.id] kpi_values = kpi_values_by_period_ids[period.id]
for kpi_name in kpi_values: for kpi_name in kpi_values: