From 649ea4927e30bf19168f76e02f149912c15cae13 Mon Sep 17 00:00:00 2001 From: pha-odoo Date: Thu, 10 Jan 2019 10:13:45 +0000 Subject: [PATCH] [FIX] hr: move print_employee_badge to the hr module closes odoo/odoo#30302 --- addons/hr/__manifest__.py | 1 + addons/{hr_attendance => hr}/report/hr_employee_badge.xml | 4 ++-- addons/hr_attendance/__manifest__.py | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) rename addons/{hr_attendance => hr}/report/hr_employee_badge.xml (96%) diff --git a/addons/hr/__manifest__.py b/addons/hr/__manifest__.py index d77cb860431..752fdb133aa 100644 --- a/addons/hr/__manifest__.py +++ b/addons/hr/__manifest__.py @@ -29,6 +29,7 @@ 'views/res_config_settings_views.xml', 'views/mail_channel_views.xml', 'data/hr_data.xml', + 'report/hr_employee_badge.xml' ], 'demo': [ 'data/hr_demo.xml' diff --git a/addons/hr_attendance/report/hr_employee_badge.xml b/addons/hr/report/hr_employee_badge.xml similarity index 96% rename from addons/hr_attendance/report/hr_employee_badge.xml rename to addons/hr/report/hr_employee_badge.xml index 708a4932cbc..1a5e8fdc645 100644 --- a/addons/hr_attendance/report/hr_employee_badge.xml +++ b/addons/hr/report/hr_employee_badge.xml @@ -5,8 +5,8 @@ string="Print Badge" model="hr.employee" report_type="qweb-pdf" - name="hr_attendance.print_employee_badge" - file="hr_attendance.print_employee_badge" + name="hr.print_employee_badge" + file="hr.print_employee_badge" print_report_name="'Print Badge - %s' % (object.name).replace('/', '')" /> diff --git a/addons/hr_attendance/__manifest__.py b/addons/hr_attendance/__manifest__.py index 8de64bd8c60..c9f67beadd8 100644 --- a/addons/hr_attendance/__manifest__.py +++ b/addons/hr_attendance/__manifest__.py @@ -22,7 +22,6 @@ actions(Check in/Check out) performed by them. 'security/ir.model.access.csv', 'views/web_asset_backend_template.xml', 'views/hr_attendance_view.xml', - 'report/hr_employee_badge.xml', 'views/hr_department_view.xml', 'views/hr_employee_view.xml', 'views/res_config_settings_views.xml',