From 2ee52c73f3d6e93f1b0ddab73b6d2dfb5fb5eb12 Mon Sep 17 00:00:00 2001 From: "ARA (OpenERP)" Date: Mon, 17 Jan 2011 14:39:55 +0530 Subject: [PATCH] [FIX]hr_timesheet: Problems printing timesheet reports lp bug: https://launchpad.net/bugs/695960 fixed bzr revid: ara@tinyerp.com-20110117090955-ofb3iiabb99e3zqt --- addons/hr_timesheet/report/user_timesheet.py | 3 ++- addons/hr_timesheet/report/users_timesheet.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py index 4d1d5f428cf..df70b3a0dcb 100644 --- a/addons/hr_timesheet/report/user_timesheet.py +++ b/addons/hr_timesheet/report/user_timesheet.py @@ -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): %s %s - ''' % (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') diff --git a/addons/hr_timesheet/report/users_timesheet.py b/addons/hr_timesheet/report/users_timesheet.py index e6b366d627a..fac92d6a322 100644 --- a/addons/hr_timesheet/report/users_timesheet.py +++ b/addons/hr_timesheet/report/users_timesheet.py @@ -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 - ''' % (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')