From 4de7aa117260c248a16a578e1950c51181f4112a Mon Sep 17 00:00:00 2001 From: Horilla Date: Mon, 18 Mar 2024 16:26:07 +0530 Subject: [PATCH] [FIX] LEAVE: Forecasted leave issue --- leave/models.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/leave/models.py b/leave/models.py index 7a51e3bf4..00feeb3d0 100644 --- a/leave/models.py +++ b/leave/models.py @@ -297,9 +297,14 @@ class AvailableLeave(models.Model): today = datetime.now() for i in range(1, 7): # Calculate for the next 6 months next_month = today + relativedelta(months=i) - forecasted_leave[next_month.strftime("%Y-%m")] = self.available_days + min(self.leave_type_id.carryforward_max,( - self.leave_type_id.total_days * i - )) + if self.leave_type_id.carryforward_max: + forecasted_leave[next_month.strftime("%Y-%m")] = self.available_days + min(self.leave_type_id.carryforward_max,( + self.leave_type_id.total_days * i + )) + else: + forecasted_leave[next_month.strftime("%Y-%m")] = self.available_days +( + self.leave_type_id.total_days * i + ) return forecasted_leave # Resetting carryforward days