Merge branch 'stable' into latest

Conflicts:
	erpnext/accounts/doctype/journal_voucher/journal_voucher.js
	erpnext/accounts/doctype/payable_voucher/payable_voucher.js
	index.html
	version.num

erpnext/support/doctype/support_ticket/__init__.py

@@ -1,4 +1,5 @@
 import webnotes
+from webnotes.utils import cstr
 
 from webnotes.utils.email_lib.receive import POP3Mailbox
 
@@ -111,7 +112,7 @@ class SupportMailbox(POP3Mailbox):
 			status = add_file_list('Support Ticket', doc.name, attachment['filename'], fid)
 			if not status:
 				doc.description = doc.description \
-					+ "\nCould not attach: " + str(attachment['filename'])
+					+ "\nCould not attach: " + cstr(attachment['filename'])
 				doc.save()
 			webnotes.conn.commit()
 
@@ -137,7 +138,7 @@ We will get back to you as soon as possible
 		sendmail(\
 			recipients = [d.raised_by], \
 			sender = self.email_settings.support_email, \
-			subject = '['+d.name+'] ' + str(d.subject or ''), \
+			subject = '['+d.name+'] ' + cstr(d.subject), \
 			msg = response)
 		
 	def auto_close_tickets(self):

erpnext/support/doctype/support_ticket/support_ticket.py

@@ -24,7 +24,7 @@ class DocType(TransactionBase):
 		response = self.doc.new_response + '\n\n[Please do not change the subject while responding.]'
 
 		# add last response to new response
-		response += unicode(self.last_response(), 'utf-8')
+		response += self.last_response()
 
 		signature = webnotes.conn.get_value('Email Settings',None,'support_signature')
 		if signature:
@@ -36,7 +36,7 @@ class DocType(TransactionBase):
 			recipients = [self.doc.raised_by], \
 			sender=webnotes.conn.get_value('Email Settings',None,'support_email'), \
 			subject=subject, \
-			msg=response.encode('utf-8'))
+			msg=response)
 
 		self.doc.new_response = None
 		webnotes.conn.set(self.doc,'status','Waiting for Customer')