f1aa43b75f
Fix the supplier, shipment date, and library filters on the invoice search. An invoice's library is (in parallel with order search) defined as the library of the staff member that approved the basket. Before this patch, the code was referring to an aqorders.branchcode column that doesn't exist. This patch also improves the author, title, ISBN/EAN/ISSN, publisher, and publication year filters to no longer require exact matches; substring matches now suffice. Finally, this patch considers biblio.copyrightdate in addition to biblioitems.publicationyear for publication date searches, as the MARC21 frameworks use the former column but not the latter. This patch also fixes the current test cases for invoices so that they pass and adds regression tests. Test plan: [1] Create two invoices for different vendors. [2] Do an invoice search and filter on shipment date. Verify that the expected invoice(s) are returned. [3] Do an invoice search and filter on branch (of the staff member that approved the basket). Verify that the expected invoice(s) are returned. [4] Do an invoice search and filter on supplier. Verify that the expected invoice(s) are returned. [5] Do invoice searches on author, title, ISBN/EAN/ISSN, publisher, and publication year and verify that the results are as expected. Signed-off-by: Galen Charlton <gmc@esilibrary.com> Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com> Patch passes all tests, test plan and QA script. (Adding from Katrin notes early) I agree with Possible improvements: - Document the behaviour of the library search as there are lots of branches all over acquisitions with different meaning. - Add the shipment date to the results list table - Change label ISBN/EAN/ISSN to not include EAN for MARC21 installations Signed-off-by: Galen Charlton <gmc@esilibrary.com>
182 lines
5.9 KiB
Perl
182 lines
5.9 KiB
Perl
#!/usr/bin/perl
|
|
#
|
|
# This Koha test module is a stub!
|
|
# Add more tests here!!!
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
use C4::Bookseller qw( GetBookSellerFromId );
|
|
use C4::Biblio qw( AddBiblio );
|
|
|
|
use Test::More tests => 21;
|
|
|
|
BEGIN {
|
|
use_ok('C4::Acquisition');
|
|
}
|
|
|
|
my $dbh = C4::Context->dbh;
|
|
$dbh->{AutoCommit} = 0;
|
|
$dbh->{RaiseError} = 1;
|
|
|
|
$dbh->do(q{DELETE FROM aqinvoices});
|
|
|
|
my $booksellerid = C4::Bookseller::AddBookseller(
|
|
{
|
|
name => "my vendor",
|
|
address1 => "bookseller's address",
|
|
phone => "0123456",
|
|
active => 1
|
|
}
|
|
);
|
|
|
|
my $booksellerinfo = GetBookSellerFromId( $booksellerid );
|
|
my $basketno = NewBasket($booksellerid, 1);
|
|
my $basket = GetBasket($basketno);
|
|
|
|
my $budgetid = C4::Budgets::AddBudget(
|
|
{
|
|
budget_code => "budget_code_test_getordersbybib",
|
|
budget_name => "budget_name_test_getordersbybib",
|
|
}
|
|
);
|
|
my $budget = C4::Budgets::GetBudget( $budgetid );
|
|
|
|
my ($ordernumber1, $ordernumber2, $ordernumber3);
|
|
my $bibrec1 = MARC::Record->new();
|
|
$bibrec1->append_fields(
|
|
MARC::Field->new('020', '', '', 'a' => '1234567890'),
|
|
MARC::Field->new('100', '', '', 'a' => 'Shakespeare, Billy'),
|
|
MARC::Field->new('245', '', '', 'a' => 'Bug 8854'),
|
|
MARC::Field->new('260', '', '', 'b' => 'Scholastic Publishing', c => 'c2012'),
|
|
);
|
|
my ($biblionumber1, $biblioitemnumber1) = AddBiblio($bibrec1, '');
|
|
my ($biblionumber2, $biblioitemnumber2) = AddBiblio(MARC::Record->new, '');
|
|
my ($biblionumber3, $biblioitemnumber3) = AddBiblio(MARC::Record->new, '');
|
|
( undef, $ordernumber1 ) = C4::Acquisition::NewOrder(
|
|
{
|
|
basketno => $basketno,
|
|
quantity => 2,
|
|
biblionumber => $biblionumber1,
|
|
budget_id => $budget->{budget_id},
|
|
}
|
|
);
|
|
|
|
( undef, $ordernumber2 ) = C4::Acquisition::NewOrder(
|
|
{
|
|
basketno => $basketno,
|
|
quantity => 1,
|
|
biblionumber => $biblionumber2,
|
|
budget_id => $budget->{budget_id},
|
|
}
|
|
);
|
|
|
|
( undef, $ordernumber3 ) = C4::Acquisition::NewOrder(
|
|
{
|
|
basketno => $basketno,
|
|
quantity => 1,
|
|
biblionumber => $biblionumber3,
|
|
budget_id => $budget->{budget_id},
|
|
ecost => 42,
|
|
rrp => 42,
|
|
}
|
|
);
|
|
|
|
my $invoiceid1 = AddInvoice(invoicenumber => 'invoice1', booksellerid => $booksellerid, unknown => "unknown");
|
|
my $invoiceid2 = AddInvoice(invoicenumber => 'invoice2', booksellerid => $booksellerid, unknown => "unknown",
|
|
shipmentdate => '2012-12-24',
|
|
);
|
|
|
|
my ($datereceived, $new_ordernumber) = ModReceiveOrder(
|
|
$biblionumber1,
|
|
$ordernumber1,
|
|
2,
|
|
undef,
|
|
12,
|
|
12,
|
|
$invoiceid1,
|
|
42
|
|
);
|
|
|
|
($datereceived, $new_ordernumber) = ModReceiveOrder(
|
|
$biblionumber2,
|
|
$ordernumber2,
|
|
1,
|
|
undef,
|
|
5,
|
|
5,
|
|
$invoiceid2,
|
|
42
|
|
);
|
|
|
|
($datereceived, $new_ordernumber) = ModReceiveOrder(
|
|
$biblionumber3,
|
|
$ordernumber3,
|
|
1,
|
|
undef,
|
|
12,
|
|
12,
|
|
$invoiceid2,
|
|
42
|
|
);
|
|
|
|
|
|
my $invoice1 = GetInvoiceDetails($invoiceid1);
|
|
my $invoice2 = GetInvoiceDetails($invoiceid2);
|
|
|
|
is(scalar @{$invoice1->{'orders'}}, 1, 'Invoice1 has only one order');
|
|
is(scalar @{$invoice2->{'orders'}}, 2, 'Invoice2 has only two orders');
|
|
|
|
my @invoices = GetInvoices();
|
|
cmp_ok(scalar @invoices, '>=', 2, 'GetInvoices returns at least two invoices');
|
|
|
|
@invoices = GetInvoices(invoicenumber => 'invoice2');
|
|
cmp_ok(scalar @invoices, '>=', 1, 'GetInvoices returns at least one invoice when a specific invoice is requested');
|
|
|
|
@invoices = GetInvoices(shipmentdateto => '2012-12-24', shipmentdatefrom => '2012-12-24');
|
|
is($invoices[0]->{invoicenumber}, 'invoice2', 'GetInvoices() to search by shipmentdate works (bug 8854)');
|
|
@invoices = GetInvoices(title => 'Bug');
|
|
is($invoices[0]->{invoicenumber}, 'invoice1', 'GetInvoices() to search by title works (bug 8854)');
|
|
@invoices = GetInvoices(author => 'Billy');
|
|
is($invoices[0]->{invoicenumber}, 'invoice1', 'GetInvoices() to search by author works (bug 8854)');
|
|
@invoices = GetInvoices(publisher => 'Scholastic');
|
|
is($invoices[0]->{invoicenumber}, 'invoice1', 'GetInvoices() to search by publisher works (bug 8854)');
|
|
@invoices = GetInvoices(publicationyear => '2012');
|
|
is($invoices[0]->{invoicenumber}, 'invoice1', 'GetInvoices() to search by publication/copyright year works (bug 8854)');
|
|
@invoices = GetInvoices(isbneanissn => '1234567890');
|
|
is($invoices[0]->{invoicenumber}, 'invoice1', 'GetInvoices() to search by ISBN works (bug 8854)');
|
|
@invoices = GetInvoices(isbneanissn => '123456789');
|
|
is($invoices[0]->{invoicenumber}, 'invoice1', 'GetInvoices() to search by partial ISBN works (bug 8854)');
|
|
|
|
my $invoicesummary1 = GetInvoice($invoiceid1);
|
|
is($invoicesummary1->{'invoicenumber'}, 'invoice1', 'GetInvoice retrieves correct invoice');
|
|
is($invoicesummary1->{'invoicenumber'}, $invoice1->{'invoicenumber'}, 'GetInvoice and GetInvoiceDetails retrieve same information');
|
|
|
|
ModInvoice(invoiceid => $invoiceid1, invoicenumber => 'invoice11');
|
|
$invoice1 = GetInvoiceDetails($invoiceid1);
|
|
is($invoice1->{'invoicenumber'}, 'invoice11', 'ModInvoice changed invoice number');
|
|
|
|
is($invoice1->{'closedate'}, undef, 'Invoice is not closed before CloseInvoice call');
|
|
CloseInvoice($invoiceid1);
|
|
$invoice1 = GetInvoiceDetails($invoiceid1);
|
|
isnt($invoice1->{'closedate'}, undef, 'Invoice is closed after CloseInvoice call');
|
|
ReopenInvoice($invoiceid1);
|
|
$invoice1 = GetInvoiceDetails($invoiceid1);
|
|
is($invoice1->{'closedate'}, undef, 'Invoice is open after ReopenInvoice call');
|
|
|
|
|
|
MergeInvoices($invoiceid1, [ $invoiceid2 ]);
|
|
|
|
my $mergedinvoice = GetInvoiceDetails($invoiceid1);
|
|
is(scalar @{$mergedinvoice->{'orders'}}, 3, 'Merged invoice has three orders');
|
|
|
|
my $invoiceid3 = AddInvoice(invoicenumber => 'invoice3', booksellerid => $booksellerid, unknown => "unknown");
|
|
my $invoicecount = GetInvoices();
|
|
DelInvoice($invoiceid3);
|
|
@invoices = GetInvoices();
|
|
is(scalar @invoices, $invoicecount - 1, 'DelInvoice deletes invoice');
|
|
is(GetInvoice($invoiceid3), undef, 'DelInvoice deleted correct invoice');
|
|
|
|
END {
|
|
$dbh and $dbh->rollback;
|
|
}
|