From 535f3b097517ddf6565c7933768b35e3667e380e Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Wed, 1 Jun 2016 12:52:50 +0530
Subject: [PATCH] [minor] make task editable in project and add description to
 designation fixing #5361

---
 erpnext/hr/doctype/designation/designation.js |  8 +++++
 .../hr/doctype/designation/designation.json   | 35 +++++++++++++++++--
 erpnext/projects/doctype/project/project.js   |  9 +++++
 3 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 erpnext/hr/doctype/designation/designation.js

diff --git a/erpnext/hr/doctype/designation/designation.js b/erpnext/hr/doctype/designation/designation.js
new file mode 100644
index 0000000000..952c73fe3f
--- /dev/null
+++ b/erpnext/hr/doctype/designation/designation.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Designation', {
+	refresh: function(frm) {
+
+	}
+});
diff --git a/erpnext/hr/doctype/designation/designation.json b/erpnext/hr/doctype/designation/designation.json
index 1a1cc32971..73f4446014 100644
--- a/erpnext/hr/doctype/designation/designation.json
+++ b/erpnext/hr/doctype/designation/designation.json
@@ -3,6 +3,7 @@
  "allow_import": 1, 
  "allow_rename": 1, 
  "autoname": "field:designation_name", 
+ "beta": 0, 
  "creation": "2013-01-10 16:34:13", 
  "custom": 0, 
  "docstatus": 0, 
@@ -17,6 +18,7 @@
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
    "in_filter": 0, 
    "in_list_view": 1, 
    "label": "Designation", 
@@ -26,12 +28,38 @@
    "oldfieldtype": "Data", 
    "permlevel": 0, 
    "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
    "search_index": 0, 
    "set_only_once": 0, 
    "unique": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "bold": 0, 
+   "collapsible": 0, 
+   "fieldname": "description", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "ignore_user_permissions": 0, 
+   "ignore_xss_filter": 0, 
+   "in_filter": 0, 
+   "in_list_view": 0, 
+   "label": "Description", 
+   "length": 0, 
+   "no_copy": 0, 
+   "permlevel": 0, 
+   "precision": "", 
+   "print_hide": 0, 
+   "print_hide_if_no_value": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0, 
+   "set_only_once": 0, 
+   "unique": 0
   }
  ], 
  "hide_heading": 0, 
@@ -44,7 +72,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2015-11-16 06:29:45.227540", 
+ "modified": "2016-06-01 12:52:03.787578", 
  "modified_by": "Administrator", 
  "module": "HR", 
  "name": "Designation", 
@@ -71,6 +99,9 @@
    "write": 1
   }
  ], 
+ "quick_entry": 1, 
  "read_only": 0, 
- "read_only_onload": 0
+ "read_only_onload": 0, 
+ "sort_order": "ASC", 
+ "track_seen": 0
 }
\ No newline at end of file
diff --git a/erpnext/projects/doctype/project/project.js b/erpnext/projects/doctype/project/project.js
index 4835287a6a..7b340d21a7 100644
--- a/erpnext/projects/doctype/project/project.js
+++ b/erpnext/projects/doctype/project/project.js
@@ -2,6 +2,15 @@
 // License: GNU General Public License v3. See license.txt
 
 frappe.ui.form.on("Project", {
+	setup: function(frm) {
+		frm.get_field('tasks').grid.editable_fields = [
+			{fieldname: 'title', columns: 4},
+			{fieldname: 'status', columns: 3},
+			{fieldname: 'start_date', columns: 2},
+			{fieldname: 'end_date', columns: 2}
+		];
+
+	},
 	onload: function(frm) {
 		var so = frappe.meta.get_docfield("Project", "sales_order");
 		so.get_route_options_for_new_doc = function(field) {