From ecc6a661f9c638d376f5a0b663551586179237d6 Mon Sep 17 00:00:00 2001 From: aditya singh rawat <80266913+unreal0901@users.noreply.github.com> Date: Fri, 28 Feb 2025 22:23:38 +0530 Subject: [PATCH] Update payslip_calc.py Deduction Duplication fixed --- payroll/methods/payslip_calc.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/payroll/methods/payslip_calc.py b/payroll/methods/payslip_calc.py index e46cf3404..9387705c6 100644 --- a/payroll/methods/payslip_calc.py +++ b/payroll/methods/payslip_calc.py @@ -515,14 +515,14 @@ def calculate_pre_tax_deduction(*_args, **kwargs): include_active_employees=True, is_pretax=True, is_tax=False ).exclude(exclude_employees=employee) - deductions = specific_deductions | conditional_deduction | active_employee_deduction + deductions = (specific_deductions | conditional_deduction | active_employee_deduction).distinct() deductions = ( deductions.exclude(one_time_date__lt=start_date) .exclude(one_time_date__gt=end_date) .exclude(update_compensation__isnull=False) ) # Installment deductions - installments = deductions.filter(is_installment=True) + installments = deductions.filter(is_installment=True).distinct() pre_tax_deductions = [] pre_tax_deductions_amt = [] @@ -622,14 +622,14 @@ def calculate_post_tax_deduction(*_args, **kwargs): active_employee_deduction = models.Deduction.objects.filter( include_active_employees=True, is_pretax=False, is_tax=False ).exclude(exclude_employees=employee) - deductions = specific_deductions | conditional_deduction | active_employee_deduction + deductions = (specific_deductions | conditional_deduction | active_employee_deduction).distinct() deductions = ( deductions.exclude(one_time_date__lt=start_date) .exclude(one_time_date__gt=end_date) .exclude(update_compensation__isnull=False) ) # Installment deductions - installments = deductions.filter(is_installment=True) + installments = deductions.filter(is_installment=True).distinct() post_tax_deductions = [] post_tax_deductions_amt = []