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

(-)a/C4/Acquisition.pm (-5 / +9 lines)
Lines 2574-2586 sub GetInvoiceDetails { Link Here
2574
    my $invoice = $sth->fetchrow_hashref;
2574
    my $invoice = $sth->fetchrow_hashref;
2575
2575
2576
    $query = q{
2576
    $query = q{
2577
        SELECT aqorders.*, biblio.*,
2577
        SELECT aqorders.*,
2578
        biblio.copyrightdate,
2578
                biblio.*,
2579
        biblioitems.publishercode,
2579
                biblio.copyrightdate,
2580
        biblioitems.publicationyear,
2580
                biblioitems.publishercode,
2581
        aqbasket.basketname
2581
                biblioitems.publicationyear,
2582
                aqbasket.basketname,
2583
                aqbasketgroups.id AS basketgroupid,
2584
                aqbasketgroups.name AS basketgroupname
2582
        FROM aqorders
2585
        FROM aqorders
2583
          LEFT JOIN aqbasket ON aqorders.basketno = aqbasket.basketno
2586
          LEFT JOIN aqbasket ON aqorders.basketno = aqbasket.basketno
2587
          LEFT JOIN aqbasketgroups ON aqbasket.basketgroupid = aqbasketgroups.id
2584
          LEFT JOIN biblio ON aqorders.biblionumber = biblio.biblionumber
2588
          LEFT JOIN biblio ON aqorders.biblionumber = biblio.biblionumber
2585
          LEFT JOIN biblioitems ON aqorders.biblionumber = biblioitems.biblionumber
2589
          LEFT JOIN biblioitems ON aqorders.biblionumber = biblioitems.biblionumber
2586
        WHERE invoiceid = ?
2590
        WHERE invoiceid = ?
(-)a/t/db_dependent/Acquisition/Invoices.t (-5 / +5 lines)
Lines 1-7 Link Here
1
#!/usr/bin/perl
1
#!/usr/bin/perl
2
#
3
# This Koha test module is a stub!
4
# Add more tests here!!!
5
2
6
use Modern::Perl;
3
use Modern::Perl;
7
4
Lines 11-17 use C4::Bookseller qw( AddBookseller ); Link Here
11
use Koha::Acquisition::Order;
8
use Koha::Acquisition::Order;
12
use Koha::Acquisition::Bookseller;
9
use Koha::Acquisition::Bookseller;
13
10
14
use Test::More tests => 22;
11
use Test::More tests => 24;
15
12
16
BEGIN {
13
BEGIN {
17
    use_ok('C4::Acquisition');
14
    use_ok('C4::Acquisition');
Lines 134-139 my $invoice2 = GetInvoiceDetails($invoiceid2); Link Here
134
is(scalar @{$invoice1->{'orders'}}, 1, 'Invoice1 has only one order');
131
is(scalar @{$invoice1->{'orders'}}, 1, 'Invoice1 has only one order');
135
is(scalar @{$invoice2->{'orders'}}, 2, 'Invoice2 has only two orders');
132
is(scalar @{$invoice2->{'orders'}}, 2, 'Invoice2 has only two orders');
136
133
134
my $orders = $invoice1->{orders};
135
ok( exists( @$orders[0]->{basketgroupid} ), "GetInvoiceDetails: The basketgroupid key exists" );
136
ok( exists( @$orders[0]->{basketgroupname} ), "GetInvoiceDetails: The basketgroupname key exists" );
137
137
my @invoices = GetInvoices();
138
my @invoices = GetInvoices();
138
cmp_ok(scalar @invoices, '>=', 2, 'GetInvoices returns at least two invoices');
139
cmp_ok(scalar @invoices, '>=', 2, 'GetInvoices returns at least two invoices');
139
140
140
- 

Return to bug 13333