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

erpnext/patches/jan_mar_2012/convert_tables_to_utf8.py

@@ -0,0 +1,11 @@
+import webnotes
+
+def execute():
+	sql = webnotes.conn.sql
+	
+	sql("commit")
+	sql("set foreign_key_checks=0")
+	for tab in sql("show tables"):
+		sql("ALTER TABLE `%s` CONVERT TO CHARACTER SET utf8" % tab[0])
+
+	sql("set foreign_key_checks=1")

erpnext/support/doctype/support_ticket/support_ticket.py

@@ -23,6 +23,9 @@ 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 += self.last_response()
+
 		signature = webnotes.conn.get_value('Email Settings',None,'support_signature')
 		if signature:
 			response += '\n\n' + signature
@@ -39,6 +42,14 @@ class DocType(TransactionBase):
 		webnotes.conn.set(self.doc,'status','Waiting for Customer')
 		self.make_response_record(response)
 	
+	def last_response(self):
+		"""return last response"""
+		tmp = webnotes.conn.sql("""select mail from `tabSupport Ticket Response`
+			where parent = %s order by creation desc limit 1
+			""", self.doc.name)
+			
+		return '\n\n=== In response to ===\n\n' + tmp[0][0] 
+		
 	def make_response_record(self, response, from_email = None, content_type='text/plain'):
 		"""
 			Creates a new Support Ticket Response record

index.html

@@ -3,7 +3,7 @@
 	<meta charset="utf-8">
 	<title>ERPNext</title>
 	<meta name="author" content="">
-	<script type="text/javascript">window._version_number="31"
+	<script type="text/javascript">window._version_number="34"
 
 wn={}
 wn.provide=function(namespace){var nsl=namespace.split('.');var l=nsl.length;var parent=window;for(var i=0;i<l;i++){var n=nsl[i];if(!parent[n]){parent[n]={}}

version.num

@@ -1 +1 @@
-31
+34