This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 681dc4f livrable #8198 Merge branch 'feature/8198' into develop adds bba4285 ajout du code de prélèvement et du mode de recopie pour l'import export (refs #8153) adds e61c8c5 on n'enregistre pas les lignes importées, on les retourne à l'utilisateur (refs #8153) adds 879dea2 on recharge les lignes ) partir du résultat de l'import (fixes #8153) adds e64da66 Remove strange comment adds 39cffa5 Do not import empty SamplingCode adds 8748f39 Fix merge new 18011f5 livrable #8153 Merge branch 'feature/8153' into develop 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 18011f572900afee15e40a086273c59e53b910b6 Merge: 681dc4f 8748f39 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 31 18:04:57 2016 +0200 livrable #8153 Merge branch 'feature/8153' into develop Summary of changes: .../persistence/entities/CaracteristicMap.java | 2 +- .../catches/multipost/MultiPostExportContext.java | 4 +- .../catches/multipost/MultiPostImportResult.java | 36 ++ .../catches/multipost/MultiPostImportService.java | 100 ++++- .../multipost/csv/IndividualObservationRow.java | 42 +- .../csv/IndividualObservationRowModel.java | 5 + .../IndividualObservationBatchTableModel.java | 12 +- .../catches/species/BenthosBatchUISupportImpl.java | 3 +- .../catches/species/SpeciesBatchUISupportImpl.java | 3 +- .../species/SpeciesOrBenthosBatchUISupport.java | 3 +- .../frequency/SpeciesFrequencyUIHandler.java | 443 +++++++++++---------- .../species/frequency/SpeciesFrequencyUIModel.java | 8 + .../ImportMultiPostSpeciesSupportAction.java | 87 +++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 15 files changed, 463 insertions(+), 287 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportResult.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.