From a276b2bd077e97ce2eb6b19f77432bb8456969cf Mon Sep 17 00:00:00 2001 From: Horilla Date: Mon, 15 Jul 2024 12:02:40 +0530 Subject: [PATCH] [FIX] PAYROLL: Auto payslip generation will run after enabling it on settings --- payroll/models/models.py | 6 ++++++ payroll/scheduler.py | 2 ++ 2 files changed, 8 insertions(+) diff --git a/payroll/models/models.py b/payroll/models/models.py index ed8c46103..052e8c130 100644 --- a/payroll/models/models.py +++ b/payroll/models/models.py @@ -1895,5 +1895,11 @@ class PayslipAutoGenerate(models.Model): } ) + def save(self): + from payroll.scheduler import auto_payslip_generate + + if self.auto_generate: + auto_payslip_generate() + def __str__(self) -> str: return f"{self.generate_day} | {self.company_id} " diff --git a/payroll/scheduler.py b/payroll/scheduler.py index dfeaf5c08..75bf5f48d 100644 --- a/payroll/scheduler.py +++ b/payroll/scheduler.py @@ -60,6 +60,8 @@ def generate_payslip(date, companies, all): payslip = Payslip.objects.filter( employee_id=employee, start_date=start_date, end_date=end_date ).first() + if payslip: + continue contract = Contract.objects.filter( employee_id=employee, contract_status="active" ).first()