From 503150f99f2874bbe851094f6975cee874235e17 Mon Sep 17 00:00:00 2001 From: AarDG10 Date: Mon, 2 Mar 2026 11:17:09 +0530 Subject: [PATCH] refactor(user): cleaner code in send_password_notification Small refactor for cleaner code. Co-authored-by: Ankush Menat --- frappe/core/doctype/user/user.py | 33 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 8e65573474..fdc3cca83c 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -447,23 +447,24 @@ class User(Document): def send_password_notification(self, new_password): try: if self.flags.in_insert: - if self.name not in STANDARD_USERS: - if new_password: - # new password given, no email required - _update_password( - user=self.name, pwd=new_password, logout_all_sessions=self.logout_all_sessions - ) + if self.name in STANDARD_USERS: + return + if new_password: + # new password given, no email required + _update_password( + user=self.name, pwd=new_password, logout_all_sessions=self.logout_all_sessions + ) - if ( - not self.flags.no_welcome_mail - and cint(self.send_welcome_email) - and not self.flags.email_sent - ): - self.send_welcome_mail_to_user() - self.flags.email_sent = 1 - if frappe.session.user != "Guest": - msgprint(_("Welcome email sent")) - return + if ( + not self.flags.no_welcome_mail + and cint(self.send_welcome_email) + and not self.flags.email_sent + ): + self.send_welcome_mail_to_user() + self.flags.email_sent = 1 + if frappe.session.user != "Guest": + msgprint(_("Welcome email sent")) + return else: self.set_new_password(new_password)