This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 4b2b1be Fixes #7277 Merge branch 'feature/7277' into develop adds 5a7656b ajout du champs de poids de sous echantillon sur l'ecran de creation de lot du benthos (refs #7278) adds f1b6e6f ajout du champs de poids de sous echantillon sur l'ecran de creation de lot d'especes (fixes #7278) adds 9e82f1e Mise à jour du mapping de l'aide en ligne adds 23d3230 Mise à jour du mapping de l'aide en ligne adds f504b6c - le poids de sous echantillon doit etre strictement inferieru au poids de catégorie - i18n (refs #7278) adds 686280c correction de la validation (les poids ventilés supérieurs au poids du lot, si on met un poids de sous echantillon, l'erreur ne disparait pas) (fixes #7278) adds 4de1cf6 Renommage de batchSampleWeight en batchSampleCategoryWeight (See #7278) new 17a6ec6 Fixes #7278 Merge branch 'feature/7278' into develop The 1 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 17a6ec61d7051d3d709759055260d04f152fa0c0 Merge: 4b2b1be 4de1cf6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Dec 23 18:54:38 2015 +0100 Fixes #7278 Merge branch 'feature/7278' into develop Summary of changes: .../filtered-resources/tutti-help-fr.properties | 10 +++--- .../catches/benthos/BenthosBatchUIHandler.java | 4 ++- .../benthos/create/CreateBenthosBatchUI.css | 17 +++++++++- .../benthos/create/CreateBenthosBatchUI.jaxx | 11 +++++++ .../create/CreateBenthosBatchUIHandler.java | 1 + .../benthos/create/CreateBenthosBatchUIModel.java | 36 ++++++++++++++++++++-- .../catches/species/SpeciesBatchUIHandler.java | 3 +- .../species/create/CreateSpeciesBatchUI.css | 17 +++++++++- .../species/create/CreateSpeciesBatchUI.jaxx | 11 +++++++ .../create/CreateSpeciesBatchUIHandler.java | 1 + .../species/create/CreateSpeciesBatchUIModel.java | 31 +++++++++++++++++++ .../CreateBenthosBatchUIModel-error-validation.xml | 34 +++++++++++++++----- .../CreateSpeciesBatchUIModel-error-validation.xml | 31 ++++++++++++++++--- .../resources/i18n/tutti-ui-swing_en_GB.properties | 17 ++++++++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 19 +++++++++--- 15 files changed, 216 insertions(+), 27 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.