fix errors after rebase

data/maarchRM/sql/pgsql/demo.sql

@@ -351,77 +351,6 @@ INSERT INTO "recordsManagement"."retentionRule" ("code","duration","finalDisposi
 ('GES', 'P5Y', 'destruction', 'Documents de gestion', 'Documents de gestion', NULL)
 ;
 
-<<<<<<< HEAD
-INSERT INTO "recordsManagement"."archivalProfile" ("archivalProfileId","reference","name","descriptionSchema","descriptionClass","retentionStartDate","isRetentionLastDeposit","retentionRuleCode","description","accessRuleCode","acceptUserIndex","acceptArchiveWithoutProfile","fileplanLevel","processingStatuses") VALUES
-('1', 'COUA', 'Courrier Administratif', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('2', 'PRVN', 'Procès-Verbal de Négociation', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('3', 'PRVIF', 'Procès-verbal à Incidence Financière', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('4', 'ETAR', 'État de Rapprochement', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('5', 'RELCC', 'Relevé de Contrôle de Caisse', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('6', 'CTRF', 'Contrat Fournisseur', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('7', 'DCLTVA', 'Déclaration de TVA', NULL, NULL, 'originatingDate', false, 'IMP', NULL, NULL, true, true, 'file', NULL),
-('8', 'QUTP', 'Quittance de Paiement', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('9', 'FICIC', 'Fiche d''Imputation Comptable', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('10', 'FACJU', 'Facture Justificative', NULL, NULL, 'originatingDate', false, 'COM', NULL, NULL, true, true, 'item', NULL),
-('11', 'FICREC', 'Fiche Récapitulative', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('12', 'DOSC', 'Dossiers Caisse', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'file', NULL),
-('13', 'PIECD', 'Pièce de Caisse-Dépense', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('14', 'PIEJ', 'Pièce Justificative', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('15', 'DOSB', 'Dossiers Banque', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'file', NULL),
-('16', 'PIEBD', 'Pièce de Banque-Dépense', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('17', 'FICDG', 'Fiche DG', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('18', 'NOTSER', 'Note de service', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('19', 'PM', 'Passation de marché', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'file', NULL),
-('20', 'BORT', 'Bordereau de transmission', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('21', 'COUNM', 'Courrier de notification de marché', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('22', 'PRVA', 'Procès-Verbal d''Attribution', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('23', 'PRVOP', 'Proces-Verbal d''Ouverture des Plis', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('24', 'RAPEO', 'Rapport d’Évaluation des Offres', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('26', 'DEMC', 'Demande de Cotation', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('27', 'RAPFOR', 'Rapport de Formation', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('28', 'DOSIP', 'Dossier Individuel du Personnel', NULL, NULL, 'originatingDate', false, 'DIP', NULL, NULL, true, true, 'file', NULL),
-('29', 'ETAC', 'Etat Civil', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('30', 'CURV', 'Curriculum Vitae', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('31', 'EXTAN', 'Extrait d''Acte de Naissance', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('33', 'CASJU', 'Casier Judiciaire', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('34', 'ATTSU', 'Attestation de succès', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('35', 'CTRTRV', 'Contrat de Travail', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('37', 'ATTT', 'Attestation de Travail', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('39', 'CNSS', 'Caisse Nationale de Sécurité Sociale', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('41', 'CAR', 'Carrière', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('42', 'DECIN', 'Décision de nomination', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('43', 'DECIR', 'Décision de redéploiement', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('47', 'ATTF', 'Attestation de formation', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('53', 'COURRN', 'Courrier Répartition du Résultat Net', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('54', 'COUDS', 'Courrier Domiciliation de Salaire', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('55', 'FICP', 'Fiche de Poste', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('56', 'FICF', 'Fiche de Fonction', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('57', 'DEMA', 'Demandes Administratives', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('58', 'COUAA', 'Courrier Autorisation d''Absence', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('59', 'COUCA', 'Courrier Congés Administratifs', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('60', 'COUDE', 'Courrier Demande d''Emploi', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('61', 'DOSETU', 'Dossier de Synthèse et d’Étude', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'file', NULL),
-('62', 'FICRM', 'Fiche de Remontée Mensuelle', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('63', 'RAPT', 'Rapport Trimestriel', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('64', 'RAPMOE', '	Rapport de Mise en Œuvre', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('65', 'RAPA', 'Rapport d''Activité', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('66', 'RAPSE', 'Rapport de Suivi et Évaluation', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('67', 'RAPGES', 'Rapport de Gestion', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('68', 'TDRE', 'Termes de Références des Études', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('69', 'DCRN', 'Décret de Nomination', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('70', 'FICCR', 'Fiche de compte rendu', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('71', 'LETC', 'Lettre circulaire', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('72', 'FICI', 'Fiche d''instruction', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('73', 'RAPAMI', 'Rapport d''Audit et Missions Internes', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('74', 'RAPAE', 'Rapport d''Audit Externe', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('75', 'RAPER', 'Rapport d’Études et Recherches', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('76', 'COUABID', 'Courrier Arrivée BID', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('77', 'SMIROP', 'Fiche de visite SMIROP', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('78', 'VISA', 'Visas obtenus', NULL, NULL, 'originatingDate', false, NULL, NULL, NULL, true, true, 'item', NULL),
-('79', 'FACVEN', 'Facture de vente', NULL, NULL, 'originatingDate', false, 'COM', NULL, NULL, true, true, 'item', NULL),
-('80', 'FACACH', 'Facture d''achat', NULL, NULL, 'description/dueDate', false, 'COM', NULL, NULL, true, false, 'item', '{"NEW": {"type": "initial", "label": "Nouvelle(s) facture(s)", "actions": {"qualify": {}, "cancelQualify": {}}, "default": true, "position": 0, "filterUserAccess": false}, "PAYED": {"type": "final", "label": "Payée", "actions": {}, "default": false, "position": 6, "filterUserAccess": false}, "APPROVED": {"type": "intermediate", "label": "À payer", "actions": {"pay": {}, "updateMetadata": {}}, "default": false, "position": 5, "filterUserAccess": true}, "REJECTED": {"type": "intermediate", "label": "Rejetée(s)", "actions": {"sendValidation": {}, "updateMetadata": {}, "sendToApprobation": {}}, "default": false, "position": 3, "filterUserAccess": true}, "CANCELLED": {"type": "final", "label": "Annulée", "actions": {}, "default": false, "position": 7, "filterUserAccess": false}, "QUALIFIED": {"type": "intermediate", "label": "À valider", "actions": {"reject": {}, "redirect": {}, "validate": {}}, "default": false, "position": 1, "filterUserAccess": true}, "VALIDATED": {"type": "intermediate", "label": "À approuver", "actions": {"reject": {}, "approve": {}}, "default": false, "position": 4, "filterUserAccess": true}, "MISQUALIFIED": {"type": "intermediate", "label": "À requalifier", "actions": {"qualify": {}}, "default": false, "position": 2, "filterUserAccess": true}}'),
-('81', 'BULPAI', 'Bulletins de paie', NULL, NULL, NULL, false, 'BULPAI', NULL, NULL, false, false, 'item', '{}')
-=======
 INSERT INTO "recordsManagement"."archivalProfile" ("archivalProfileId","reference","name","descriptionSchema","descriptionClass","retentionStartDate" ,"retentionRuleCode","description","accessRuleCode","acceptUserIndex","acceptArchiveWithoutProfile","fileplanLevel","processingStatuses","isRetentionLastDeposit") VALUES
 ('1', 'COUA', 'Courrier Administratif', NULL, NULL, 'originatingDate', NULL, NULL, NULL, true, true, 'item', NULL, false),
 ('2', 'PRVN', 'Procès-Verbal de Négociation', NULL, NULL, 'originatingDate', NULL, NULL, NULL, true, true, 'item', NULL, false),
@@ -491,7 +420,6 @@ INSERT INTO "recordsManagement"."archivalProfile" ("archivalProfileId","referenc
 ('79', 'FACVEN', 'Facture de vente', NULL, NULL, 'originatingDate', 'COM', NULL, NULL, true, true, 'item', NULL, false),
 ('80', 'FACACH', 'Facture d''achat', NULL, NULL, 'description/dueDate', 'COM', NULL, NULL, true, false, 'item', '{"NEW": {"type": "initial", "label": "Nouvelle(s) facture(s)", "actions": {"qualify": {}, "cancelQualify": {}}, "default": true, "position": 0, "filterUserAccess": false}, "PAYED": {"type": "final", "label": "Payée", "actions": {}, "default": false, "position": 6, "filterUserAccess": false}, "APPROVED": {"type": "intermediate", "label": "À payer", "actions": {"pay": {}, "updateMetadata": {}}, "default": false, "position": 5, "filterUserAccess": true}, "REJECTED": {"type": "intermediate", "label": "Rejetée(s)", "actions": {"sendValidation": {}, "updateMetadata": {}, "sendToApprobation": {}}, "default": false, "position": 3, "filterUserAccess": true}, "CANCELLED": {"type": "final", "label": "Annulée", "actions": {}, "default": false, "position": 7, "filterUserAccess": false}, "QUALIFIED": {"type": "intermediate", "label": "À valider", "actions": {"reject": {}, "redirect": {}, "validate": {}}, "default": false, "position": 1, "filterUserAccess": true}, "VALIDATED": {"type": "intermediate", "label": "À approuver", "actions": {"reject": {}, "approve": {}}, "default": false, "position": 4, "filterUserAccess": true}, "MISQUALIFIED": {"type": "intermediate", "label": "À requalifier", "actions": {"qualify": {}}, "default": false, "position": 2, "filterUserAccess": true}}', false),
 ('81', 'BULPAI', 'Bulletins de paie', NULL, NULL, NULL, 'BULPAI', NULL, NULL, false, false, 'item', '{}', false)
->>>>>>> d39e120eee045cc330d971d6b53aef67b6b97b7e
 ;
 
 INSERT INTO "recordsManagement"."archivalProfileContents" ("parentProfileId","containedProfileId") VALUES

data/maarchRM/sql/pgsql/migrationV2.7_V2.8.sql

 -- Migration script for PGSQL from Maarch RM V2.7 to V2.8
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 DROP SCHEMA IF EXISTS "Collection" CASCADE;
 
 CREATE SCHEMA "Collection";
@@ -30,12 +27,4 @@ WITH (
   OIDS=FALSE
 );
 
-=======
 ALTER TABLE "recordsManagement"."archivalProfile" ADD COLUMN "isRetentionLastDeposit" boolean default false;
->>>>>>> feat/#16379 : Elimination date based on the last deposit
-=======
-ALTER TABLE "recordsManagement"."archivalProfile" ADD COLUMN "isRetentionLastDeposit" boolean default false;
->>>>>>> feat/#16379 : Elimination date based on the last deposit
-=======
-ALTER TABLE "recordsManagement"."archivalProfile" ADD COLUMN "isRetentionLastDeposit" boolean default false;
->>>>>>> d39e120eee045cc330d971d6b53aef67b6b97b7e

src/bundle/recordsManagement/Controller/archiveEntryTrait.php

@@ -778,11 +778,7 @@ trait archiveEntryTrait
     }
 
     /**
-<<<<<<< HEAD
-     * Check a parentArchive retention rule
-=======
      * Update the retention start date of an archive
->>>>>>> d39e120eee045cc330d971d6b53aef67b6b97b7e
      *
      * @param recordsManagement/archive $archive      The archive to receive
      */

src/bundle/recordsManagement/Message/archivalProfile.php

@@ -79,11 +79,7 @@ class archivalProfile
     public $retentionStartDate;
 
     /**
-<<<<<<< HEAD
-     * The starting date of the retention rule calculation is from last deposit
-=======
      * The starting date of calculated retention rule based on last deposit date
->>>>>>> d39e120eee045cc330d971d6b53aef67b6b97b7e
      *
      * @var boolean
      */

src/bundle/recordsManagement/Model/archivalProfile.php

@@ -82,11 +82,7 @@ class archivalProfile
     public $retentionStartDate;
 
     /**
-<<<<<<< HEAD
-     * The starting date of the retention rule calculation is from last deposit
-=======
      * The starting date of calculated retention rule based on last deposit date
->>>>>>> d39e120eee045cc330d971d6b53aef67b6b97b7e
      *
      * @var boolean
      */

src/bundle/recordsManagement/Resources/sql/schema.pgsql.sql

@@ -52,7 +52,6 @@ CREATE TABLE "recordsManagement"."archivalProfile"
   "descriptionSchema" text,
   "descriptionClass" text,
   "retentionStartDate" text,
-  "isRetentionLastDeposit" boolean,
   "retentionRuleCode" text ,
   "description" text,
   "accessRuleCode" text,
@@ -60,6 +59,7 @@ CREATE TABLE "recordsManagement"."archivalProfile"
   "acceptArchiveWithoutProfile" boolean default true,
   "fileplanLevel" text,
   "processingStatuses" jsonb,
+  "isRetentionLastDeposit" boolean,
   PRIMARY KEY ("archivalProfileId"),
   UNIQUE ("reference"),
   FOREIGN KEY ("accessRuleCode")

src/presentation/maarchRM/Resources/locale/fr/recordsManagement/archivalProfile.po

@@ -278,5 +278,5 @@ msgstr "Voir dans la liste"
 msgid "cannot be recursively called"
 msgstr "ne peut pas être appelé récursivement"
 
-msgid "Update when an item is added"
+msgid "Update when a file is added"
 msgstr "Mettre à jour au versement d'une pièce"
\ No newline at end of file

src/presentation/maarchRM/Resources/view/recordsManagement/archivalProfile/managementRulesTab.html

@@ -41,11 +41,7 @@
         </div>
     </div>
     <div id="updateRetentionRuleOnDeposit" class="form-group">
-<<<<<<< HEAD
-        <label class="col-md-3 control-label">Update when an item is added</label>
-=======
         <label class="col-md-3 control-label">Update when a file is added</label>
->>>>>>> d39e120eee045cc330d971d6b53aef67b6b97b7e
         <div class="col-md-9">
             <input type="checkbox" name="isRetentionLastDeposit" id="isRetentionLastDepositToggle" data-toggle="toggle" value="[?merge .isRetentionLastDeposit ?]">
         </div>