[MERGE] [6.0RC1][hr_timesheet] Problems printing timesheet reports
bzr revid: mra@mra-laptop-20110117111333-yieqqvd0ljh3c8mf
This commit is contained in:
commit
ae717cd9ac
|
@ -27,6 +27,7 @@ from tools.translate import _
|
||||||
import time
|
import time
|
||||||
import pooler
|
import pooler
|
||||||
from report import report_sxw
|
from report import report_sxw
|
||||||
|
from tools import ustr
|
||||||
|
|
||||||
def lengthmonth(year, month):
|
def lengthmonth(year, month):
|
||||||
if month == 2 and ((year % 4 == 0) and ((year % 100 != 0) or (year % 400 == 0))):
|
if month == 2 and ((year % 4 == 0) and ((year % 100 != 0) or (year % 400 == 0))):
|
||||||
|
@ -109,7 +110,7 @@ class report_custom(report_rml):
|
||||||
<employee>%s</employee>
|
<employee>%s</employee>
|
||||||
%s
|
%s
|
||||||
</report>
|
</report>
|
||||||
''' % (header_xml,toxml(empl_name), '\n'.join(date_xml) + '\n'.join(account_xml))
|
''' % (header_xml, ustr(empl_name), '\n'.join(date_xml) + '\n'.join(account_xml))
|
||||||
return xml
|
return xml
|
||||||
|
|
||||||
report_custom('report.hr.analytical.timesheet', 'hr.employee', '', 'addons/hr_timesheet/report/user_timesheet.xsl')
|
report_custom('report.hr.analytical.timesheet', 'hr.employee', '', 'addons/hr_timesheet/report/user_timesheet.xsl')
|
||||||
|
|
|
@ -26,6 +26,7 @@ import time
|
||||||
import pooler
|
import pooler
|
||||||
from tools.translate import _
|
from tools.translate import _
|
||||||
from report import report_sxw
|
from report import report_sxw
|
||||||
|
from tools import ustr
|
||||||
|
|
||||||
|
|
||||||
def lengthmonth(year, month):
|
def lengthmonth(year, month):
|
||||||
|
@ -111,7 +112,7 @@ class report_custom(report_rml):
|
||||||
%s
|
%s
|
||||||
%s
|
%s
|
||||||
</report>
|
</report>
|
||||||
''' % (header_xml,date_xml, emp_xml)
|
''' % (header_xml,date_xml, ustr(emp_xml))
|
||||||
return xml
|
return xml
|
||||||
|
|
||||||
report_custom('report.hr.analytical.timesheet_users', 'hr.employee', '', 'addons/hr_timesheet/report/users_timesheet.xsl')
|
report_custom('report.hr.analytical.timesheet_users', 'hr.employee', '', 'addons/hr_timesheet/report/users_timesheet.xsl')
|
||||||
|
|
Loading…
Reference in New Issue