Merge branch 'edge' of github.com:webnotes/erpnext into edge

startup/install.py

@@ -33,7 +33,7 @@ def make_roles():
 		"Partner", "Projects User", "Purchase Manager", "Purchase Master Manager",
 		"Purchase User", "Quality Manager", "Sales Manager",
 		"Sales Master Manager", "Sales User", "Supplier", "Support Manager",
-		"Support Team"]
+		"Support Team", "Website Manager"]
 		
 	for r in roles:
 		doc = webnotes.doc(fielddata = {

website/doctype/web_page/web_page.txt

@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-01-10 16:34:32", 
+  "creation": "2013-01-27 16:31:21", 
   "docstatus": 0, 
-  "modified": "2013-01-22 14:57:27", 
+  "modified": "2013-02-12 09:33:47", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -66,6 +66,7 @@
   "doctype": "DocField", 
   "fieldname": "page_name", 
   "fieldtype": "Data", 
+  "in_list_view": 1, 
   "label": "Page Name", 
   "read_only": 1
  }, 

website/utils.py

@@ -19,7 +19,6 @@ from __future__ import unicode_literals
 import os
 import conf
 import webnotes
-from webnotes.utils import cstr
 
 page_map = {
 	'Web Page': webnotes._dict({
@@ -52,7 +51,7 @@ def render(page_name):
 			html = get_html(page_name)
 		else:
 			html = get_html('index')
-	except Exception, e:
+	except Exception:
 		html = get_html('error')
 
 	from webnotes.handler import eprint, print_zip
@@ -244,7 +243,7 @@ def get_outer_env():
 	})
 	
 	settings = webnotes.doc("Website Settings", "Website Settings")
-	for k in ["brand_html", "copyright", "address", "top_bar_background"]:
+	for k in ["brand_html", "copyright", "address", "top_bar_background", "favicon"]:
 		if k in settings.fields:
 			ret[k] = settings.fields[k]