This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit a87fc399c8168606e19fed9ace4ab704fdb44912 Merge: 8f4f316 ed01b4f Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 18 10:03:24 2015 +0200 fixes #6990: [IMPORT GENERIQUE] Mauvaise gestion des espèces temporaires Merge branch 'feature/6990' into develop .../entities/protocol/TuttiProtocols.java | 10 ++-- .../tutti/service/csv/SpeciesParserFormatter.java | 22 ++++++--- .../genericformat/GenericFormatContextSupport.java | 10 ++-- .../genericformat/GenericFormatExportContext.java | 2 +- .../GenericFormatImportEntityParserFactory.java | 2 +- .../GenericFormatReferentialImportResult.java | 6 +-- ...enericFormatReferentialSpeciesImportResult.java | 53 ++++++++++++++++++++++ .../importactions/ImportProtocolAction.java | 6 ++- .../ImportReferentialSpeciesAction.java | 10 +++- .../ReferentialTemporarySpeciesService.java | 4 +- .../consumer/CsvConsumerForTemporarySpecies.java | 4 +- .../service/referential/csv/SpeciesModel.java | 22 ++++++--- .../tutti/service/referential/csv/SpeciesRow.java | 14 ++++++ .../producer/CsvProducerForTemporarySpecies.java | 4 +- 14 files changed, 129 insertions(+), 40 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.