diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index be49bf57465..22580091600 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -109,6 +109,7 @@ class AccountsController(TransactionBase): def set_missing_item_details(self): """set missing item values""" from erpnext.stock.get_item_details import get_item_details + if hasattr(self, "items"): parent_dict = {} for fieldname in self.meta.get_valid_columns(): diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json index 83f7a84e9fb..70826fb62bc 100644 --- a/erpnext/stock/doctype/item/item.json +++ b/erpnext/stock/doctype/item/item.json @@ -174,6 +174,7 @@ "precision": "" }, { + "default": "0", "description": "Automatically set. If this item has variants, then it cannot be selected in sales orders etc.", "fieldname": "has_variants", "fieldtype": "Check", @@ -875,7 +876,7 @@ "icon": "icon-tag", "idx": 1, "max_attachments": 1, - "modified": "2015-02-23 06:12:13.359646", + "modified": "2015-02-24 05:19:07.382483", "modified_by": "Administrator", "module": "Stock", "name": "Item", diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py index 44f60d78365..ff4c237114b 100644 --- a/erpnext/stock/get_item_details.py +++ b/erpnext/stock/get_item_details.py @@ -205,7 +205,6 @@ def get_price_list_rate(args, item_doc, out): validate_price_list(args) validate_conversion_rate(args, meta) - price_list_rate = get_price_list_rate_for(args, item_doc.name) if not price_list_rate and item_doc.variant_of: price_list_rate = get_price_list_rate_for(args, item_doc.variant_of) diff --git a/erpnext/templates/form_grid/includes/visible_cols.html b/erpnext/templates/form_grid/includes/visible_cols.html index 285c1254b69..e9be40ceb2a 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(val) { %} + if((df.fieldname !== "description") && val) { %}
{%= __(df.label) %}: diff --git a/erpnext/templates/form_grid/item_grid.html b/erpnext/templates/form_grid/item_grid.html index 2a1a671c63c..84b18f88366 100644 --- a/erpnext/templates/form_grid/item_grid.html +++ b/erpnext/templates/form_grid/item_grid.html @@ -47,32 +47,7 @@ {% if(doc.item_name != doc.item_code) { %}
{%= doc.item_name %}{% } %} - - {% include "templates/form_grid/includes/visible_cols.html" %} -