From c33245fd1fbce259e1a2bbb4a336d5708c3a566c Mon Sep 17 00:00:00 2001
From: Kheireddine Mehdi <kheireddine.mehdi@sophal.net>
Date: Sun, 27 Oct 2024 10:56:58 +0100
Subject: [PATCH] fix send email with login credentials

---
 .../base/service/user/UserServiceImpl.java    | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/modules/axelor-open-suite/axelor-base/src/main/java/com/axelor/apps/base/service/user/UserServiceImpl.java b/modules/axelor-open-suite/axelor-base/src/main/java/com/axelor/apps/base/service/user/UserServiceImpl.java
index 8d56de3e..14ac1731 100644
--- a/modules/axelor-open-suite/axelor-base/src/main/java/com/axelor/apps/base/service/user/UserServiceImpl.java
+++ b/modules/axelor-open-suite/axelor-base/src/main/java/com/axelor/apps/base/service/user/UserServiceImpl.java
@@ -363,24 +363,20 @@ public class UserServiceImpl implements UserService {
           templateMessageService.generateAndSendMessage(user, template);
       }
 
-      if(sendEmailUponAccountCreation){
-        if (user.equals(AuthUtils.getUser())) {
-          logger.debug("User {} changed own password.", user.getCode());
-          return;
-          }
+      else if(sendEmailUponAccountCreation){
+        user.setSendEmailUponAccountCreation(false);
+        AppBase appBase = Beans.get(AppBaseService.class).getAppBase();
+        Template template = appBase.getAccountCreationTemplate();
 
-          AppBase appBase = Beans.get(AppBaseService.class).getAppBase();
-          Template template = appBase.getAccountCreationTemplate();
+        if (template == null) {
+          throw new AxelorException(
+              appBase,
+              TraceBackRepository.CATEGORY_NO_VALUE,
+              I18n.get("Template for account creation is missing."));
+        }
 
-          if (template == null) {
-            throw new AxelorException(
-                appBase,
-                TraceBackRepository.CATEGORY_NO_VALUE,
-                I18n.get("Template for account creation is missing."));
-          }
-
-          TemplateMessageService templateMessageService = Beans.get(TemplateMessageService.class);
-          templateMessageService.generateAndSendMessage(user, template);
+        TemplateMessageService templateMessageService = Beans.get(TemplateMessageService.class);
+        templateMessageService.generateAndSendMessage(user, template);
       }
     } finally {
       user.setTransientPassword(null);