nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-18 19:07:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4742 from nabinhait/multifixes1

Browse Source 
Multi fixes
This commit is contained in:
Rushabh Mehta
2016-02-08 10:55:48 +05:30
parent 2b8472fe54 4129ae5395
commit 57fb74f262
5 changed files with 56 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,11 +95,11 @@ cur_frm.cscript.refresh = function(doc,cdt,cdn){
if(doc.docstatus==0 && doc.exp_approver==user && doc.approval_status=="Approved")
cur_frm.savesubmit();
if(doc.docstatus==1 && frappe.model.can_create("Journal Entry") &&
if(doc.docstatus==1 && frappe.model.can_create("Journal Entry") && doc.approval_status=="Approved" &&
cint(doc.total_amount_reimbursed) < cint(doc.total_sanctioned_amount))
cur_frm.add_custom_button(__("Bank Entry"),
cur_frm.cscript.make_bank_entry, __("Make"));
cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
cur_frm.add_custom_button(__("Bank Entry"),
cur_frm.cscript.make_bank_entry, __("Make"));
cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
}
}