This is an automated email from the git hooks/post-receive script. New commit to branch feature/8081 in repository tutti. See http://git.codelutin.com/tutti.git commit f54784e98ac00bba896e5e3b3043e8c945aabd16 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 8 14:48:06 2016 +0100 mauvais merge (refs #8081) --- .../operation/catches/species/frequency/SpeciesFrequencyUIModel.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java index c8624c0..3ddc475 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java @@ -651,12 +651,11 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa } public boolean mustCopyIndividualObservationSize() { - return getIndividualObservationRowsInError().isEmpty() - && (isCopyIndividualObservationAll() || isCopyIndividualObservationSize()); + return isCopyIndividualObservationAll() || isCopyIndividualObservationSize(); } public boolean mustCopyIndividualObservationWeight() { - return getIndividualObservationRowsInError().isEmpty() && isCopyIndividualObservationAll(); + return isCopyIndividualObservationAll(); } public boolean isCopyIndividualObservationAll() { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.