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

yuthon_hr_employee/models/yuthon_hr_employee.py

@@ -876,7 +876,6 @@ class YuthonHrEmployee(models.Model):
     def update_parental_leave(self):
         today = datetime.now().date()
         active_contracts = self.env['hr.contract'].search([
-            ('employee_id.name','=', '和博延'),
             ('state', '=', 'open'),
             ('contract_type_id.name', 'ilike', '正式合同'),
             ('employee_id', '!=', False)

yuthon_salary/wizard/salary_party_wizard.py

@@ -24,8 +24,8 @@ class SalaryPartyWizard(models.TransientModel):
             self.salary_party_data(row)
 
     def salary_party_data(self, row):
-        select_year = str(row[0].value).replace("年", "").strip()
-        select_time = str(row[1].value).replace("月", "").strip()
+        select_year = int(row[0].value)
+        select_time = int(row[1].value)
         employee_id = self.env['hr.employee'].search([('identification_id', '=', row[3].value)], limit=1)
         card = row[3].value
         fee = row[4].value