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 6a1d158 [jgitflow-maven-plugin]merging 'release/4.2-rc-2' into 'master' adds 41c0de8 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 421f97b [jgitflow-maven-plugin]merging 'master' into 'develop' adds e9d165d [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 83b4bb0 wording adds 2d199d9 wording adds 5492b28 Lors du chargement d'un protocol, on remplace les taxon referents obsoletes adds d974af9 Amélioration du code de dictionnaire des taxons obstolètes et importés adds eaebd84 Remplacement des taxons référents obsolètes lors de l'import d'un protocol adds 4b07a84 Fixes #7846. o remplacement des taxons obsolètes lors du chargement du protocol o remplacement des taxons obsolètes lors de l'import du protocol Merge branch 'feature/7846_import_generique_et_taxon_obsoletes' into develop adds 95b27f5 modif du formatter de commentaires pour remplacer les points virgule par des points (fixes #7128) adds 56a6256 Merge branch 'feature/7128' into 'develop' adds 9609d17 On arrondit les composants d'une coordonnée (See #7857) adds e5173df Termine #7857. Merge branch 'feature/7857_precision_sur_coordonnees' into develop adds 64002f5 Add missing license header adds a412c8a [jgitflow-maven-plugin]updating poms for branch'release/4.2' with non-snapshot versions adds b203959 [jgitflow-maven-plugin]merging 'release/4.2' 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 +- .../tutti/persistence/TuttiPersistenceImpl.java | 4 ++ .../entities/data/FishingOperationBean.java | 52 ++++++++++++++++++++++ .../entities/protocol/TuttiProtocols.java | 4 ++ .../main/java/fr/ifremer/tutti/util/Numbers.java | 20 +++++++++ tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../tutti/service/csv/CommentParserFormatter.java | 2 +- ...enericFormatReferentialSpeciesImportResult.java | 38 +++++++--------- .../ImportReferentialSpeciesAction.java | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../content/home/actions/ImportProtocolAction.java | 3 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 24 +++++----- 16 files changed, 121 insertions(+), 42 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/FishingOperationBean.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.