diff --git a/yuthon_catering/views/root_menu.xml b/yuthon_catering/views/root_menu.xml index 90058bb5d..5acd10c77 100644 --- a/yuthon_catering/views/root_menu.xml +++ b/yuthon_catering/views/root_menu.xml @@ -4,6 +4,10 @@ + diff --git a/yuthon_official/__manifest__.py b/yuthon_official/__manifest__.py index aba236bcc..c90def369 100644 --- a/yuthon_official/__manifest__.py +++ b/yuthon_official/__manifest__.py @@ -32,6 +32,8 @@ 'views/official_menus.xml', 'report/official_print_action.xml', 'report/official_print_template.xml', + 'report/file_processing_report.xml', + 'report/file_processing_report_templates.xml', ], diff --git a/yuthon_official/models/yuthon_file_processing.py b/yuthon_official/models/yuthon_file_processing.py index c39c64cf8..f230a8631 100644 --- a/yuthon_official/models/yuthon_file_processing.py +++ b/yuthon_official/models/yuthon_file_processing.py @@ -249,6 +249,10 @@ class YuthonFileProcessing(models.Model): 'default_incoming_normal_id': self.id, }, } + + def action_print_file_processing(self): + report_ref = self.env.ref('yuthon_official.action_file_processing_report') + return report_ref.report_action(self.id) # def button_meet(self): # return { # "name": "会议", diff --git a/yuthon_official/report/file_processing_report.xml b/yuthon_official/report/file_processing_report.xml new file mode 100644 index 000000000..95b622d6c --- /dev/null +++ b/yuthon_official/report/file_processing_report.xml @@ -0,0 +1,22 @@ + + + + + File Processing Small Top Margin + A4 + 5 + Portrait + + + 文件处理表 + + yuthon.file.processing + qweb-pdf + yuthon_official.file_processing_report_document + yuthon_official.file_processing_report_document + + report + '文件处理表%s_%s_%s' % (object.name or '', object.users_id.name or '', (object.date and object.date.strftime('%Y-%m-%d') or '')) + + + diff --git a/yuthon_official/report/file_processing_report_templates.xml b/yuthon_official/report/file_processing_report_templates.xml new file mode 100644 index 000000000..1b44dc7ac --- /dev/null +++ b/yuthon_official/report/file_processing_report_templates.xml @@ -0,0 +1,143 @@ + + + + + + diff --git a/yuthon_official/views/yuthon_file_processing_views.xml b/yuthon_official/views/yuthon_file_processing_views.xml index d10e967eb..7b60778fd 100644 --- a/yuthon_official/views/yuthon_file_processing_views.xml +++ b/yuthon_official/views/yuthon_file_processing_views.xml @@ -21,6 +21,10 @@
+
diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml index 9d89f5109..a17bd96f3 100644 --- a/yuthon_work_brand/views/hr_menus.xml +++ b/yuthon_work_brand/views/hr_menus.xml @@ -360,16 +360,20 @@ parent="human_resources_salary_root_board" action="yuthon_salary.action_view_hr_payslip_month_form2" sequence="3"/> - + + + + + + +