[merge] merge with master

website/helpers/blog_feed.py

@@ -49,9 +49,10 @@ rss_item = u"""
 
 def generate():
 	"""generate rss feed"""
-	import webnotes, os
+	import os, urllib
+	import webnotes
 	from webnotes.model.doc import Document
-	from website.helpers.blog import get_blog_content
+	from webnotes.utils import escape_html
 	
 	host = (os.environ.get('HTTPS') and 'https://' or 'http://') + os.environ.get('HTTP_HOST')
 	
@@ -62,7 +63,8 @@ def generate():
 		order by published_on desc limit 20""", as_dict=1)
 
 	for blog in blog_list:
-		blog.link = host + '/' + blog.name + '.html'
+		blog.link = urllib.quote(host + '/' + blog.name + '.html')
+		blog.content = escape_html(blog.content or "")
 		
 		items += rss_item % blog
 

website/helpers/product.py

@@ -4,10 +4,9 @@
 from __future__ import unicode_literals
 
 import webnotes
-from webnotes.utils import cstr
+from webnotes.utils import cstr, cint
 from webnotes.webutils import build_html, delete_page_cache
 
-
 @webnotes.whitelist(allow_guest=True)
 def get_product_info(item_code):
 	"""get product price / stock info"""
@@ -20,10 +19,20 @@ def get_product_info(item_code):
 			in_stock = in_stock[0][0] > 0 and 1 or 0
 	else:
 		in_stock = -1
+		
+	price = price_list and webnotes.conn.sql("""select ref_rate, ref_currency from
+		`tabItem Price` where parent=%s and price_list_name=%s""", 
+		(item_code, price_list), as_dict=1) or []
+	
+	price = price and price[0] or None
+	
+	if price:
+		price["ref_currency"] = not cint(webnotes.conn.get_default("hide_currency_symbol")) \
+			and (webnotes.conn.get_value("Currency", price.ref_currency, "symbol") or price.ref_currency) \
+			or ""
+
 	return {
-		"price": price_list and webnotes.conn.sql("""select ref_rate, ref_currency from
-			`tabItem Price` where parent=%s and price_list_name=%s""", 
-			(item_code, price_list), as_dict=1) or [],
+		"price": price,
 		"stock": in_stock
 	}
 

website/helpers/sitemap.py

@@ -2,6 +2,7 @@
 # License: GNU General Public License (v3). For more information see license.txt
 
 from __future__ import unicode_literals
+
 frame_xml = """<?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">%s
 </urlset>"""
@@ -32,10 +33,11 @@ def generate(domain):
 		
 			for p in pages:
 				if count >= max_items: break
-				page_url = os.path.join(domain, urllib.quote(p[0]))
-				modified = p[1].strftime('%Y-%m-%d')
-				site_map += link_xml % (page_url, modified)
-				count += 1
+				if p[0]:
+					page_url = os.path.join(domain, urllib.quote(p[0]))
+					modified = p[1].strftime('%Y-%m-%d')
+					site_map += link_xml % (page_url, modified)
+					count += 1
 				
 			if count >= max_items: break