From f79e8740b36a63f5dcffc57f46cc5b29923980a7 Mon Sep 17 00:00:00 2001 From: "Ashvin Rathod (OpenERP)" Date: Thu, 24 May 2012 18:05:36 +0530 Subject: [PATCH] [IMP] hr_holiday: improve holiday report bzr revid: ara@tinyerp.com-20120524123536-12qllmpfblgzi5c3 --- addons/hr_holidays/report/holidays_summary.xsl | 2 +- addons/hr_holidays/report/holidays_summary_report.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/addons/hr_holidays/report/holidays_summary.xsl b/addons/hr_holidays/report/holidays_summary.xsl index a65425dd0b3..771cb75210b 100644 --- a/addons/hr_holidays/report/holidays_summary.xsl +++ b/addons/hr_holidays/report/holidays_summary.xsl @@ -149,7 +149,7 @@ - Off-Days' Summary + Leaves/Holidays Summary Analyze from to of the holidays. diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py index d756dfe6dfd..5e04584a54a 100644 --- a/addons/hr_holidays/report/holidays_summary_report.py +++ b/addons/hr_holidays/report/holidays_summary_report.py @@ -106,6 +106,10 @@ class report_custom(report_rml): eom = som+datetime.timedelta(59) day_diff=eom-som + name = '' + if len(data['form']['emp']) == 1: + name = 'of'+' '+obj_emp.read(cr, uid, data['form']['emp'][0], ['name'])['name'] + if data['form']['holiday_type']!='both': type=data['form']['holiday_type'] if data['form']['holiday_type']=='Confirmed': @@ -118,6 +122,7 @@ class report_custom(report_rml): date_xml.append('%s\n'% (str(rml_obj.formatLang(som.strftime("%Y-%m-%d"),date=True)))) date_xml.append('%s\n' %(str(rml_obj.formatLang(eom.strftime("%Y-%m-%d"),date=True)))) date_xml.append('%s'%(type)) + date_xml.append('%s'%(name)) # date_xml=[] for l in range(0,len(legend)):