Merge pull request #3228 from neilLasrado/hr

Minor Fixes for HR

erpnext/hr/doctype/leave_allocation/leave_allocation.json

@@ -47,6 +47,22 @@
    "reqd": 1, 
    "search_index": 1
   }, 
+  {
+   "fieldname": "description", 
+   "fieldtype": "Small Text", 
+   "hidden": 0, 
+   "label": "Description", 
+   "oldfieldname": "reason", 
+   "oldfieldtype": "Small Text", 
+   "permlevel": 0, 
+   "width": "300px"
+  }, 
+  {
+   "fieldname": "column_break1", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0, 
+   "width": "50%"
+  }, 
   {
    "default": "Today", 
    "fieldname": "posting_date", 
@@ -74,22 +90,6 @@
    "reqd": 1, 
    "search_index": 1
   }, 
-  {
-   "fieldname": "description", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "label": "Description", 
-   "oldfieldname": "reason", 
-   "oldfieldtype": "Small Text", 
-   "permlevel": 0, 
-   "width": "300px"
-  }, 
-  {
-   "fieldname": "column_break1", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
-   "width": "50%"
-  }, 
   {
    "fieldname": "carry_forward", 
    "fieldtype": "Check", 
@@ -138,7 +138,7 @@
  "icon": "icon-ok", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2015-04-06 06:03:27.883985", 
+ "modified": "2015-05-08 03:44:08.092937", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Allocation", 

erpnext/hr/doctype/leave_type/leave_type.json

@@ -51,7 +51,7 @@
   {
    "fieldname": "is_lwp", 
    "fieldtype": "Check", 
-   "label": "Is LWP", 
+   "label": "Is Leave Without Pay", 
    "permlevel": 0
   }, 
   {
@@ -63,7 +63,7 @@
  ], 
  "icon": "icon-flag", 
  "idx": 1, 
- "modified": "2015-02-05 05:11:40.849495", 
+ "modified": "2015-05-08 05:15:24.194053", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Leave Type",