diff --git a/addons/hr_attendance/hr_attendance_wizard.xml b/addons/hr_attendance/hr_attendance_wizard.xml index 0c9e256ae458e3a80d97768838b5968204b02e19..92c28911b40d75c20d0b7f6d051e7475088dd67f 100644 --- a/addons/hr_attendance/hr_attendance_wizard.xml +++ b/addons/hr_attendance/hr_attendance_wizard.xml @@ -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"/> diff --git a/addons/hr_attendance/report/attendance_errors.py b/addons/hr_attendance/report/attendance_errors.py index 762dd1944965d178e730c892abb6b082ae00ff42..d9dd93a04261abb69cf7d3319c4e81901683ff50 100644 --- a/addons/hr_attendance/report/attendance_errors.py +++ b/addons/hr_attendance/report/attendance_errors.py @@ -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: diff --git a/addons/hr_attendance/report/bymonth.py b/addons/hr_attendance/report/bymonth.py index d0715b4b66da8dee0c063795b4dc9f5263926f60..1da6db83cfd2087335640b7016711dc62c64dbb4 100644 --- a/addons/hr_attendance/report/bymonth.py +++ b/addons/hr_attendance/report/bymonth.py @@ -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: diff --git a/addons/hr_attendance/report/timesheet.py b/addons/hr_attendance/report/timesheet.py index feec7743370ed14fbb72cb82966134defcc4585c..a256e27767b79ba663fc317cd4e2534fc1edfadb 100644 --- a/addons/hr_attendance/report/timesheet.py +++ b/addons/hr_attendance/report/timesheet.py @@ -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 diff --git a/addons/hr_attendance/wizard/print_attendance_error.py b/addons/hr_attendance/wizard/print_attendance_error.py index 6505b77183250653a03ddb9b708d155c44fca3be..fe88406f331465c63cd7a93049faa646112a41ee 100644 --- a/addons/hr_attendance/wizard/print_attendance_error.py +++ b/addons/hr_attendance/wizard/print_attendance_error.py @@ -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: diff --git a/addons/hr_attendance/wizard/print_bymonth.py b/addons/hr_attendance/wizard/print_bymonth.py index 4e28055bcdc002c5a470c41bc36b8e64d4f584a6..8c83b90cde3507765b0b8c01b8fc907cf8e3a458 100644 --- a/addons/hr_attendance/wizard/print_bymonth.py +++ b/addons/hr_attendance/wizard/print_bymonth.py @@ -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: diff --git a/addons/hr_attendance/wizard/print_byweek.py b/addons/hr_attendance/wizard/print_byweek.py index ed3dd8f07a885bd264678cff2ff6ed699c030c55..b5956cb7b48de4b57f7da31848bcad378c75225b 100644 --- a/addons/hr_attendance/wizard/print_byweek.py +++ b/addons/hr_attendance/wizard/print_byweek.py @@ -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: