Author: kmorin Date: 2014-11-26 15:21:23 +0000 (Wed, 26 Nov 2014) New Revision: 700 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/700 Log: fixes #6168 Les ?\195?\169l?\195?\169ments ne sont pas transmis ?\195?\160 l'EDI quand ils sont d?\195?\169plac?\195?\169s directement Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-11-26 13:30:10 UTC (rev 699) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java 2014-11-26 15:21:23 UTC (rev 700) @@ -1242,7 +1242,9 @@ List<Email> emails = dao.forTopiaIdIn(emailIds).findAll(); for (Email email : emails) { - email.setDemandStatus(DemandStatus.QUALIFIED); + if (email.getDemandStatus() != DemandStatus.TRANSMISSION_TO_EDI) { + email.setDemandStatus(DemandStatus.QUALIFIED); + } email.setMailFolder(newFolder); email.setTakenBy(null); @@ -1411,7 +1413,20 @@ rangeRowTopiaDao.update(rangeRow); } - email.setDemandStatus(DemandStatus.IN_PROGRESS); + History transmission = CollectionUtils.find(email.getHistory(), new Predicate<History>() { + @Override + public boolean evaluate(History object) { + return object.getType() == HistoryType.TRANSMISSION; + } + }); + + if (transmission != null) { + email.setDemandStatus(DemandStatus.QUALIFIED); + + } else { + email.setDemandStatus(DemandStatus.IN_PROGRESS); + } + emailsToUpdate.add(email); importedCount++;