gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bug_9503' into 3.12-master

This commit is contained in:
Jared Camins-Esakov 2013-02-04 07:46:45 -05:00
parent 59ab127b99 a00946e48c
commit fc3f9cfbe3
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
C4/Acquisition.pm
View File

@ -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.*

2
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt
View File

@ -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 %]">[% suggestions_loo.invoicenumber %]</a>
[% ELSE %]
&nbsp;
[% END %]