renamed color field
diff --git a/erpnext/education/api.py b/erpnext/education/api.py
index ef1cc46..8571bf9 100644
--- a/erpnext/education/api.py
+++ b/erpnext/education/api.py
@@ -189,7 +189,7 @@
from frappe.desk.calendar import get_event_conditions
conditions = get_event_conditions("Course Schedule", filters)
- data = frappe.db.sql("""select name, course, _color,
+ data = frappe.db.sql("""select name, course, color,
timestamp(schedule_date, from_time) as from_datetime,
timestamp(schedule_date, to_time) as to_datetime,
room, student_group, 0 as 'allDay'
diff --git a/erpnext/education/doctype/course_schedule/course_schedule.json b/erpnext/education/doctype/course_schedule/course_schedule.json
index 8212871..9b7d897 100644
--- a/erpnext/education/doctype/course_schedule/course_schedule.json
+++ b/erpnext/education/doctype/course_schedule/course_schedule.json
@@ -210,7 +210,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "_color",
+ "fieldname": "color",
"fieldtype": "Color",
"hidden": 0,
"ignore_user_permissions": 0,
@@ -464,7 +464,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2018-04-29 12:02:31.960104",
+ "modified": "2018-04-30 12:49:51.094872",
"modified_by": "Administrator",
"module": "Education",
"name": "Course Schedule",
diff --git a/erpnext/education/doctype/course_schedule/course_schedule_calendar.js b/erpnext/education/doctype/course_schedule/course_schedule_calendar.js
index 09c441d..803527e 100644
--- a/erpnext/education/doctype/course_schedule/course_schedule_calendar.js
+++ b/erpnext/education/doctype/course_schedule/course_schedule_calendar.js
@@ -5,8 +5,7 @@
"end": "to_datetime",
"id": "name",
"title": "course",
- "allDay": "allDay",
- "color": "_color"
+ "allDay": "allDay"
},
gantt: false,
order_by: "schedule_date",
diff --git a/erpnext/hr/doctype/holiday_list/holiday_list.json b/erpnext/hr/doctype/holiday_list/holiday_list.json
index 314a0ea..f417cb2 100644
--- a/erpnext/hr/doctype/holiday_list/holiday_list.json
+++ b/erpnext/hr/doctype/holiday_list/holiday_list.json
@@ -269,7 +269,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "_color",
+ "fieldname": "color",
"fieldtype": "Color",
"hidden": 0,
"ignore_user_permissions": 0,
@@ -306,7 +306,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2018-04-27 17:16:37.720416",
+ "modified": "2018-04-30 12:49:59.239227",
"modified_by": "Administrator",
"module": "HR",
"name": "Holiday List",
diff --git a/erpnext/hr/doctype/holiday_list/holiday_list.py b/erpnext/hr/doctype/holiday_list/holiday_list.py
index b668719..26919595 100644
--- a/erpnext/hr/doctype/holiday_list/holiday_list.py
+++ b/erpnext/hr/doctype/holiday_list/holiday_list.py
@@ -79,6 +79,6 @@
if end:
filters.append(['Holiday', 'holiday_date', '<', getdate(end)])
return frappe.get_list('Holiday List',
- fields=['name', '`tabHoliday`.holiday_date', '`tabHoliday`.description', '`tabHoliday List`._color'],
+ fields=['name', '`tabHoliday`.holiday_date', '`tabHoliday`.description', '`tabHoliday List`.color'],
filters = filters,
update={"allDay": 1})
diff --git a/erpnext/hr/doctype/holiday_list/holiday_list_calendar.js b/erpnext/hr/doctype/holiday_list/holiday_list_calendar.js
index 7ac0b6b..8f4dc28 100644
--- a/erpnext/hr/doctype/holiday_list/holiday_list_calendar.js
+++ b/erpnext/hr/doctype/holiday_list/holiday_list_calendar.js
@@ -8,7 +8,7 @@
"id": "name",
"title": "description",
"allDay": "allDay",
- "color": "_color"
+ "color": "color"
},
get_events_method: "erpnext.hr.doctype.holiday_list.holiday_list.get_events",
filters: [
diff --git a/erpnext/hr/doctype/leave_application/leave_application.json b/erpnext/hr/doctype/leave_application/leave_application.json
index 24f2dc6..290120b 100644
--- a/erpnext/hr/doctype/leave_application/leave_application.json
+++ b/erpnext/hr/doctype/leave_application/leave_application.json
@@ -695,7 +695,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "_color",
+ "fieldname": "color",
"fieldtype": "Color",
"hidden": 0,
"ignore_user_permissions": 0,
@@ -854,7 +854,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 3,
- "modified": "2018-04-27 17:37:43.021792",
+ "modified": "2018-04-30 12:49:40.845022",
"modified_by": "Administrator",
"module": "HR",
"name": "Leave Application",
diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py
index eca858b..6ad8b7e 100755
--- a/erpnext/hr/doctype/leave_application/leave_application.py
+++ b/erpnext/hr/doctype/leave_application/leave_application.py
@@ -407,7 +407,7 @@
add_leaves(events, start, end, match_conditions=match_conditions)
def add_leaves(events, start, end, match_conditions=None):
- query = """select name, from_date, to_date, employee_name, _color, half_day,
+ query = """select name, from_date, to_date, employee_name, color, half_day,
employee, docstatus
from `tabLeave Application` where
from_date <= %(end)s and to_date >= %(start)s <= to_date
@@ -421,8 +421,8 @@
"doctype": "Leave Application",
"from_date": d.from_date,
"to_date": d.to_date,
- "docstatus": d.docstatus,
- "color": d._color,
+ "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 3fbf42a..0e0d864 100644
--- a/erpnext/hr/doctype/leave_application/leave_application_calendar.js
+++ b/erpnext/hr/doctype/leave_application/leave_application_calendar.js
@@ -7,8 +7,7 @@
"end": "to_date",
"id": "name",
"title": "title",
- "docstatus": 1,
- "color": "_color"
+ "docstatus": 1
},
options: {
header: {
@@ -16,6 +15,6 @@
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/projects/doctype/task/task.json b/erpnext/projects/doctype/task/task.json
index fd80d5e..ee93bcc 100644
--- a/erpnext/projects/doctype/task/task.json
+++ b/erpnext/projects/doctype/task/task.json
@@ -503,7 +503,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "_color",
+ "fieldname": "color",
"fieldtype": "Color",
"hidden": 0,
"ignore_user_permissions": 0,
@@ -1283,7 +1283,7 @@
"istable": 0,
"max_attachments": 5,
"menu_index": 0,
- "modified": "2018-04-27 16:31:41.490545",
+ "modified": "2018-04-30 12:48:52.743838",
"modified_by": "Administrator",
"module": "Projects",
"name": "Task",
diff --git a/erpnext/projects/doctype/task/task_calendar.js b/erpnext/projects/doctype/task/task_calendar.js
index a216723..49dbb76 100644
--- a/erpnext/projects/doctype/task/task_calendar.js
+++ b/erpnext/projects/doctype/task/task_calendar.js
@@ -8,8 +8,7 @@
"id": "name",
"title": "subject",
"allDay": "allDay",
- "progress": "progress",
- "color": "_color"
+ "progress": "progress"
},
gantt: true,
filters: [