fixes(minor): clean item group html and hide image

erpnext/non_profit/doctype/certification_application/certification_application.json

@@ -282,7 +282,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2018-06-14 23:17:07.405689", 
+ "modified": "2018-08-16 10:56:08.160427",
  "modified_by": "Administrator",
  "module": "Non Profit",
  "name": "Certification Application",
@@ -307,25 +307,6 @@
    "share": 1,
    "submit": 0,
    "write": 1
-  }, 
-  {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Customer", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 1
   }
  ],
  "quick_entry": 0,
@@ -335,5 +316,6 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1,
- "track_seen": 0
+ "track_seen": 0,
+ "track_views": 0
 }

erpnext/setup/doctype/item_group/item_group.json

@@ -156,7 +156,7 @@
    "columns": 0,
    "fieldname": "image",
    "fieldtype": "Attach Image",
-   "hidden": 0,
+   "hidden": 1,
    "ignore_user_permissions": 0,
    "ignore_xss_filter": 0,
    "in_filter": 0,
@@ -370,6 +370,38 @@
    "translatable": 0,
    "unique": 1
   },
+  {
+   "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
+   "allow_on_submit": 0,
+   "bold": 0,
+   "collapsible": 0,
+   "columns": 0,
+   "fieldname": "weightage",
+   "fieldtype": "Int",
+   "hidden": 0,
+   "ignore_user_permissions": 0,
+   "ignore_xss_filter": 0,
+   "in_filter": 0,
+   "in_global_search": 0,
+   "in_list_view": 0,
+   "in_standard_filter": 0,
+   "label": "Weightage",
+   "length": 0,
+   "no_copy": 0,
+   "permlevel": 0,
+   "precision": "",
+   "print_hide": 0,
+   "print_hide_if_no_value": 0,
+   "read_only": 0,
+   "remember_last_selected_value": 0,
+   "report_hide": 0,
+   "reqd": 0,
+   "search_index": 0,
+   "set_only_once": 0,
+   "translatable": 0,
+   "unique": 0
+  },
   {
    "allow_bulk_edit": 0,
    "allow_in_quick_entry": 0,
@@ -584,7 +616,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 3,
- "modified": "2018-08-16 05:41:46.788896",
+ "modified": "2018-08-16 10:50:41.011806",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Item Group",

erpnext/setup/doctype/item_group/item_group.py

@@ -12,6 +12,7 @@ from frappe.website.render import clear_cache
 from frappe.website.doctype.website_slideshow.website_slideshow import get_slideshow
 from erpnext.shopping_cart.product_info import set_product_info_for_website
 from erpnext.utilities.product import get_qty_in_stock
+from frappe.utils.html_utils import clean_html
 
 class ItemGroup(NestedSet, WebsiteGenerator):
 	nsm_parent_field = 'parent_item_group'
@@ -26,6 +27,7 @@ class ItemGroup(NestedSet, WebsiteGenerator):
 
 	def validate(self):
 		super(ItemGroup, self).validate()
+		self.description = clean_html(self.description)
 		self.make_route()
 
 	def on_update(self):
@@ -133,7 +135,8 @@ def get_child_groups_for_list_in_html(item_group, start, limit, search):
 			lft = ('>', item_group.lft),
 			rgt = ('<', item_group.rgt),
 		),
-		or_filters = search_filters)
+		or_filters = search_filters,
+		order_by = 'weightage desc, name asc')
 
 	return [get_item_for_list_in_html(r) for r in data]