[FIX]hr_timesheet: Problems printing atttendance by month and holiday summery reports
bzr revid: ara@tinyerp.com-20110117123644-dsywsjudkcfa798x
This commit is contained in:
parent
db2b558de3
commit
3ec0d38e20
|
@ -29,6 +29,7 @@ from report.interface import report_rml
|
|||
from report.interface import toxml
|
||||
|
||||
from report import report_sxw
|
||||
from tools import ustr
|
||||
|
||||
one_day = relativedelta(days=1)
|
||||
month2name = [0, 'January', 'February', 'March', 'April', 'May', 'Jun', 'July', 'August', 'September', 'October', 'November', 'December']
|
||||
|
@ -60,7 +61,7 @@ class report_custom(report_rml):
|
|||
<name>%s</name>
|
||||
%%s
|
||||
</user>
|
||||
''' % (toxml(emp['name']))
|
||||
''' % (ustr(emp['name']))
|
||||
today, tomor = month, month + one_day
|
||||
while today.month == month.month:
|
||||
#### Work hour calculation
|
||||
|
|
|
@ -29,6 +29,7 @@ from report.interface import toxml
|
|||
import pooler
|
||||
import time
|
||||
from report import report_sxw
|
||||
from tools import ustr
|
||||
|
||||
def lengthmonth(year, month):
|
||||
if month == 2 and ((year % 4 == 0) and ((year % 100 != 0) or (year % 400 == 0))):
|
||||
|
@ -244,7 +245,7 @@ class report_custom(report_rml):
|
|||
%s
|
||||
%s
|
||||
</report>
|
||||
''' % (header_xml,months_xml,date_xml, emp_xml)
|
||||
''' % (header_xml,months_xml,date_xml, ustr(emp_xml))
|
||||
|
||||
return xml
|
||||
|
||||
|
|
Loading…
Reference in New Issue