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

[FIX] report: force encoding of dateformat string

Browse Source 
some locales have unicode into the date format (eg: zh_CN uses %Y年%m月%d日)
conversion using str() would not work for them
opw #593932

bzr revid: mat@openerp.com-20130730125534-77hfb2k6z7epbhsv
This commit is contained in:
Martin Trigaux
2013-07-30 14:55:34 +02:00
parent cf666e2d78 6c063627e6
commit 6fcd169b52
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/report/report_sxw.py
+4 -4
View File
@@ -108,7 +108,7 @@ class _date_format(str, _format):
if self.val:
if getattr(self,'name', None):
date = datetime.strptime(self.name[:get_date_length()], DEFAULT_SERVER_DATE_FORMAT)
return date.strftime(str(self.lang_obj.date_format))
return date.strftime(self.lang_obj.date_format.encode('utf-8'))
return self.val
class _dttime_format(str, _format):
@@ -119,8 +119,8 @@ class _dttime_format(str, _format):
def __str__(self):
if self.val and getattr(self,'name', None):
return datetime.strptime(self.name, DEFAULT_SERVER_DATETIME_FORMAT)\
.strftime("%s %s"%(str(self.lang_obj.date_format),
str(self.lang_obj.time_format)))
.strftime("%s %s"%((self.lang_obj.date_format).encode('utf-8'),
(self.lang_obj.time_format).encode('utf-8')))
return self.val
@@ -312,7 +312,7 @@ class rml_parse(object):
date = datetime_field.context_timestamp(self.cr, self.uid,
timestamp=date,
context=self.localcontext)
return date.strftime(date_format)
return date.strftime(date_format.encode('utf-8'))
res = self.lang_dict['lang_obj'].format('%.' + str(digits) + 'f', value, grouping=grouping, monetary=monetary)
if currency_obj: