[fix] show item description in form grid based on in_list_view
diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
index b4a9c0a..8012bba 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -58,7 +58,7 @@
"fieldname": "description",
"fieldtype": "Small Text",
"in_filter": 1,
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Small Text",
@@ -498,7 +498,7 @@
],
"idx": 1,
"istable": 1,
- "modified": "2015-05-27 02:47:15.134435",
+ "modified": "2015-07-02 05:37:29.289574",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order Item",
diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
index fb654c2..a373185 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
@@ -100,7 +100,7 @@
{
"fieldname": "description",
"fieldtype": "Text",
- "in_list_view": 1,
+ "in_list_view": 0,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@@ -344,7 +344,7 @@
],
"idx": 1,
"istable": 1,
- "modified": "2015-02-25 04:31:21.801200",
+ "modified": "2015-07-02 05:32:56.511570",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Entry Detail",
diff --git a/erpnext/templates/form_grid/includes/visible_cols.html b/erpnext/templates/form_grid/includes/visible_cols.html
index c26f279..caa1366 100644
--- a/erpnext/templates/form_grid/includes/visible_cols.html
+++ b/erpnext/templates/form_grid/includes/visible_cols.html
@@ -9,5 +9,7 @@
{%= doc.get_formatted(df.fieldname) %}
</div>
</div>
+ {% } else if (df.fieldname==="description") { %}
+ <p>{{ doc.description }}</p>
{% } %}
{% }); %}
diff --git a/erpnext/templates/form_grid/item_grid.html b/erpnext/templates/form_grid/item_grid.html
index d2db463..197cef4 100644
--- a/erpnext/templates/form_grid/item_grid.html
+++ b/erpnext/templates/form_grid/item_grid.html
@@ -1,4 +1,6 @@
-{% var visible_columns = row.get_visible_columns(["item_code", "qty", "rate", "amount", "stock_uom", "uom", "discount_percentage", "schedule_date", "warehouse", "against_sales_order", "sales_order"]); %}
+{% var visible_columns = row.get_visible_columns(["item_code", "qty", "rate", "amount",
+ "stock_uom", "uom", "discount_percentage", "schedule_date", "warehouse",
+ "against_sales_order", "sales_order"]); %}
{% if(!doc) { %}
<div class="row">
@@ -48,12 +50,7 @@
{% if(doc.item_name != doc.item_code && in_list(visible_column_fieldnames, "item_name")) { %}
<br>{%= doc.item_name %}{% } %}
-
- {% if((doc.description != doc.item_code != doc.item_name) &&
- in_list(visible_column_fieldnames, "description")) { %}
- <br>
- <strong>Description: </strong>
- {%= doc.get_formatted("description") %}{% } %}
+
{% include "templates/form_grid/includes/visible_cols.html" %}
</div>