This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from d7b1e7f Correction syntaxique dans un message d'erreur new 301a959 fixes #8311: [IMPORT GENERIQUE] Avertir de l'écrasement de données uniquement lorsque la campagne ou le trait existe déjà en base new 1c38756 Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/tutti into develop The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 1c38756c6bd4f91e279d63b4d9a74ed244fef06b Merge: 301a959 d7b1e7f Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Wed Jul 27 18:31:28 2016 +0200 Merge branch 'develop' of https://gitlab.nuiton.org/codelutin/tutti into develop commit 301a9597d44c2a041022c970e4de7f6d87fb595a Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Wed Jul 27 18:30:04 2016 +0200 fixes #8311: [IMPORT GENERIQUE] Avertir de l'écrasement de données uniquement lorsque la campagne ou le trait existe déjà en base Summary of changes: .../genericformat/GenericFormatImportUIModel.java | 4 ++-- .../actions/GenericFormatImportAction.java | 4 ++-- .../genericformat/tree/CruiseSelectTreeNode.java | 19 ++++++++++++++++ .../tree/OperationSelectTreeNode.java | 6 ++++++ .../genericformat/tree/ProgramSelectTreeNode.java | 25 +++++++++++++++++----- 5 files changed, 49 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.