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

fix in expense claim

Browse Source
This commit is contained in:
Anand Doshi 2012-12-06 17:34:57 +05:30
parent 787374b79e
commit 14dcb47dc2
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hr/doctype/expense_claim/expense_claim.js
View File

@ -54,10 +54,8 @@ cur_frm.cscript.refresh = function(doc,cdt,cdn){
} else {
if(doc.approval_status=="Draft") {
if(user==doc.exp_approver) {
if(doc.approval_status=="Draft") {
cur_frm.set_intro("You are the Expense Approver for this record. Please Update the 'Status' and Save");
cur_frm.toggle_enable("approval_status", true);
}
cur_frm.set_intro("You are the Expense Approver for this record. Please Update the 'Status' and Save");
cur_frm.toggle_enable("approval_status", true);
} else {
cur_frm.set_intro("Expense Claim is pending approval. Only the Expense Approver can update status.");
cur_frm.toggle_enable("approval_status", false);

10
hr/doctype/expense_claim/expense_claim.txt
View File

@ -2,9 +2,9 @@
{
"owner": "harshada@webnotestech.com",
"docstatus": 0,
"creation": "2012-12-05 14:11:53",
"creation": "2012-12-05 16:53:59",
"modified_by": "Administrator",
"modified": "2012-12-05 14:22:27"
"modified": "2012-12-06 17:34:37"
},
{
"is_submittable": 1,
@ -43,7 +43,7 @@
"permlevel": 0
},
{
"permlevel": 1,
"permlevel": 0,
"no_copy": 1,
"oldfieldtype": "Select",
"colour": "White:FFF",
@ -248,8 +248,8 @@
"doctype": "DocPerm",
"submit": 1,
"write": 1,
"cancel": 1,
"role": "Expense Approver",
"cancel": 1,
"permlevel": 0,
"match": "exp_approver:user"
},
@ -259,8 +259,8 @@
"doctype": "DocPerm",
"submit": 1,
"write": 1,
"cancel": 1,
"role": "HR User",
"cancel": 1,
"permlevel": 0
},
{