commit bea0671fc0cd4b84f4792427aee26249eea9b59c
author Rushabh Mehta <rmehta@gmail.com> Mon Dec 24 12:52:51 2012 +0530
committer Rushabh Mehta <rmehta@gmail.com> Mon Dec 24 12:52:51 2012 +0530
tree d51d93f35298b360640e397132777c945698090d
parent bda54e58bf1cf6f2144c0004124d0fba498960e8
parent 00db8639940b46629c9400401f822f1d3b7d70d3

Merge branch 'master' of github.com:webnotes/erpnext

hr/doctype/attendance/attendance.txt

diff --git a/hr/doctype/attendance/attendance.txt b/hr/doctype/attendance/attendance.txt
index 2ef65ac..bd8b2a3 100644
--- a/hr/doctype/attendance/attendance.txt
+++ b/hr/doctype/attendance/attendance.txt
@@ -2,9 +2,9 @@
  {
   "owner": "ashwini@webnotestech.com", 
   "docstatus": 0, 
-  "creation": "2012-07-03 13:30:41", 
+  "creation": "2012-12-14 14:27:05", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-13 14:23:24"
+  "modified": "2012-12-23 09:42:45"
  }, 
  {
   "is_submittable": 1, 
@@ -134,7 +134,7 @@
   "doctype": "DocField", 
   "label": "Fiscal Year", 
   "oldfieldname": "fiscal_year", 
-  "options": "\n2012\n2013", 
+  "options": "link:Fiscal Year", 
   "fieldname": "fiscal_year", 
   "fieldtype": "Select", 
   "reqd": 1, 
@@ -146,7 +146,7 @@
   "doctype": "DocField", 
   "label": "Company", 
   "oldfieldname": "company", 
-  "options": "\nAlpha\nBeta\nDemo Company", 
+  "options": "link:Company", 
   "fieldname": "company", 
   "fieldtype": "Select", 
   "reqd": 1, 
@@ -175,15 +175,15 @@
   "permlevel": 1
  }, 
  {
+  "role": "System Manager", 
+  "doctype": "DocPerm"
+ }, 
+ {
   "role": "HR User", 
   "doctype": "DocPerm"
  }, 
  {
   "role": "HR Manager", 
   "doctype": "DocPerm"
- }, 
- {
-  "role": "System Manager", 
-  "doctype": "DocPerm"
  }
 ]
\ No newline at end of file