Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed color field from sales order and work order

Browse Source
This commit is contained in:
Shreya 2018-04-30 13:58:44 +05:30
parent fd47b92138
commit eb54331d5f
8 changed files with 7 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/hr/doctype/holiday_list/holiday_list_calendar.js
View File

@ -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: [

2
erpnext/hr/doctype/leave_application/leave_application.py
View File

@ -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 ""),

2
erpnext/hr/doctype/leave_application/leave_application_calendar.js
View File

@ -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"
}

33
erpnext/manufacturing/doctype/work_order/work_order.json
View File

@ -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",

1
erpnext/manufacturing/doctype/work_order/work_order_calendar.js
View File

@ -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;

2
erpnext/selling/doctype/sales_order/sales_order.json
View File

@ -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",

2
erpnext/selling/doctype/sales_order/sales_order.py
View File

@ -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`

3
erpnext/selling/doctype/sales_order/sales_order_calendar.js
View File

@ -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: [