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

Show only users with Expense Approver role in Expense Claim Approver field

Browse Source
This commit is contained in:
Nabin Hait 2015-06-15 17:59:37 +05:30
parent 7c5ba957ac
commit 5d0ce7939f
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/hr/doctype/expense_claim/expense_claim.js
View File

@ -63,7 +63,7 @@ cur_frm.cscript.onload = function(doc,cdt,cdn) {
cur_frm.set_query("exp_approver", function() { cur_frm.set_query("exp_approver", function() {
return { return {
filters: [["UserRole", "role", "=", "Expense Approver"]] query: "erpnext.hr.doctype.expense_claim.expense_claim.get_expense_approver"
}; };
}); });
} }

11
erpnext/hr/doctype/expense_claim/expense_claim.py
View File

@ -58,4 +58,13 @@ class ExpenseClaim(Document):
def validate_sanctioned_amount(self): def validate_sanctioned_amount(self):
for d in self.get('expenses'): for d in self.get('expenses'):
if flt(d.sanctioned_amount) > flt(d.claim_amount): if flt(d.sanctioned_amount) > flt(d.claim_amount):
frappe.throw(_("Sanctioned Amount cannot be greater than Claim Amount in Row {0}.").format(d.idx)) frappe.throw(_("Sanctioned Amount cannot be greater than Claim Amount in Row {0}.").format(d.idx))
@frappe.whitelist()
def get_expense_approver(doctype, txt, searchfield, start, page_len, filters):
return frappe.db.sql("""
select u.name, concat(u.first_name, ' ', u.last_name)
from tabUser u, tabUserRole r
where u.name = r.parent and r.role = 'Expense Approver' and u.name like %s
""", ("%" + txt + "%"))