Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rushabh Mehta 2013-02-06 16:06:03 +01:00
commit cc0df70e87
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hr/doctype/job_applicant/get_job_applications.py
View File

@ -21,8 +21,8 @@ from webnotes.utils.email_lib.receive import POP3Mailbox
from core.doctype.communication.communication import make from core.doctype.communication.communication import make
class JobsMailbox(POP3Mailbox): class JobsMailbox(POP3Mailbox):
def setup(self): def setup(self, args=None):
self.settings = webnotes.doc("Jobs Email Settings", "Jobs Email Settings") self.settings = args or webnotes.doc("Jobs Email Settings", "Jobs Email Settings")
def check_mails(self): def check_mails(self):
return webnotes.conn.sql("select user from tabSessions where \ return webnotes.conn.sql("select user from tabSessions where \

4
selling/doctype/lead/get_leads.py
View File

@ -21,8 +21,8 @@ from webnotes.utils.email_lib.receive import POP3Mailbox
from core.doctype.communication.communication import make from core.doctype.communication.communication import make
class SalesMailbox(POP3Mailbox): class SalesMailbox(POP3Mailbox):
def setup(self): def setup(self, args=None):
self.settings = webnotes.doc("Sales Email Settings", "Sales Email Settings") self.settings = args or webnotes.doc("Sales Email Settings", "Sales Email Settings")
def check_mails(self): def check_mails(self):
return webnotes.conn.sql("select user from tabSessions where \ return webnotes.conn.sql("select user from tabSessions where \

4
support/doctype/support_ticket/get_support_mails.py
View File

@ -22,9 +22,9 @@ from webnotes.utils.email_lib.receive import POP3Mailbox
from core.doctype.communication.communication import make from core.doctype.communication.communication import make
class SupportMailbox(POP3Mailbox): class SupportMailbox(POP3Mailbox):
def setup(self): def setup(self, args=None):
self.email_settings = webnotes.doc("Email Settings", "Email Settings") self.email_settings = webnotes.doc("Email Settings", "Email Settings")
self.settings = webnotes._dict({ self.settings = args or webnotes._dict({
"use_ssl": self.email_settings.support_use_ssl, "use_ssl": self.email_settings.support_use_ssl,
"host": self.email_settings.support_host, "host": self.email_settings.support_host,
"username": self.email_settings.support_username, "username": self.email_settings.support_username,