Merge branch '15.0' into 15.0-test

This commit is contained in:
Jared Kipe
2022-07-28 20:37:14 +00:00

View File

@@ -49,7 +49,8 @@ class HRPayslip(models.Model):
full_months += 1
else:
for i in range(7, 13):
if date_hire < date(self.date_to.year-1, i, 15):
# note this is run in December, so it should look at current year
if date_hire < date(self.date_to.year, i, 15):
full_months += 1
return full_months