From 57bbb2861f0c0e2c8eca67d40ec07f46b5a476c8 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Thu, 20 Aug 2020 12:35:27 -0400 Subject: [PATCH] Bug 25534: (QA follow-up) Add AV category Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- installer/data/mysql/atomicupdate/cancellation_reason.perl | 6 +++++- installer/data/mysql/mandatory/auth_val_cat.sql | 1 + .../prog/en/modules/admin/authorised_values.tt | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/installer/data/mysql/atomicupdate/cancellation_reason.perl b/installer/data/mysql/atomicupdate/cancellation_reason.perl index f1c1257de9..9aa9099964 100644 --- a/installer/data/mysql/atomicupdate/cancellation_reason.perl +++ b/installer/data/mysql/atomicupdate/cancellation_reason.perl @@ -1,7 +1,11 @@ $DBversion = 'XXX'; # will be replaced by the RM if ( CheckVersion( $DBversion ) ) { $dbh->do(q{ -INSERT INTO `letter` VALUES ('reserves','HOLD_CANCELLATION','','Hold Cancellation',0,'Your hold was canceled.','[%- USE AuthorisedValues -%]\r\nDear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nYour hold for [% biblio.title %] was canceled for the following reason: [% AuthorisedValues.GetByCode( \'HOLD_CANCELLATION\', hold.cancellation_reason ) %]','email','default'); + INSERT IGNORE INTO authorised_value_categories( category_name, is_system ) VALUES ('HOLD_CANCELLATION', 0); + }); + + $dbh->do(q{ +INSERT IGNORE INTO `letter` VALUES ('reserves','HOLD_CANCELLATION','','Hold Cancellation',0,'Your hold was canceled.','[%- USE AuthorisedValues -%]\r\nDear [% borrower.firstname %] [% borrower.surname %],\r\n\r\nYour hold for [% biblio.title %] was canceled for the following reason: [% AuthorisedValues.GetByCode( \'HOLD_CANCELLATION\', hold.cancellation_reason ) %]','email','default'); }); if ( !column_exists( 'reserves', 'cancellation_reason' ) ) { diff --git a/installer/data/mysql/mandatory/auth_val_cat.sql b/installer/data/mysql/mandatory/auth_val_cat.sql index c45b5985dd..bd8f81d761 100644 --- a/installer/data/mysql/mandatory/auth_val_cat.sql +++ b/installer/data/mysql/mandatory/auth_val_cat.sql @@ -17,6 +17,7 @@ INSERT IGNORE INTO authorised_value_categories( category_name, is_system ) ('ITEMTYPECAT', 0), ('PAYMENT_TYPE', 0), ('PA_CLASS', 0), + ('HOLD_CANCELLATION', 0), ('ROADTYPE', 0); INSERT IGNORE INTO authorised_value_categories( category_name, is_system ) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt index 57a8379d2e..c87bbf7aba 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt @@ -382,6 +382,8 @@

General holdings: retention designator :: This data element specifies the retention policy for the unit at the time of the holdings report.

[% CASE 'HINGS_UT' %]

General holdings: type of unit designator

+ [% CASE 'HOLD_CANCELLATION' %] +

Reasons why a hold might have been cancelled

[% CASE 'HSBND_FREQ' %]

Frequencies used by the housebound module. They are displayed on the housebound tab in the patron account in staff.

[% CASE 'ITEMTYPECAT' %] -- 2.39.5