From d24d1f6a4512cacaae28be4e87a27ae6321764c0 Mon Sep 17 00:00:00 2001 From: mtr Date: Mon, 17 Jan 2011 10:43:37 +0530 Subject: [PATCH] [IMP] hr_timesheet: uncommit the changes made for Bug #695960 bzr revid: mtr@mtr-20110117051337-9ge2j1n6waoodvqm --- addons/hr_timesheet/report/user_timesheet.py | 3 --- addons/hr_timesheet/report/users_timesheet.py | 3 --- 2 files changed, 6 deletions(-) diff --git a/addons/hr_timesheet/report/user_timesheet.py b/addons/hr_timesheet/report/user_timesheet.py index ee324fd3f41..fe1d4d3ded5 100755 --- a/addons/hr_timesheet/report/user_timesheet.py +++ b/addons/hr_timesheet/report/user_timesheet.py @@ -27,7 +27,6 @@ from tools.translate import _ import time import pooler from report import report_sxw -import unicodedata def lengthmonth(year, month): if month == 2 and ((year % 4 == 0) and ((year % 100 != 0) or (year % 400 == 0))): @@ -50,8 +49,6 @@ class report_custom(report_rml): emp_obj = pooler.get_pool(cr.dbname).get('hr.employee') user_id = emp_obj.browse(cr, uid, emp_id).user_id.id empl_name = emp_obj.browse(cr, uid, emp_id).name - if isinstance(empl_name,unicode): - empl_name = (unicodedata.normalize('NFKD', unicode(empl_name)).encode('ASCII', 'ignore')) # Computing the dates (start of month: som, and end of month: eom) diff --git a/addons/hr_timesheet/report/users_timesheet.py b/addons/hr_timesheet/report/users_timesheet.py index 2ba1c8f314f..2e0082e05df 100755 --- a/addons/hr_timesheet/report/users_timesheet.py +++ b/addons/hr_timesheet/report/users_timesheet.py @@ -26,7 +26,6 @@ import time import pooler from tools.translate import _ from report import report_sxw -import unicodedata def lengthmonth(year, month): @@ -92,8 +91,6 @@ class report_custom(report_rml): for id in data['form']['employee_ids']: user = emp_obj.browse(cr, uid, id).user_id.id empl_name = emp_obj.browse(cr, uid, id).name - if isinstance(empl_name,unicode): - empl_name = (unicodedata.normalize('NFKD', unicode(empl_name)).encode('ASCII', 'ignore')) if user: emp_xml += emp_create_xml(cr, user, som, eom, empl_name)