diff --git a/migration/20.10/2010.sql b/migration/20.10/2010.sql index f4a33d03b866e54871fc9489a56af048a771d5a0..43cb51711ced69629dc7cac53a55ba76db164494 100755 --- a/migration/20.10/2010.sql +++ b/migration/20.10/2010.sql @@ -291,6 +291,9 @@ UPDATE actions SET component = 'sendToRecordManagementAction' where action_page UPDATE actions SET component = 'checkAcknowledgmentRecordManagementAction' where action_page = 'check_acknowledgement'; UPDATE actions SET component = 'checkReplyRecordManagementAction' where action_page = 'check_reply'; +UPDATE res_attachments SET attachment_type = 'acknowledgement_record_management' WHERE attachment_type = 'simple_attachment' AND format = 'xml' AND title = 'Accusé de réception' AND relation = 1 AND status = 'TRA'; +UPDATE res_attachments SET attachment_type = 'reply_record_management' WHERE attachment_type = 'simple_attachment' AND format = 'xml' AND title = 'Réponse au transfert' AND relation = 1 AND status = 'TRA'; + /* RE CREATE VIEWS */ CREATE OR REPLACE VIEW res_view_letterbox AS SELECT r.res_id, diff --git a/package.json b/package.json index 935fa31d0f8fab02295a0f4a50ee3c9afc18463d..5494a1398036d8aeb59ae0066dbde661bec7fd12 100755 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "@fortawesome/fontawesome-free": "^5.15.1", "@swimlane/ngx-charts": "^16.0.0", "@types/datatables.net": "^1.10.19", - "@types/jquery": "^3.5.1", + "@types/jquery": "^3.5.3", "@types/jquery.nicescroll": "^3.7.1", "@types/jstree": "^3.3.40", "@types/tooltipster": "0.0.30", diff --git a/src/core/lang/lang-en.php b/src/core/lang/lang-en.php index bbd40788796d2feff426b313258fe26fee064dc5..344b7368e531beeed519694c03b23ddc26654a7c 100755 --- a/src/core/lang/lang-en.php +++ b/src/core/lang/lang-en.php @@ -294,6 +294,8 @@ define('_PRINT_FOLDER', 'Folder'); define('_REDACTOR', 'Redactor'); define('_ASSIGNEE', 'Assignee'); define('_DOCUMENT_WITH_NOTES', 'Document with notes'); +define("_ACKNOWLEDGEMENT_RECORD_MANAGEMENT", "Acknowledgement receipt (Record management)"); +define("_REPLY_RECORD_MANAGEMENT", "Transfer reply (Record management)"); define('_SUMMARY_SHEET', 'Summary sheet'); define('_UNDEFINED', 'Undefined'); diff --git a/src/core/lang/lang-fr.php b/src/core/lang/lang-fr.php index 22a46fd2b0068774e4d87bded80c9cc5ed4db8c3..10bbe127d6e9249f7fa60d57ea7854e8ac13dc49 100755 --- a/src/core/lang/lang-fr.php +++ b/src/core/lang/lang-fr.php @@ -294,6 +294,8 @@ define('_PRINT_FOLDER', 'Dossier'); define('_REDACTOR', 'Rédacteur'); define('_ASSIGNEE', 'Attributaire'); define('_DOCUMENT_WITH_NOTES', 'Document annoté'); +define("_ACKNOWLEDGEMENT_RECORD_MANAGEMENT", "Accusé de réception (Archivage)"); +define("_REPLY_RECORD_MANAGEMENT", "Réponse au transfert (Archivage)"); define('_SUMMARY_SHEET', 'Fiche de liaison'); define('_UNDEFINED', 'Non défini'); @@ -491,4 +493,4 @@ define('_CHECK_REPLY_RECORD_MANAGEMENT', 'Vérification de la réponse au transf define('_CHECK_REPLY_RECORD_MANAGEMENT_DESC', 'Vérification de la réponse au transfert du système d\'archivage électronique'); define('_CHECK_ACKNOWLEDGMENT_RECORD_MANAGEMENT', 'Vérification du transfert du paquet au système d\'archivage électronique'); -define('_CHECK_ACKNOWLEDGMENT_RECORD_MANAGEMENT_DESC', 'Vérification du transfert du paquet au système d\'archivage électronique'); \ No newline at end of file +define('_CHECK_ACKNOWLEDGMENT_RECORD_MANAGEMENT_DESC', 'Vérification du transfert du paquet au système d\'archivage électronique');