diff --git a/yuthon_hr_employee_approval/__manifest__.py b/yuthon_hr_employee_approval/__manifest__.py index 3428c083c..2aec7f781 100644 --- a/yuthon_hr_employee_approval/__manifest__.py +++ b/yuthon_hr_employee_approval/__manifest__.py @@ -59,6 +59,8 @@ 'report/leaving_approval_report_templates.xml', 'report/onboard_approval_report.xml', 'report/onboard_approval_template.xml', + 'report/renewal_approval_report.xml', + 'report/renewal_approval_template.xml', 'wizard/yuthon_website_employee_wizard.xml', 'wizard/interview_approval_wizard.xml', diff --git a/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py b/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py index deeb45858..aa475709c 100644 --- a/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py +++ b/yuthon_hr_employee_approval/models/yuthon_renewal_approval.py @@ -44,6 +44,12 @@ class YuthonRenewalApproval(models.Model): name_title = fields.Char(default=_get_default_name_title) self_users_ids = fields.Many2many('res.users', string="当前经办人", default=lambda self: [(6, 0, [self.env.user.id])]) + def action_print_renewal_approval(self): + """打印合同续签申请""" + self.ensure_one() + report = self.env.ref('yuthon_hr_employee_approval.action_renewal_approval_report') + return report.report_action(self) + def end_approval(self): self.ensure_one() original_contract = self.employee_id.contract_id diff --git a/yuthon_hr_employee_approval/report/renewal_approval_report.xml b/yuthon_hr_employee_approval/report/renewal_approval_report.xml new file mode 100644 index 000000000..f4ab2b47e --- /dev/null +++ b/yuthon_hr_employee_approval/report/renewal_approval_report.xml @@ -0,0 +1,23 @@ + + + + + Renewal Approval Small Top Margin + A4 + 5 + Portrait + + + + 合同续签申请 + + yuthon.renewal.approval + qweb-pdf + yuthon_hr_employee_approval.renewal_approval_template + yuthon_hr_employee_approval.renewal_approval_template + + report + '合同续签申请_%s_%s' % (object.name or '', object.code or '') + + + diff --git a/yuthon_hr_employee_approval/report/renewal_approval_template.xml b/yuthon_hr_employee_approval/report/renewal_approval_template.xml new file mode 100644 index 000000000..a4fc8ba62 --- /dev/null +++ b/yuthon_hr_employee_approval/report/renewal_approval_template.xml @@ -0,0 +1,152 @@ + + + + diff --git a/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml b/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml index de7476491..b3991e784 100644 --- a/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml +++ b/yuthon_hr_employee_approval/views/yuthon_renewal_approval_views.xml @@ -16,6 +16,9 @@ yuthon.renewal.approval
+
+