Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #24304 from deepeshgarg007/ytd_mtd_cal_fix

Browse Source 
fix: Do not consider current salary slip in sum
This commit is contained in:
Deepesh Garg 2021-01-05 17:43:18 +05:30 committed by GitHub
commit 357c370fe2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/payroll/doctype/salary_slip/salary_slip.py
View File

@ -1145,7 +1145,9 @@ class SalarySlip(TransactionBase):
fields = ['sum(net_pay) as sum'],
filters = {'employee_name' : self.employee_name,
'start_date' : ['>=', period_start_date],
'end_date' : ['<', period_end_date]})
'end_date' : ['<', period_end_date],
'name': ['!=', self.name]
})
year_to_date = flt(salary_slip_sum[0].sum) if salary_slip_sum else 0.0
@ -1160,7 +1162,8 @@ class SalarySlip(TransactionBase):
fields = ['sum(net_pay) as sum'],
filters = {'employee_name' : self.employee_name,
'start_date' : ['>=', first_day_of_the_month],
'end_date' : ['<', self.start_date]
'end_date' : ['<', self.start_date],
'name': ['!=', self.name]
})
month_to_date = flt(salary_slip_sum[0].sum) if salary_slip_sum else 0.0