From 1aa7c2a1bbe8a7ccd7b72265424b8d3f68c699c7 Mon Sep 17 00:00:00 2001
From: ljmwkx <1340053001@qq.com>
Date: Mon, 10 Mar 2025 10:41:53 +0800
Subject: [PATCH 1/2] 1

---
 .../views/hr_attendance_detail_wechat_views.xml              | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/yuthon_hr_attendance/views/hr_attendance_detail_wechat_views.xml b/yuthon_hr_attendance/views/hr_attendance_detail_wechat_views.xml
index 40e0bd62c..cc901d635 100644
--- a/yuthon_hr_attendance/views/hr_attendance_detail_wechat_views.xml
+++ b/yuthon_hr_attendance/views/hr_attendance_detail_wechat_views.xml
@@ -30,7 +30,10 @@
         <field name="name">hr.attendance.detail.tree</field>
         <field name="model">hr.attendance.detail</field>
         <field name="arch" type="xml">
-            <tree string="hr attendance detail" js_class="custom_detail_statements_button">
+            <tree string="hr attendance detail">
+                <header>
+                    <button name="get_hr_attendance_time" type="object" string="手动计算" display="always"/>
+                </header>
                 <field name="employee_id"/>
                 <field name="department_id"/>
                 <field name="groupname"/>

From a2be16f59cc7362f5a783dbeaf4ebbb3b36c00a6 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Mon, 10 Mar 2025 11:05:36 +0800
Subject: [PATCH 2/2] =?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/property_management.xml             | 20 ++++++++++++++++++-
 .../models/inherit_hr_payroll_structure.py    |  1 -
 .../inherit_hr_payroll_structure_views.xml    |  2 +-
 yuthon_salary/wizard/salary_compute_wizard.py | 17 +++++++++++++---
 .../wizard/salary_compute_wizard_views.xml    |  2 +-
 5 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/yuthon_property_approval/views/property_management.xml b/yuthon_property_approval/views/property_management.xml
index 4790a6b52..f6b6b18a7 100644
--- a/yuthon_property_approval/views/property_management.xml
+++ b/yuthon_property_approval/views/property_management.xml
@@ -17,7 +17,25 @@
         <field name="arch" type="xml">
             <form string="物业管理变更申请表" create="0">
                 <sheet>
-                    <field name="code"/>
+                    <widget name="web_ribbon" title="普件" bg_color="text-bg-success"
+                        invisible="urgency_level != 'normal'"/>
+                    <widget name="web_ribbon" title="急件" bg_color="text-bg-warning"
+                            invisible="urgency_level != 'urgent'"/>
+                    <widget name="web_ribbon" title="特级" bg_color="text-bg-danger"
+                            invisible="urgency_level != 'emergency'"/>
+                    <group col="4">
+                        <group>
+                            <field name="code" string="流水号" readonly="1"/>
+                        </group>
+                        <group>
+                            <field name="urgency_level" readonly="1"/>
+                        </group>
+                    </group>
+                    <div class="col-12 text-center">
+                        <h1>
+                            <field name="name_title" readonly="1"/>
+                        </h1>
+                    </div>
                     <div class="oe_title">
                         <label for="name"/>
                         <h1>
diff --git a/yuthon_salary/models/inherit_hr_payroll_structure.py b/yuthon_salary/models/inherit_hr_payroll_structure.py
index 12a731aec..59e023206 100644
--- a/yuthon_salary/models/inherit_hr_payroll_structure.py
+++ b/yuthon_salary/models/inherit_hr_payroll_structure.py
@@ -147,7 +147,6 @@ class HrPayrollStructure(models.Model):
                 structure.write({'rule_ids': rule_list})
 
     def salary_rule_data(self):
-        # 定义不同公司的字段映射
         company_mappings = {
             'thwg': {
                 '基本工资': 'base_salary',
diff --git a/yuthon_salary/views/inherit_hr_payroll_structure_views.xml b/yuthon_salary/views/inherit_hr_payroll_structure_views.xml
index 69fca5cb2..e5bb6092f 100644
--- a/yuthon_salary/views/inherit_hr_payroll_structure_views.xml
+++ b/yuthon_salary/views/inherit_hr_payroll_structure_views.xml
@@ -19,7 +19,7 @@
             </xpath>
             <xpath expr="//field[@name='country_id']" position="after">
                 <button name="open_record" type="object" class="btn btn-primary" string="查看详情"/>
-                <button name="salary_rule_data"  type="object" class="btn btn-primary" string="cs"/>
+<!--                <button name="salary_rule_data"  type="object" class="btn btn-primary" string="cs"/>-->
             </xpath>
             <xpath expr="//field[@name='name']" position="before">
                 <field name="sequence"/>
diff --git a/yuthon_salary/wizard/salary_compute_wizard.py b/yuthon_salary/wizard/salary_compute_wizard.py
index 9aa1efa03..db67ad679 100644
--- a/yuthon_salary/wizard/salary_compute_wizard.py
+++ b/yuthon_salary/wizard/salary_compute_wizard.py
@@ -13,7 +13,7 @@ class SalaryComputeWizard(models.Model):
     _description = '薪资计算弹窗'
 
     department_ids = fields.Many2many('hr.department', string="部门")
-    personnel_ids = fields.Many2many('hr.employee', string='人员', store=True)
+    employee_ids = fields.Many2many('hr.employee', string='人员', store=True)
     select_year = fields.Selection(selection=[(str(i), str(i)) for i in range(2024, 2060)], string='年份',
                                    default=lambda self: str(datetime.now().year))
     select_time = fields.Selection([('1', '一月'), ('2', '二月'), ('3', '三月'), ('4', '四月'),
@@ -39,7 +39,18 @@ class SalaryComputeWizard(models.Model):
         department_user_ids = set()
         for department_id in self.department_ids:
             department_user_ids.update(get_department_employees(department_id))
-        self.personnel_ids = [(6, 0, list(department_user_ids))]
+        self.employee_ids = [(6, 0, list(department_user_ids))]
+
 
     def confirm(self):
-        pass
\ No newline at end of file
+        for employee in self.employee_ids:
+            contract_id = self.env['hr.contract'].search([('employee_id', '=', employee.id)], limit=1)
+            struct_id = contract_id.structure_type_id.default_struct_id
+            payslip = self.env['hr.payslip'].create({
+                'name': employee.name,
+                'employee_id': employee.id,
+                'contract_id': contract_id.id,
+                'struct_id': struct_id.id,
+                'state':'draft',
+            })
+            payslip.compute_sheet()
diff --git a/yuthon_salary/wizard/salary_compute_wizard_views.xml b/yuthon_salary/wizard/salary_compute_wizard_views.xml
index d310c999d..e21d9a09d 100644
--- a/yuthon_salary/wizard/salary_compute_wizard_views.xml
+++ b/yuthon_salary/wizard/salary_compute_wizard_views.xml
@@ -8,7 +8,7 @@
                 <sheet>
                     <group>
                         <field name="department_ids" widget="many2many_tags"/>
-                        <field name="personnel_ids" widget="many2many_tags" force_save="1" invisible="1"/>
+                        <field name="employee_ids" widget="many2many_tags" force_save="1"/>
                         <field name="select_year"/>
                         <field name="select_time"/>
                     </group>