odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Corrections on report_sxw 

bzr revid: jvo@tinyerp.com-20090204090159-ttbugu4xvow1887t
This commit is contained in:
Jay (Open ERP) 2009-02-04 14:31:59 +05:30
parent cab7dd7603
commit cf6253282e
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
bin/report/report_sxw.py
View File

@ -166,11 +166,16 @@ class _format(object):
class _float_format(float, _format):
def __init__(self,value):
super(_float_format, self).__init__()
self.val = value and str(value) or str(0.00)
def __str__(self):
digits = 2
if self._field and hasattr(self._field, 'digits') and self._field.digits:
if hasattr(self,'_field') and hasattr(self._field, 'digits') and self._field.digits:
digits = self._field.digits[1]
return self.lang_obj.format('%.' + str(digits) + 'f', self.name, True)
return self.lang_obj.format('%.' + str(digits) + 'f', self.name, True)
return self.val
# if not self.object._context:
# return locale.format('%f', self.name, True)
@ -181,17 +186,27 @@ class _float_format(float, _format):
class _int_format(int, _format):
def __init__(self,value):
super(_int_format, self).__init__()
self.val = value and str(value) or str(0)
def __str__(self):
return self.lang_obj.format('%.d', self.name, True)
if hasattr(self,'lang_obj'):
return self.lang_obj.format('%.d', self.name, True)
return self.val
# return locale.format('%d', self.name, True)
class _date_format(str, _format):
def __init__(self,value):
super(_date_format, self).__init__()
self.val = str(value)
def __str__(self):
if self.name:
if hasattr(self,'name') and self.name:
date = mx.DateTime.strptime(self.name,DT_FORMAT)
return date.strftime(self.lang_obj.date_format)
return ''
return self.val
# if not self.object._context:
# return self.name
#
@ -205,11 +220,15 @@ class _date_format(str, _format):
# return ''
class _dttime_format(str, _format):
def __init__(self,value):
super(_dttime_format, self).__init__()
self.val = str(value)
def __str__(self):
if self.name:
if hasattr(self,'name') and self.name:
datetime = mx.DateTime.strptime(self.name,DHM_FORMAT)
return datetime.strftime(self.lang_obj.date_format+ " " + self.lang_obj.time_format)
return ''
return self.val
_fields_process = {