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

This commit is contained in:
Anand Doshi 2012-12-28 15:30:57 +05:30
commit 632d1c939a
3 changed files with 3 additions and 7 deletions

View File

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

View File

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