diff --git a/yuthon_hr_employee/views/inherit_hr_job_views.xml b/yuthon_hr_employee/views/inherit_hr_job_views.xml index 0b4541859..24747189d 100644 --- a/yuthon_hr_employee/views/inherit_hr_job_views.xml +++ b/yuthon_hr_employee/views/inherit_hr_job_views.xml @@ -80,6 +80,7 @@ 1 + diff --git a/yuthon_hr_employee_approval/__manifest__.py b/yuthon_hr_employee_approval/__manifest__.py index dca4eebeb..e1951e1f2 100644 --- a/yuthon_hr_employee_approval/__manifest__.py +++ b/yuthon_hr_employee_approval/__manifest__.py @@ -12,7 +12,7 @@ 'author': 'pengyuthon', 'website': 'https://www.pengyuthon.com', 'depends': ['base', 'hr', 'yuthon_hr_employee', 'soong_workflow', 'documents', 'hr_recruitment', - 'room', 'yuthon_issue', 'mail'], + 'room', 'yuthon_issue', 'mail', 'web'], 'data': [ 'security/ir.model.access.csv', 'data/process_code_data.xml', @@ -52,8 +52,13 @@ 'views/yuthon_social_files_approval_view.xml', 'views/website_employee_views.xml', 'views/menuitem.xml', + + 'report/contract_review_report.xml', + 'report/contract_review_report_templates.xml', + 'wizard/yuthon_website_employee_wizard.xml', - 'wizard/interview_approval_wizard.xml' + 'wizard/interview_approval_wizard.xml', + ], 'installable': True, 'application': False, diff --git a/yuthon_hr_employee_approval/models/contract_review_approval.py b/yuthon_hr_employee_approval/models/contract_review_approval.py index df8920d11..03c17c5c4 100644 --- a/yuthon_hr_employee_approval/models/contract_review_approval.py +++ b/yuthon_hr_employee_approval/models/contract_review_approval.py @@ -33,6 +33,14 @@ class ContractReviewApproval(models.Model): name_title = fields.Char(default=_get_default_name_title) + + def action_print_contract_review(self): + # report_ref = self.env['ir.actions.report'].search([ + # ('report_name', '=', 'yuthon_hr_employee_approval.action_contract_review_report')]) + report_ref = self.env.ref('yuthon_hr_employee_approval.action_contract_review_report') + return report_ref.report_action(self.id) + return self.env.ref('yuthon_hr_employee_approval.action_contract_review_report').report_action(self.id) + @api.onchange('user_id') def _onchange_user_id(self): if self.user_id: diff --git a/yuthon_hr_employee_approval/views/contract_review_approval_views.xml b/yuthon_hr_employee_approval/views/contract_review_approval_views.xml index b1f3e9283..85d75a049 100644 --- a/yuthon_hr_employee_approval/views/contract_review_approval_views.xml +++ b/yuthon_hr_employee_approval/views/contract_review_approval_views.xml @@ -16,6 +16,12 @@ contract.review.approval
+
+
diff --git a/yuthon_trade/report/business_approval_print_report.xml b/yuthon_trade/report/business_approval_print_report.xml new file mode 100644 index 000000000..a7f9a2c39 --- /dev/null +++ b/yuthon_trade/report/business_approval_print_report.xml @@ -0,0 +1,15 @@ + + + + + 业务审批单 + yuthon.business.approval + qweb-pdf + yuthon_trade.business_approval_print_report_document + yuthon_trade.business_approval_print_report_document + + report + '业务审批单 - %s' % (object.name or '') + + + \ No newline at end of file