!3480 !3479 添加功能

Merge pull request !3480 from 李鹏宇/dev

yuthon_hr_employee/models/yuthon_hr_employee.py

@@ -244,8 +244,9 @@ class YuthonHrEmployee(models.Model):
     @api.depends('converted', 'salary_year_jin_ids')
     def _compute_total_coefficients(self):
         for record in self:
+            company_employees = self.env['hr.employee'].search([])
             record.total_coefficients = sum(employee.converted for employee in self.salary_year_jin_ids)
-            record.calculation_totals = sum(employee.conversion_factor for employee in self.salary_year_jin_ids)
+            record.calculation_totals = sum(employee.conversion_factor for employee in company_employees)
 
     @api.depends('contract_id')
     def _compute_resource_calendar_id(self):

yuthon_salary/wizard/salary_compute_wizard.py

@@ -35,7 +35,7 @@ class SalaryComputeWizard(models.Model):
             employees = self.env['hr.employee'].search([
                 ('company_id', '=', self.company_id.id),
                 ('is_salary', '=', True),
-                ('contract_id.state', 'not in', ['draft', 'cancel']),
+                ('contract_id.state', 'not in', ['draft', 'cancel']), # 改一下逻辑 要按入职时间和薪资计算选择的年月
                 ('contract_id', '!=', False),
             ])
             self.employee_ids = [(6, 0, employees.ids)]