Fix Bug #327471 "the report name is wrong in hr_attendence module"
Also change the name of the wizards in the hr_attendence module bzr revid: ls@numerigraphe.fr-20090210084800-x50c18hmpg6135i6
This commit is contained in:
parent
b13793ea9d
commit
a0e52e7bee
|
@ -3,10 +3,10 @@
|
|||
<data>
|
||||
|
||||
<wizard id="si_so" model="hr.employee" name="hr.si_so" string="Sign in / Sign out"/>
|
||||
<wizard id="wizard_attendance_error" keyword="client_print_multi" model="hr.employee" name="hr.timesheet.attendance.report" string="Print Attendance Error Report"/>
|
||||
<wizard id="wizard_attendance_error" keyword="client_print_multi" model="hr.employee" name="hr.attendance.report" string="Print Attendance Error Report"/>
|
||||
|
||||
<wizard id="print_week" keyword="client_print_multi" model="hr.employee" name="hr.print_week" string="Print Timesheet by week"/>
|
||||
<wizard id="print_month" keyword="client_print_multi" model="hr.employee" name="hr.print_month" string="Print Timesheet by month"/>
|
||||
<wizard id="print_week" keyword="client_print_multi" model="hr.employee" name="hr.attendance.print_week" string="Print Timesheet by week"/>
|
||||
<wizard id="print_month" keyword="client_print_multi" model="hr.employee" name="hr.attendance.print_month" string="Print Timesheet by month"/>
|
||||
|
||||
<menuitem action="si_so" id="menu_si_so" parent="menu_hr_attendance" type="wizard"
|
||||
groups="group_hr_attendance"/>
|
||||
|
|
|
@ -73,7 +73,7 @@ class attendance_print(report_sxw.rml_parse):
|
|||
|
||||
return (self._sign(total),total2 and self._sign(total2))
|
||||
|
||||
report_sxw.report_sxw('report.hr.timesheet.attendance.error', 'hr.employee', 'addons/hr_attendance/report/attendance_errors.rml',parser=attendance_print, header=2)
|
||||
report_sxw.report_sxw('report.hr.attendance.error', 'hr.employee', 'addons/hr_attendance/report/attendance_errors.rml',parser=attendance_print, header=2)
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
@ -96,7 +96,7 @@ class report_custom(report_rml):
|
|||
|
||||
return xml
|
||||
|
||||
report_custom('report.hr.timesheet.bymonth', 'hr.employee', '', 'addons/hr_attendance/report/bymonth.xsl')
|
||||
report_custom('report.hr.attendance.bymonth', 'hr.employee', '', 'addons/hr_attendance/report/bymonth.xsl')
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
||||
|
|
|
@ -115,5 +115,5 @@ class report_custom(report_rml):
|
|||
''' % '\n'.join(user_xml)
|
||||
return self.post_process_xml_data(cr, uid, xml, context)
|
||||
|
||||
report_custom('report.hr.timesheet.allweeks', 'hr.employee', '', 'addons/hr_attendance/report/timesheet.xsl')
|
||||
report_custom('report.hr.attendance.allweeks', 'hr.employee', '', 'addons/hr_attendance/report/timesheet.xsl')
|
||||
# vim:noexpandtab:tw=0
|
||||
|
|
|
@ -46,10 +46,10 @@ class wiz_attendance(wizard.interface):
|
|||
},
|
||||
'print': {
|
||||
'actions': [],
|
||||
'result': {'type': 'print', 'report': 'hr.timesheet.attendance.error', 'state':'end'}
|
||||
'result': {'type': 'print', 'report': 'hr.attendance.error', 'state':'end'}
|
||||
}
|
||||
}
|
||||
wiz_attendance('hr.timesheet.attendance.report')
|
||||
wiz_attendance('hr.attendance.report')
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
@ -54,10 +54,10 @@ class wiz_bymonth(wizard.interface):
|
|||
},
|
||||
'print': {
|
||||
'actions': [],
|
||||
'result': {'type': 'print', 'report': 'hr.timesheet.bymonth', 'state': 'end'}
|
||||
'result': {'type': 'print', 'report': 'hr.attendance.bymonth', 'state': 'end'}
|
||||
}
|
||||
}
|
||||
wiz_bymonth('hr.print_month')
|
||||
wiz_bymonth('hr.attendance.print_month')
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
@ -44,10 +44,10 @@ class wiz_byweek(wizard.interface):
|
|||
},
|
||||
'print': {
|
||||
'actions': [],
|
||||
'result': {'type': 'print', 'report': 'hr.timesheet.allweeks', 'state':'end'}
|
||||
'result': {'type': 'print', 'report': 'hr.attendance.allweeks', 'state':'end'}
|
||||
}
|
||||
}
|
||||
wiz_byweek('hr.print_week')
|
||||
wiz_byweek('hr.attendance.print_week')
|
||||
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
Loading…
Reference in New Issue