| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionForm.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionForm.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormCommentaire.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormCommentaire.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormDescription.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormDescription.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormInventaire.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormInventaire.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormPersonne.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormPersonne.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormPublication.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormPublication.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormContenu.java |
|---|
| 133,7 → 133,7 |
| classementFieldSet.setLayout(Formulaire.creerFormLayout(largeurLabelDefaut, alignementLabelDefaut)); |
| etatClassementCombo = new ChampComboBoxListeValeurs(i18nC.etatClassementCollection(), "etatClassement", tabIndex++); |
| classementFieldSet.add(etatClassementCombo); |
| classementFieldSet.add(etatClassementCombo, new FormData(550, 0)); |
| annotationClassementChp = new TextArea(); |
| annotationClassementChp.setFieldLabel(i18nC.annotationClassementCollection()); |
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormContenu.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionVue.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionListeVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionListeVue.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormGeneral.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormGeneral.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionDetailVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionDetailVue.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/. |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection:r1878-1880 |