From 46da9fceccc35086bf2b7c53edba787ed418f33e Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 17 Jan 2020 11:20:37 +0000 Subject: [PATCH] Bug 24436: Add 'Reserve' options to branchtransfers trigger Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize --- Koha/Schema/Result/Branchtransfer.pm | 9 ++++--- .../data/mysql/atomicupdate/bug_24436.perl | 27 +++++++++++++++++++ installer/data/mysql/kohastructure.sql | 2 +- 3 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_24436.perl diff --git a/Koha/Schema/Result/Branchtransfer.pm b/Koha/Schema/Result/Branchtransfer.pm index 1caca87b2d..a2f63b81c0 100644 --- a/Koha/Schema/Result/Branchtransfer.pm +++ b/Koha/Schema/Result/Branchtransfer.pm @@ -72,7 +72,7 @@ __PACKAGE__->table("branchtransfers"); =head2 reason data_type: 'enum' - extra: {list => ["Manual","StockrotationAdvance","StockrotationRepatriation","ReturnToHome","ReturnToHolding","RotatingCollection"]} + extra: {list => ["Manual","StockrotationAdvance","StockrotationRepatriation","ReturnToHome","ReturnToHolding","RotatingCollection","Reserve","LostReserve","CancelReserve"]} is_nullable: 1 =cut @@ -128,6 +128,9 @@ __PACKAGE__->add_columns( "ReturnToHome", "ReturnToHolding", "RotatingCollection", + "Reserve", + "LostReserve", + "CancelReserve", ], }, is_nullable => 1, @@ -194,8 +197,8 @@ __PACKAGE__->belongs_to( ); -# Created by DBIx::Class::Schema::Loader v0.07046 @ 2020-03-20 10:50:34 -# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Z5PcwyW+X3XM1CeO6CZKBw +# Created by DBIx::Class::Schema::Loader v0.07046 @ 2020-03-20 11:24:33 +# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:50FpCj6vWH5O8MThCy/1hA sub koha_object_class { 'Koha::Item::Transfer'; diff --git a/installer/data/mysql/atomicupdate/bug_24436.perl b/installer/data/mysql/atomicupdate/bug_24436.perl new file mode 100644 index 0000000000..a23ce9ebad --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_24436.perl @@ -0,0 +1,27 @@ +$DBversion = 'XXX'; # will be replaced by the RM +if( CheckVersion( $DBversion ) ) { + + # Add reserve reasons enum + $dbh->do( + qq{ + ALTER TABLE + `branchtransfers` + MODIFY COLUMN + `reason` enum( + 'Manual', + 'StockrotationAdvance', + 'StockrotationRepatriation', + 'ReturnToHome', + 'ReturnToHolding', + 'RotatingCollection', + 'Reserve', + 'LostReserve', + 'CancelReserve' + ) + AFTER `comments` + } + ); + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 24299 - Add 'reserve' reasons to branchtransfers enum)\n"; +} diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 572e13e962..6495f25bbd 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -906,7 +906,7 @@ CREATE TABLE `branchtransfers` ( -- information for items that are in transit be `datearrived` datetime default NULL, -- the date the transfer arrived at its destination `tobranch` varchar(10) NOT NULL default '', -- the branch the transfer was going to `comments` LONGTEXT, -- any comments related to the transfer - `reason` ENUM('Manual', 'StockrotationAdvance', 'StockrotationRepatriation', 'ReturnToHome', 'ReturnToHolding', 'RotatingCollection'), -- what triggered the transfer + `reason` ENUM('Manual', 'StockrotationAdvance', 'StockrotationRepatriation', 'ReturnToHome', 'ReturnToHolding', 'RotatingCollection', 'Reserve', 'LostReserve', 'CancelReserve'), -- what triggered the transfer PRIMARY KEY (`branchtransfer_id`), KEY `frombranch` (`frombranch`), KEY `tobranch` (`tobranch`), -- 2.20.1