Attachment 118198 Details for Bug 18532 – Bug 18532: (follow-up) Fix notice message, add notice to all installer languages and fix preference message

[patch] Bug 18532: (follow-up) Fix notice message, add notice to all installer languages and fix preference message

Bug-18532-follow-up-Fix-notice-message-add-notice-.patch (text/plain), 20.87 KB, created by Tomás Cohen Arazi (tcohen) on 2021-03-12 13:58:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomás Cohen Arazi (tcohen)

Created: 2021-03-12 13:58:47 UTC

Size: 20.87 KB

patch

obsolete

>From bf4f6615b64f00a3cb09bea13984ee1844ff88aa Mon Sep 17 00:00:00 2001
>From: Agustin Moyano <agustinmoyano@theke.io>
>Date: Thu, 10 Dec 2020 16:27:45 -0300
>Subject: [PATCH] Bug 18532: (follow-up) Fix notice message, add notice to all
> installer languages and fix preference message
>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> .../data/mysql/atomicupdate/bug-18532.perl    | 16 ++++++------
> .../mysql/en/mandatory/sample_notices.yml     | 25 +++++++++++++++++++
> .../fr-CA/obligatoire/sample_notices.sql      | 18 +++++++++++++
> .../fr-FR/1-Obligatoire/sample_notices.sql    | 18 +++++++++++++
> .../nb-NO/1-Obligatorisk/sample_notices.sql   | 18 +++++++++++++
> .../mysql/pl-PL/mandatory/sample_notices.sql  |  6 ++---
> .../mysql/ru-RU/mandatory/sample_notices.sql  | 18 +++++++++++++
> .../mysql/uk-UA/mandatory/sample_notices.sql  | 18 +++++++++++++
> .../en/modules/admin/preferences/patrons.pref |  4 +--
> 9 files changed, 128 insertions(+), 13 deletions(-)
>
>diff --git a/installer/data/mysql/atomicupdate/bug-18532.perl b/installer/data/mysql/atomicupdate/bug-18532.perl
>index 1c75ca19fce..e06295d3376 100644
>--- a/installer/data/mysql/atomicupdate/bug-18532.perl
>+++ b/installer/data/mysql/atomicupdate/bug-18532.perl
>@@ -1,19 +1,19 @@
> $DBversion = 'XXX'; # will be replaced by the RM
> if( CheckVersion( $DBversion ) ) {
>     # you can use $dbh here like:
>-    $dbh->do( qq{
>-        INSERT IGNORE INTO letter (module, code, name, title, content, message_transport_type) VALUES ('circulation', 'AUTO_RENEWALS_DGST', 'notification on auto renewing', 'Auto renewals (Digest)',
>+    $dbh->do( q{
>+        INSERT IGNORE INTO letter (module, code, name, title, content, message_transport_type) VALUES ('circulation', 'AUTO_RENEWALS_DGST', 'Notification on auto renewals', 'Auto renewals (Digest)',
>         "Dear [% borrower.firstname %] [% borrower.surname %],
>         [% IF error %]
>-            There were [% error %] items that were not correctly renewed.
>+            There were [% error %] items that were not renewed.
>         [% END %]
>         [% IF success %]
>-            There were [% success %] items that where correctly renewed.
>+            There were [% success %] items that where renewed.
>         [% END %]
>         [% FOREACH checkout IN checkouts %]
>             [% checkout.item.biblio.title %] : [% checkout.item.barcode %]
>             [% IF !checkout.auto_renew_error %]
>-                was renewed until [% checkout.date_due %]
>+                was renewed until [% checkout.date_due | $KohaDates as_due_date => 1%]
>             [% ELSE %]
>                 was not renewed with error: [% checkout.auto_renew_error %]
>             [% END %]
>@@ -21,13 +21,13 @@ if( CheckVersion( $DBversion ) ) {
>         ", 'email');
>     });
> 
>-    $dbh->do( qq{
>+    $dbh->do( q{
>         INSERT IGNORE INTO `message_attributes`
>             (`message_attribute_id`, message_name, `takes_days`)
>         VALUES (7, 'Auto_Renewals', 0)
>     });
> 
>-    $dbh->do( qq{
>+    $dbh->do( q{
>         INSERT IGNORE INTO `message_transports`
>             (`message_attribute_id`, `message_transport_type`, `is_digest`, `letter_module`, `letter_code`)
>         VALUES  (7, 'email', 0, 'circulation', 'AUTO_RENEWALS'),
>@@ -36,7 +36,7 @@ if( CheckVersion( $DBversion ) ) {
>                 (7, 'sms', 1, 'circulation', 'AUTO_RENEWALS_DGST')
>     });
> 
>-    $dbh->do( qq{
>+    $dbh->do( q{
>         insert into borrower_message_transport_preferences (borrower_message_preference_id, message_transport_type)
>         select  p.borrower_message_preference_id, 'email'
>         from    borrower_message_preferences p
>diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml
>index e58c0075afd..745321f717a 100644
>--- a/installer/data/mysql/en/mandatory/sample_notices.yml
>+++ b/installer/data/mysql/en/mandatory/sample_notices.yml
>@@ -1478,3 +1478,28 @@ tables:
>             - "Barcode: [% item.barcode %] <br />"
>             - "</p>"
>             - "[% END %]"
>+
>+        - module: circulation
>+          code: AUTO_RENEWALS_DGST
>+          branchcode: ""
>+          name: "Notification on auto renewals"
>+          is_html: 0
>+          title: "Auto renewals (Digest)"
>+          message_transport_type: email
>+          lang: default
>+          content:
>+            - "Dear [% borrower.firstname %] [% borrower.surname %],"
>+            - "[% IF error %]"
>+            - "There were [% error %] items that were not renewed."
>+            - "[% END %]"
>+            - "[% IF success %]"
>+            - "There were [% success %] items that where renewed."
>+            - "[% END %]"
>+            - "[% FOREACH checkout IN checkouts %]"
>+            - "[% checkout.item.biblio.title %] : [% checkout.item.barcode %]"
>+            - "[% IF !checkout.auto_renew_error %]"
>+            - "was renewed until [% checkout.date_due | $KohaDates as_due_date => 1%]"
>+            - "[% ELSE %]"
>+            - "was not renewed with error: [% checkout.auto_renew_error %]"
>+            - "[% END %]"
>+            - "[% END %]"
>diff --git a/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql b/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql
>index 2317e98575c..94aa4deec8c 100644
>--- a/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql
>+++ b/installer/data/mysql/fr-CA/obligatoire/sample_notices.sql
>@@ -316,3 +316,21 @@ INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, conten
> INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_CANCEL', '', 'ILL request cancelled', 0, "Interlibrary loan request cancelled", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has requested cancellation of this ILL request:\n\n[% ill_full_metadata %]", 'sms', 'default');
> INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_MODIFIED', '', 'ILL request modified', 0, "Interlibrary loan request modified", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has modified this ILL request:\n\n[% ill_full_metadata %]", 'sms', 'default');
> INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PARTNER_REQ', '', 'ILL request to partners', 0, "Interlibrary loan request to partners", "Dear Sir/Madam,\n\nWe would like to request an interlibrary loan for a title matching the following description:\n\n[% ill_full_metadata %]\n\nPlease let us know if you are able to supply this to us.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'sms', 'default');
>+
>+INSERT IGNORE INTO letter (module, code, name, title, content, message_transport_type) VALUES ('circulation', 'AUTO_RENEWALS_DGST', 'Notification on auto renewals', 'Auto renewals (Digest)',
>+"Dear [% borrower.firstname %] [% borrower.surname %],
>+[% IF error %]
>+    There were [% error %] items that were not renewed.
>+[% END %]
>+[% IF success %]
>+    There were [% success %] items that where renewed.
>+[% END %]
>+[% FOREACH checkout IN checkouts %]
>+    [% checkout.item.biblio.title %] : [% checkout.item.barcode %]
>+    [% IF !checkout.auto_renew_error %]
>+        was renewed until [% checkout.date_due | $KohaDates as_due_date => 1%]
>+    [% ELSE %]
>+        was not renewed with error: [% checkout.auto_renew_error %]
>+    [% END %]
>+[% END %]
>+", 'email');
>\ No newline at end of file
>diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
>index 7bc86d3ec2e..745d46acec9 100644
>--- a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
>+++ b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
>@@ -429,3 +429,21 @@ INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, conten
> INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_CANCEL', '', 'ILL request cancelled', 0, "Interlibrary loan request cancelled", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has requested cancellation of this ILL request:\n\n[% ill_full_metadata %]", 'sms', 'default');
> INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_MODIFIED', '', 'ILL request modified', 0, "Interlibrary loan request modified", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has modified this ILL request:\n\n[% ill_full_metadata %]", 'sms', 'default');
> INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PARTNER_REQ', '', 'ILL request to partners', 0, "Interlibrary loan request to partners", "Dear Sir/Madam,\n\nWe would like to request an interlibrary loan for a title matching the following description:\n\n[% ill_full_metadata %]\n\nPlease let us know if you are able to supply this to us.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'sms', 'default');
>+
>+INSERT IGNORE INTO letter (module, code, name, title, content, message_transport_type) VALUES ('circulation', 'AUTO_RENEWALS_DGST', 'Notification on auto renewals', 'Auto renewals (Digest)',
>+"Dear [% borrower.firstname %] [% borrower.surname %],
>+[% IF error %]
>+    There were [% error %] items that were not renewed.
>+[% END %]
>+[% IF success %]
>+    There were [% success %] items that where renewed.
>+[% END %]
>+[% FOREACH checkout IN checkouts %]
>+    [% checkout.item.biblio.title %] : [% checkout.item.barcode %]
>+    [% IF !checkout.auto_renew_error %]
>+        was renewed until [% checkout.date_due | $KohaDates as_due_date => 1%]
>+    [% ELSE %]
>+        was not renewed with error: [% checkout.auto_renew_error %]
>+    [% END %]
>+[% END %]
>+", 'email');
>\ No newline at end of file
>diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
>index 19821cb794e..e0c70489090 100644
>--- a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
>+++ b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
>@@ -447,3 +447,21 @@ INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, conten
> INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_CANCEL', '', 'ILL request cancelled', 0, "Interlibrary loan request cancelled", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has requested cancellation of this ILL request:\n\n[% ill_full_metadata %]", 'sms', 'default');
> INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_MODIFIED', '', 'ILL request modified', 0, "Interlibrary loan request modified", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has modified this ILL request:\n\n[% ill_full_metadata %]", 'sms', 'default');
> INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PARTNER_REQ', '', 'ILL request to partners', 0, "Interlibrary loan request to partners", "Dear Sir/Madam,\n\nWe would like to request an interlibrary loan for a title matching the following description:\n\n[% ill_full_metadata %]\n\nPlease let us know if you are able to supply this to us.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'sms', 'default');
>+
>+INSERT IGNORE INTO letter (module, code, name, title, content, message_transport_type) VALUES ('circulation', 'AUTO_RENEWALS_DGST', 'Notification on auto renewals', 'Auto renewals (Digest)',
>+"Dear [% borrower.firstname %] [% borrower.surname %],
>+[% IF error %]
>+    There were [% error %] items that were not renewed.
>+[% END %]
>+[% IF success %]
>+    There were [% success %] items that where renewed.
>+[% END %]
>+[% FOREACH checkout IN checkouts %]
>+    [% checkout.item.biblio.title %] : [% checkout.item.barcode %]
>+    [% IF !checkout.auto_renew_error %]
>+        was renewed until [% checkout.date_due | $KohaDates as_due_date => 1%]
>+    [% ELSE %]
>+        was not renewed with error: [% checkout.auto_renew_error %]
>+    [% END %]
>+[% END %]
>+", 'email');
>\ No newline at end of file
>diff --git a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
>index 75e1311d555..7764c1ec183 100644
>--- a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
>+++ b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
>@@ -430,15 +430,15 @@ The following item, [% biblio.title %], has correctly been renewed and is now du
> INSERT IGNORE INTO letter (module, code, name, title, content, message_transport_type) VALUES ('circulation', 'AUTO_RENEWALS_DGST', 'Notification on auto renewing', 'Auto renewals (Digest)',
> "Dear [% borrower.firstname %] [% borrower.surname %],
> [% IF error %]
>-    There were [% error %] items that were not correctly renewed.
>+    There were [% error %] items that were not renewed.
> [% END %]
> [% IF success %]
>-    There were [% success %] items that where correctly renewed.
>+    There were [% success %] items that where renewed.
> [% END %]
> [% FOREACH checkout IN checkouts %]
>     [% checkout.item.biblio.title %] : [% checkout.item.barcode %]
>     [% IF !checkout.auto_renew_error %]
>-        was renewed until [% checkout.date_due | $KohaDates %]
>+        was renewed until [% checkout.date_due | $KohaDates as_due_date => 1%]
>     [% ELSE %]
>         was not renewed with error: [% checkout.auto_renew_error %]
>     [% END %]
>diff --git a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
>index e9b0006f912..b4ff4efc45f 100644
>--- a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
>+++ b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
>@@ -428,3 +428,21 @@ INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, conten
> INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_CANCEL', '', 'ILL request cancelled', 0, "Interlibrary loan request cancelled", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has requested cancellation of this ILL request:\n\n[% ill_full_metadata %]", 'sms', 'default');
> INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_MODIFIED', '', 'ILL request modified', 0, "Interlibrary loan request modified", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has modified this ILL request:\n\n[% ill_full_metadata %]", 'sms', 'default');
> INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PARTNER_REQ', '', 'ILL request to partners', 0, "Interlibrary loan request to partners", "Dear Sir/Madam,\n\nWe would like to request an interlibrary loan for a title matching the following description:\n\n[% ill_full_metadata %]\n\nPlease let us know if you are able to supply this to us.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'sms', 'default');
>+
>+INSERT IGNORE INTO letter (module, code, name, title, content, message_transport_type) VALUES ('circulation', 'AUTO_RENEWALS_DGST', 'Notification on auto renewals', 'Auto renewals (Digest)',
>+"Dear [% borrower.firstname %] [% borrower.surname %],
>+[% IF error %]
>+    There were [% error %] items that were not renewed.
>+[% END %]
>+[% IF success %]
>+    There were [% success %] items that where renewed.
>+[% END %]
>+[% FOREACH checkout IN checkouts %]
>+    [% checkout.item.biblio.title %] : [% checkout.item.barcode %]
>+    [% IF !checkout.auto_renew_error %]
>+        was renewed until [% checkout.date_due | $KohaDates as_due_date => 1%]
>+    [% ELSE %]
>+        was not renewed with error: [% checkout.auto_renew_error %]
>+    [% END %]
>+[% END %]
>+", 'email');
>\ No newline at end of file
>diff --git a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
>index 1c8b70eda73..16c26b1f5d2 100644
>--- a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
>+++ b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
>@@ -519,3 +519,21 @@ INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, conten
> INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_CANCEL', '', 'ILL request cancelled', 0, "Interlibrary loan request cancelled", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has requested cancellation of this ILL request:\n\n[% ill_full_metadata %]", 'sms', 'default');
> INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_REQUEST_MODIFIED', '', 'ILL request modified', 0, "Interlibrary loan request modified", "The patron for interlibrary loans request [% illrequest.illrequest_id %], with the following details, has modified this ILL request:\n\n[% ill_full_metadata %]", 'sms', 'default');
> INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('ill', 'ILL_PARTNER_REQ', '', 'ILL request to partners', 0, "Interlibrary loan request to partners", "Dear Sir/Madam,\n\nWe would like to request an interlibrary loan for a title matching the following description:\n\n[% ill_full_metadata %]\n\nPlease let us know if you are able to supply this to us.\n\nKind Regards\n\n[% branch.branchname %]\n[% branch.branchaddress1 %]\n[% branch.branchaddress2 %]\n[% branch.branchaddress3 %]\n[% branch.branchcity %]\n[% branch.branchstate %]\n[% branch.branchzip %]\n[% branch.branchphone %]\n[% branch.branchillemail %]\n[% branch.branchemail %]", 'sms', 'default');
>+
>+INSERT IGNORE INTO letter (module, code, name, title, content, message_transport_type) VALUES ('circulation', 'AUTO_RENEWALS_DGST', 'Notification on auto renewals', 'Auto renewals (Digest)',
>+"Dear [% borrower.firstname %] [% borrower.surname %],
>+[% IF error %]
>+    There were [% error %] items that were not renewed.
>+[% END %]
>+[% IF success %]
>+    There were [% success %] items that where renewed.
>+[% END %]
>+[% FOREACH checkout IN checkouts %]
>+    [% checkout.item.biblio.title %] : [% checkout.item.barcode %]
>+    [% IF !checkout.auto_renew_error %]
>+        was renewed until [% checkout.date_due | $KohaDates as_due_date => 1%]
>+    [% ELSE %]
>+        was not renewed with error: [% checkout.auto_renew_error %]
>+    [% END %]
>+[% END %]
>+", 'email');
>\ No newline at end of file
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
>index 21235e9ee5c..e599773fa2d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
>@@ -192,12 +192,12 @@ Patrons:
>                0: Disable
>          - sending purchase suggestion messages by SMS if no patron email is defined.
>      -
>-         - "Send automatic renewal notices "
>+         - "Send automatic renewal notices: "
>          - pref: AutoRenewalNotices
>            choices:
>                never: never
>                preferences: according to patron messaging preferences
>-               cron: (Deprecated) according to cron switch
>+               cron: (Deprecated) according to --send-notices cron switch
>     Patron forms:
>      -
>          - "The following <a href='http://schema.koha-community.org/__VERSION__/tables/borrowers.html' target='blank'>database columns</a> must be filled in on the patron entry screen:"
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 18532: 95030 | 95031 | 95337 | 95338 | 95456 | 96049 | 96050 | 96487 | 96494 | 96495 | 98078 | 98079 | 99193 | 99194 | 104880 | 104881 | 104882 | 104883 | 105500 | 105501 | 105502 | 105503 | 114316 | 115798 | 115799 | 115800 | 115801 | 115802 | 115829 | 115830 | 115831 | 115832 | 115833 | 118198 | 118199 | 118205 | 118318 | 118329 | 118330 | 118331 | 118356