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

(-)a/acqui/neworderbiblio.pl (+2 lines)
Lines 97-102 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
97
    }
97
    }
98
);
98
);
99
99
100
output_and_exit( $input, $cookie, $template, 'unknown_vendor') unless $bookseller;
101
100
# Searching the catalog.
102
# Searching the catalog.
101
103
102
my @operands = $query;
104
my @operands = $query;
(-)a/acqui/neworderempty.pl (+3 lines)
Lines 138-143 my $basketobj = Koha::Acquisition::Baskets->find( $basketno ); Link Here
138
$booksellerid = $basket->{booksellerid} unless $booksellerid;
138
$booksellerid = $basket->{booksellerid} unless $booksellerid;
139
my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
139
my $bookseller = Koha::Acquisition::Booksellers->find( $booksellerid );
140
140
141
output_and_exit( $input, $cookie, $template, 'unknown_basket') unless $basketobj;
142
output_and_exit( $input, $cookie, $template, 'unknown_vendor') unless $bookseller;
143
141
my $contract = GetContract({
144
my $contract = GetContract({
142
    contractnumber => $basket->{contractnumber}
145
    contractnumber => $basket->{contractnumber}
143
});
146
});
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/blocking_errors.inc (+2 lines)
Lines 11-16 Link Here
11
        <div class="dialog message">Subscription not found.</div>
11
        <div class="dialog message">Subscription not found.</div>
12
    [% CASE 'unknown_basket' %]
12
    [% CASE 'unknown_basket' %]
13
        <div class="dialog message">Basket not found.</div>
13
        <div class="dialog message">Basket not found.</div>
14
    [% CASE 'unknown_vendor' %]
15
        <div class="dialog message">Vendor not found.</div>
14
    [% CASE 'wrong_csrf_token' %]
16
    [% CASE 'wrong_csrf_token' %]
15
        <div class="dialog message">The form submission failed (Wrong CSRF token). Try to come back, refresh the page, then try again.</div>
17
        <div class="dialog message">The form submission failed (Wrong CSRF token). Try to come back, refresh the page, then try again.</div>
16
    [% CASE %][% blocking_error | html %]
18
    [% CASE %][% blocking_error | html %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt (+2 lines)
Lines 12-17 Link Here
12
12
13
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% name | html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Basket [% basketno | html %]</a> &rsaquo; Search existing records</div>
13
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% name | html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Basket [% basketno | html %]</a> &rsaquo; Search existing records</div>
14
14
15
[% INCLUDE 'blocking_errors.inc' %]
16
15
<div class="main container-fluid">
17
<div class="main container-fluid">
16
    <div class="row">
18
    <div class="row">
17
        <div class="col-sm-10 col-sm-push-2">
19
        <div class="col-sm-10 col-sm-push-2">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-1 / +2 lines)
Lines 17-22 Link Here
17
17
18
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% name | html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Basket [% basketno | html %]</a> &rsaquo; [% IF ( ordernumber ) %]Modify order details (line #[% ordernumber | html %])[% ELSE %]New order[% END %]</div>
18
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | html %]">[% name | html %]</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basketno | html %]">Basket [% basketno | html %]</a> &rsaquo; [% IF ( ordernumber ) %]Modify order details (line #[% ordernumber | html %])[% ELSE %]New order[% END %]</div>
19
19
20
[% INCLUDE 'blocking_errors.inc' %]
21
20
<div class="main container-fluid">
22
<div class="main container-fluid">
21
    <div class="row">
23
    <div class="row">
22
        <div class="col-sm-10 col-sm-push-2">
24
        <div class="col-sm-10 col-sm-push-2">
23
- 

Return to bug 23320