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

(-)a/C4/Acquisition.pm (-1 / +4 lines)
Lines 1110-1115 C<$order> are fields from the biblio, biblioitems, aqorders tables of the Koha d Link Here
1110
1110
1111
sub GetOrder {
1111
sub GetOrder {
1112
    my ($ordernumber) = @_;
1112
    my ($ordernumber) = @_;
1113
    return unless $ordernumber;
1114
1113
    my $dbh      = C4::Context->dbh;
1115
    my $dbh      = C4::Context->dbh;
1114
    my $query = qq{SELECT
1116
    my $query = qq{SELECT
1115
                aqorders.*,
1117
                aqorders.*,
Lines 1147-1153 sub GetOrder { Link Here
1147
    my $sth= $dbh->prepare($query);
1149
    my $sth= $dbh->prepare($query);
1148
    $sth->execute($ordernumber);
1150
    $sth->execute($ordernumber);
1149
    my $data = $sth->fetchrow_hashref;
1151
    my $data = $sth->fetchrow_hashref;
1150
    $data->{orderdate} = format_date( $data->{orderdate} );
1152
    return unless $data;
1153
    $data->{orderdate} = format_date( $data->{orderdate} ); # FIXME Should be done in the templates
1151
    $sth->finish;
1154
    $sth->finish;
1152
    return $data;
1155
    return $data;
1153
}
1156
}
(-)a/t/db_dependent/Acquisition.t (-2 / +6 lines)
Lines 8-14 use POSIX qw(strftime); Link Here
8
8
9
use C4::Bookseller qw( GetBookSellerFromId );
9
use C4::Bookseller qw( GetBookSellerFromId );
10
10
11
use Test::More tests => 62;
11
use Test::More tests => 64;
12
12
13
BEGIN {
13
BEGIN {
14
    use_ok('C4::Acquisition');
14
    use_ok('C4::Acquisition');
Lines 223-226 is($order3->{'quantityreceived'}, 2, 'Order not split up'); Link Here
223
is($order3->{'quantity'}, 2, '2 items on order');
223
is($order3->{'quantity'}, 2, '2 items on order');
224
is($order3->{'budget_id'}, $budgetid2, 'Budget has changed');
224
is($order3->{'budget_id'}, $budgetid2, 'Budget has changed');
225
225
226
my $nonexistent_order = GetOrder();
227
is( $nonexistent_order, undef, 'GetOrder returns undef if no ordernumber is given' );
228
$nonexistent_order = GetOrder( 424242424242 );
229
is( $nonexistent_order, undef, 'GetOrder return undef if a nonexistent ordernumber is given' );
230
226
$dbh->rollback;
231
$dbh->rollback;
227
- 

Return to bug 11550