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 @@ - - - - + + + + - - - - + + + + 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()