From 14dcb47dc26e0f29644acf96ba098a586310dcce Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@iwebnotes.com>
Date: Thu, 6 Dec 2012 17:34:57 +0530
Subject: [PATCH] fix in expense claim

---
 hr/doctype/expense_claim/expense_claim.js  |  6 ++----
 hr/doctype/expense_claim/expense_claim.txt | 10 +++++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/hr/doctype/expense_claim/expense_claim.js b/hr/doctype/expense_claim/expense_claim.js
index 8ba097821f1..28487a801e4 100644
--- a/hr/doctype/expense_claim/expense_claim.js
+++ b/hr/doctype/expense_claim/expense_claim.js
@@ -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);
diff --git a/hr/doctype/expense_claim/expense_claim.txt b/hr/doctype/expense_claim/expense_claim.txt
index f42e2dd5715..638a9f75712 100644
--- a/hr/doctype/expense_claim/expense_claim.txt
+++ b/hr/doctype/expense_claim/expense_claim.txt
@@ -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
  }, 
  {