This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 9bffba4 nettoyage du site technique (tout ce qui est dans les spécs n'ont plus rien à faire ici) new 8a74ea2 Ne pas accepter un import de taxon si le referenceTaxonId est null (refs #7047) new 0a7c92e fixes #7047: [IMPORT GENERIQUE] erreur si le referenceTaxonId n'est pas renseigné dans le fichier d'import des taxon. Merge branch 'feature/7047' into develop new 08e2db7 correction traduction (refs #7058) new fcda3ba ajout de controle pour valider le dénombrement sur une mensuration mais aussi un poids de mensuration différent de Zéro (refs #7058) new 8b4f025 fixes #7058: [IMPORT GENERIQUE] Erreur lors de la suppression des poids en double Merge branch 'feature/7058' into develop The 5 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 8b4f025dfa3785e764d2339bdc9f1b33202797f2 Merge: 0a7c92e fcda3ba Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue May 5 20:57:09 2015 +0200 fixes #7058: [IMPORT GENERIQUE] Erreur lors de la suppression des poids en double Merge branch 'feature/7058' into develop commit fcda3ba1ee92d3e6e6f7cf4c8d544886a61c379e Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue May 5 20:57:06 2015 +0200 ajout de controle pour valider le dénombrement sur une mensuration mais aussi un poids de mensuration différent de Zéro (refs #7058) commit 08e2db77042db7dcea32b3693c802ade352a5f43 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon May 4 12:45:55 2015 +0200 correction traduction (refs #7058) commit 0a7c92ebe1858e6b579b5cf51cf0d7953139c2bd Merge: 9bffba4 8a74ea2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon May 4 12:16:22 2015 +0200 fixes #7047: [IMPORT GENERIQUE] erreur si le referenceTaxonId n'est pas renseigné dans le fichier d'import des taxon. Merge branch 'feature/7047' into develop commit 8a74ea25270a0397e67e8c5e80ce53394914ac75 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon May 4 12:16:07 2015 +0200 Ne pas accepter un import de taxon si le referenceTaxonId est null (refs #7047) Summary of changes: .../i18n/tutti-persistence_fr_FR.properties | 2 +- .../consumer/CsvConsumerForCatch.java | 19 +++++++++++++ .../FrequencyWeigthNullValueException.java | 31 ++++++++++++++++++++++ .../MissingBatchNumberForFrequencyException.java | 31 ++++++++++++++++++++++ .../consumer/CsvConsumerForTemporarySpecies.java | 10 +++++-- .../resources/i18n/tutti-service_en_GB.properties | 3 +++ .../resources/i18n/tutti-service_fr_FR.properties | 3 +++ 7 files changed, 96 insertions(+), 3 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/FrequencyWeigthNullValueException.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/MissingBatchNumberForFrequencyException.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.