SOPHAL/ERP
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

First commit (wating to add alerts in budget)

Browse Source
This commit is contained in:
BACHIR SOULDI
2025-09-04 13:21:24 +01:00
parent f70bf3341b
commit 9eb959f07a
192 changed files with 51034 additions and 4992 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/axelor-open-suite/axelor-message/src/main/java/com/axelor/apps/message/service/TemplateMessageService.java
View File

@@ -19,6 +19,7 @@ package com.axelor.apps.message.service;
import com.axelor.apps.message.db.Message;
import com.axelor.apps.message.db.Template;
import com.axelor.auth.db.User;
import com.axelor.db.Model;
import com.axelor.exception.AxelorException;
import com.axelor.meta.db.MetaFile;
@@ -26,8 +27,6 @@ import com.axelor.tool.template.TemplateMaker;
import java.io.IOException;
import java.util.Set;
import javax.mail.MessagingException;
import com.axelor.auth.db.User;
import java.util.List;
public interface TemplateMessageService {
@@ -44,8 +43,8 @@ public interface TemplateMessageService {
InstantiationException, IllegalAccessException;
public Message generateAndSendMessageToBulkUsers(Model model, Template template, Set<User> users)
throws MessagingException, IOException, AxelorException, ClassNotFoundException,
InstantiationException, IllegalAccessException;
throws MessagingException, IOException, AxelorException, ClassNotFoundException,
InstantiationException, IllegalAccessException;
public Set<MetaFile> getMetaFiles(Template template) throws AxelorException, IOException;

36
modules/axelor-open-suite/axelor-message/src/main/java/com/axelor/apps/message/service/TemplateMessageServiceImpl.java
View File

@@ -22,10 +22,12 @@ import com.axelor.apps.message.db.EmailAddress;
import com.axelor.apps.message.db.Message;
import com.axelor.apps.message.db.Template;
import com.axelor.apps.message.db.TemplateContext;
import com.axelor.apps.message.db.repo.EmailAccountRepository;
import com.axelor.apps.message.db.repo.EmailAddressRepository;
import com.axelor.apps.message.db.repo.MessageRepository;
import com.axelor.apps.message.db.repo.TemplateRepository;
import com.axelor.apps.message.exception.IExceptionMessage;
import com.axelor.auth.db.User;
import com.axelor.db.EntityHelper;
import com.axelor.db.JPA;
import com.axelor.db.Model;
@@ -50,21 +52,20 @@ import com.google.inject.persist.Transactional;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.ArrayList;
import java.util.Set;
import java.util.HashSet;
import javax.mail.MessagingException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.axelor.auth.db.User;
public class TemplateMessageServiceImpl implements TemplateMessageService {
private static final String RECIPIENT_SEPARATOR = ";|,";
private static final char TEMPLATE_DELIMITER = '$';
@Inject protected EmailAccountRepository mailAccountRepo;
private final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -235,7 +236,7 @@ public class TemplateMessageServiceImpl implements TemplateMessageService {
// Set recipients as sets
message.setToEmailAddressSet(emailAddresses);
message.setCcEmailAddressSet(emailAddresses);
messageService.sendMessage(message);
return message;
@@ -350,6 +351,33 @@ public class TemplateMessageServiceImpl implements TemplateMessageService {
return mailAccount;
}
System.out.println("getMailAccount");
// EmailAccount mailAccount = Beans.get(MailAccountService.class).getDefaultSender();
EmailAccount mail = getDefaultSender();
// if (mailAccount != null) {
// log.debug("Email account ::: {}", mailAccount);
// return mailAccount;
// }
if (mail != null) {
log.debug("Email ::: {}", mail);
return mail;
}
return null;
}
protected EmailAccount getDefaultSender() {
EmailAccount mail =
mailAccountRepo
.all()
.filter(
"self.isDefault = true AND self.serverTypeSelect = ?1",
EmailAccountRepository.SERVER_TYPE_SMTP)
.fetchOne();
if (mail != null) {
log.debug("Email ::: {}", mail);
return mail;
}
return null;
}
}