This is an automated email from the git hooks/post-receive script. New change to branch feature/merge_species_benthos in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git discards ddeea47 suppression de BenthosBatch, BenthosBatchFrequency et des contrat SpeciesBatchAble et SpeciesFrequencyBatchAble dans le module swing discards dfdf9c9 suppression de BenthosBatch, BenthosBatchFrequency et des contrat SpeciesBatchAble et SpeciesFrequencyBatchAble dans le module service discards 884591e suppression de BenthosBatch, BenthosBatchFrequency et des contrat SpeciesBatchAble et SpeciesFrequencyBatchAble dans le module persistence adds d159bac Selection + rendre visible la ligne de la rafal (See #8129) adds ae30f75 Merge branch 'feature/8129' into 'develop' adds 573e649 on force le mode rafale si on est en mode de recopie, même à l'initialisation adds 9522217 Permettre d'arrondir à partir d'une unité adds b031235 Ajout de nouvelles méthodes sur Weights adds 5868576 Utilisation des arrondis de poids (see #8128) + utilisation des nouvelles méthodes sur les poids adds d5c4c44 Correction de l'arrondi (See #8128) adds bd34b7e Fixes #8128 Merge branch 'feature/8128' into develop adds 06def09 import adds 0af8ebc Persister les mensurations si le poids ou la taille est présente adds a2d6dba Forcer le mode de recopie à l'ouverture de l'écran adds 0868f86 Ajout de deux titres (See #8140) adds 85cddd8 - remplacement des titleborders par des jxtitlepanes - deplacement de certains boutons dans les barres de titre see #8140 adds e5916d9 Fixes #8140 Merge branch 'feature/8140' into develop adds 7f23045 suppression de BenthosBatch, BenthosBatchFrequency et des contrat SpeciesBatchAble et SpeciesFrequencyBatchAble dans le module persistence adds 28557a2 suppression de BenthosBatch, BenthosBatchFrequency et des contrat SpeciesBatchAble et SpeciesFrequencyBatchAble dans le module service adds 98e8ce9 suppression de BenthosBatch, BenthosBatchFrequency et des contrat SpeciesBatchAble et SpeciesFrequencyBatchAble dans le module swing This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (ddeea47) \ N -- N -- N refs/heads/feature/merge_species_benthos (98e8ce9) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. No new revisions were added by this update. Summary of changes: .../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 | 5 +- .../frequency/SpeciesFrequencyCellComponent.java | 2 +- .../frequency/SpeciesFrequencyRowModel.java | 3 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 114 ++++++++++---------- .../species/frequency/SpeciesFrequencyUI.jcss | 119 ++++++++++++--------- .../frequency/SpeciesFrequencyUIHandler.java | 15 +-- .../species/frequency/SpeciesFrequencyUIModel.java | 10 +- .../actions/ApplySpeciesFrequencyRafaleAction.java | 14 ++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 +- 21 files changed, 238 insertions(+), 188 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.