!2028 !2027 添加功能

Merge pull request !2028 from 李鹏宇/dev

yuthon_contract/models/inherit_hr_contract.py

@@ -19,8 +19,7 @@ class HrContract(models.Model):
         ('attendance', 'Attendances'),
         ('planning', '特殊排版')])
     is_probation = fields.Boolean(string="试用期")
-    wage = fields.Monetary('Wage', required=True, tracking=True, help="Employee's monthly gross wage.",
-                           group_operator="avg", compute='_compute_wage')
+    wage = fields.Float(string="基本工资", compute='_compute_wage', store=True)
     start_date = fields.Date(string="开始日期", required=True, default=fields.Date.today)
     end_date = fields.Date(string="结束日期", required=True,
                            default=lambda self: fields.Date.today() + relativedelta(months=+3))
@@ -48,7 +47,7 @@ class HrContract(models.Model):
     def _compute_wage(self):
         for record in self:
             if record.structure_type_id and record.yuthon_company:
-                wage_id = self.env['hr.salary.rule'].search([('struct_id.name', '=', record.structure_type_id.name),
+                wage_id = self.env['hr.salary.rule'].search([('struct_id', '=', record.structure_type_id.default_struct_id.id),
                                                              ('yuthon_company','=', record.yuthon_company), ('name', '=','基本工资')])
                 if wage_id:
                     record.wage = wage_id.amount_fix