[minor] bring back old grid style in material request
diff --git a/erpnext/setup/setup_wizard/domainify.py b/erpnext/setup/setup_wizard/domainify.py
index 67d77a8..05af9a6 100644
--- a/erpnext/setup/setup_wizard/domainify.py
+++ b/erpnext/setup/setup_wizard/domainify.py
@@ -63,7 +63,8 @@
'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 b1f1423..0be2bae 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.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 0000000..866c06e
--- /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) { %}
+ <div class="row">
+ <div class="col-sm-4">{%= __("Item") %}</div>
+ <div class="col-sm-3">{%= __("Required On") %}</div>
+ <div class="col-sm-3">{%= __("Warehouse") %}</div>
+ <div class="col-sm-2 text-right">{%= __("Qty") %}</div>
+ </div>
+{% } else { %}
+ <div class="row">
+ <div class="col-sm-4">
+ <span class="indicator {%= (doc.qty<=doc.ordered_qty) ? "green" : "orange" %}">{%= doc.item_code %}</strong>
+ {% if(doc.item_name != doc.item_code) { %}
+ <br>{%= doc.item_name %}{% } %}
+ <!-- {% if(doc.item_name != doc.description) { %}
+ <p>{%= doc.description %}</p>{% } %} -->
+ {% include "templates/form_grid/includes/visible_cols.html" %}
+ </div>
+
+
+ <div class="col-sm-3">
+ {% if(doc.schedule_date) { %}
+ <span title="{%= __("Reqd By Date") %}" class="{%=
+ (frappe.datetime.get_diff(doc.schedule_date, frappe.datetime.get_today()) < 0
+ && doc.ordered_qty < doc.qty)
+ ? "text-danger" : "text-muted" %}">
+ {%= doc.get_formatted("schedule_date") %}</span>
+ {% } %}
+ </div>
+
+ <!-- warehouse -->
+ <div class="col-sm-3">
+ {% if(doc.warehouse) { %}
+ <span class="label label-default" title="{%= __("For Warehouse") %}"
+ style="margin-right: 10px;">
+ {%= doc.warehouse %}
+ </span>
+ {% } %}
+ </div>
+
+ <!-- qty -->
+ <div class="col-sm-2 text-right">
+ {%= doc.get_formatted("qty") %}
+ <span class="small">{%= doc.uom || doc.stock_uom %}</span>
+ </div>
+ </div>
+{% } %}