Merge branch 'master' of github.com:webnotes/erpnext
This commit is contained in:
commit
632d1c939a
@ -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():
|
||||||
|
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user