Tony CHEMIT pushed to branch feature/1254 at ultreiaio / ird-observe

Commits:

• 298645ca
  by Tony Chemit at 2021-01-20T14:51:45+01:00

  Revert bad replaces
  

• 0498c7e8
  by Tony Chemit at 2021-01-20T15:34:02+01:00

  Les tests passent jusqu'aux services :)
  Il ne reste plus qu'à modifier les ui (peace of cake)
  

30 changed files:

• client/configuration/src/main/config/Client.ini
• client/configuration/src/main/i18n/getters/config.getter
• client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/SetNonTargetCatchUI.jaxx
• client/datasource/editor/ps/src/main/resources/fr/ird/observe/client/datasource/editor/ps/data/observation/SetNonTargetCatchUINavigationNode.scope
• client/i18n/src/main/i18n/translations/observe_en_GB.properties
• client/i18n/src/main/i18n/translations/observe_es_ES.properties
• client/i18n/src/main/i18n/translations/observe_fr_FR.properties
• doc/modelisation/zargo/v5/observe.ini
• doc/modelisation/zargo/v7/observe.ini
• models/dto-definition/src/main/models/Observe-20-data-ps-observation.model
• models/dto/src/main/resources/observe-reports.properties
• models/persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_9_0.java
• models/persistence/src/main/models/Observe-20-data-ps-observation.model
• + models/persistence/src/main/resources/db/migration/9.0/03_ps_observation_merge_catches-create-common.sql
• models/persistence/src/main/resources/db/migration/9.0/03_ps_observation_merge_catches-common.sql → models/persistence/src/main/resources/db/migration/9.0/03_ps_observation_merge_catches-fill-common.sql
• + models/persistence/src/main/resources/db/migration/9.0/03_ps_observation_merge_catches-finalize-common.sql
• models/persistence/src/main/resources/db/migration/9.0/04_ps_observation_drop_tables-H2.sql
• models/persistence/src/main/resources/db/migration/9.0/04_ps_observation_drop_tables-PG.sql
• models/persistence/src/main/resources/db/migration/9.0/observe_create-schema-H2.sql
• models/persistence/src/main/resources/db/migration/9.0/observe_create-schema-PG.sql
• models/persistence/src/main/resources/db/migration/9.0/observe_full-schema-H2.sql
• models/persistence/src/main/resources/db/migration/9.0/observe_full-schema-PG.sql
• models/persistence/src/test/resources/fixtures/persistence/count-data-seine-1.properties
• models/persistence/src/test/resources/fixtures/persistence/count-data-seine-2.properties
• models/persistence/src/test/resources/fixtures/persistence/count-data-seine-3.properties
• models/persistence/src/test/resources/fixtures/persistence/count-referential-common.properties
• models/persistence/src/test/resources/fixtures/persistence/count-referential-seine.properties
• models/persistence/src/test/resources/fixtures/persistence/entity-associations-count-referential.properties
• models/persistence/src/test/resources/fixtures/persistence/entity-paths-count.properties
• models/persistence/src/test/resources/fixtures/persistence/entity-paths-links-count.properties

The diff was not included because it is too large.