[Koha-patches] [PATCH] Bug 9503 Correct name of parameter passed to parcel.pl

[Colin Campbell]

invoiceid was being passed as invoice causing GetInvoiceDetails
to silently fail and a system error downstream when
accessing the 'orders' element of the undefined invoice

Added an error message if GetInvoiceDetails called on undef
---
 C4/Acquisition.pm                                           | 8 +++++---
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
index 4a03e2c..249f10d 100644
--- a/C4/Acquisition.pm
+++ b/C4/Acquisition.pm
@@ -2319,9 +2319,11 @@ Orders informations are in $invoice->{orders} (array ref)
 
 sub GetInvoiceDetails {
     my ($invoiceid) = @_;
-    my $invoice;
 
-    return unless $invoiceid;
+    if ( !defined $invoiceid ) {
+        carp 'GetInvoiceDetails called without an invoiceid';
+        return;
+    }
 
     my $dbh = C4::Context->dbh;
     my $query = qq{
@@ -2333,7 +2335,7 @@ sub GetInvoiceDetails {
     my $sth = $dbh->prepare($query);
     $sth->execute($invoiceid);
 
-    $invoice = $sth->fetchrow_hashref;
+    my $invoice = $sth->fetchrow_hashref;
 
     $query = qq{
         SELECT aqorders.*, biblio.*
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt 
b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
index e10ec8f..94d1bc7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
@@ -91,7 +91,7 @@
                         [% END %]
                     </td>
                                        <td>[% IF ( 
suggestions_loo.invoicenumber ) %]
-                                               <a 
href="/cgi-bin/koha/acqui/parcel.pl?invoice=[% suggestions_loo.invoicenumber 
%]&amp;booksellerid=[% suggestions_loo.id %]&amp;datereceived=[% 
suggestions_loo.datereceived %]">[% suggestions_loo.invoicenumber %]</a>
+                                               <a 
href="/cgi-bin/koha/acqui/parcel.pl?invoiceid=[% suggestions_loo.invoicenumber 
%]&amp;booksellerid=[% suggestions_loo.id %]&amp;datereceived=[% 
suggestions_loo.datereceived %]">[% suggestions_loo.invoicenumber %]</a>
                                            [% ELSE %]
                                                &nbsp;
                                            [% END %]
-- 
1.8.1.1.347.g9591fcc

_______________________________________________
Koha-patches mailing list
Koha-patches@lists.koha-community.org
http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-patches
website : http://www.koha-community.org/
git : http://git.koha-community.org/
bugs : http://bugs.koha-community.org/