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

fix: unsaved merge conflict

Browse Source
This commit is contained in:
Sagar Vora 2019-01-29 17:52:47 +05:30
parent f3cfad7595
commit 51a27b3524
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/hr/doctype/payroll_entry/payroll_entry.py
View File

@ -482,7 +482,6 @@ def payroll_entry_has_bank_entries(name):
return response return response
<<<<<<< HEAD
def create_salary_slips_for_employees(employees, args, publish_progress=True): def create_salary_slips_for_employees(employees, args, publish_progress=True):
salary_slips_exists_for = get_existing_salary_slips(employees, args) salary_slips_exists_for = get_existing_salary_slips(employees, args)
count=0 count=0
@ -548,7 +547,6 @@ def submit_salary_slips_for_employees(payroll_entry, salary_slips, publish_progr
if not_submitted_ss: if not_submitted_ss:
frappe.msgprint(_("Could not submit some Salary Slips")) frappe.msgprint(_("Could not submit some Salary Slips"))
=======
def get_payroll_entries_for_jv(doctype, txt, searchfield, start, page_len, filters): def get_payroll_entries_for_jv(doctype, txt, searchfield, start, page_len, filters):
return frappe.db.sql(""" return frappe.db.sql("""
select name from `tabPayroll Entry` select name from `tabPayroll Entry`
@ -561,4 +559,3 @@ def get_payroll_entries_for_jv(doctype, txt, searchfield, start, page_len, filte
'txt': "%%%s%%" % frappe.db.escape(txt), 'txt': "%%%s%%" % frappe.db.escape(txt),
'start': start, 'page_len': page_len 'start': start, 'page_len': page_len
}) })
>>>>>>> master