From afa6a33449615335fb6e9144d78d49beb7e6b640 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Mon, 21 Apr 2014 05:06:14 +0000 Subject: [PATCH] Bug 7288: (follow-up) various fixes - Fix syntax error in supplied test - remove subscriptionid as a field returned by GetInvoices(), as the is_linked_to_subscriptions Boolean takes its place. Signed-off-by: Galen Charlton --- C4/Acquisition.pm | 1 - t/db_dependent/Acquisition/Invoices.t | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index a5979371b0..f7c1d235d5 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -2579,7 +2579,6 @@ sub GetInvoices { my $dbh = C4::Context->dbh; my $query = qq{ SELECT aqinvoices.*, aqbooksellers.name AS suppliername, - aqorders.subscriptionid, COUNT( DISTINCT IF( aqorders.datereceived IS NOT NULL, diff --git a/t/db_dependent/Acquisition/Invoices.t b/t/db_dependent/Acquisition/Invoices.t index 3862926724..b7d75b27ba 100644 --- a/t/db_dependent/Acquisition/Invoices.t +++ b/t/db_dependent/Acquisition/Invoices.t @@ -9,7 +9,7 @@ use warnings; use C4::Bookseller qw( GetBookSellerFromId ); use C4::Biblio qw( AddBiblio ); -use Test::More tests => 21; +use Test::More tests => 22; BEGIN { use_ok('C4::Acquisition'); @@ -184,7 +184,7 @@ my @invoices_linked_to_subscriptions = map{ ? $_ : () } @invoices; -is_deeply( \@invoices_linked_to_subscriptions, [], "GetInvoices return linked_to_subscriptions: there is no invoices linked to subscriptions yet" ) +is_deeply( \@invoices_linked_to_subscriptions, [], "GetInvoices return linked_to_subscriptions: there is no invoices linked to subscriptions yet" ); END { $dbh and $dbh->rollback; -- 2.39.5