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 eeab0f2eb0a147558cb56461e15fecf88471b47d Merge: 7b0afb8 04196f9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 10 19:57:46 2015 +0200 fixes #6933: bug à l'exportation données vers base centrale Merge branch 'feature/6933' into develop .../main/java/fr/ird/observe/entities/Trip.java | 3 + .../entities/longline/TripLonglineDAOImpl.java | 32 ++++++++- .../observe/entities/seine/TripSeineDAOImpl.java | 32 ++++++++- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 6 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 34 +++++++--- .../ui/admin/consolidate/ConsolidateUIHandler.java | 26 +++++--- .../ird/observe/ui/admin/export/ExportModel.java | 28 ++++++-- .../observe/ui/admin/export/ExportUIHandler.java | 78 +++++++++++++--------- .../fr/ird/observe/ui/admin/export/TripEntry.java | 36 ++++++---- .../ui/admin/export/TripToExportTableModel.java | 9 +-- 10 files changed, 205 insertions(+), 79 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.