diff options
| author | Thibault Delavallée <tde@odoo.com> | 2017-03-31 14:50:48 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2017-05-10 17:16:09 +0200 |
| commit | b380347b0b973307aec3f1af93c34bdb27ebd8d9 (patch) | |
| tree | 7b2ab031edeaf375104798dd99ae4d9dd310b5c4 /addons | |
| parent | 0e9d397978365c26bc4c7deddbb47be4c989c3c2 (diff) | |
[IMP] hr related addons: improve report naming and use print_report_name
Purpose of this commit is to clean and uniformize report naming through
various addons. It has been chosen to name them using a formatting like
<report_name> - <object_name or suffix> .
Improve report naming in hr_attendance, hr_expense and hr_payroll.
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/hr_attendance/report/hr_employee_badge.xml | 7 | ||||
| -rw-r--r-- | addons/hr_expense/report/report_expense_sheet.xml | 4 | ||||
| -rw-r--r-- | addons/hr_payroll/views/hr_payroll_report.xml | 9 |
3 files changed, 7 insertions, 13 deletions
diff --git a/addons/hr_attendance/report/hr_employee_badge.xml b/addons/hr_attendance/report/hr_employee_badge.xml index d022b0829ba..0961d0b178b 100644 --- a/addons/hr_attendance/report/hr_employee_badge.xml +++ b/addons/hr_attendance/report/hr_employee_badge.xml @@ -6,10 +6,9 @@ model="hr.employee" report_type="qweb-pdf" name="hr_attendance.print_employee_badge" - file="hr_attendance.print_employee_badge"/> - <record id="hr_employee_print_badge" model="ir.actions.report"> - <field name="print_report_name">'Print Badge'+'-'+(object.name)</field> - </record> + file="hr_attendance.print_employee_badge" + print_report_name="'Print Badge - %s' % (object.name).replace('/', '')" + /> <template id="print_employee_badge"> <t t-call="web.basic_layout"> diff --git a/addons/hr_expense/report/report_expense_sheet.xml b/addons/hr_expense/report/report_expense_sheet.xml index aef3e1c2c77..ecbe3241ba2 100644 --- a/addons/hr_expense/report/report_expense_sheet.xml +++ b/addons/hr_expense/report/report_expense_sheet.xml @@ -105,9 +105,7 @@ report_type="qweb-pdf" name="hr_expense.report_expense_sheet" file="hr_expense.report_expense_sheet" + print_report_name="'Expenses - %s - %s' % (object.employee_id.name, (object.name).replace('/', ''))" /> - <record id="action_report_hr_expense_sheet" model="ir.actions.report"> - <field name="print_report_name">'Expenses'+'-'+(object.employee_id.name)+'-'+(object.name)</field> - </record> </odoo>
\ No newline at end of file diff --git a/addons/hr_payroll/views/hr_payroll_report.xml b/addons/hr_payroll/views/hr_payroll_report.xml index 6b1e8a94637..e9c4ac11ccf 100644 --- a/addons/hr_payroll/views/hr_payroll_report.xml +++ b/addons/hr_payroll/views/hr_payroll_report.xml @@ -16,10 +16,9 @@ report_type="qweb-pdf" name="hr_payroll.report_payslip" file="hr_payroll.report_payslip" + print_report_name="'Payslip - %s' % (object.employee_id.name)" /> - <record id="action_report_payslip" model="ir.actions.report"> - <field name="print_report_name">(object.employee_id.name)+'-'+'Payslip'</field> - </record> + <report id="payslip_details_report" model="hr.payslip" @@ -27,8 +26,6 @@ report_type="qweb-pdf" name="hr_payroll.report_payslipdetails" file="hr_payroll.report_payslipdetails" + print_report_name="'Payslip Details - %s' % (object.employee_id.name)" /> - <record id="payslip_details_report" model="ir.actions.report"> - <field name="print_report_name">(object.name)</field> - </record> </odoo> |