nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 07:29:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Compute month_to_date

Browse Source
This commit is contained in:
Ganga Manoj
2020-12-18 23:52:11 +05:30
parent 1b1df6b6bc
commit 59fbf702da
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,6 +50,7 @@ class SalarySlip(TransactionBase):
self.calculate_net_pay() self.calculate_net_pay()
self.compute_year_to_date() self.compute_year_to_date()
self.compute_month_to_date()
if frappe.db.get_single_value("Payroll Settings", "max_working_hours_against_timesheet"): if frappe.db.get_single_value("Payroll Settings", "max_working_hours_against_timesheet"):
max_working_hours = frappe.db.get_single_value("Payroll Settings", "max_working_hours_against_timesheet") max_working_hours = frappe.db.get_single_value("Payroll Settings", "max_working_hours_against_timesheet")
@@ -1138,8 +1139,7 @@ class SalarySlip(TransactionBase):
fields = ['employee_name', 'start_date', 'end_date', 'net_pay'], fields = ['employee_name', 'start_date', 'end_date', 'net_pay'],
filters = {'employee_name' : self.employee_name, filters = {'employee_name' : self.employee_name,
'start_date' : ['>=', payroll_period.start_date], 'start_date' : ['>=', payroll_period.start_date],
'end_date' : ['<=', payroll_period.end_date], 'end_date' : ['<', self.start_date]
'name' : ['!=', self.name]
}) })
for salary_slip in salary_slips_from_current_payroll_period: for salary_slip in salary_slips_from_current_payroll_period:
@@ -1148,6 +1148,22 @@ class SalarySlip(TransactionBase):
year_to_date += self.net_pay year_to_date += self.net_pay
self.year_to_date = year_to_date self.year_to_date = year_to_date
def compute_month_to_date(self):
month_to_date = 0
date = datetime.datetime.strptime(self.start_date,"%Y-%m-%d")
first_day_of_the_month = "1-" + str(date.month) + "-" + str(date.year)
salary_slips_from_this_month = frappe.get_list('Salary Slip',
fields = ['employee_name', 'start_date', 'net_pay'],
filters = {'employee_name' : self.employee_name,
'start_date' : ['>=', first_day_of_the_month],
'end_date' : ['<', self.start_date]
})
for salary_slip in salary_slips_from_this_month:
month_to_date += salary_slip.net_pay
month_to_date += self.net_pay
self.month_to_date = month_to_date
def unlink_ref_doc_from_salary_slip(ref_no): def unlink_ref_doc_from_salary_slip(ref_no):
linked_ss = frappe.db.sql_list("""select name from `tabSalary Slip` linked_ss = frappe.db.sql_list("""select name from `tabSalary Slip`
where journal_entry=%s and docstatus < 2""", (ref_no)) where journal_entry=%s and docstatus < 2""", (ref_no))