!1671 !1670 添加功能

Merge pull request !1671 from 李鹏宇/dev

yuthon_holiday/models/inherit_hr_leave.py

@@ -4,6 +4,7 @@ from email.policy import default
 
 from odoo import models, fields, api, _
 from odoo.exceptions import ValidationError
+import re
 
 
 class HrLeave(models.Model):
@@ -172,10 +173,11 @@ class HolidaysRequestBatch(models.Model):
             for leave in self.leave_ids:
                 if leave.number_of_days_display:
                     number_day += leave.number_of_days_display
-            for leave in self.hour_leave_ids:
-                if leave.number_of_hours_display:
-                    number_hours += leave.number_of_hours_text
-            self.name = f"{employee_name}的休假：{number_day + number_hours}天"
+            for hour_leave in self.hour_leave_ids:
+                if hour_leave.number_of_hours_text:
+                    hours_str = re.search(r'\d+', hour_leave.number_of_hours_text).group()
+                    number_hours += float(hours_str)
+            self.name = f"{employee_name}的休假：{number_day + round(number_hours / 24, 1)}天"
         else:
             self.name = f'{employee_name}的休假'