diff --git a/src/app/external/exportSeda/controllers/ExportSEDATrait.php b/src/app/external/exportSeda/controllers/ExportSEDATrait.php index 2c9569d1e842dc962798efc305ca6ff32375224f..f33c51502c0fe7bb1e945637ac2fc88577bdd98c 100644 --- a/src/app/external/exportSeda/controllers/ExportSEDATrait.php +++ b/src/app/external/exportSeda/controllers/ExportSEDATrait.php @@ -625,7 +625,7 @@ trait ExportSEDATrait return ['errors' => ['Reply is not readable']]; } - $messageExchange = MessageExchangeModel::getMessageByReference(['select' => ['message_id'], 'reference' => (string)$replyXml->MessageReceivedIdentifier]); + $messageExchange = MessageExchangeModel::getMessageByReference(['select' => ['message_id'], 'reference' => (string)$replyXml->MessageRequestIdentifier]); if (empty($messageExchange)) { return ['errors' => ['No reply found with this reference']]; } diff --git a/src/frontend/app/administration/registered-mail/registered-mail-list.component.ts b/src/frontend/app/administration/registered-mail/registered-mail-list.component.ts index fcb0e0c9ffd890a5401f404e4d9a0407fad5bfbc..d515c71e573123d62fdc5670012747cee9fbd70f 100644 --- a/src/frontend/app/administration/registered-mail/registered-mail-list.component.ts +++ b/src/frontend/app/administration/registered-mail/registered-mail-list.component.ts @@ -98,7 +98,7 @@ export class RegisteredMailListComponent implements OnInit { const dataTosend = JSON.parse(JSON.stringify(row)); dataTosend.status = 'OK'; - const dialogRef = this.dialog.open(ConfirmComponent, { panelClass: 'maarch-modal', autoFocus: false, disableClose: true, data: { title: this.translate.instant('lang.activate'), msg: 'En activant cette plage, cela clôturera la plage actuelle utilisée pour ce type de recommandé.' } }); + const dialogRef = this.dialog.open(ConfirmComponent, { panelClass: 'maarch-modal', autoFocus: false, disableClose: true, data: { title: this.translate.instant('lang.activateRegisteredMailNumberRange'), msg: 'En activant cette plage, cela clôturera la plage actuelle utilisée pour ce type de recommandé.' } }); dialogRef.afterClosed().pipe( filter((data: string) => data === 'ok'), diff --git a/src/lang/lang-en.json b/src/lang/lang-en.json index 272bcbc26ab9f2938ee0e507af6308af02e182dd..894d03aed30d0055bdc3050b800856eebd0b1ad3 100644 --- a/src/lang/lang-en.json +++ b/src/lang/lang-en.json @@ -389,6 +389,7 @@ "contactsParameters_addressTown": "City", "contactsParameters_civility": "Civility", "contactsParameters_company": "Company", + "contactsParameters_companyLastname": "Company/Lastname", "contactsParameters_department": "Department", "contactsParameters_email": "Email", "contactsParameters_firstname": "First name", @@ -1912,6 +1913,7 @@ "phoneModificationNotAllowed": "Phone is not allowed to be modified.", "userModificationNotAllowed": "User is not allowed to be modified or does not exists.", "contactDoesNotExists": "Contact does not exists.", + "activateRegisteredMailNumberRange": "Activate registered mail number range", "argumentUserIdEmpty": "Argument user_id is empty for a user.", "argumentFirstnameEmpty": "Argument firstname is empty for a user.", "argumentLastnameEmpty": "Argument lastname is empty for a user.", diff --git a/src/lang/lang-fr.json b/src/lang/lang-fr.json index f63482fd80d0985adfb5f544e8c060b6dfb36b5d..0633dff5f54e10e6aac7784cabb7d5d19c56c1e4 100644 --- a/src/lang/lang-fr.json +++ b/src/lang/lang-fr.json @@ -390,6 +390,7 @@ "contactsParameters_addressTown": "Ville", "contactsParameters_civility": "Civilité", "contactsParameters_company": "Organisation", + "contactsParameters_companyLastname": "Organisation/Nom", "contactsParameters_department": "Service", "contactsParameters_email": "Courriel", "contactsParameters_firstname": "Prénom", @@ -1900,7 +1901,7 @@ "disableField": "Désactiver le champ", "emailSubject": "Objet du courriel", "authorizedRoutes": "Routes autorisées", - "authorizedRoutesNotWellFormatted": "Le champ 'Routes autorisées' n'est pas correctement formatté.", + "authorizedRoutesNotWellFormatted": "Le champ 'Routes autorisées' n'est pas correctement formaté.", "infoImportusers": "La colonne <b>id</b> est utilisée pour identifier un utilisateur", "infoImportusers2": "Les colonnes <b>id</b> et <b>user_id</b> ne sont pas prises en compte lors de mise à jour d'utilisateurs", "hotkeyInfo": "Maintenez <b>SHIFT</b> pour propager vos sélections aux sous-éléments", @@ -1908,6 +1909,7 @@ "hotkeyTitle": "Maintient de la touche shift", "technicalParameters": "Paramètres techniques", "registeredMail": "Recommandé", + "activateRegisteredMailNumberRange": "Activer la plage de numéro de recommandé", "registeredMails": "Recommandés", "adminRegisteredMailDesc": "Administrer vos envoi des recommandés", "issuingSite": "Site émetteur",