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

(-)a/Koha/Acquisition/Basket.pm (+19 lines)
Line 0 Link Here
1
package Koha::Acquisition::Basket;
2
3
use Modern::Perl;
4
5
use Koha::Database;
6
7
use base qw( Koha::Object );
8
9
sub bookseller {
10
    my ($self) = @_;
11
    my $bookseller_rs = $self->_result->booksellerid;
12
    return Koha::Acquisition::Bookseller->_new_from_dbic( $bookseller_rs );
13
}
14
15
sub _type {
16
    return 'Aqbasket';
17
}
18
19
1;
(-)a/Koha/Acquisition/Baskets.pm (+18 lines)
Line 0 Link Here
1
package Koha::Acquisition::Baskets;
2
3
use Modern::Perl;
4
5
use Koha::Database;
6
use Koha::Acquisition::Basket;
7
8
use base qw( Koha::Objects );
9
10
sub _type {
11
    return 'Aqbasket';
12
}
13
14
sub object_class {
15
    return 'Koha::Acquisition::Basket';
16
}
17
18
1;
(-)a/acqui/cancelorder.pl (-1 / +2 lines)
Lines 35-40 use CGI; Link Here
35
use C4::Auth;
35
use C4::Auth;
36
use C4::Output;
36
use C4::Output;
37
use C4::Acquisition;
37
use C4::Acquisition;
38
use Koha::Acquisition::Baskets;
38
39
39
my $input = new CGI;
40
my $input = new CGI;
40
my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
41
my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
Lines 50-56 my $action = $input->param('action'); Link Here
50
my $ordernumber = $input->param('ordernumber');
51
my $ordernumber = $input->param('ordernumber');
51
my $biblionumber = $input->param('biblionumber');
52
my $biblionumber = $input->param('biblionumber');
52
my $basketno = $input->param('basketno');
53
my $basketno = $input->param('basketno');
53
my $basket = Koha::Database->new()->schema()->resultset('Aqbasket')->find($basketno);
54
my $basket = Koha::Acquisition::Baskets->find({ basketno => $basketno }, { prefetch => 'booksellerid' });
54
my $referrer = $input->param('referrer') || $input->referer;
55
my $referrer = $input->param('referrer') || $input->referer;
55
my $del_biblio = $input->param('del_biblio') ? 1 : 0;
56
my $del_biblio = $input->param('del_biblio') ? 1 : 0;
56
57
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/cancelorder.tt (-3 / +2 lines)
Lines 9-16 Link Here
9
<div id="breadcrumbs">
9
<div id="breadcrumbs">
10
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
10
    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
11
    <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</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;
12
    <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% basket.bookseller.id %]">[% basket.bookseller.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;
13
    <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno %]">Basket [% basket.basketname | html %] ([% basket.basketno %]) for [% basket.bookseller.name | html %]</a> &rsaquo;
14
    Cancel order
14
    Cancel order
15
</div>
15
</div>
16
16
17
- 

Return to bug 18584