This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit bd34b7e778f9829297cbf04fa331aff99d5edf2b Merge: 573e649 d5c4c44 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 17 10:42:31 2016 +0100 Fixes #8128 Merge branch 'feature/8128' into develop .../service/CatchBatchPersistenceServiceImpl.java | 4 +- .../java/fr/ifremer/tutti/type/WeightUnit.java | 19 +++++++++- .../main/java/fr/ifremer/tutti/util/Weights.java | 29 ++++++--------- .../tutti/service/bigfin/BigfinImportService.java | 5 ++- .../service/catches/WeightComputingService.java | 43 +++++++++++----------- .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 5 ++- .../service/psionimport/PsionImportService.java | 4 +- .../tutti/service/pupitri/PupitriImportResult.java | 6 +-- .../service/pupitri/PupitriImportService.java | 7 ++-- .../pupitri/report/PupitriImportReportModel.java | 14 +++---- .../benthos/actions/CreateBenthosMelagAction.java | 2 +- .../species/actions/CreateSpeciesMelagAction.java | 2 +- .../frequency/SpeciesFrequencyRowModel.java | 2 +- .../species/frequency/SpeciesFrequencyUIModel.java | 10 ++--- 14 files changed, 84 insertions(+), 68 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.