Created attachment 133696 [details] [review] DBIx schema diff Bug 19532 Recalls added several db changes. Comparing a structure from v21.11.00 + updatedatabase.pl and a structure generated from current master kohastructure.sql, after updating DBIx schema (via misc/devel/update_dbix_class_files.pl not dbic) we see a difference in Koha/Schema/Result/Branchtransfer.pm.
We see that kohastructure.sql has 'Recall' and 'CancelRecall' in branchtransfers.reason and branchtransfers.cancellation_reason : https://git.koha-community.org/Koha-community/Koha/src/commit/74792b35a83a863fa5e68c37f0c0f552f0c21a7b/installer/data/mysql/kohastructure.sql#L1560 But DBRev only add in branchtransfers.reason : https://git.koha-community.org/Koha-community/Koha/src/commit/74792b35a83a863fa5e68c37f0c0f552f0c21a7b/installer/data/mysql/db_revs/211200018.pl#L93 Which one is correct :/
Second : DBRev removes from ENUM branchtransfers.reason the value 'TransferCancellation' added by Bug 12362
Hi Fridolin, I will take a look at this asap. Aleisha
Created attachment 134008 [details] [review] 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, it still uses the default 'Manual' reason, so we don't need the 'CancelRecall' cancellation reason that was added by Bug 19532. This patch removes 'Recall' and 'CancelRecall' from branchtransfers.cancellation_reason, and removes 'CancelRecall' from branchtransfers.reason. Sponsored-by: Catalyst IT
(In reply to Aleisha Amohia from comment #3) > Hi Fridolin, I will take a look at this asap. > > Aleisha Thanks a lot. The recalls feature is not yet in a release. May we fix directly its DBRev 21.12.00.018 ?
Created attachment 134344 [details] [review] 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
Created attachment 134356 [details] [review] 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 Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Created attachment 134618 [details] [review] 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 Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Fixed db_rev 211200018.pl was missing 'TransferCancellation'. I really need this one for 22.05 release. Consider I QA.
Pushed to master for 22.05, thanks to everybody involved [U+1F984]