Merge branch 'master' of github.com:webnotes/erpnext

home/__init__.py

@@ -87,5 +87,5 @@ def update_feed(controller, method=None):
 	doc = controller.doc
 	if method in ['on_update', 'on_submit']:
 		subject, color = feed_dict.get(doc.doctype, [None, None])
-		if subject:			
+		if subject:
 			make_feed('', doc.doctype, doc.name, doc.owner, subject % doc.fields, color)

support/doctype/support_ticket/__init__.py

@@ -112,11 +112,7 @@ class SupportMailbox(POP3Mailbox):
 		except:
 			d.description = 'Unable to extract message'
 			d.save(1)
-
 		else:
-			# update feed
-			update_feed(d, 'on_update')
-
 			# send auto reply
 			if cint(self.email_settings.send_autoreply):
 				if "mailer-daemon" not in d.raised_by.lower():

support/doctype/support_ticket/support_ticket.py

@@ -50,11 +50,11 @@ class DocType(TransactionBase):
 	
 	def close_ticket(self):
 		webnotes.conn.set(self.doc,'status','Closed')
-		update_feed(self.doc)
+		update_feed(self)
 
 	def reopen_ticket(self):
 		webnotes.conn.set(self.doc,'status','Open')		
-		update_feed(self.doc)
+		update_feed(self)
 		
 	def on_trash(self):
 		webnotes.conn.sql("""update `tabCommunication` set support_ticket=NULL