From eb54331d5f91b200e001774f798ff7fc2e87df49 Mon Sep 17 00:00:00 2001 From: Shreya Date: Mon, 30 Apr 2018 13:58:44 +0530 Subject: [PATCH] removed color field from sales order and work order --- .../holiday_list/holiday_list_calendar.js | 3 +- .../leave_application/leave_application.py | 2 +- .../leave_application_calendar.js | 2 +- .../doctype/work_order/work_order.json | 33 +------------------ .../doctype/work_order/work_order_calendar.js | 1 - .../doctype/sales_order/sales_order.json | 2 +- .../doctype/sales_order/sales_order.py | 2 +- .../sales_order/sales_order_calendar.js | 3 +- 8 files changed, 7 insertions(+), 41 deletions(-) diff --git a/erpnext/hr/doctype/holiday_list/holiday_list_calendar.js b/erpnext/hr/doctype/holiday_list/holiday_list_calendar.js index 8f4dc28441..507d070444 100644 --- a/erpnext/hr/doctype/holiday_list/holiday_list_calendar.js +++ b/erpnext/hr/doctype/holiday_list/holiday_list_calendar.js @@ -7,8 +7,7 @@ frappe.views.calendar["Holiday List"] = { "end": "to_date", "id": "name", "title": "description", - "allDay": "allDay", - "color": "color" + "allDay": "allDay" }, get_events_method: "erpnext.hr.doctype.holiday_list.holiday_list.get_events", filters: [ diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py index 6ad8b7efca..4231cc2424 100755 --- a/erpnext/hr/doctype/leave_application/leave_application.py +++ b/erpnext/hr/doctype/leave_application/leave_application.py @@ -421,7 +421,7 @@ def add_leaves(events, start, end, match_conditions=None): "doctype": "Leave Application", "from_date": d.from_date, "to_date": d.to_date, - "docstatus": d.docstatus, + "docstatus": d.docstatus, "color": d.color, "title": cstr(d.employee_name) + \ (d.half_day and _(" (Half Day)") or ""), diff --git a/erpnext/hr/doctype/leave_application/leave_application_calendar.js b/erpnext/hr/doctype/leave_application/leave_application_calendar.js index 0e0d8645fa..0286f30064 100644 --- a/erpnext/hr/doctype/leave_application/leave_application_calendar.js +++ b/erpnext/hr/doctype/leave_application/leave_application_calendar.js @@ -15,6 +15,6 @@ frappe.views.calendar["Leave Application"] = { center: 'title', right: 'month' } - }, + }, get_events_method: "erpnext.hr.doctype.leave_application.leave_application.get_events" } \ No newline at end of file diff --git a/erpnext/manufacturing/doctype/work_order/work_order.json b/erpnext/manufacturing/doctype/work_order/work_order.json index 6ce53ca02f..1cc2459ab2 100644 --- a/erpnext/manufacturing/doctype/work_order/work_order.json +++ b/erpnext/manufacturing/doctype/work_order/work_order.json @@ -1481,37 +1481,6 @@ "translatable": 0, "unique": 0 }, - { - "allow_bulk_edit": 0, - "allow_on_submit": 1, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "_color", - "fieldtype": "Color", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Color", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 1, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 - }, { "allow_bulk_edit": 0, "allow_on_submit": 0, @@ -1557,7 +1526,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2018-04-27 16:48:31.251817", + "modified": "2018-04-30 12:49:21.211740", "modified_by": "Administrator", "module": "Manufacturing", "name": "Work Order", diff --git a/erpnext/manufacturing/doctype/work_order/work_order_calendar.js b/erpnext/manufacturing/doctype/work_order/work_order_calendar.js index fb444c94e9..c44b1e2700 100644 --- a/erpnext/manufacturing/doctype/work_order/work_order_calendar.js +++ b/erpnext/manufacturing/doctype/work_order/work_order_calendar.js @@ -7,7 +7,6 @@ frappe.views.calendar["Work Order"] = { "end": "planned_end_date", "id": "name", "title": "name", - "color": "_color", "allDay": "allDay", "progress": function(data) { return flt(data.produced_qty) / data.qty * 100; diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index 303ff9a1a3..ea1b573e69 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -3642,7 +3642,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2018-03-10 07:35:33.258624", + "modified": "2018-04-30 12:49:10.225292", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order", diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py index a96e3a55be..4ac29fde15 100755 --- a/erpnext/selling/doctype/sales_order/sales_order.py +++ b/erpnext/selling/doctype/sales_order/sales_order.py @@ -662,7 +662,7 @@ def get_events(start, end, filters=None): data = frappe.db.sql(""" select distinct `tabSales Order`.name, `tabSales Order`.customer_name, `tabSales Order`.status, - `tabSales Order`.delivery_status, `tabSales Order`.billing_status, `tabSales Order`._color, + `tabSales Order`.delivery_status, `tabSales Order`.billing_status, `tabSales Order Item`.delivery_date from `tabSales Order`, `tabSales Order Item` diff --git a/erpnext/selling/doctype/sales_order/sales_order_calendar.js b/erpnext/selling/doctype/sales_order/sales_order_calendar.js index 67c7ba35dc..cb412cfb4a 100644 --- a/erpnext/selling/doctype/sales_order/sales_order_calendar.js +++ b/erpnext/selling/doctype/sales_order/sales_order_calendar.js @@ -7,8 +7,7 @@ frappe.views.calendar["Sales Order"] = { "end": "delivery_date", "id": "name", "title": "customer_name", - "allDay": "allDay", - "color": "_color" + "allDay": "allDay" }, gantt: true, filters: [