Merge remote-tracking branch 'origin/dev' into dev

yuthon_salary/models/inherit_hr_payroll_structure.py

@@ -25,7 +25,7 @@ class HrPayrollStructure(models.Model):
     position_salary = fields.Monetary(string="岗位工资", currency_field="currency_id")
     position_subsidy = fields.Monetary(string="岗位补贴", currency_field="currency_id")
     integrated_subsidy = fields.Monetary(string="综合补贴", currency_field="currency_id")
-    advance_performance_bonuses = fields.Monetary(string="预发绩效奖金", currency_field="currency_id")
+    advance_performance_bonuses = fields.Monetary(string="月绩效奖金", currency_field="currency_id")
     renk_log_ids = fields.One2many("rank.log.line", "structure_id", string="职级日志明细行")
 
     @api.depends('create_time', 'end_time')
@@ -108,7 +108,7 @@ class HrPayrollStructure(models.Model):
 
     @api.onchange('advance_performance_bonuses')
     def _onchange_advance_performance_bonuses(self):
-        self._handle_salary_rule('预发绩效奖金', self.advance_performance_bonuses)
+        self._handle_salary_rule('月绩效奖金', self.advance_performance_bonuses)
 
     def open_record(self):
         return {
@@ -127,7 +127,7 @@ class HrPayrollStructure(models.Model):
                 'rank_salary': '职级工资',
                 'communication_subsidy': '通讯补贴',
                 'position_salary': '岗位工资',
-                'advance_performance_bonuses': '预发绩效奖金'  # 补充新增字段
+                'advance_performance_bonuses': '月绩效奖金'  # 补充新增字段
             }
             for record in self:
                 for field, name in field_mapping.items():
@@ -182,7 +182,7 @@ class HrPayrollStructure(models.Model):
             '天河粮储': {
                 '基本工资': 'base_salary',
                 '职级工资': 'rank_salary',
-                '预发绩效奖金': 'advance_performance_bonuses'
+                '月绩效奖金': 'advance_performance_bonuses'
             }
         }
 
@@ -312,7 +312,7 @@ class RankLogLine(models.Model):
     rank_salary = fields.Float(string="职级工资")
     communication_subsidy = fields.Float(string="通讯补贴")
     position_salary = fields.Float(string="岗位工资")
-    advance_performance_bonuses = fields.Float(string="预发绩效奖金")
+    advance_performance_bonuses = fields.Float(string="月绩效奖金")
     effective_date = fields.Date(string="生效日期")
     lapse_date = fields.Date(string="失效日期")
     is_enable = fields.Boolean(string="启用")

yuthon_salary/models/inherit_hr_payslip.py

@@ -24,7 +24,7 @@ class InheritHrPayslip(models.Model):
     identification_id = fields.Char(string='证件号码', related='employee_id.identification_id', store=True)
     card_type = fields.Char(string='证件类型', store=True, default="居民身份证")
     salary_group_id = fields.Many2one('yuthon.salary.group', string="工资组", store=True, index=True)
-    performance_bonuses = fields.Float(string='预发绩效奖金', compute='_compute_salary', store=True)
+    performance_bonuses = fields.Float(string='月绩效', compute='_compute_salary', store=True)
     full_attendance_award = fields.Float(string='全勤奖', compute='_compute_salary', store=True)
     commuting_allowance = fields.Float(string='通信补贴', compute='_compute_salary', store=True)
     position_subsidy = fields.Monetary(string="岗位补贴", compute="_compute_salary", store=True)
@@ -503,7 +503,7 @@ class InheritHrPayslip(models.Model):
                         rec.position_salary = line.total
                     if line.name == '基本工资':
                         rec.base_salary = line.total
-                    if line.name == '预发绩效奖金':
+                    if line.name == '月绩效奖金':
                         rec.performance_bonuses = line.total
                     if line.name == '工龄工资':
                         rec.seniority_salary = line.total

yuthon_salary/models/yuthon_salary_active.py

@@ -31,7 +31,7 @@ class YuthonSalaryActive(models.Model):
     select_year = fields.Selection(selection=[(str(i), str(i)) for i in range(2024, 2040)], string='年份')
     basic_salary = fields.Float(string='基本工资')
     rank_salary = fields.Float(string='职级工资')
-    pre_performance_bonus = fields.Float(string='预发绩效奖金')
+    pre_performance_bonus = fields.Float(string='月绩效')
     post_salary = fields.Float(string='岗位工资')
     communication_subsidy = fields.Float(string='通讯补贴')
     seniority_wage = fields.Float(string='工龄工资')