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

show item description in item grid view if marked for 'In List View'

Browse Source
This commit is contained in:
Nabin Hait 2015-06-02 14:32:18 +05:30
parent 42f2674cba
commit c87595b2da
14 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
View File

@ -40,7 +40,7 @@
{
"fieldname": "description",
"fieldtype": "Text",
"in_list_view": 1,
"in_list_view": 0,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@ -452,7 +452,7 @@
],
"idx": 1,
"istable": 1,
"modified": "2015-05-27 02:47:16.341373",
"modified": "2015-06-02 14:18:56.294949",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice Item",

4
erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
View File

@ -58,7 +58,7 @@
{
"fieldname": "description",
"fieldtype": "Text",
"in_list_view": 1,
"in_list_view": 0,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@ -505,7 +505,7 @@
],
"idx": 1,
"istable": 1,
"modified": "2015-05-27 02:47:15.645114",
"modified": "2015-06-02 14:18:45.176726",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice Item",

4
erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
View File

@ -75,7 +75,7 @@
{
"fieldname": "description",
"fieldtype": "Small Text",
"in_list_view": 1,
"in_list_view": 0,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Small Text",
@ -538,7 +538,7 @@
],
"idx": 1,
"istable": 1,
"modified": "2015-05-27 02:47:16.553472",
"modified": "2015-06-02 14:19:21.459032",
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order Item",

4
erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
View File

@ -59,7 +59,7 @@
{
"fieldname": "description",
"fieldtype": "Small Text",
"in_list_view": 1,
"in_list_view": 0,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Small Text",
@ -413,7 +413,7 @@
],
"idx": 1,
"istable": 1,
"modified": "2015-05-27 02:47:15.853886",
"modified": "2015-06-02 14:19:33.922968",
"modified_by": "Administrator",
"module": "Buying",
"name": "Supplier Quotation Item",

4
erpnext/crm/doctype/opportunity_item/opportunity_item.json
View File

@ -85,7 +85,7 @@
{
"fieldname": "description",
"fieldtype": "Text",
"in_list_view": 1,
"in_list_view": 0,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@ -134,7 +134,7 @@
],
"idx": 1,
"istable": 1,
"modified": "2015-05-14 14:55:18.325286",
"modified": "2015-06-02 14:18:16.622288",
"modified_by": "Administrator",
"module": "CRM",
"name": "Opportunity Item",

2
erpnext/manufacturing/doctype/bom/bom.py
View File

@ -425,5 +425,5 @@ def validate_bom_no(item, bom_no):
if not getattr(frappe.flags, "in_test", False):
frappe.throw(_("BOM {0} must be submitted").format(bom_no))
if item and not (bom.item.lower() == item.lower() or \
bom.item.lower() == frappe.db.get_value("Item", item, "variant_of").lower()):
bom.item.lower() == cstr(frappe.db.get_value("Item", item, "variant_of")).lower()):
frappe.throw(_("BOM {0} does not belong to Item {1}").format(bom_no, item))

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

@ -55,7 +55,7 @@
{
"fieldname": "description",
"fieldtype": "Small Text",
"in_list_view": 1,
"in_list_view": 0,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Small Text",
@ -392,7 +392,7 @@
],
"idx": 1,
"istable": 1,
"modified": "2015-06-01 18:22:28.595765",
"modified": "2015-06-02 14:18:00.266748",
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation Item",

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

@ -65,7 +65,7 @@
{
"fieldname": "description",
"fieldtype": "Small Text",
"in_list_view": 1,
"in_list_view": 0,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Small Text",
@ -523,7 +523,7 @@
],
"idx": 1,
"istable": 1,
"modified": "2015-05-27 02:47:16.946934",
"modified": "2015-06-02 14:18:34.512236",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note Item",

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

@ -48,7 +48,7 @@
{
"fieldname": "description",
"fieldtype": "Text",
"in_list_view": 1,
"in_list_view": 0,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@ -264,7 +264,7 @@
],
"idx": 1,
"istable": 1,
"modified": "2015-02-19 01:07:00.695393",
"modified": "2015-06-02 14:19:45.611733",
"modified_by": "Administrator",
"module": "Stock",
"name": "Material Request Item",

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

@ -49,7 +49,7 @@
{
"fieldname": "description",
"fieldtype": "Text",
"in_list_view": 1,
"in_list_view": 0,
"label": "Description",
"oldfieldname": "description",
"oldfieldtype": "Text",
@ -642,7 +642,7 @@
],
"idx": 1,
"istable": 1,
"modified": "2015-05-27 02:47:16.086625",
"modified": "2015-06-02 14:19:13.528248",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt Item",

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

@ -1,6 +1,6 @@
{% $.each(visible_columns || [], function(i, df) { %}
{% var val = doc.get_formatted(df.fieldname);
if((df.fieldname !== "description") && val) { %}
if(val) { %}
<div class="row">
<div class="col-xs-4 text-ellipsis">
<strong title="{%= __(df.label) %}">{%= __(df.label) %}:</strong>

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

@ -1,4 +1,4 @@
{% var visible_columns = row.get_visible_columns(["item_code", "item_name", "description", "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", "item_name", "qty", "rate", "amount", "stock_uom", "uom", "discount_percentage", "schedule_date", "warehouse", "against_sales_order", "sales_order"]); %}
{% if(!doc) { %}
<div class="row">

2
erpnext/templates/form_grid/material_request_grid.html
View File

@ -1,5 +1,5 @@
{% var visible_columns = row.get_visible_columns(["item_code", "warehouse",
"item_name", "description", "amount", "stock_uom", "uom", "qty", "schedule_date"]); %}
"item_name", "amount", "stock_uom", "uom", "qty", "schedule_date"]); %}
{% if(!doc) { %}
<div class="row">

2
erpnext/templates/form_grid/stock_entry_grid.html
View File

@ -1,5 +1,5 @@
{% var visible_columns = row.get_visible_columns(["item_code",
"item_name", "description", "amount", "stock_uom", "uom", "qty",
"item_name", "amount", "stock_uom", "uom", "qty",
"s_warehouse", "t_warehouse", "incoming_rate"]);
%}