This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See http://git.codelutin.com/tutti.git from f75ea1d [jgitflow-maven-plugin]merging 'release/4.0.7' into 'master' adds 7e51e69 [jgitflow-maven-plugin]updating poms for 4.0.8-SNAPSHOT development adds 350262d [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds b9e6d57 [jgitflow-maven-plugin]merging 'master' into 'develop' adds cbbd6ae [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 2d68325 ajout du signe Sex.UNKNOWN (refs #7536) adds 5076694 register unknown sex sign (refs #7536) adds b15c54b colonne SEX, interpréter None en ne créant pas de fils "Non sexe" (sauf si pour cette espèce il y a une autre catégorie dans la colonne SEX. Dans ce cas il faut créer le fils "Non sexe" qui sera frère de, par exemple, Male) adds 23e84a3 Ajout d'un test pour valider l'import BigFin adds e77ecad [IMPORT BIGFIN] colonne SEX interpréter Unkknown en "UNK - Indetermine" et None en ne créant pas de fils "Non sexe" termine #7536 Merge branch 'feature/7536' into develop adds 4f5990b fixes #7537 [IMPORT BIGFIN] gestion des poids adds 2c302db Modification du test d'import BigFin adds 1d72ceb [IMPORT BIGFIN] gestion des poids termine #7537 Merge branch 'feature/7537' into develop adds 0b74aad [ERGO] modifier un libellé dans un message termine #7526 adds aa545c0 [jgitflow-maven-plugin]updating poms for 4.1 branch with snapshot versions adds 88d2a10 [jgitflow-maven-plugin]updating poms for branch'release/4.1' with non-snapshot versions adds 58b7c14 [jgitflow-maven-plugin]merging 'release/4.1' into 'master' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../entities/data/SpeciesAbleBatchs.java | 16 +- .../service/util/BatchPersistenceHelper.java | 4 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../tutti/service/bigfin/BigfinImportService.java | 53 +- .../fr/ifremer/tutti/service/bigfin/signs/Sex.java | 22 +- .../ifremer/tutti/service/bigfin/signs/Sign.java | 8 +- .../ifremer/tutti/service/bigfin/signs/Size.java | 6 +- .../tutti/service/bigfin/signs/VracHorsVrac.java | 4 +- .../service/bigfin/BigfinImportService2Test.java | 188 +- .../importbigfin2.tuttiProtocol} | 4105 ++++++++++---------- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 17 files changed, 2298 insertions(+), 2124 deletions(-) copy tutti-service/src/test/resources/{pupitri/ano-3898.tuttiProtocol => bigfin/importbigfin2.tuttiProtocol} (57%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.