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 ed0767c1d07d3c2d914db9519f55b86c82dbf168 Merge: 95c702e 0f362ec Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 25 11:21:27 2015 +0100 fixes #6805: [REFERENTIEL] Incohérences lors de la modification des référentiels temporaires Merge branch 'feature/6805' into develop .../persistence/entities/referential/Persons.java | 8 +- .../referential/GearPersistenceServiceImpl.java | 33 +++++--- .../referential/PersonPersistenceServiceImpl.java | 11 +++ .../referential/VesselPersistenceServiceImpl.java | 41 ++++++++-- .../fr/ifremer/tutti/service/TuttiDataContext.java | 13 ++- .../consumer/CsvConsumerForTemporaryPerson.java | 3 +- .../consumer/CsvConsumerForTemporaryVessel.java | 2 +- .../operation/catches/MultiPostImportLogDialog.css | 2 +- .../catches/MultiPostImportLogDialog.jaxx | 3 +- .../catches/species/ImportPupitriPopupUI.css | 2 + .../catches/species/ImportPupitriPopupUI.jaxx | 4 +- .../species/ImportPupitriPopupUIHandler.java | 26 +----- .../species/actions/ImportPupitriAction.java | 3 +- .../actions/ImportPupitriPopupCancelAction.java | 28 +++++++ .../actions/ImportPupitriPopupValidateAction.java | 45 ++++++++++ .../MultiPostImportLogCloseDialogAction.java | 24 ++++++ .../AbstractOpenReplaceTemporaryUIAction.java | 64 ++++++++------- .../actions/ImportTemporaryActionSupport.java | 95 ++++++++++++++++++++++ .../actions/ImportTemporaryGearAction.java | 64 +++++---------- .../actions/ImportTemporaryPersonAction.java | 66 +++++---------- .../actions/ImportTemporarySpeciesAction.java | 62 ++++---------- .../actions/ImportTemporaryVesselAction.java | 62 ++++---------- .../replace/AbstractReplaceTemporaryUI.css | 1 + .../replace/AbstractReplaceTemporaryUI.jaxx | 2 +- .../actions/AbstractReplaceTemporaryUIAction.java | 13 +++ .../replace/actions/CloseReplaceUIAction.java | 27 ++++++ .../actions/ReplaceTemporaryGearAction.java | 7 ++ .../actions/ReplaceTemporaryPersonAction.java | 7 ++ .../actions/ReplaceTemporarySpeciesAction.java | 6 ++ .../actions/ReplaceTemporaryVesselAction.java | 7 ++ 30 files changed, 459 insertions(+), 272 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.