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

fix: Improve month_to_date computation

Browse Source
This commit is contained in:
Ganga Manoj 2020-12-21 23:52:05 +05:30
parent c36cab81f2
commit 090783804b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ from __future__ import unicode_literals
import frappe, erpnext import frappe, erpnext
import datetime, math import datetime, math
from frappe.utils import add_days, cint, cstr, flt, getdate, rounded, date_diff, money_in_words, formatdate from frappe.utils import add_days, cint, cstr, flt, getdate, rounded, date_diff, money_in_words, formatdate, get_first_day
from frappe.model.naming import make_autoname from frappe.model.naming import make_autoname
from frappe import msgprint, _ from frappe import msgprint, _
@ -1150,8 +1150,7 @@ class SalarySlip(TransactionBase):
def compute_month_to_date(self): def compute_month_to_date(self):
month_to_date = 0 month_to_date = 0
date = datetime.datetime.strptime(self.start_date,"%Y-%m-%d") first_day_of_the_month = get_first_day(self.start_date)
first_day_of_the_month = "1-" + str(date.month) + "-" + str(date.year)
salary_slips_from_this_month = frappe.get_list('Salary Slip', salary_slips_from_this_month = frappe.get_list('Salary Slip',
fields = ['employee_name', 'start_date', 'net_pay'], fields = ['employee_name', 'start_date', 'net_pay'],
filters = {'employee_name' : self.employee_name, filters = {'employee_name' : self.employee_name,