From a2df283e9a1a328e09a0787c53b77f184ee703d2 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Wed, 27 Apr 2022 02:41:12 +0000 Subject: [PATCH] Bug 30600: Fix recall reasons for branch transfers When a recall triggers a branch transfer, the reason for the transfer is 'Recall'. When a transfer is cancelled that was triggered by a recall, depending on where it is cancelled, will use the 'Manual' or 'CancelRecall' cancellation reasons. This patch ensures branchtransfers.cancellation_reason adds 'CancelRecall', and branchtransfers.reason adds 'Recall' as options. Sponsored-by: Catalyst IT --- installer/data/mysql/db_revs/211200018.pl | 10 ++++++++-- installer/data/mysql/kohastructure.sql | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/installer/data/mysql/db_revs/211200018.pl b/installer/data/mysql/db_revs/211200018.pl index fac13045eb..27304ed37f 100755 --- a/installer/data/mysql/db_revs/211200018.pl +++ b/installer/data/mysql/db_revs/211200018.pl @@ -88,10 +88,16 @@ Notes: <>', 'print') INSERT IGNORE INTO permissions (module_bit, code, description) VALUES (27, 'manage_recalls', 'Manage recalls for patrons') }); - # Add Recall and CancelReserve ENUM options to branchtransfers.reason + # Add Recall ENUM option to branchtransfers.reason $dbh->do(q{ ALTER TABLE branchtransfers MODIFY COLUMN reason - ENUM('Manual', 'StockrotationAdvance', 'StockrotationRepatriation', 'ReturnToHome', 'ReturnToHolding', 'RotatingCollection', 'Reserve', 'LostReserve', 'CancelReserve', 'Recall', 'CancelRecall') + ENUM('Manual', 'StockrotationAdvance', 'StockrotationRepatriation', 'ReturnToHome', 'ReturnToHolding', 'RotatingCollection', 'Reserve', 'LostReserve', 'CancelReserve', 'Recall') + }); + + # Add CancelRecall ENUM option to branchtransfers.cancellation_reason + $dbh->do(q{ + ALTER TABLE branchtransfers MODIFY COLUMN cancellation_reason + ENUM('Manual', 'StockrotationAdvance', 'StockrotationRepatriation', 'ReturnToHome', 'ReturnToHolding', 'RotatingCollection', 'Reserve', 'LostReserve', 'CancelReserve', 'ItemLost', 'WrongTransfer', 'CancelRecall') }); } diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index f7ec7186b9..11fdbdfe95 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -1557,8 +1557,8 @@ CREATE TABLE `branchtransfers` ( `datecancelled` datetime DEFAULT NULL COMMENT 'the date the transfer was cancelled', `tobranch` varchar(10) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT 'the branch the transfer was going to', `comments` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'any comments related to the transfer', - `reason` enum('Manual','StockrotationAdvance','StockrotationRepatriation','ReturnToHome','ReturnToHolding','RotatingCollection','Reserve','LostReserve','CancelReserve','TransferCancellation','Recall','CancelRecall') COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'what triggered the transfer', - `cancellation_reason` enum('Manual','StockrotationAdvance','StockrotationRepatriation','ReturnToHome','ReturnToHolding','RotatingCollection','Reserve','LostReserve','CancelReserve','ItemLost', 'WrongTransfer','Recall','CancelRecall') COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'what triggered the transfer cancellation', + `reason` enum('Manual','StockrotationAdvance','StockrotationRepatriation','ReturnToHome','ReturnToHolding','RotatingCollection','Reserve','LostReserve','CancelReserve','TransferCancellation','Recall') COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'what triggered the transfer', + `cancellation_reason` enum('Manual','StockrotationAdvance','StockrotationRepatriation','ReturnToHome','ReturnToHolding','RotatingCollection','Reserve','LostReserve','CancelReserve','ItemLost', 'WrongTransfer','CancelRecall') COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'what triggered the transfer cancellation', PRIMARY KEY (`branchtransfer_id`), KEY `frombranch` (`frombranch`), KEY `tobranch` (`tobranch`), -- 2.11.0