Merge branch 'master' of github.com:webnotes/erpnext into unicode
This commit is contained in:
commit
3d498ccfb1
@ -93,6 +93,7 @@ class SupportMailbox(POP3Mailbox):
|
|||||||
webnotes.conn.commit()
|
webnotes.conn.commit()
|
||||||
# extract attachments
|
# extract attachments
|
||||||
self.save_attachments(st.doc, mail.attachments)
|
self.save_attachments(st.doc, mail.attachments)
|
||||||
|
webnotes.conn.begin()
|
||||||
return
|
return
|
||||||
|
|
||||||
from webnotes.model.doctype import get_property
|
from webnotes.model.doctype import get_property
|
||||||
@ -123,9 +124,9 @@ class SupportMailbox(POP3Mailbox):
|
|||||||
self.send_auto_reply(d)
|
self.send_auto_reply(d)
|
||||||
|
|
||||||
webnotes.conn.commit()
|
webnotes.conn.commit()
|
||||||
|
|
||||||
# extract attachments
|
# extract attachments
|
||||||
self.save_attachments(d, mail.attachments)
|
self.save_attachments(d, mail.attachments)
|
||||||
|
webnotes.conn.begin()
|
||||||
|
|
||||||
|
|
||||||
def save_attachments(self, doc, attachment_list=[]):
|
def save_attachments(self, doc, attachment_list=[]):
|
||||||
|
Loading…
Reference in New Issue
Block a user