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 9e92e7aeabe4c4f063fc63aadff088cac1a4fc41 Merge: e66a1c9 381e7f4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 3 13:11:51 2016 +0100 [PS] Gestion plus intelligente des champs Devenir et Raison du rejet (Fixes #8377) Merge branch 'feature/8377' into develop .../ui/content/ref/impl/seine/SpeciesFateUI.jaxx | 8 ++++++ ...{SpeciesFateUIModel.java => SpeciesFateUI.jcss} | 31 ++++++--------------- .../content/ref/impl/seine/SpeciesFateUIModel.java | 8 ++++-- .../content/table/impl/seine/NonTargetCatchUI.jcss | 1 + .../table/impl/seine/NonTargetCatchUIHandler.java | 12 +++++--- .../i18n/application-swing_en_GB.properties | 1 + .../i18n/application-swing_es_ES.properties | 1 + .../i18n/application-swing_fr_FR.properties | 1 + .../DataSourceMigrationForVersion_5_1.java | 1 + ...5_1_16_evol_8377_speciesFate_add_discard-H2.sql | 1 + ...5_1_16_evol_8377_speciesFate_add_discard-PG.sql | 1 + entities/src/main/xmi/observe-seine.zargo | Bin 86621 -> 86714 bytes .../ReferentialReferenceSetDefinitions.java | 3 +- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 60479 -> 60566 bytes .../binder/referential/SpeciesFateBinder.java | 11 +++----- 15 files changed, 42 insertions(+), 38 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.