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

fix: editable employee grid

Browse Source 
fix: editable employee grid
This commit is contained in:
Anurag Mishra 2021-01-07 12:10:57 +05:30 committed by GitHub
commit dbb994238e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
erpnext/payroll/doctype/payroll_entry/payroll_entry.py
View File

@ -21,6 +21,9 @@ class PayrollEntry(Document):
if cint(entries) == len(self.employees): if cint(entries) == len(self.employees):
self.set_onload("submitted_ss", True) self.set_onload("submitted_ss", True)
def validate(self):
self.number_of_employees = len(self.employees)
def on_submit(self): def on_submit(self):
self.create_salary_slips() self.create_salary_slips()
@ -113,7 +116,7 @@ class PayrollEntry(Document):
for d in employees: for d in employees:
self.append('employees', d) self.append('employees', d)
self.number_of_employees = len(employees) self.number_of_employees = len(self.employees)
if self.validate_attendance: if self.validate_attendance:
return self.validate_employee_attendance() return self.validate_employee_attendance()
@ -145,8 +148,8 @@ class PayrollEntry(Document):
""" """
self.check_permission('write') self.check_permission('write')
self.created = 1 self.created = 1
emp_list = [d.employee for d in self.get_emp_list()] employees = [emp.employee for emp in self.employees]
if emp_list: if employees:
args = frappe._dict({ args = frappe._dict({
"salary_slip_based_on_timesheet": self.salary_slip_based_on_timesheet, "salary_slip_based_on_timesheet": self.salary_slip_based_on_timesheet,
"payroll_frequency": self.payroll_frequency, "payroll_frequency": self.payroll_frequency,
@ -160,10 +163,10 @@ class PayrollEntry(Document):
"exchange_rate": self.exchange_rate, "exchange_rate": self.exchange_rate,
"currency": self.currency "currency": self.currency
}) })
if len(emp_list) > 30: if len(employees) > 30:
frappe.enqueue(create_salary_slips_for_employees, timeout=600, employees=emp_list, args=args) frappe.enqueue(create_salary_slips_for_employees, timeout=600, employees=employees, args=args)
else: else:
create_salary_slips_for_employees(emp_list, args, publish_progress=False) create_salary_slips_for_employees(employees, args, publish_progress=False)
# since this method is called via frm.call this doc needs to be updated manually # since this method is called via frm.call this doc needs to be updated manually
self.reload() self.reload()