nestict/ihrm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] Merge conflict

Browse Source
This commit is contained in:
Horilla
2025-03-11 14:20:36 +05:30
parent 6e3f345da4
commit 78e958f49e
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
payroll/methods/payslip_calc.py
View File

@@ -454,7 +454,7 @@ def calculate_tax_deduction(*_args, **kwargs):
deductions.exclude(one_time_date__lt=start_date) deductions.exclude(one_time_date__lt=start_date)
.exclude(one_time_date__gt=end_date) .exclude(one_time_date__gt=end_date)
.exclude(update_compensation__isnull=False) .exclude(update_compensation__isnull=False)
) ).distinct()
deductions_amt = [] deductions_amt = []
serialized_deductions = [] serialized_deductions = []
for deduction in deductions: for deduction in deductions:
@@ -515,14 +515,16 @@ def calculate_pre_tax_deduction(*_args, **kwargs):
include_active_employees=True, is_pretax=True, is_tax=False include_active_employees=True, is_pretax=True, is_tax=False
).exclude(exclude_employees=employee) ).exclude(exclude_employees=employee)
deductions = specific_deductions | conditional_deduction | active_employee_deduction deductions = (
specific_deductions | conditional_deduction | active_employee_deduction
).distinct()
deductions = ( deductions = (
deductions.exclude(one_time_date__lt=start_date) deductions.exclude(one_time_date__lt=start_date)
.exclude(one_time_date__gt=end_date) .exclude(one_time_date__gt=end_date)
.exclude(update_compensation__isnull=False) .exclude(update_compensation__isnull=False)
) )
# Installment deductions # Installment deductions
installments = deductions.filter(is_installment=True) installments = deductions.filter(is_installment=True).distinct()
pre_tax_deductions = [] pre_tax_deductions = []
pre_tax_deductions_amt = [] pre_tax_deductions_amt = []
@@ -622,14 +624,16 @@ def calculate_post_tax_deduction(*_args, **kwargs):
active_employee_deduction = models.Deduction.objects.filter( active_employee_deduction = models.Deduction.objects.filter(
include_active_employees=True, is_pretax=False, is_tax=False include_active_employees=True, is_pretax=False, is_tax=False
).exclude(exclude_employees=employee) ).exclude(exclude_employees=employee)
deductions = specific_deductions | conditional_deduction | active_employee_deduction deductions = (
specific_deductions | conditional_deduction | active_employee_deduction
).distinct()
deductions = ( deductions = (
deductions.exclude(one_time_date__lt=start_date) deductions.exclude(one_time_date__lt=start_date)
.exclude(one_time_date__gt=end_date) .exclude(one_time_date__gt=end_date)
.exclude(update_compensation__isnull=False) .exclude(update_compensation__isnull=False)
) )
# Installment deductions # Installment deductions
installments = deductions.filter(is_installment=True) installments = deductions.filter(is_installment=True).distinct()
post_tax_deductions = [] post_tax_deductions = []
post_tax_deductions_amt = [] post_tax_deductions_amt = []