Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.js b/erpnext/hr/doctype/expense_claim/expense_claim.js
index 9242a72..206d208 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.js
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.js
@@ -69,17 +69,6 @@
}
doc.total_claimed_amount = flt(total_claim);
refresh_field('total_claimed_amount');
-
- $c_obj(make_doclist(doc.doctype, doc.name),'validate_approver','', function(r,rt){
- if(r.message){
- if(r.message['valid_approver'] == 'No'){
- doc.exp_approver ='';
- }
- get_field(doc.doctype, 'exp_approver' , doc.name).options = '';
- get_field(doc.doctype, 'exp_approver' , doc.name).options = r.message['app_lst'];
- refresh_field('exp_approver');
- }
- });
}
else if(doc.approval_status == 'Submitted'){
var val = getchildren('Expense Claim Detail', doc.name, 'expense_voucher_details', doc.doctype);
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.py b/erpnext/hr/doctype/expense_claim/expense_claim.py
index 881000c..94761a1 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.py
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.py
@@ -127,17 +127,7 @@
if not self.doc.exp_approver:
msgprint("Please select Expense Claim approver")
raise Exception
-
- def validate_approver(self):
- app_lst = self.get_approver_lst()
- if self.doc.exp_approver and self.doc.exp_approver not in app_lst:
- msgprint("Approver "+self.doc.exp_approver+" is not authorized to approve this expense voucher. Please select another approver")
- valid_app = 'No'
- else:
- valid_app = 'Yes'
- ret = {'app_lst':("\n" + "\n".join(app_lst)), 'valid_approver':valid_app}
- return ret
-
+
def on_submit(self):
self.validate_exp_details()
set(self.doc, 'approval_status', 'Submitted')