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 <gmc@esilibrary.com>

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index a597937..f7c1d23 100644 (file)
--- 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 3862926..b7d75b2 100644 (file)
--- 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;