diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json index 29173e2c717..1280cc0c1e6 100755 --- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json +++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json @@ -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", diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json index 612a89e8e56..4ace40a672a 100644 --- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json +++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json @@ -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", diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json index 43a0e0b7c42..9f80ba33429 100755 --- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json +++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json @@ -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", diff --git a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json index ccfade2b280..c591b9652ea 100644 --- a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json +++ b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json @@ -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", diff --git a/erpnext/crm/doctype/opportunity_item/opportunity_item.json b/erpnext/crm/doctype/opportunity_item/opportunity_item.json index d33fdcaeb24..d809f5b9fdc 100644 --- a/erpnext/crm/doctype/opportunity_item/opportunity_item.json +++ b/erpnext/crm/doctype/opportunity_item/opportunity_item.json @@ -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", diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py index d4fa02c752b..f550a8afe41 100644 --- a/erpnext/manufacturing/doctype/bom/bom.py +++ b/erpnext/manufacturing/doctype/bom/bom.py @@ -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)) diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.json b/erpnext/selling/doctype/quotation_item/quotation_item.json index 17208b78107..ec10b592735 100644 --- a/erpnext/selling/doctype/quotation_item/quotation_item.json +++ b/erpnext/selling/doctype/quotation_item/quotation_item.json @@ -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", diff --git a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json index 956f57698a9..4bb326bd106 100644 --- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json +++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json @@ -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", diff --git a/erpnext/stock/doctype/material_request_item/material_request_item.json b/erpnext/stock/doctype/material_request_item/material_request_item.json index 3b659e3ac20..c4bebebe646 100644 --- a/erpnext/stock/doctype/material_request_item/material_request_item.json +++ b/erpnext/stock/doctype/material_request_item/material_request_item.json @@ -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", diff --git a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json index 4cf4107d932..c48aa2c269b 100755 --- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json +++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json @@ -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", diff --git a/erpnext/templates/form_grid/includes/visible_cols.html b/erpnext/templates/form_grid/includes/visible_cols.html index e9be40ceb2a..285c1254b69 100644 --- a/erpnext/templates/form_grid/includes/visible_cols.html +++ b/erpnext/templates/form_grid/includes/visible_cols.html @@ -1,6 +1,6 @@ {% $.each(visible_columns || [], function(i, df) { %} {% var val = doc.get_formatted(df.fieldname); - if((df.fieldname !== "description") && val) { %} + if(val) { %}
{%= __(df.label) %}: diff --git a/erpnext/templates/form_grid/item_grid.html b/erpnext/templates/form_grid/item_grid.html index bc8e23ec9d8..9905f99480f 100644 --- a/erpnext/templates/form_grid/item_grid.html +++ b/erpnext/templates/form_grid/item_grid.html @@ -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) { %}
diff --git a/erpnext/templates/form_grid/material_request_grid.html b/erpnext/templates/form_grid/material_request_grid.html index be7fb293871..8016316cd87 100644 --- a/erpnext/templates/form_grid/material_request_grid.html +++ b/erpnext/templates/form_grid/material_request_grid.html @@ -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) { %}
diff --git a/erpnext/templates/form_grid/stock_entry_grid.html b/erpnext/templates/form_grid/stock_entry_grid.html index efb4ab64c0d..1782b82007a 100644 --- a/erpnext/templates/form_grid/stock_entry_grid.html +++ b/erpnext/templates/form_grid/stock_entry_grid.html @@ -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"]); %}