From 70b7d3280b5032a2f77d06b64d7d20ee6ba1fb84 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Mon, 26 Sep 2016 18:20:14 +0530 Subject: [PATCH] added required fields in doctypes for gantt (#6466) --- .../holiday_list/holiday_list_calendar.js | 4 +- .../leave_application_list.js | 2 +- .../production_order/production_order_list.js | 2 +- erpnext/projects/doctype/task/task.json | 58 ++++++++++++++++++- erpnext/projects/doctype/task/task_list.js | 2 +- .../doctype/timesheet/timesheet_calendar.js | 8 +-- .../doctype/timesheet/timesheet_list.js | 2 +- 7 files changed, 67 insertions(+), 11 deletions(-) diff --git a/erpnext/hr/doctype/holiday_list/holiday_list_calendar.js b/erpnext/hr/doctype/holiday_list/holiday_list_calendar.js index 3cc8dd5036f..507d070444b 100644 --- a/erpnext/hr/doctype/holiday_list/holiday_list_calendar.js +++ b/erpnext/hr/doctype/holiday_list/holiday_list_calendar.js @@ -3,8 +3,8 @@ frappe.views.calendar["Holiday List"] = { field_map: { - "start": "holiday_date", - "end": "holiday_date", + "start": "from_date", + "end": "to_date", "id": "name", "title": "description", "allDay": "allDay" diff --git a/erpnext/hr/doctype/leave_application/leave_application_list.js b/erpnext/hr/doctype/leave_application/leave_application_list.js index f82dfb2f284..966d1aa2b6f 100644 --- a/erpnext/hr/doctype/leave_application/leave_application_list.js +++ b/erpnext/hr/doctype/leave_application/leave_application_list.js @@ -1,5 +1,5 @@ frappe.listview_settings['Leave Application'] = { - add_fields: ["status", "leave_type", "employee", "employee_name", "total_leave_days", "from_date"], + add_fields: ["status", "leave_type", "employee", "employee_name", "total_leave_days", "from_date", "to_date"], filters:[["status","!=", "Rejected"]], get_indicator: function(doc) { return [__(doc.status), frappe.utils.guess_colour(doc.status), diff --git a/erpnext/manufacturing/doctype/production_order/production_order_list.js b/erpnext/manufacturing/doctype/production_order/production_order_list.js index cce56cfe353..762beb0e7c1 100644 --- a/erpnext/manufacturing/doctype/production_order/production_order_list.js +++ b/erpnext/manufacturing/doctype/production_order/production_order_list.js @@ -1,6 +1,6 @@ frappe.listview_settings['Production Order'] = { add_fields: ["bom_no", "status", "sales_order", "qty", - "produced_qty", "expected_delivery_date"], + "produced_qty", "expected_delivery_date", "planned_start_date", "planned_end_date"], filters: [["status", "!=", "Stopped"]], get_indicator: function(doc) { if(doc.status==="Submitted") { diff --git a/erpnext/projects/doctype/task/task.json b/erpnext/projects/doctype/task/task.json index 94ec8a13151..499bd8a97c2 100644 --- a/erpnext/projects/doctype/task/task.json +++ b/erpnext/projects/doctype/task/task.json @@ -9,11 +9,13 @@ "docstatus": 0, "doctype": "DocType", "document_type": "Setup", + "editable_grid": 0, "fields": [ { "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "subject", "fieldtype": "Data", "hidden": 0, @@ -40,6 +42,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 0, "fieldname": "project", "fieldtype": "Link", "hidden": 0, @@ -67,6 +70,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break0", "fieldtype": "Column Break", "hidden": 0, @@ -93,6 +97,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 0, "fieldname": "status", "fieldtype": "Select", "hidden": 0, @@ -120,6 +125,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "priority", "fieldtype": "Select", "hidden": 0, @@ -147,6 +153,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_10", "fieldtype": "Section Break", "hidden": 0, @@ -171,6 +178,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "exp_start_date", "fieldtype": "Date", "hidden": 0, @@ -197,6 +205,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "0", "description": "", "fieldname": "expected_time", @@ -225,6 +234,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_11", "fieldtype": "Column Break", "hidden": 0, @@ -249,6 +259,7 @@ "allow_on_submit": 0, "bold": 1, "collapsible": 0, + "columns": 0, "fieldname": "exp_end_date", "fieldtype": "Date", "hidden": 0, @@ -275,6 +286,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break0", "fieldtype": "Section Break", "hidden": 0, @@ -300,6 +312,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "description", "fieldtype": "Text Editor", "hidden": 0, @@ -328,6 +341,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break", "fieldtype": "Section Break", "hidden": 0, @@ -353,6 +367,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "depends_on", "fieldtype": "Table", "hidden": 0, @@ -379,6 +394,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "description": "", "fieldname": "actual", "fieldtype": "Section Break", @@ -407,6 +423,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "act_start_date", "fieldtype": "Date", "hidden": 0, @@ -433,6 +450,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "default": "", "description": "", "fieldname": "actual_time", @@ -461,6 +479,33 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, + "fieldname": "progress", + "fieldtype": "Percent", + "hidden": 0, + "ignore_user_permissions": 0, + "ignore_xss_filter": 0, + "in_filter": 0, + "in_list_view": 0, + "label": "Progress", + "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 + }, + { + "allow_on_submit": 0, + "bold": 0, + "collapsible": 0, + "columns": 0, "fieldname": "column_break_15", "fieldtype": "Column Break", "hidden": 0, @@ -485,6 +530,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "act_end_date", "fieldtype": "Date", "hidden": 0, @@ -511,6 +557,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "section_break_17", "fieldtype": "Section Break", "hidden": 0, @@ -535,6 +582,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "total_costing_amount", "fieldtype": "Currency", "hidden": 0, @@ -562,6 +610,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "total_expense_claim", "fieldtype": "Currency", "hidden": 0, @@ -588,6 +637,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_20", "fieldtype": "Column Break", "hidden": 0, @@ -612,6 +662,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "total_billing_amount", "fieldtype": "Currency", "hidden": 0, @@ -637,6 +688,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "more_details", "fieldtype": "Section Break", "hidden": 0, @@ -661,6 +713,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.status == \"Closed\" || doc.status == \"Pending Review\"", "fieldname": "review_date", "fieldtype": "Date", @@ -688,6 +741,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "depends_on": "eval:doc.status == \"Closed\"", "fieldname": "closing_date", "fieldtype": "Date", @@ -715,6 +769,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "column_break_22", "fieldtype": "Column Break", "hidden": 0, @@ -738,6 +793,7 @@ "allow_on_submit": 0, "bold": 0, "collapsible": 0, + "columns": 0, "fieldname": "company", "fieldtype": "Link", "hidden": 0, @@ -772,7 +828,7 @@ "istable": 0, "max_attachments": 5, "menu_index": 0, - "modified": "2016-06-20 17:31:00.798534", + "modified": "2016-09-22 18:16:50.339542", "modified_by": "Administrator", "module": "Projects", "name": "Task", diff --git a/erpnext/projects/doctype/task/task_list.js b/erpnext/projects/doctype/task/task_list.js index d24e1aceba2..d9e8f55ef01 100644 --- a/erpnext/projects/doctype/task/task_list.js +++ b/erpnext/projects/doctype/task/task_list.js @@ -1,5 +1,5 @@ frappe.listview_settings['Task'] = { - add_fields: ["project", "status", "priority", "exp_start_date", "exp_end_date", "subject"], + add_fields: ["project", "status", "priority", "exp_start_date", "exp_end_date", "subject", "progress"], filters: [["status", "=", "Open"]], onload: function(listview) { var method = "erpnext.projects.doctype.task.task.set_multiple_status"; diff --git a/erpnext/projects/doctype/timesheet/timesheet_calendar.js b/erpnext/projects/doctype/timesheet/timesheet_calendar.js index a41ba38a7be..ad81de65cde 100644 --- a/erpnext/projects/doctype/timesheet/timesheet_calendar.js +++ b/erpnext/projects/doctype/timesheet/timesheet_calendar.js @@ -1,10 +1,10 @@ frappe.views.calendar["Timesheet"] = { field_map: { - "start": "from_time", - "end": "to_time", + "start": "start_date", + "end": "end_date", "name": "parent", - "id": "parent", - "title": "activity_type", + "id": "name", + "title": "name", "allDay": "allDay", "child_name": "name" }, diff --git a/erpnext/projects/doctype/timesheet/timesheet_list.js b/erpnext/projects/doctype/timesheet/timesheet_list.js index c538fa10e8f..1b200f855db 100644 --- a/erpnext/projects/doctype/timesheet/timesheet_list.js +++ b/erpnext/projects/doctype/timesheet/timesheet_list.js @@ -1,5 +1,5 @@ frappe.listview_settings['Timesheet'] = { - add_fields: ["status", "total_hours"], + add_fields: ["status", "total_hours", "start_date", "end_date"], get_indicator: function(doc) { if (doc.status== "Billed") { return [__("Billed"), "green", "status,=," + "Billed"]