Merge branch 'develop' of https://github.com/frappe/lms into profile
This commit is contained in:
@@ -14,7 +14,7 @@ class LMSJobApplication(Document):
|
||||
outgoing_email_account = frappe.get_cached_value(
|
||||
"Email Account", {"default_outgoing": 1, "enable_outgoing": 1}, "name"
|
||||
)
|
||||
if outgoing_email_account:
|
||||
if outgoing_email_account or frappe.conf.get("mail_login"):
|
||||
self.send_email_to_employer()
|
||||
|
||||
def validate_duplicate(self):
|
||||
|
||||
@@ -18,7 +18,7 @@ class LMSAssignmentSubmission(Document):
|
||||
outgoing_email_account = frappe.get_cached_value(
|
||||
"Email Account", {"default_outgoing": 1, "enable_outgoing": 1}, "name"
|
||||
)
|
||||
if outgoing_email_account:
|
||||
if outgoing_email_account or frappe.conf.get("mail_login"):
|
||||
self.send_mail()
|
||||
|
||||
def validate_duplicates(self):
|
||||
|
||||
@@ -73,7 +73,9 @@ class LMSBatch(Document):
|
||||
outgoing_email_account = frappe.get_cached_value(
|
||||
"Email Account", {"default_outgoing": 1, "enable_outgoing": 1}, "name"
|
||||
)
|
||||
if not student.confirmation_email_sent and outgoing_email_account:
|
||||
if not student.confirmation_email_sent and (
|
||||
outgoing_email_account or frappe.conf.get("mail_login")
|
||||
):
|
||||
self.send_mail(student)
|
||||
student.confirmation_email_sent = 1
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ class LMSCertificate(Document):
|
||||
outgoing_email_account = frappe.get_cached_value(
|
||||
"Email Account", {"default_outgoing": 1, "enable_outgoing": 1}, "name"
|
||||
)
|
||||
if outgoing_email_account:
|
||||
if outgoing_email_account or frappe.conf.get("mail_login"):
|
||||
self.send_mail()
|
||||
|
||||
def send_mail(self):
|
||||
|
||||
Reference in New Issue
Block a user