From 4ed53ad39e92f4f7d09e974e0f86ac9b2402a48b Mon Sep 17 00:00:00 2001
From: "Somesh Khare (OpenERP)" <skh@openerp.com>
Date: Mon, 22 Apr 2013 18:19:43 +0530
Subject: [PATCH] [FIX]hr_holidays, hr_timesheet: XMLSyntaxError Error occurred
 when company name have ampersand '&' sign (Case: Ref 591630)

bzr revid: skh@openerp.com-20130422124943-04zhbhbj9snvikqv
---
 addons/hr_holidays/report/holidays_summary_report.py | 2 +-
 addons/hr_timesheet/report/users_timesheet.py        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/hr_holidays/report/holidays_summary_report.py b/addons/hr_holidays/report/holidays_summary_report.py
index f60d7a3ee1c..f5bc6271b90 100644
--- a/addons/hr_holidays/report/holidays_summary_report.py
+++ b/addons/hr_holidays/report/holidays_summary_report.py
@@ -96,7 +96,7 @@ class report_custom(report_rml):
         res=cr.fetchone()[0]
         date_xml=[]
         date_today=time.strftime('%Y-%m-%d %H:%M:%S')
-        date_xml +=['<res name="%s" today="%s" />' % (res,date_today)]
+        date_xml +=['<res name="%s" today="%s" />' % (to_xml(res),date_today)]
 
         cr.execute("SELECT id, name, color_name FROM hr_holidays_status ORDER BY id")
         legend=cr.fetchall()
diff --git a/addons/hr_timesheet/report/users_timesheet.py b/addons/hr_timesheet/report/users_timesheet.py
index 4827994f2cd..a7bb81cb81f 100644
--- a/addons/hr_timesheet/report/users_timesheet.py
+++ b/addons/hr_timesheet/report/users_timesheet.py
@@ -27,6 +27,7 @@ from openerp import pooler
 from openerp.tools.translate import _
 from openerp.report import report_sxw
 from openerp.tools import ustr
+from openerp.tools import to_xml
 
 
 def lengthmonth(year, month):
@@ -104,7 +105,7 @@ class report_custom(report_rml):
         <date>%s</date>
         <company>%s</company>
         </header>
-        '''  % (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,uid).company_id.name)
+        '''  % (str(rml_obj.formatLang(time.strftime("%Y-%m-%d"),date=True))+' ' + str(time.strftime("%H:%M")),to_xml(pooler.get_pool(cr.dbname).get('res.users').browse(cr,uid,uid).company_id.name))
 
         xml='''<?xml version="1.0" encoding="UTF-8" ?>
         <report>