This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit aa9e69329444b67f0ced7a9b0d55ffd6d59c7682 Merge: 1012fd7 bf3128e Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Feb 17 16:53:36 2015 +0100 fixes #6677 [TECH] Assainissement de l'utilisation des codes campagnes dans les taxons Merge branch 'feature/6677' into develop .../tutti/persistence/TuttiPersistenceImpl.java | 39 +---- .../entities/protocol/TuttiProtocols.java | 140 +++++++++++++---- .../persistence/entities/referential/Speciess.java | 12 ++ .../entities/referential/TaxonCache.java | 101 ++++++++++++ .../entities/referential/TaxonCaches.java | 105 +++++++++++++ .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + .../ifremer/tutti/service/PersistenceService.java | 174 +-------------------- .../java/fr/ifremer/tutti/service/SpeciesMap.java | 147 ----------------- .../fr/ifremer/tutti/service/TuttiDataContext.java | 12 +- .../export/pdf/CatchesPdfExportService.java | 163 +++++++------------ .../sumatra/CatchesSumatraExportService.java | 96 +++++++++--- .../toconfirmreport/ToConfirmReportService.java | 18 ++- .../service/psionimport/PsionImportService.java | 10 +- .../service/pupitri/PupitriImportService.java | 73 +++------ .../ui/swing/action/ImportProtocolAction.java | 65 +++----- .../frequency/BenthosFrequencyUIHandler.java | 30 ++-- .../CreateIndividualObservationBatchUIHandler.java | 18 +-- .../frequency/SpeciesFrequencyUIHandler.java | 43 ++--- 19 files changed, 568 insertions(+), 680 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.