This is an automated email from the git hooks/post-receive script. New commit to branch feature/8213 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 59dac8eac081ac054b6da6601f33ea700191ced8 Author: Kevin Morin <morin@codelutin.com> Date: Fri Apr 1 23:42:43 2016 +0200 on ne set le rtp a null que quand on edite un nouveau batch (fixes #8213) --- .../filtered-resources/tutti-help-fr.properties | 26 ++-------------------- .../frequency/SpeciesFrequencyUIHandler.java | 2 +- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties index d4a116c..966dd6b 100644 --- a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties +++ b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties @@ -1,28 +1,5 @@ -### -# #%L -# Tutti :: UI -# $Id:$ -# $HeadURL:$ -# %% -# Copyright (C) 2012 - 2016 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Tue Mar 22 13:24:39 CET 2016 +#Fri Apr 01 23:37:59 CEST 2016 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions @@ -487,6 +464,7 @@ tutti.report.field.fishingOperation.help=report.html\#fields tutti.report.field.outputFile.help=report.html\#fields tutti.report.field.report.help=report.html\#fields tutti.report.help=report.html +tutti.selectCruise.action.calcifiedPiecesSamplingReport.help= tutti.selectCruise.action.cloneProtocol.help=selectCruise.html\#actions tutti.selectCruise.action.deleteProtocol.help=selectCruise.html\#actions tutti.selectCruise.action.editCatches.help=selectCruise.html\#actions diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java index f1a0cb6..37e4887 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java @@ -878,6 +878,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci model.setBatch(speciesBatch); model.setMinStep(null); model.setMaxStep(null); + model.setRtp(null); model.setCopyRtpWeights(false); model.setAddIndividualObservationOnRafale(false); @@ -1724,7 +1725,6 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci model.setTotalComputedWeight(null); model.setTotalWeight(null); model.setSimpleCount(null); - model.setRtp(null); Caracteristic lengthStepCaracteristic = null; CopyIndividualObservationMode copyIndividualObservationMode = null; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.