Merge branch 'develop' of https://github.com/frappe/lms into profile

This commit is contained in:
Jannat Patel
2024-04-15 10:06:58 +05:30
7 changed files with 25 additions and 12 deletions

View File

@@ -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):

View File

@@ -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):

View File

@@ -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

View File

@@ -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):