View | Details | Raw Unified | Return to bug 30944
Collapse All | Expand All

(-)a/installer/data/mysql/atomicupdate/bug_30944_-_fix_RecallCancellation_branchtransfers.cancellation_reason.pl (+14 lines)
Line 0 Link Here
1
use Modern::Perl;
2
3
return {
4
    bug_number => "30944",
5
    description => "Replace branchtransfers.cancellation_reason CancelRecall with RecallCancellation",
6
    up => sub {
7
        my ($args) = @_;
8
        my ($dbh, $out) = @$args{qw(dbh out)};
9
10
        $dbh->do(q{
11
            ALTER TABLE branchtransfers MODIFY COLUMN cancellation_reason ENUM('Manual','StockrotationAdvance','StockrotationRepatriation','ReturnToHome','ReturnToHolding','RotatingCollection','Reserve','LostReserve','CancelReserve','ItemLost','WrongTransfer','RecallCancellation') COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'what triggered the transfer cancellation'
12
        });
13
    },
14
};
(-)a/installer/data/mysql/kohastructure.sql (-1 / +1 lines)
Lines 1573-1579 CREATE TABLE `branchtransfers` ( Link Here
1573
  `tobranch` varchar(10) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT 'the branch the transfer was going to',
1573
  `tobranch` varchar(10) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT 'the branch the transfer was going to',
1574
  `comments` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'any comments related to the transfer',
1574
  `comments` longtext COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'any comments related to the transfer',
1575
  `reason` ENUM('Manual','StockrotationAdvance','StockrotationRepatriation','ReturnToHome','ReturnToHolding','RotatingCollection','Reserve','LostReserve','CancelReserve','TransferCancellation','Recall','RecallCancellation') COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'what triggered the transfer',
1575
  `reason` ENUM('Manual','StockrotationAdvance','StockrotationRepatriation','ReturnToHome','ReturnToHolding','RotatingCollection','Reserve','LostReserve','CancelReserve','TransferCancellation','Recall','RecallCancellation') COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'what triggered the transfer',
1576
  `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',
1576
  `cancellation_reason` enum('Manual','StockrotationAdvance','StockrotationRepatriation','ReturnToHome','ReturnToHolding','RotatingCollection','Reserve','LostReserve','CancelReserve','ItemLost','WrongTransfer','RecallCancellation') COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'what triggered the transfer cancellation',
1577
  PRIMARY KEY (`branchtransfer_id`),
1577
  PRIMARY KEY (`branchtransfer_id`),
1578
  KEY `frombranch` (`frombranch`),
1578
  KEY `frombranch` (`frombranch`),
1579
  KEY `tobranch` (`tobranch`),
1579
  KEY `tobranch` (`tobranch`),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/recalls/request.tt (+1 lines)
Lines 29-34 Link Here
29
        [% IF recalls.count %]
29
        [% IF recalls.count %]
30
            <form method="post" action="/cgi-bin/koha/recalls/request.pl">
30
            <form method="post" action="/cgi-bin/koha/recalls/request.pl">
31
                <input type="hidden" name="op" value="cancel_multiple_recalls">
31
                <input type="hidden" name="op" value="cancel_multiple_recalls">
32
                <input type="hidden" name="biblionumber" value="[% biblio.biblionumber | html %]">
32
                <input type="checkbox" id="select_all"> <span id="select_all_text">Select all</span>
33
                <input type="checkbox" id="select_all"> <span id="select_all_text">Select all</span>
33
                [% INCLUDE 'recalls.inc' %]
34
                [% INCLUDE 'recalls.inc' %]
34
                <fieldset class="action">
35
                <fieldset class="action">
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt (-1 / +1 lines)
Lines 857-863 Link Here
857
                                    <li><a href="ilsdi.pl?service=Describe&amp;verb=HoldItem">HoldItem</a></li>
857
                                    <li><a href="ilsdi.pl?service=Describe&amp;verb=HoldItem">HoldItem</a></li>
858
                                    <li><a href="ilsdi.pl?service=Describe&amp;verb=CancelHold">CancelHold</a></li>
858
                                    <li><a href="ilsdi.pl?service=Describe&amp;verb=CancelHold">CancelHold</a></li>
859
                                    <li>RecallItem <em>(Not supported by Koha)</em></li>
859
                                    <li>RecallItem <em>(Not supported by Koha)</em></li>
860
                                    <li>CancelRecall <em>(Not supported by Koha)</em></li>
860
                                    <li>RecallCancellation <em>(Not supported by Koha)</em></li>
861
                                </ul>
861
                                </ul>
862
862
863
                                <h2>Level 4: Robust/domain specific discovery platforms</h2>
863
                                <h2>Level 4: Robust/domain specific discovery platforms</h2>
(-)a/opac/ilsdi.pl (-2 / +1 lines)
Lines 74-80 my @services = ( Link Here
74
    'CancelHold',
74
    'CancelHold',
75
75
76
    #	'RecallItem',                        # Not supported by Koha
76
    #	'RecallItem',                        # Not supported by Koha
77
    #	'CancelRecall',                      # Not supported by Koha
77
    #	'RecallCancellation',                      # Not supported by Koha
78
    #	Level 4: Robust/domain specific discovery platforms
78
    #	Level 4: Robust/domain specific discovery platforms
79
    #	'SearchCourseReserves',              # TODO
79
    #	'SearchCourseReserves',              # TODO
80
    #	'Explain'                            # TODO
80
    #	'Explain'                            # TODO
81
- 

Return to bug 30944