This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 232a048d72c55a2c6a35a862bc6084fa909290e9 Merge: 9be563d 9ff2298 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Oct 16 16:50:27 2015 +0200 Merge branch 'feature/7603' into develop .../content/table/impl/seine/SchoolEstimateUI.jaxx | 13 ++- .../table/impl/seine/SchoolEstimateUIHandler.java | 116 +++++++-------------- .../table/impl/seine/SchoolEstimateUIModel.java | 45 +++++--- ...choolEstimateDto-n1-update-error-validation.xml | 76 ++++++++++++++ ...choolEstimateDto-n1-update-error-validation.xml | 65 ++++++++++++ .../v1/seine/SchoolEstimateServiceController.java | 8 +- .../ird/observe/entities/referentiel/Species2.java | 28 +++-- .../observe/entities/referentiel/SpeciesLists.java | 2 + .../service/seine/SchoolEstimateService.java | 4 +- .../java/fr/ird/observe/services/dto/IdDtos.java | 13 +++ .../ird/observe/services/ObserveServiceTopia.java | 20 +++- .../ird/observe/services/entity/EntitiesSet.java | 19 +--- .../services/entity/ObserveEntitiesFilters.java | 5 + .../services/entity/SpeciesListEntitiesSet.java | 11 +- .../entity/SpeciesListOceanEntitiesSet.java | 39 +++++++ .../services/entity/UniverseEntitiesSet.java | 13 ++- .../service/seine/SchoolEstimateServiceTopia.java | 16 ++- 17 files changed, 354 insertions(+), 139 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.