[IMP] hr_holidays_credit: remove useless if case, add test

OCA · Jun 16, 2021 · 86c8a6c · 86c8a6c
1 parent b51db7d
commit 86c8a6c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/hr_holidays_credit/models/hr_leave_type.py b/hr_holidays_credit/models/hr_leave_type.py
@@ -63,13 +63,12 @@ def name_get(self):
                             if abs(amount) <= 1
                             else _("%g hours available") % amount
                         )
-                    else:
-                        extra = _("%g %s available") % (amount, record.request_unit)
 
                     if record.allow_credit:
                         extra += " " + _("+ credit")
 
                 elif amount < 0:
+                    amount = abs(amount)
                     if record.request_unit == "day":
                         extra = (
                             _("%g day used in credit") % amount
@@ -82,11 +81,6 @@ def name_get(self):
                             if abs(amount) <= 1
                             else _("%g hours used in credit") % amount
                         )
-                    else:
-                        extra = _("%g %s used in credit") % (
-                            amount,
-                            record.request_unit,
-                        )
 
             if extra:
                 record_name = _("%(name)s (%(extra)s)") % {

diff --git a/hr_holidays_credit/tests/test_hr_holidays_credit.py b/hr_holidays_credit/tests/test_hr_holidays_credit.py
@@ -193,8 +193,27 @@ def test_2_days_used_in_credit_display_name(self):
         ).name_get()[0][1]
         self.assertIn("2 days used in credit", name)
 
-    def test_8_hours_available_without_credit_display_name(self):
+    def test_x_hours_used_in_credit_display_name(self):
         employee = self.SudoEmployee.create({"name": "Employee #8"})
+        leave = self.SudoLeave.create(
+            {
+                "holiday_status_id": self.in_hours_w_credit_leave_type.id,
+                "holiday_type": "employee",
+                "employee_id": employee.id,
+                "number_of_days": 1,
+            }
+        )
+
+        name = self.in_hours_w_credit_leave_type.with_context(
+            employee_id=employee.id
+        ).name_get()[0][1]
+        self.assertIn(
+            "%g hours used in credit" % abs(leave.number_of_hours_display), name
+        )
+        self.assertNotIn(" + credit", name)
+
+    def test_x_hours_available_without_credit_display_name(self):
+        employee = self.SudoEmployee.create({"name": "Employee #9"})
         alloc = self.LeaveAllocation.create(
             {
                 "name": "Test Allocation 2",