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

(-)a/acqui/basket.pl (-4 / +4 lines)
Lines 101-107 unless (CanUserManageBasket($loggedinuser, $basket, $userflags)) { Link Here
101
        basketno => $basketno,
101
        basketno => $basketno,
102
        basketname => $basket->{basketname},
102
        basketname => $basket->{basketname},
103
        booksellerid => $booksellerid,
103
        booksellerid => $booksellerid,
104
        name => $bookseller->name,
104
        booksellername => $bookseller->name,
105
    );
105
    );
106
    output_html_with_http_headers $query, $cookie, $template->output;
106
    output_html_with_http_headers $query, $cookie, $template->output;
107
    exit;
107
    exit;
Lines 160-166 if ( $op eq 'delete_confirm' ) { Link Here
160
    DelBasket($basketno,);
160
    DelBasket($basketno,);
161
    $template->param(
161
    $template->param(
162
        delete_confirmed => 1,
162
        delete_confirmed => 1,
163
        name => $bookseller->name,
163
        booksellername => $bookseller->name,
164
        booksellerid => $booksellerid,
164
        booksellerid => $booksellerid,
165
    );
165
    );
166
} elsif ( !$bookseller ) {
166
} elsif ( !$bookseller ) {
Lines 220-226 if ( $op eq 'delete_confirm' ) { Link Here
220
    $template->param(
220
    $template->param(
221
        confirm_close   => "1",
221
        confirm_close   => "1",
222
        booksellerid    => $booksellerid,
222
        booksellerid    => $booksellerid,
223
        name            => $bookseller->name,
223
        booksellername  => $bookseller->name,
224
        basketno        => $basket->{'basketno'},
224
        basketno        => $basket->{'basketno'},
225
        basketname      => $basket->{'basketname'},
225
        basketname      => $basket->{'basketname'},
226
        basketgroupname => $basket->{'basketname'},
226
        basketgroupname => $basket->{'basketname'},
Lines 411-417 if ( $op eq 'list' ) { Link Here
411
        billingplace         => $basket->{billingplace},
411
        billingplace         => $basket->{billingplace},
412
        active               => $bookseller->active,
412
        active               => $bookseller->active,
413
        booksellerid         => $bookseller->id,
413
        booksellerid         => $bookseller->id,
414
        name                 => $bookseller->name,
414
        booksellername       => $bookseller->name,
415
        books_loop           => \@books_loop,
415
        books_loop           => \@books_loop,
416
        book_foot_loop       => \@book_foot_loop,
416
        book_foot_loop       => \@book_foot_loop,
417
        cancelledorders_loop => \@cancelledorders_loop,
417
        cancelledorders_loop => \@cancelledorders_loop,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-6 / +5 lines)
Lines 18-24 Link Here
18
[% USE AuthorisedValues %]
18
[% USE AuthorisedValues %]
19
19
20
[% INCLUDE 'doc-head-open.inc' %]
20
[% INCLUDE 'doc-head-open.inc' %]
21
<title>Koha &rsaquo; Acquisitions &rsaquo; [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno %]) for [% name|html %]</title>
21
<title>Koha &rsaquo; Acquisitions &rsaquo; [% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno %]) for [% booksellername|html %]</title>
22
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
22
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/datatables.css" />
23
[% INCLUDE 'doc-head-close.inc' %]
23
[% INCLUDE 'doc-head-close.inc' %]
24
[% INCLUDE 'datatables.inc' %]
24
[% INCLUDE 'datatables.inc' %]
Lines 196-203 Link Here
196
<div id="breadcrumbs">
196
<div id="breadcrumbs">
197
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
197
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
198
    <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;
198
    <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo;
199
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% name|html %]</a> &rsaquo;
199
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% booksellername|html %]</a> &rsaquo;
200
    [% UNLESS ( basketno ) %][% IF ( delete_confirmed ) %]Deleted [% ELSE %]New [% END %][% END %]Basket [% basketname|html %] [% IF ( basketno ) %]([% basketno %])[% END %] for [% name|html %]
200
    [% UNLESS ( basketno ) %][% IF ( delete_confirmed ) %]Deleted [% ELSE %]New [% END %][% END %]Basket [% basketname|html %] [% IF ( basketno ) %]([% basketno %])[% END %] for [% booksellername|html %]
201
</div>
201
</div>
202
202
203
<div id="doc3" class="yui-t2">
203
<div id="doc3" class="yui-t2">
Lines 341-347 Link Here
341
                </div>
341
                </div>
342
                <a href="booksellers.pl">Click here to go back to booksellers page</a>
342
                <a href="booksellers.pl">Click here to go back to booksellers page</a>
343
            [% ELSE %]
343
            [% ELSE %]
344
                <a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid %]" class="btn btn-default btn-sm">Show baskets for vendor [% name | html %]</a> <a href="/cgi-bin/koha/acqui/booksellers.pl" class="btn btn-default btn-sm">Show all active baskets</a>
344
                <a href="/cgi-bin/koha/acqui/booksellers.pl?booksellerid=[% booksellerid %]" class="btn btn-default btn-sm">Show baskets for vendor [% booksellername | html %]</a> <a href="/cgi-bin/koha/acqui/booksellers.pl" class="btn btn-default btn-sm">Show all active baskets</a>
345
            [% END %]
345
            [% END %]
346
        [% ELSE %]
346
        [% ELSE %]
347
347
Lines 361-367 Link Here
361
                [% END %]
361
                [% END %]
362
            </div>
362
            </div>
363
        [% END %]
363
        [% END %]
364
        <h1>[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno %]) for <a href="supplier.pl?booksellerid=[% booksellerid %]">[% name|html %]</a></h1>
364
        <h1>[% UNLESS ( basketno ) %]New [% END %]Basket [% basketname|html %] ([% basketno %]) for <a href="supplier.pl?booksellerid=[% booksellerid %]">[% booksellername|html %]</a></h1>
365
        [% IF ( basketno ) %]
365
        [% IF ( basketno ) %]
366
            <div id="acqui_basket_summary" class="yui-g">
366
            <div id="acqui_basket_summary" class="yui-g">
367
                <div class="rows">
367
                <div class="rows">
368
- 

Return to bug 19180