Merge branch 'develop' into remove-nonprofit
This commit is contained in:
@@ -67,7 +67,6 @@ calendars = ["Task", "Work Order", "Leave Application", "Sales Order", "Holiday
|
||||
domains = {
|
||||
'Distribution': 'erpnext.domains.distribution',
|
||||
'Education': 'erpnext.domains.education',
|
||||
'Hospitality': 'erpnext.domains.hospitality',
|
||||
'Manufacturing': 'erpnext.domains.manufacturing',
|
||||
'Retail': 'erpnext.domains.retail',
|
||||
'Services': 'erpnext.domains.services',
|
||||
@@ -563,13 +562,6 @@ global_search_doctypes = {
|
||||
{'doctype': 'Assessment Code', 'index': 39},
|
||||
{'doctype': 'Discussion', 'index': 40},
|
||||
],
|
||||
"Hospitality": [
|
||||
{'doctype': 'Hotel Room', 'index': 0},
|
||||
{'doctype': 'Hotel Room Reservation', 'index': 1},
|
||||
{'doctype': 'Hotel Room Pricing', 'index': 2},
|
||||
{'doctype': 'Hotel Room Package', 'index': 3},
|
||||
{'doctype': 'Hotel Room Type', 'index': 4}
|
||||
]
|
||||
}
|
||||
|
||||
additional_timeline_content = {
|
||||
|
||||
Reference in New Issue
Block a user