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 7dedfd49b7bf4ca0b38b46f06aab4b2ca6d1564c Merge: c2d4a8a 0ce79ed Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 1 23:13:07 2015 +0200 fixes #6698: [IMPORT GENERIQUE] Rapport d’import transmissible par mail Merge branch 'feature/6698' into develop .../entities/data/FishingOperations.java | 2 +- .../genericformat/GenericFormatContextSupport.java | 8 +- .../GenericFormatImportCruiseContext.java | 18 +- .../GenericFormatImportCruiseResult.java | 69 +- .../GenericFormatImportOperationResult.java | 78 +- .../genericformat/GenericFormatImportResult.java | 69 +- .../genericformat/GenericFormatResultSupport.java | 10 +- .../GenericFormatValidateFileContext.java | 2 +- .../GenericformatImportPersistenceHelper.java | 15 +- .../importactions/DoCheckWeightAction.java | 2 +- .../importactions/DoCleanWeightAction.java | 2 +- .../importactions/ImportAccidentalCatchAction.java | 2 +- .../importactions/ImportCatchAction.java | 4 +- .../ImportIndividualObservationAction.java | 2 +- .../importactions/ImportMarineLitterAction.java | 2 +- .../importactions/ImportOperationAction.java | 24 +- .../importactions/ImportParameterAction.java | 2 +- .../resources/ftl/genericFormatImportReport_fr.ftl | 281 ++++--- .../ftl/genericFormatValidateReport_fr.ftl | 19 +- .../resources/i18n/tutti-service_fr_FR.properties | 2 +- .../GenericFormatImportServiceTest.java | 16 +- .../genericFormat/default/attachments.csv | 1 + .../test/resources/genericFormat/default/catch.csv | 866 ++++++++++----------- .../genericFormat/default/marineLitter.csv | 8 +- .../resources/genericFormat/default/operation.csv | 6 +- .../resources/genericFormat/default/survey.csv | 4 +- .../resources/genericFormat/empty/attachments.csv | 1 + .../test/resources/genericFormat/empty/catch.csv | 2 +- .../resources/genericFormat/empty/marineLitter.csv | 2 +- .../resources/genericFormat/empty/operation.csv | 2 +- .../test/resources/genericFormat/empty/survey.csv | 2 +- 31 files changed, 836 insertions(+), 687 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.