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

[MERGE] [6.0RC1][hr_timesheet] Problems printing timesheet reports 

bzr revid: mra@mra-laptop-20110117111333-yieqqvd0ljh3c8mf
This commit is contained in:
Mustufa Rangwala 2011-01-17 16:43:33 +05:30
parent e1438f29fa db2b558de3
commit ae717cd9ac
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/hr_timesheet/report/user_timesheet.py
View File

@ -27,6 +27,7 @@ from tools.translate import _
import time
import pooler
from report import report_sxw
from tools import ustr
def lengthmonth(year, month):
if month == 2 and ((year % 4 == 0) and ((year % 100 != 0) or (year % 400 == 0))):
@ -109,7 +110,7 @@ class report_custom(report_rml):
<employee>%s</employee>
%s
</report>
''' % (header_xml,toxml(empl_name), '\n'.join(date_xml) + '\n'.join(account_xml))
''' % (header_xml, ustr(empl_name), '\n'.join(date_xml) + '\n'.join(account_xml))
return xml
report_custom('report.hr.analytical.timesheet', 'hr.employee', '', 'addons/hr_timesheet/report/user_timesheet.xsl')

3
addons/hr_timesheet/report/users_timesheet.py
View File

@ -26,6 +26,7 @@ import time
import pooler
from tools.translate import _
from report import report_sxw
from tools import ustr
def lengthmonth(year, month):
@ -111,7 +112,7 @@ class report_custom(report_rml):
%s
%s
</report>
''' % (header_xml,date_xml, emp_xml)
''' % (header_xml,date_xml, ustr(emp_xml))
return xml
report_custom('report.hr.analytical.timesheet_users', 'hr.employee', '', 'addons/hr_timesheet/report/users_timesheet.xsl')