nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: do not consider current salary slip in sum

Browse Source
This commit is contained in:
Deepesh Garg
2021-01-05 17:34:16 +05:30
parent a56a5ccefa
commit b01b108dfa
1 changed files with 5 additions and 2 deletions
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'], fields = ['sum(net_pay) as sum'],
filters = {'employee_name' : self.employee_name, filters = {'employee_name' : self.employee_name,
'start_date' : ['>=', period_start_date], '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 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'], fields = ['sum(net_pay) as sum'],
filters = {'employee_name' : self.employee_name, filters = {'employee_name' : self.employee_name,
'start_date' : ['>=', first_day_of_the_month], '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 month_to_date = flt(salary_slip_sum[0].sum) if salary_slip_sum else 0.0