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

[Fix] Filters to get employee in Payroll

Browse Source
This commit is contained in:
Kanchan Chauhan 2016-11-16 15:29:01 +05:30
parent 535462fc20
commit 7652b857c8
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/controllers/queries.py
View File

@ -32,12 +32,13 @@ def get_filters_cond(doctype, filters, conditions):
# searches for active employees # searches for active employees
def employee_query(doctype, txt, searchfield, start, page_len, filters): def employee_query(doctype, txt, searchfield, start, page_len, filters):
conditions = []
return frappe.db.sql("""select name, employee_name from `tabEmployee` return frappe.db.sql("""select name, employee_name from `tabEmployee`
where status = 'Active' where status = 'Active'
and docstatus < 2 and docstatus < 2
and ({key} like %(txt)s and ({key} like %(txt)s
or employee_name like %(txt)s) or employee_name like %(txt)s)
{mcond} {fcond} {mcond}
order by order by
if(locate(%(_txt)s, name), locate(%(_txt)s, name), 99999), if(locate(%(_txt)s, name), locate(%(_txt)s, name), 99999),
if(locate(%(_txt)s, employee_name), locate(%(_txt)s, employee_name), 99999), if(locate(%(_txt)s, employee_name), locate(%(_txt)s, employee_name), 99999),
@ -45,6 +46,7 @@ def employee_query(doctype, txt, searchfield, start, page_len, filters):
name, employee_name name, employee_name
limit %(start)s, %(page_len)s""".format(**{ limit %(start)s, %(page_len)s""".format(**{
'key': searchfield, 'key': searchfield,
'fcond': get_filters_cond(doctype, filters, conditions),
'mcond': get_match_cond(doctype) 'mcond': get_match_cond(doctype)
}), { }), {
'txt': "%%%s%%" % txt, 'txt': "%%%s%%" % txt,

6
erpnext/hr/doctype/process_payroll/process_payroll.py
View File

@ -22,7 +22,7 @@ class ProcessPayroll(Document):
sal_struct = frappe.db.sql(""" sal_struct = frappe.db.sql("""
select name from `tabSalary Structure` select name from `tabSalary Structure`
where docstatus != 2 and company = %(company)s and where docstatus != 2 and is_active = 'Yes' and company = %(company)s and
ifnull(salary_slip_based_on_timesheet,0) = %(salary_slip_based_on_timesheet)s""", ifnull(salary_slip_based_on_timesheet,0) = %(salary_slip_based_on_timesheet)s""",
{"company": self.company, "salary_slip_based_on_timesheet":self.salary_slip_based_on_timesheet}) {"company": self.company, "salary_slip_based_on_timesheet":self.salary_slip_based_on_timesheet})
@ -51,8 +51,8 @@ class ProcessPayroll(Document):
def get_joining_releiving_condition(self): def get_joining_releiving_condition(self):
cond = """ cond = """
and ifnull(t1.date_of_joining, '0000-00-00') <= '%(from_date)s' and ifnull(t1.date_of_joining, '0000-00-00') <= '%(to_date)s'
and ifnull(t1.relieving_date, '2199-12-31') >= '%(to_date)s' and ifnull(t1.relieving_date, '2199-12-31') >= '%(from_date)s'
""" % {"from_date": self.from_date, "to_date": self.to_date} """ % {"from_date": self.from_date, "to_date": self.to_date}
return cond return cond

18
erpnext/hr/doctype/salary_structure/salary_structure.js
View File

@ -28,7 +28,15 @@ frappe.ui.form.on('Salary Structure', {
type: "deduction" type: "deduction"
} }
} }
}) });
frm.set_query("employee", "employees", function(doc) {
return {
query: "erpnext.controllers.queries.employee_query",
filters: {
company: doc.company
}
}
});
}, },
refresh: function(frm) { refresh: function(frm) {
@ -182,11 +190,3 @@ frappe.ui.form.on('Salary Detail', {
calculate_totals(frm.doc); calculate_totals(frm.doc);
} }
}) })
frappe.ui.form.on('Salary Structure Employee', {
onload: function(frm) {
frm.set_query("employee","employees", function(doc,cdt,cdn) {
return{ query: "erpnext.controllers.queries.employee_query" }
})
}
});