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

(-)a/acqui/cancelorder.pl (+3 lines)
Lines 49-54 my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( { Link Here
49
my $action = $input->param('action');
49
my $action = $input->param('action');
50
my $ordernumber = $input->param('ordernumber');
50
my $ordernumber = $input->param('ordernumber');
51
my $biblionumber = $input->param('biblionumber');
51
my $biblionumber = $input->param('biblionumber');
52
my $basketno = $input->param('basketno');
53
my $basket = Koha::Database->new()->schema()->resultset('Aqbasket')->find($basketno);
52
my $referrer = $input->param('referrer') || $input->referer;
54
my $referrer = $input->param('referrer') || $input->referer;
53
my $del_biblio = $input->param('del_biblio') ? 1 : 0;
55
my $del_biblio = $input->param('del_biblio') ? 1 : 0;
54
56
Lines 68-73 if($action and $action eq "confirmcancel") { Link Here
68
$template->param(
70
$template->param(
69
    ordernumber => $ordernumber,
71
    ordernumber => $ordernumber,
70
    biblionumber => $biblionumber,
72
    biblionumber => $biblionumber,
73
    basket => $basket,
71
    referrer => $referrer,
74
    referrer => $referrer,
72
    del_biblio => $del_biblio,
75
    del_biblio => $del_biblio,
73
);
76
);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-2 / +2 lines)
Lines 647-656 Link Here
647
                            [% IF ( books_loo.left_holds_on_order ) %]
647
                            [% IF ( books_loo.left_holds_on_order ) %]
648
                            <span class="button" title="Can't cancel order, ([% books_loo.holds_on_order %]) holds are linked with this order cancel holds first">Can't cancel order</span><br>
648
                            <span class="button" title="Can't cancel order, ([% books_loo.holds_on_order %]) holds are linked with this order cancel holds first">Can't cancel order</span><br>
649
                            [% ELSE %]
649
                            [% ELSE %]
650
                            <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber %]&biblionumber=[% books_loo.biblionumber %]&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno %]" class="button">Cancel order</a><br>
650
                            <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber %]&biblionumber=[% books_loo.biblionumber %]&basketno=[% basketno %]&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno %]" class="button">Cancel order</a><br>
651
                            [% END %]
651
                            [% END %]
652
                            [% IF ( books_loo.can_del_bib ) %]
652
                            [% IF ( books_loo.can_del_bib ) %]
653
                            <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber %]&biblionumber=[% books_loo.biblionumber %]&del_biblio=1&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno %]" class="button">Cancel order and delete catalog record</a><br>
653
                            <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% books_loo.ordernumber %]&biblionumber=[% books_loo.biblionumber %]&basketno=[% basketno %]&del_biblio=1&referrer=/cgi-bin/koha/acqui/basket.pl%3Fbasketno=[% basketno %]" class="button">Cancel order and delete catalog record</a><br>
654
                            [% ELSE %]
654
                            [% ELSE %]
655
                            <span class="button" title="Can't delete catalog record, see constraints below">Can't cancel order and delete catalog record</span><br>
655
                            <span class="button" title="Can't delete catalog record, see constraints below">Can't cancel order and delete catalog record</span><br>
656
                            [% END %]
656
                            [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt (-2 / +7 lines)
Lines 6-12 Link Here
6
<body id="acq_cancelorder" class="acq">
6
<body id="acq_cancelorder" class="acq">
7
[% INCLUDE 'header.inc' %]
7
[% INCLUDE 'header.inc' %]
8
8
9
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisition</a> &rsaquo; Cancel order</div>
9
<div id="breadcrumbs">
10
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
11
    <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;
12
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% basket.booksellerid.id %]">[% basket.booksellerid.name | html %]</a> &rsaquo;
13
    <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno %]">Basket [% basket.basketname | html %] ([% basket.basketno %]) for [% basket.booksellerid.name | html %]</a> &rsaquo;
14
    Cancel order
15
</div>
10
16
11
<div id="doc" class="yui-t7">
17
<div id="doc" class="yui-t7">
12
18
13
- 

Return to bug 18584