From 3b90f8dc47f3d9a9a930a3c773656623d0759ac1 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Thu, 5 Jun 2025 11:45:46 +0800
Subject: [PATCH 1/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

---
 .../models/property_split_approval.py            |  1 +
 .../views/property_lease_contract.xml            | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/yuthon_property_approval/models/property_split_approval.py b/yuthon_property_approval/models/property_split_approval.py
index 391808f8f..c6d274562 100644
--- a/yuthon_property_approval/models/property_split_approval.py
+++ b/yuthon_property_approval/models/property_split_approval.py
@@ -12,6 +12,7 @@ class PropertySplitApproval(models.Model):
     department_id = fields.Many2one(related='users_id.employee_id.department_id', string="部门")
     property_id = fields.Many2one('yuthon.property', string='物业名称')
     units = fields.Char(related='property_id.units', string='单元')
+    effective_date = fields.Date(string='生效日期', default=fields.Date.today())
     property_floor_id = fields.Many2one(related='property_id.property_floor_id', string='楼层')
     asset_type_id = fields.Many2one(related='property_id.asset_type_id', string='资产类型')
     building_area = fields.Float(related='property_id.building_area', string='建筑面积')
diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml
index a244a095b..1f68cfe03 100644
--- a/yuthon_property_approval/views/property_lease_contract.xml
+++ b/yuthon_property_approval/views/property_lease_contract.xml
@@ -478,16 +478,16 @@
                         <page string="附件">
                             <group col="2">
                                 <group>
-                                    <field name="license_id" widget="preview_many2one" readonly="1"/>
-                                    <field name="legal_entity_id" widget="preview_many2one" readonly="1"/>
-                                    <field name="handover_time" widget="preview_many2one" readonly="1"/>
-                                    <field name="lease_contract" widget="preview_many2one" readonly="1"/>
+                                    <field name="license_id" widget="preview_many2one"/>
+                                    <field name="legal_entity_id" widget="preview_many2one"/>
+                                    <field name="handover_time" widget="preview_many2one"/>
+                                    <field name="lease_contract" widget="preview_many2one"/>
                                 </group>
                                 <group>
-                                    <field name="power_attorney_id" widget="preview_many2one" readonly="1"/>
-                                    <field name="asset_valuation_id" widget="preview_many2one" readonly="1"/>
-                                    <field name="confirmation_transaction_id" widget="preview_many2one" readonly="1"/>
-                                    <field name="other_id" widget="preview_many2one" readonly="1"/>
+                                    <field name="power_attorney_id" widget="preview_many2one"/>
+                                    <field name="asset_valuation_id" widget="preview_many2one"/>
+                                    <field name="confirmation_transaction_id" widget="preview_many2one"/>
+                                    <field name="other_id" widget="preview_many2one"/>
                                 </group>
                             </group>
                         </page>

From 9206314394edd0ed631ec431d330e8cae1dabd94 Mon Sep 17 00:00:00 2001
From: zhou <123@>
Date: Thu, 5 Jun 2025 16:42:29 +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

---
 yuthon_salary/models/inherit_hr_payslip.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/yuthon_salary/models/inherit_hr_payslip.py b/yuthon_salary/models/inherit_hr_payslip.py
index a530cf192..3e5f0b250 100644
--- a/yuthon_salary/models/inherit_hr_payslip.py
+++ b/yuthon_salary/models/inherit_hr_payslip.py
@@ -115,7 +115,7 @@ class InheritHrPayslip(models.Model):
     # 粮储常用项
     quality_allowance = fields.Float(string='质检员津贴')
     environmental_allowance = fields.Float(string='环境作业津贴')
-
+    
     performance_deduction = fields.Float(string='扣发绩效奖金', compute='_compute_deduction', store=True)
     commuting_deduction = fields.Float(string='扣发通信补贴', compute='_compute_deduction', store=True)
     base_salary_deduction = fields.Float(string='扣发基本工资', compute='_compute_deduction', store=True)
@@ -129,9 +129,10 @@ class InheritHrPayslip(models.Model):
     def action_refresh_from_work_entries(self):
         payslip_records  = self.browse(self._context.get('active_ids', self._context.get('active_id')))
         payslips = payslip_records or self
-        # 过滤出状态为草稿或已验证的工资单
+        # 过滤出状态为草稿或已验证的工资单 以及试用期的
         payslips = payslips.filtered(
             lambda slip: slip.state in ['draft', 'verify']
+                         and not slip.employee_id.contract_id.is_probation
         )
         # delete old payslip lines
         payslips.line_ids.unlink()