Ashvin Rathod (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-hr_improvements-sbh-holiday_report-ara
into lp:~openerp-dev/openobject-addons/trunk-hr_improvements-sbh.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-hr_improvements-sbh-holiday_report-ara/+merge/107204
Hello,
Hr_holiday: [IMP] Improve holiday report
Thank you,
ara
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-hr_improvements-sbh-holiday_report-ara/+merge/107204
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-hr_improvements-sbh-holiday_report-ara
into lp:~openerp-dev/openobject-addons/trunk-hr_improvements-sbh.
=== modified file 'hr_holidays/report/holidays_summary.xsl'
--- hr_holidays/report/holidays_summary.xsl 2011-01-14 00:11:01 +0000
+++ hr_holidays/report/holidays_summary.xsl 2012-05-24 12:39:18 +0000
@@ -149,7 +149,7 @@
</tr>
</blockTable>
<spacer length="1.0cm" />
- <para style="title" t="1">Off-Days' Summary</para>
+ <para style="title" t="1">Leaves/Holidays Summary <xsl:value-of select="report/name" /></para>
<spacer length="0.5cm" />
<para style="normal-title" t="1">Analyze from <u><xsl:value-of select="report/from" /></u> to <u> <xsl:value-of select="report/to" /> </u> of the <u><xsl:value-of select="report/type" /></u> holidays. </para>
<spacer length="1.0cm" />
=== modified file 'hr_holidays/report/holidays_summary_report.py'
--- hr_holidays/report/holidays_summary_report.py 2011-10-16 01:28:00 +0000
+++ hr_holidays/report/holidays_summary_report.py 2012-05-24 12:39:18 +0000
@@ -106,6 +106,10 @@
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 @@
date_xml.append('<from>%s</from>\n'% (str(rml_obj.formatLang(som.strftime("%Y-%m-%d"),date=True))))
date_xml.append('<to>%s</to>\n' %(str(rml_obj.formatLang(eom.strftime("%Y-%m-%d"),date=True))))
date_xml.append('<type>%s</type>'%(type))
+ date_xml.append('<name>%s</name>'%(name))
# date_xml=[]
for l in range(0,len(legend)):
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
