branch develop updated (e97f925 -> 2eab33a)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from e97f925 fixes #9012 [Administration) Impossible d'ouvrir la Liste des chargés de clientèle new 2eab33a fixes #9014 [Création manuelle] l'icone de conflit de client est affichée The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 2eab33a562595493d5972854c30b81c2aa7a1fe3 Author: Kevin Morin <morin@codelutin.com> Date: Mon Jan 30 16:40:04 2017 +0100 fixes #9014 [Création manuelle] l'icone de conflit de client est affichée Summary of changes: .../faxtomail/ui/swing/content/demande/DemandeListUIHandler.java | 2 ++ .../src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 2eab33a562595493d5972854c30b81c2aa7a1fe3 Author: Kevin Morin <morin@codelutin.com> Date: Mon Jan 30 16:40:04 2017 +0100 fixes #9014 [Création manuelle] l'icone de conflit de client est affichée --- .../faxtomail/ui/swing/content/demande/DemandeListUIHandler.java | 2 ++ .../src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java index 3953794..f524649 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeListUIHandler.java @@ -24,6 +24,7 @@ package com.franciaflex.faxtomail.ui.swing.content.demande; import com.franciaflex.faxtomail.persistence.entities.Attachment; import com.franciaflex.faxtomail.persistence.entities.AttachmentFile; +import com.franciaflex.faxtomail.persistence.entities.Client; import com.franciaflex.faxtomail.persistence.entities.Configuration; import com.franciaflex.faxtomail.persistence.entities.DemandStatus; import com.franciaflex.faxtomail.persistence.entities.Email; @@ -758,6 +759,7 @@ public class DemandeListUIHandler extends AbstractFaxToMailDemandListHandler<Dem email.setTakenBy(currentUser); email.setHistory(histories); email.setDemandStatus(DemandStatus.UNTREATED); + email.setMatchingClients(new ArrayList<Client>()); OriginalEmailImpl originalEmail = new OriginalEmailImpl(); originalEmail.setContent(""); diff --git a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties index a71c22c..8eb8892 100644 --- a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties +++ b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties @@ -176,7 +176,7 @@ faxtomail.demandeList.noRigthsFound=Aucun permission n'a été trouvée pour vou faxtomail.demandeList.pages=Pages \: faxtomail.demandeList.pfNbLabel=Nombre de produits finis faxtomail.demandeList.quotationNbLabel=Nombre de devis -faxtomail.demandeList.resultPerPage=Nombre de résultat par page \: +faxtomail.demandeList.resultPerPage=Nombre d'éléments par page \: faxtomail.demandeList.savNbLabel=Nombre de SAV faxtomail.demandeList.table.header.attachment=PJ faxtomail.demandeList.table.header.attachment.tip=Pièces-jointes -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm