This is an automated email from the git hooks/post-receive script. New change to branch master-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git from f160653 [jgitflow-maven-plugin]merging 'release/4.4.2' into 'master-4.4.x' adds cd4c1a9 [jgitflow-maven-plugin]updating poms for 4.4.3-SNAPSHOT development adds bc7fae2 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 3b2275d [jgitflow-maven-plugin]merging 'master-4.4.x' into 'develop-4.4.x' adds 665af62 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 4a20c31 Simplification du code de calcul du raising factor final adds 8d60163 Ajout d'un test pour vérifier le calcul du raising factor final adds 4ce9f47 Ajout méthode pour récupérer la dernière catégorie renseignée adds 687010e Utilisation des bonnes catégories pour compléter le sampleWeight (utilisé pour le calcul du raising factor final) adds 609a875 Utilisation des bonnes catégories pour compléter le sampleWeight (utilisé pour le calcul du raising factor final) adds 3096c21 Fixes #7992 Merge branch 'feature/7992_erreur_calcul_coef_final' into develop-4.4.x adds 99c4242 on ne pousse que les heures et les minutes quand on appelle set...Time (fixes #7996) adds 3c29747 Fixes #7996 Merge branch 'feature/7996' into develop-4.4.x adds b082bb7 [jgitflow-maven-plugin]updating poms for branch'release/4.4.3' with non-snapshot versions adds e8bc144 Use java 8 adds 363c8fe [jgitflow-maven-plugin]merging 'release/4.4.3' into 'master-4.4.x' No new revisions were added by this update. Summary of changes: pom.xml | 6 ++- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../tutti/service/genericformat/csv/CatchRow.java | 7 ++++ .../producer/CsvProducerForCatch.java | 34 +++++++++++------ ... => GenericFormatExportServiceAno7992Test.java} | 44 ++++++++++++---------- .../resources/genericFormat/ano7992.tuttiProtocol | 22 +++++++++++ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../operation/EditFishingOperationUIHandler.java | 2 +- .../operation/EditFishingOperationUIModel.java | 20 +++++++--- 13 files changed, 102 insertions(+), 45 deletions(-) copy tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/{GenericFormatExportServiceAno5804Test.java => GenericFormatExportServiceAno7992Test.java} (53%) create mode 100644 tutti-service/src/test/resources/genericFormat/ano7992.tuttiProtocol -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.