diff --git a/erpnext/setup/setup_wizard/domainify.py b/erpnext/setup/setup_wizard/domainify.py index 67d77a85df..05af9a6f7f 100644 --- a/erpnext/setup/setup_wizard/domainify.py +++ b/erpnext/setup/setup_wizard/domainify.py @@ -63,7 +63,8 @@ def get_domain(domain): 'Education': { 'desktop_icons': ['Student', 'Program', 'Course', 'Student Group', 'Instructor', 'Fees', 'ToDo', 'Schools'], - 'allow_roles': ['Academics User', 'Accounts User', 'Accounts Manager', 'Website Manager'], + 'allow_roles': ['Academics User', 'Accounts User', 'Accounts Manager', 'Item Manager', + 'Website Manager', 'HR User', 'HR Manager', 'Purchase User', 'Purchase Manager'], 'allow_sidebar_items': ['/announcement', '/course', '/assessment', '/fees'] }, } diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py index b1f142386c..0be2baee0c 100644 --- a/erpnext/stock/doctype/material_request/material_request.py +++ b/erpnext/stock/doctype/material_request/material_request.py @@ -15,9 +15,9 @@ from erpnext.controllers.buying_controller import BuyingController from erpnext.manufacturing.doctype.production_order.production_order import get_item_details -# form_grid_templates = { -# "items": "templates/form_grid/material_request_grid.html" -# } +form_grid_templates = { + "items": "templates/form_grid/material_request_grid.html" +} class MaterialRequest(BuyingController): def get_feed(self): diff --git a/erpnext/templates/form_grid/material_request_grid.html b/erpnext/templates/form_grid/material_request_grid.html new file mode 100644 index 0000000000..866c06e586 --- /dev/null +++ b/erpnext/templates/form_grid/material_request_grid.html @@ -0,0 +1,49 @@ +{% var visible_columns = row.get_visible_columns(["item_code", "warehouse", + "item_name", "amount", "stock_uom", "uom", "qty", "schedule_date"]); %} + +{% if(!doc) { %} +