From 054cf3907fcbaabc1295435c8a8aecd0dcbc6001 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 31 Jul 2012 11:46:41 +0530 Subject: [PATCH] removed validate approver code --- erpnext/hr/doctype/expense_claim/expense_claim.js | 13 +------------ erpnext/hr/doctype/expense_claim/expense_claim.py | 12 +----------- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.js b/erpnext/hr/doctype/expense_claim/expense_claim.js index b30a4016c4..1c5cccdd1e 100644 --- a/erpnext/hr/doctype/expense_claim/expense_claim.js +++ b/erpnext/hr/doctype/expense_claim/expense_claim.js @@ -67,17 +67,6 @@ cur_frm.cscript.calculate_total = function(doc,cdt,cdn){ } 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); @@ -251,4 +240,4 @@ cur_frm.cscript.on_submit = function(doc, cdt, cdn) { send_to: doc.exp_approver } cur_frm.cscript.notify(doc, args); -} +} \ No newline at end of file diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.py b/erpnext/hr/doctype/expense_claim/expense_claim.py index 7701e72e9b..5f31ffb8d1 100644 --- a/erpnext/hr/doctype/expense_claim/expense_claim.py +++ b/erpnext/hr/doctype/expense_claim/expense_claim.py @@ -140,17 +140,7 @@ class DocType: 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')