diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py index 7adfe98ef13..53cbb004872 100644 --- a/addons/hr_attendance/report/timesheet.py +++ b/addons/hr_attendance/report/timesheet.py @@ -24,9 +24,9 @@ from datetime import datetime from dateutil.relativedelta import relativedelta import pooler - from report.interface import report_rml from report.interface import toxml +import tools one_week = relativedelta(days=7) num2day = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'] @@ -38,7 +38,7 @@ class report_custom(report_rml): def create_xml(self, cr, uid, ids, datas, context=None): obj_emp = pooler.get_pool(cr.dbname).get('hr.employee') - + start_date = datetime.strptime(datas['form']['init_date'], '%Y-%m-%d') end_date = datetime.strptime(datas['form']['end_date'], '%Y-%m-%d') first_monday = start_date - relativedelta(days=start_date.date().weekday()) @@ -58,7 +58,7 @@ class report_custom(report_rml): %s %%s - ''' % ustr(toxml(emp['name'])) + ''' % tools.ustr(toxml(emp['name'])) while monday != last_monday: #### Work hour calculation sql = ''' diff --git a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml index b87a3903a80..4ed56ce1800 100644 --- a/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml +++ b/addons/hr_attendance/wizard/hr_attendance_byweek_view.xml @@ -1,6 +1,40 @@ + + Attendances Report Weekly + hr.attendance.week + form + +
+ + + + +