Merge branch 'master' into edge

This commit is contained in:
Rushabh Mehta 2013-01-10 11:12:35 +05:30
commit 249b0b4942

View File

@ -61,7 +61,8 @@ cur_frm.cscript.refresh = function(doc,cdt,cdn){
} else {
cur_frm.set_intro("Expense Claim is pending approval. Only the Expense Approver can update status.");
cur_frm.toggle_enable("approval_status", false);
if(!doc.__islocal) cur_frm.frm_head.appframe.buttons.Submit.toggle(false);
if(!doc.__islocal && cur_frm.frm_head.appframe.buttons.Submit)
cur_frm.frm_head.appframe.buttons.Submit.toggle(false);
}
} else {
if(doc.approval_status=="Approved") {