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

[fix] show item description in form grid based on in_list_view

Browse Source
This commit is contained in:
Rushabh Mehta 2015-07-02 15:09:18 +05:30
parent ecf220a721
commit 5105f909d6
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/selling/doctype/sales_order_item/sales_order_item.json
View File

@ -58,7 +58,7 @@
"fieldname": "description", "fieldname": "description",
"fieldtype": "Small Text", "fieldtype": "Small Text",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 0,
"label": "Description", "label": "Description",
"oldfieldname": "description", "oldfieldname": "description",
"oldfieldtype": "Small Text", "oldfieldtype": "Small Text",
@ -498,7 +498,7 @@
], ],
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"modified": "2015-05-27 02:47:15.134435", "modified": "2015-07-02 05:37:29.289574",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Order Item", "name": "Sales Order Item",

4
erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
View File

@ -100,7 +100,7 @@
{ {
"fieldname": "description", "fieldname": "description",
"fieldtype": "Text", "fieldtype": "Text",
"in_list_view": 1, "in_list_view": 0,
"label": "Description", "label": "Description",
"oldfieldname": "description", "oldfieldname": "description",
"oldfieldtype": "Text", "oldfieldtype": "Text",
@ -344,7 +344,7 @@
], ],
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"modified": "2015-02-25 04:31:21.801200", "modified": "2015-07-02 05:32:56.511570",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Entry Detail", "name": "Stock Entry Detail",

2
erpnext/templates/form_grid/includes/visible_cols.html
View File

@ -9,5 +9,7 @@
{%= doc.get_formatted(df.fieldname) %} {%= doc.get_formatted(df.fieldname) %}
</div> </div>
</div> </div>
{% } else if (df.fieldname==="description") { %}
<p>{{ doc.description }}</p>
{% } %} {% } %}
{% }); %} {% }); %}

11
erpnext/templates/form_grid/item_grid.html
View File

@ -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) { %} {% if(!doc) { %}
<div class="row"> <div class="row">
@ -48,12 +50,7 @@
{% if(doc.item_name != doc.item_code && in_list(visible_column_fieldnames, "item_name")) { %} {% if(doc.item_name != doc.item_code && in_list(visible_column_fieldnames, "item_name")) { %}
<br>{%= doc.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" %} {% include "templates/form_grid/includes/visible_cols.html" %}
</div> </div>