From 1fab5f46ac63d386a52aa6521752689f0f7272a9 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Sun, 9 Mar 2025 19:39:30 +0800
Subject: [PATCH 1/3] =?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

---
 yuthon_hr_attendance/models/hr_attendance_month.py         | 4 ++--
 yuthon_property_approval/models/property_handover.py       | 2 +-
 yuthon_salary/models/inherit_hr_payroll_structure.py       | 6 +++++-
 yuthon_salary/views/inherit_hr_payroll_structure_views.xml | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/yuthon_hr_attendance/models/hr_attendance_month.py b/yuthon_hr_attendance/models/hr_attendance_month.py
index a93645174..6c308afaa 100644
--- a/yuthon_hr_attendance/models/hr_attendance_month.py
+++ b/yuthon_hr_attendance/models/hr_attendance_month.py
@@ -98,7 +98,7 @@ class HrAttendanceMonthDetail(models.Model):
     leave_of_sick = fields.Integer(string="病假")
     statutory_leave = fields.Integer(string="法定假")
     work_overtime = fields.Integer(string="加班")
-    entry_date = fields.Date(string="入职时间")
+    entry_date = fields.Date(relatde='employee_id.open_start_time', string="入职时间")
     expected_date = fields.Date(string="离职日期")
     cop_leave = fields.Float(string='补休')
     annual_leave = fields.Float(string='年假')
@@ -121,7 +121,7 @@ class HrAttendanceMonthDetail(models.Model):
     come_late = fields.Integer(string="迟到")
     is_early_card = fields.Integer(string="早退")
     is_no_card = fields.Integer(string="缺卡")
-    is_work = fields.Boolean(string='旷工')
+    is_work = fields.Integer(string='旷工')
     # 假期
     unpaid_leave = fields.Integer(string="无薪假")
 
diff --git a/yuthon_property_approval/models/property_handover.py b/yuthon_property_approval/models/property_handover.py
index 3a1e14210..209f54709 100644
--- a/yuthon_property_approval/models/property_handover.py
+++ b/yuthon_property_approval/models/property_handover.py
@@ -15,7 +15,7 @@ class PropertyHandover(models.Model):
     code = fields.Char(string="编号",
                        default=lambda self: self.env['ir.sequence'].next_by_code('property_handover_code'))
     property_documents_ids = fields.Many2many('documents.document', string="附件")
-    source = fields.Char(string="移交单位")
+    source = fields.Char(string="接收单位")
     source_time = fields.Date(string="移交时间")
     is_issues = fields.Boolean(string='是否上会')
     related_issues_id = fields.Many2one('issue.library', string="关联议题")
diff --git a/yuthon_salary/models/inherit_hr_payroll_structure.py b/yuthon_salary/models/inherit_hr_payroll_structure.py
index e75e1e554..74f0aa408 100644
--- a/yuthon_salary/models/inherit_hr_payroll_structure.py
+++ b/yuthon_salary/models/inherit_hr_payroll_structure.py
@@ -124,4 +124,8 @@ class HrPayrollStructure(models.Model):
             "res_model": "yuthon.payroll.wizard",
             "view_mode": "form",
             "target": "new",
-        }
\ No newline at end of file
+        }
+
+    def clear_salary_rule_data(self):
+        salary_rules = self.env['hr.salary.rule'].search([])
+        salary_rules.unlink()
\ No newline at end of file
diff --git a/yuthon_salary/views/inherit_hr_payroll_structure_views.xml b/yuthon_salary/views/inherit_hr_payroll_structure_views.xml
index e3778bd39..4bd4a3223 100644
--- a/yuthon_salary/views/inherit_hr_payroll_structure_views.xml
+++ b/yuthon_salary/views/inherit_hr_payroll_structure_views.xml
@@ -19,6 +19,7 @@
             </xpath>
             <xpath expr="//field[@name='country_id']" position="after">
                 <button name="open_record" type="object" class="btn btn-primary" string="查看详情"/>
+                <button name="clear_salary_rule_data" string="清空数据" type="object" class="oe_highlight"/>
             </xpath>
             <xpath expr="//field[@name='name']" position="before">
                 <field name="sequence"/>

From 89ad07628ff128c364e166a5090ae1752d2768f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <pengyuthon@user.noreply.gitee.com>
Date: Sun, 9 Mar 2025 20:18:46 +0800
Subject: [PATCH 2/3] 1

---
 yuthon_salary/models/inherit_hr_payroll_structure.py      | 5 +++--
 .../views/inherit_hr_payroll_structure_views.xml          | 8 +++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/yuthon_salary/models/inherit_hr_payroll_structure.py b/yuthon_salary/models/inherit_hr_payroll_structure.py
index 74f0aa408..1896ae7d6 100644
--- a/yuthon_salary/models/inherit_hr_payroll_structure.py
+++ b/yuthon_salary/models/inherit_hr_payroll_structure.py
@@ -127,5 +127,6 @@ class HrPayrollStructure(models.Model):
         }
 
     def clear_salary_rule_data(self):
-        salary_rules = self.env['hr.salary.rule'].search([])
-        salary_rules.unlink()
\ No newline at end of file
+        structure_ids = self.env["hr.payroll.structure"].browse(self._context.get('active_ids', self._context.get('active_id')))
+        for rule in structure_ids:
+            rule.rule_ids.unlink()
diff --git a/yuthon_salary/views/inherit_hr_payroll_structure_views.xml b/yuthon_salary/views/inherit_hr_payroll_structure_views.xml
index 4bd4a3223..78dff5856 100644
--- a/yuthon_salary/views/inherit_hr_payroll_structure_views.xml
+++ b/yuthon_salary/views/inherit_hr_payroll_structure_views.xml
@@ -19,7 +19,6 @@
             </xpath>
             <xpath expr="//field[@name='country_id']" position="after">
                 <button name="open_record" type="object" class="btn btn-primary" string="查看详情"/>
-                <button name="clear_salary_rule_data" string="清空数据" type="object" class="oe_highlight"/>
             </xpath>
             <xpath expr="//field[@name='name']" position="before">
                 <field name="sequence"/>
@@ -104,6 +103,13 @@
         <field name="state">code</field>
         <field name="code">action = model.action_yuthon_salary()</field>
     </record>
+    <record id="all_paroll_write_salary_admin" model="ir.actions.server">
+        <field name="name">清除数据</field>
+        <field name="model_id" ref="hr_payroll.model_hr_payroll_structure"/>
+        <field name="binding_model_id" ref="hr_payroll.model_hr_payroll_structure"/>
+        <field name="state">code</field>
+        <field name="code">action = model.clear_salary_rule_data()</field>
+    </record>
     <record id="all_data_write_payroll" model="ir.actions.server">
         <field name="name">导入薪资</field>
         <field name="model_id" ref="hr_payroll.model_hr_payroll_structure"/>

From b0ff7c085b807e0033052a5abd977a5953d27a21 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Mon, 10 Mar 2025 10:04:33 +0800
Subject: [PATCH 3/3] =?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

---
 .../models/inherit_hr_payroll_structure.py    | 57 +++++++++++++++++--
 .../inherit_hr_payroll_structure_views.xml    |  3 +-
 yuthon_salary/wizard/yuthon_payroll_wizard.py |  1 +
 3 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/yuthon_salary/models/inherit_hr_payroll_structure.py b/yuthon_salary/models/inherit_hr_payroll_structure.py
index 1896ae7d6..2faede898 100644
--- a/yuthon_salary/models/inherit_hr_payroll_structure.py
+++ b/yuthon_salary/models/inherit_hr_payroll_structure.py
@@ -126,7 +126,56 @@ class HrPayrollStructure(models.Model):
             "target": "new",
         }
 
-    def clear_salary_rule_data(self):
-        structure_ids = self.env["hr.payroll.structure"].browse(self._context.get('active_ids', self._context.get('active_id')))
-        for rule in structure_ids:
-            rule.rule_ids.unlink()
+    def generate_salary_rules(self, company_code, field_mapping):
+        # 搜索符合条件的薪资结构
+        structure_ids = self.env['hr.payroll.structure'].search([('yuthon_company', '=', company_code)])
+        for structure in structure_ids:
+            # 清空当前结构的规则
+            structure.rule_ids.unlink()
+            # 初始化规则列表
+            rule_list = []
+            for rule_name, field_attr in field_mapping.items():
+                field_amount = getattr(structure, field_attr)
+                if field_amount is not None:
+                    name_pinyin = pinyin(rule_name, style=Style.FIRST_LETTER)
+                    code = "".join([p[0][0] for p in name_pinyin]).upper()
+                    category_id = self.env['hr.salary.rule.category'].search([('name', '=', '职级')], limit=1)
+                    rule_list.append([0, 0, {
+                        'name': rule_name,
+                        'category_id': category_id.id,
+                        'code': code,
+                        'yuthon_company': company_code,
+                        'amount_fix': field_amount,
+                        'struct_id': structure.id
+                    }])
+            if rule_list:
+                structure.write({'rule_ids': rule_list})
+
+    def salary_rule_data(self):
+        # 定义不同公司的字段映射
+        company_mappings = {
+            'thwg': {
+                '基本工资': 'base_salary',
+                '岗位工资': 'position_salary',
+                '综合补贴': 'integrated_subsidy',
+                '通讯补贴': 'communication_subsidy',
+                '全勤奖': 'full_attendance_bonus'
+            },
+            'thlc': {
+                '基本工资': 'base_salary',
+                '岗位工资': 'position_salary',
+                '岗位补贴': 'position_subsidy',
+                '绩效奖金': 'performance_bonus'
+            },
+            'thtz': {
+                '基本工资': 'base_salary',
+                '职级工资': 'rank_salary',
+                '绩效奖金': 'performance_bonus',
+                '通讯补贴': 'communication_subsidy',
+                '全勤奖': 'full_attendance_bonus'
+            }
+        }
+
+        for record in self:
+            for company_code, field_mapping in company_mappings.items():
+                self.generate_salary_rules(company_code, field_mapping)
\ No newline at end of file
diff --git a/yuthon_salary/views/inherit_hr_payroll_structure_views.xml b/yuthon_salary/views/inherit_hr_payroll_structure_views.xml
index 78dff5856..69fca5cb2 100644
--- a/yuthon_salary/views/inherit_hr_payroll_structure_views.xml
+++ b/yuthon_salary/views/inherit_hr_payroll_structure_views.xml
@@ -19,6 +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"/>
             </xpath>
             <xpath expr="//field[@name='name']" position="before">
                 <field name="sequence"/>
@@ -108,7 +109,7 @@
         <field name="model_id" ref="hr_payroll.model_hr_payroll_structure"/>
         <field name="binding_model_id" ref="hr_payroll.model_hr_payroll_structure"/>
         <field name="state">code</field>
-        <field name="code">action = model.clear_salary_rule_data()</field>
+        <field name="code">action = model.salary_rule_data()</field>
     </record>
     <record id="all_data_write_payroll" model="ir.actions.server">
         <field name="name">导入薪资</field>
diff --git a/yuthon_salary/wizard/yuthon_payroll_wizard.py b/yuthon_salary/wizard/yuthon_payroll_wizard.py
index cdf16c9ee..265c7ae84 100644
--- a/yuthon_salary/wizard/yuthon_payroll_wizard.py
+++ b/yuthon_salary/wizard/yuthon_payroll_wizard.py
@@ -43,6 +43,7 @@ class YuthonPayrollWizard(models.Model):
         communication_subsidy = row[4].value
         full_attendance_bonus = row[5].value
         payroll_id = self.env['hr.payroll.structure'].search([('type_id', '=', type_id.id), ('yuthon_company', '=','thtz')], limit=1)
+        payroll_id.rule_ids.unlink()
         if payroll_id:
             payroll_id.write({
                 'base_salary': base_salary,