From f9bc26d7e8138445157fb4a22d3cd7ddbd6678b6 Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Fri, 30 May 2025 20:55:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/soong_workflow_inspector_views.xml | 2 +- .../views/soong_workflow_node_views.xml | 2 +- .../soong_workflow_apostille_wizard_view.xml | 2 +- .../soong_workflow_comment_wizard_view.xml | 8 +- .../views/inherit_hr_type_views.xml | 2 +- yuthon_hr_attendance/views/go_approval.xml | 2 +- .../hr_attendance_detail_wechat_views.xml | 2 +- .../views/hr_attendance_views.xml | 2 +- .../views/overtime_approval.xml | 2 +- .../views/yuthon_duty_plan_views.xml | 2 +- .../views/yuthon_run_planning_views.xml | 2 +- .../views/yuthon_shift_planning_views.xml | 6 +- .../views/yuthon_special_approval_views.xml | 2 +- .../views/inherit_res_groups_views.xml | 2 +- .../views/yuthon_medical_manage_views.xml | 6 +- .../wizard/hr_employee_time_wizard_views.xml | 2 +- .../wizard/hr_job_add_wizard_views.xml | 2 +- .../views/inherit_hr_applicant_views.xml | 2 +- .../views/yuthon_interview_approval_views.xml | 2 +- .../wizard/interview_approval_wizard.xml | 2 +- yuthon_issue/models/issue_library.py | 14 +-- yuthon_issue/views/inherit_room_booking.xml | 2 +- yuthon_issue/views/issue_approval_views.xml | 4 +- yuthon_issue/views/issue_library_views.xml | 21 +++-- .../views/yuthon_lessee_notice.xml | 6 +- yuthon_notice/views/yuthon_notice_views.xml | 2 +- .../models/yuthon_official_incoming_normal.py | 1 - .../yuthon_official_incoming_normal_views.xml | 4 +- .../views/yuthon_official_views.xml | 2 +- .../views/yuthon_duty_management.xml | 2 +- .../views/yuthon_employee_approval.xml | 8 +- .../views/yuthon_employee_performance.xml | 2 +- .../views/yuthon_index_approval.xml | 4 +- .../views/yuthon_index_employee.xml | 2 +- .../views/yuthon_index_management.xml | 2 +- .../views/property_electric_reading_views.xml | 4 +- .../views/property_water_reading_views.xml | 4 +- .../views/yuthon_precinct_message_views.xml | 2 +- yuthon_property_approval/__manifest__.py | 1 + .../models/property_management.py | 11 +++ .../security/ir.model.access.csv | 2 +- .../views/property_management.xml | 6 +- yuthon_property_approval/wizard/__init__.py | 3 +- .../wizard/property_management_wizard.py | 89 +++++++++++++++++++ .../wizard/property_management_wizard.xml | 26 ++++++ .../models/inherit_hr_payroll_structure.py | 16 +++- .../inherit_hr_payroll_structure_views.xml | 7 ++ .../views/yuthon_trade_activities.xml | 9 +- yuthon_trade/views/yuthon_trade_premium.xml | 2 +- .../views/yuthon_will_task_views.xml | 6 +- 50 files changed, 241 insertions(+), 77 deletions(-) create mode 100644 yuthon_property_approval/wizard/property_management_wizard.py create mode 100644 yuthon_property_approval/wizard/property_management_wizard.xml diff --git a/soong_workflow/views/soong_workflow_inspector_views.xml b/soong_workflow/views/soong_workflow_inspector_views.xml index b53509f81..23e15891e 100644 --- a/soong_workflow/views/soong_workflow_inspector_views.xml +++ b/soong_workflow/views/soong_workflow_inspector_views.xml @@ -34,7 +34,7 @@ - + diff --git a/soong_workflow/views/soong_workflow_node_views.xml b/soong_workflow/views/soong_workflow_node_views.xml index 0ebbaf31a..edfb1a675 100644 --- a/soong_workflow/views/soong_workflow_node_views.xml +++ b/soong_workflow/views/soong_workflow_node_views.xml @@ -37,7 +37,7 @@ - + diff --git a/soong_workflow/wizard/soong_workflow_apostille_wizard_view.xml b/soong_workflow/wizard/soong_workflow_apostille_wizard_view.xml index 388505231..0c02fed46 100644 --- a/soong_workflow/wizard/soong_workflow_apostille_wizard_view.xml +++ b/soong_workflow/wizard/soong_workflow_apostille_wizard_view.xml @@ -11,7 +11,7 @@ - +
+ + +
+ + + 批量导入物业 + property.management.wizard + form + + \ No newline at end of file diff --git a/yuthon_salary/models/inherit_hr_payroll_structure.py b/yuthon_salary/models/inherit_hr_payroll_structure.py index 1cbafd11b..7153613f1 100644 --- a/yuthon_salary/models/inherit_hr_payroll_structure.py +++ b/yuthon_salary/models/inherit_hr_payroll_structure.py @@ -174,4 +174,18 @@ class HrPayrollStructure(models.Model): self._context.get('active_ids', self._context.get('active_id'))) for payroll in payroll_ids: for rule in payroll.rule_ids: - rule.sudo().unlink() \ No newline at end of file + rule.sudo().unlink() + + def update_payroll_items(self): + payroll_ids = self.env["hr.payroll.structure"].browse( + self._context.get('active_ids', self._context.get('active_id'))) + category_id = self.env['hr.salary.rule.category'].search([('name', '=', '常用项')], limit=1) + for payroll in payroll_ids: + self.env['hr.salary.rule'].create({ + 'name': '质检员津贴', + 'code': 'ZJYJT', + 'category_id': category_id.id, + 'struct_id': payroll.id, + 'sequence': 1, + 'amount_select': 'fix', + }) diff --git a/yuthon_salary/views/inherit_hr_payroll_structure_views.xml b/yuthon_salary/views/inherit_hr_payroll_structure_views.xml index 00caac851..35576f498 100644 --- a/yuthon_salary/views/inherit_hr_payroll_structure_views.xml +++ b/yuthon_salary/views/inherit_hr_payroll_structure_views.xml @@ -133,4 +133,11 @@ code action = model.delete_structure() + + 一次性 + + + code + action = model.update_payroll_items() + \ No newline at end of file diff --git a/yuthon_trade/views/yuthon_trade_activities.xml b/yuthon_trade/views/yuthon_trade_activities.xml index 3169b16e5..3ca16b611 100644 --- a/yuthon_trade/views/yuthon_trade_activities.xml +++ b/yuthon_trade/views/yuthon_trade_activities.xml @@ -35,8 +35,13 @@ - - +