Merge pull request #1781 from anandpdoshi/hotfix

Reload sales taxes and charges in patch

erpnext/setup/doctype/item_group/item_group.js

@@ -9,10 +9,9 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) {
 		frappe.set_route("Sales Browser", "Item Group");
 	}, "icon-sitemap")
 
-	if(!doc.__islocal && doc.show_in_website) {
-		cur_frm.appframe.add_button("View In Website", function() {
-			window.open(doc.__onload.website_route);
-		}, "icon-globe");
+	if (!doc.__islocal && doc.show_in_website) {
+		cur_frm.set_intro(__("Published on website at: {0}",
+			[repl('<a href="/%(website_route)s" target="_blank">/%(website_route)s</a>', doc.__onload)]));
 	}
 }
 

erpnext/setup/doctype/item_group/item_group.json

@@ -21,14 +21,6 @@
    "reqd": 1, 
    "search_index": 0
   }, 
-  {
-   "fieldname": "page_name", 
-   "fieldtype": "Data", 
-   "in_list_view": 1, 
-   "label": "Page Name", 
-   "permlevel": 0, 
-   "read_only": 1
-  }, 
   {
    "fieldname": "cb0", 
    "fieldtype": "Column Break", 
@@ -79,6 +71,15 @@
    "permlevel": 0, 
    "search_index": 0
   }, 
+  {
+   "depends_on": "show_in_website", 
+   "fieldname": "page_name", 
+   "fieldtype": "Data", 
+   "in_list_view": 0, 
+   "label": "Page Name", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
   {
    "depends_on": "show_in_website", 
    "fieldname": "parent_website_route", 
@@ -162,7 +163,7 @@
  "in_create": 1, 
  "issingle": 0, 
  "max_attachments": 3, 
- "modified": "2014-05-27 03:49:12.086044", 
+ "modified": "2014-06-10 05:37:03.763185", 
  "modified_by": "Administrator", 
  "module": "Setup", 
  "name": "Item Group",