use POSIX qw(strftime);
-use C4::Bookseller qw( GetBookSellerFromId );
-
-use Test::More tests => 87;
+use Test::More tests => 91;
+use Koha::Database;
BEGIN {
use_ok('C4::Acquisition');
use_ok('C4::Budgets');
use_ok('C4::Bookseller');
use_ok('Koha::Acquisition::Order');
+ use_ok('Koha::Acquisition::Bookseller');
}
# Sub used for testing C4::Acquisition subs returning order(s):
);
}
+
+my $schema = Koha::Database->new()->schema();
+$schema->storage->txn_begin();
+
my $dbh = C4::Context->dbh;
-$dbh->{AutoCommit} = 0;
$dbh->{RaiseError} = 1;
# Creating some orders
}
);
-my $booksellerinfo = C4::Bookseller::GetBookSellerFromId($booksellerid);
+my $booksellerinfo = Koha::Acquisition::Bookseller->fetch({ id => $booksellerid });
is( $booksellerinfo->{deliverytime},
5, 'set deliverytime when creating vendor (Bug 10556)' );
);
ok( $basket = GetBasket($basketno), "GetBasket($basketno) returns $basket" );
+my $bpid=AddBudgetPeriod({
+ budget_period_startdate => '2008-01-01'
+ , budget_period_enddate => '2008-12-31'
+ , budget_period_active => 1
+ , budget_period_description => "MAPERI"
+});
+
my $budgetid = C4::Budgets::AddBudget(
{
budget_code => "budget_code_test_getordersbybib",
budget_name => "budget_name_test_getordersbybib",
+ budget_period_id => $bpid,
}
);
my $budget = C4::Budgets::GetBudget($budgetid);
quantity
currency
listprice
- totalamount
datereceived
invoiceid
freight
unitprice
quantityreceived
datecancellationprinted
- supplierreference
purchaseordernumber
basketno
timestamp
gstrate
discount
budget_id
- budgetgroup_id
budgetdate
sort1
sort2
subscriptionid
parent_ordernumber
orderstatus
+ line_item_id
+ suppliers_reference_number
+ suppliers_reference_qualifier
+ suppliers_report
title
author
basketname
biblioitemnumber
datereceived
orderstatus
- supplierreference
+ line_item_id
+ suppliers_reference_number
+ suppliers_reference_qualifier
+ suppliers_report
agerestriction
budget_branchcode
gstrate
publicationyear
collectiontitle
invoiceid
- budgetgroup_id
place
issn
quantityreceived
budget_expend
rrp
cn_sort
- totalamount
lccn
sort1
volume
);
#
-# Test GetCancelledOrders
+# Test GetOrders { cancelled => 1 }
#
@expectedfields =
( @base_expectedfields, ( 'transferred_to_timestamp', 'transferred_to' ) );
-is( GetCancelledOrders(), undef,
- "GetCancelledOrders with no params returns undef" );
-@get_orders = GetCancelledOrders($basketno);
+@get_orders = GetOrders($basketno, { cancelled => 1 });
(
$test_missing_fields, $test_extra_fields,
$test_different_fields, $test_nbr_fields
is(
$$test_nbr_fields[0],
scalar @expectedfields,
- "GetCancelledOrders gets orders with the right number of fields"
+ "GetOrders { cancelled => 1 } gets orders with the right number of fields"
);
is( join( " ", @$test_missing_fields ),
- '', "GetCancelledOrders gets orders with no missing fields" );
+ '', "GetOrders { cancelled => 1 } gets orders with no missing fields" );
is( join( " ", @$test_extra_fields ),
- '', "GetCancelledOrders gets orders with no unexpected fields" );
+ '', "GetOrders { cancelled => 1 } gets orders with no unexpected fields" );
is( join( " ", @$test_different_fields ),
'',
- "GetCancelledOrders gets orders with the right content in every fields" );
+ "GetOrders { cancelled => 1 } gets orders with the right content in every fields" );
ok(
(
( scalar @get_orders == 1 )
and grep ( $_->{ordernumber} eq $ordernumbers[3], @get_orders )
),
- "GetCancelledOrders only gets cancelled orders"
+ "GetOrders { cancelled => 1 } only gets cancelled orders"
);
#
creationdate
datereceived
orderstatus
- supplierreference
+ line_item_id
+ suppliers_reference_number
+ suppliers_reference_qualifier
+ suppliers_report
isbn
copyrightdate
gstrate
title
closedate
basketname
- budgetgroup_id
invoiceid
author
parent_ordernumber
sort2_authcat
rrp
unitprice
- totalamount
sort1
ordernumber
datecreated
ok((not defined GetBiblio($order4->{biblionumber})), "biblio does not exist anymore");
# End of tests for DelOrder
-$dbh->rollback;
+# Budget reports
+my $all_count = scalar GetBudgetsReport();
+ok($all_count >= 1, "GetBudgetReport OK");
+
+my $active_count = scalar GetBudgetsReport(1);
+ok($active_count >= 1 , "GetBudgetsReport(1) OK");
+
+is($all_count, scalar GetBudgetsReport(), "GetBudgetReport returns inactive budget period acquisitions.");
+ok($active_count >= scalar GetBudgetsReport(1), "GetBudgetReport doesn't return inactive budget period acquisitions.");
+
+$schema->storage->txn_rollback();