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 ca954ab82973660aea4e3cd78865dfd82bf38641 Merge: 1e1f975 5e88001 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Nov 25 08:27:27 2014 +0100 fixes #6150 Merge branch 'feature/6150' into develop .../java/fr/ifremer/tutti/TuttiConfiguration.java | 6 +- .../ifremer/tutti/service/PdfGeneratorService.java | 84 +++++ .../export/pdf/CatchesPdfExportService.java | 90 +++--- .../fr/ifremer/tutti/service/pupitri/BoxType.java | 33 ++ .../pupitri/CarrouselImportRequestResult.java | 64 +++- .../tutti/service/pupitri/PupitriCatch.java | 168 ---------- .../service/pupitri/PupitriExportService.java | 2 + .../tutti/service/pupitri/PupitriImportResult.java | 124 +++++--- .../service/pupitri/PupitriImportService.java | 354 +++++++++------------ .../tutti/service/pupitri/PupitriSignContext.java | 65 ++++ .../service/pupitri/PupitriSpeciesContext.java | 285 +++++++++++++++++ .../service/pupitri/{ => csv}/CarrouselRow.java | 14 +- .../pupitri/{ => csv}/CarrouselRowModel.java | 23 +- .../service/pupitri/{ => csv}/SpeciesRow.java | 2 +- .../service/pupitri/{ => csv}/SpeciesRowModel.java | 2 +- .../tutti/service/pupitri/{ => csv}/TrunkRow.java | 3 +- .../service/pupitri/{ => csv}/TrunkRowModel.java | 3 +- .../pupitri/report/PupitriImportReportModel.java | 126 ++++++++ .../pupitri/report/PupitriImportReportRow.java | 84 +++++ .../service/referential/ImportRequestResult.java | 14 +- .../ReferentialTemporaryGearService.java | 6 +- .../ReferentialTemporaryPersonService.java | 6 +- .../ReferentialTemporarySpeciesService.java | 6 +- .../ReferentialTemporaryVesselService.java | 6 +- .../src/main/resources/ftl/pupitriReport_fr.ftl | 234 ++++++++++++++ .../resources/i18n/tutti-service_en_GB.properties | 4 + .../resources/i18n/tutti-service_fr_FR.properties | 7 +- ...9.java => PupitriImportServiceEvo6149Test.java} | 36 ++- .../src/test/resources/pupitri/evo-6149.car | 4 +- .../tutti/ui/swing/action/ImportPupitriAction.java | 37 +++ .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 14 + .../util/attachment/AttachmentEditorUIHandler.java | 10 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 4 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 + 34 files changed, 1395 insertions(+), 529 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.