This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit aec7d23538f4d5993a772cd6e1e24a6357c901a3 Merge: ccae38f 4fe49c1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 3 11:08:40 2016 +0100 [PS] Sur les échantillons de non cible, ajouter un champ Devenir (Fixes #8578) Merge branch 'feature/8578' into develop ...onTargetLengthDto-ui-update-error-validation.xml | 12 ++++++++++++ ...TargetLengthDto-ui-update-warning-validation.xml | 9 +++++++++ .../application-swing-validation_en_GB.properties | 2 ++ .../application-swing-validation_es_ES.properties | 2 ++ .../application-swing-validation_fr_FR.properties | 2 ++ .../swing/ui/content/ContentUIHandler.java | 4 ++-- .../content/table/impl/seine/NonTargetCatchUI.jaxx | 2 +- .../content/table/impl/seine/NonTargetSampleUI.jaxx | 12 ++++++++++++ .../content/table/impl/seine/NonTargetSampleUI.jcss | 10 ++++++++++ .../table/impl/seine/NonTargetSampleUIHandler.java | 16 +++++++++++++++- .../table/impl/seine/NonTargetSampleUIModel.java | 1 + .../versions/DataSourceMigrationForVersion_5_1.java | 1 + ...evol_8578_nonTargetLength_add_speciesFate-H2.sql | 2 ++ ...evol_8578_nonTargetLength_add_speciesFate-PG.sql | 2 ++ .../fr/ird/observe/entities/seine/SetSeines.java | 13 ++++++++++--- entities/src/main/xmi/observe-seine.zargo | Bin 86054 -> 86621 bytes .../request/ReferenceSetRequestDefinitions.java | 1 + .../src/main/xmi/observe-services-dto-seine.zargo | Bin 60028 -> 60479 bytes services-dto/src/main/xmi/observe-services-dto.ini | 2 ++ .../topia/binder/data/NonTargetLengthBinder.java | 4 ++++ .../NonTargetLength-service-error-validation.xml | 12 ++++++++++++ .../NonTargetLength-service-warning-validation.xml | 9 +++++++++ .../i18n/services-topia-validation_en_GB.properties | 2 ++ .../i18n/services-topia-validation_es_ES.properties | 2 ++ .../i18n/services-topia-validation_fr_FR.properties | 2 ++ .../consolidate/ConsolidateDataServiceTopia.java | 7 ++++++- .../service/seine/NonTargetSampleServiceTopia.java | 18 +++++++++++++++++- 27 files changed, 140 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.