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 8dadcbf Fixes #8055 Merge branch 'feature/8055' into develop adds 182a195 espèces du protocole : remplacement du du pmfm de type de pieces calcifiées par une caracteristicvalue. On propose donc les valeurs qualitative du psfm de type de piece calcifiée. Comme il n'existe pas, j'ai pris au hasard le psfm d'id 6, il faudra le modifier quand on aura la psfm (fixes #8087) new 155ec4e Fixes #8087 Merge branch 'feature/8087' 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 155ec4efe350220a816b8913ace35be42044eeee Merge: 8dadcbf 182a195 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Mar 10 15:39:02 2016 +0100 Fixes #8087 Merge branch 'feature/8087' into develop Summary of changes: .../tutti/persistence/TuttiPersistenceImpl.java | 5 ++ .../persistence/TuttiPersistenceNoDbImpl.java | 5 ++ .../entities/protocol/SpeciesProtocolBean.java | 4 +- .../CaracteristicPersistenceService.java | 2 + .../CaracteristicPersistenceServiceImpl.java | 9 ++++ .../src/main/xmi/tutti-persistence.zargo | Bin 62423 -> 62463 bytes .../ifremer/tutti/service/PersistenceService.java | 5 ++ .../fr/ifremer/tutti/service/TuttiDataContext.java | 13 +++++ .../protocol/EditProtocolSpeciesRowModel.java | 28 ++++------ .../protocol/EditProtocolSpeciesTableModel.java | 2 +- .../content/protocol/EditProtocolUIHandler.java | 59 ++++++++++++--------- 11 files changed, 87 insertions(+), 45 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.