From e73f273a5e747f7f5eb693a03105131b67f0c91b Mon Sep 17 00:00:00 2001
From: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
Date: Wed, 2 Dec 2009 14:48:48 +0100
Subject: [PATCH] (bug #3348) another order receive fix

This patch fix orderreceive.pl when there is no result, and add a link to go back to receive summary.

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
---
 acqui/orderreceive.pl                                          | 3 ++-
 .../intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl
index 0e952bb342..6d33e7e78e 100755
--- a/acqui/orderreceive.pl
+++ b/acqui/orderreceive.pl
@@ -85,7 +85,7 @@ my @results = SearchOrder( $search, $supplierid, $biblionumber);
 my $count   = scalar @results;
 my $order 	= GetOrder($search);
 
-my $bookseller = GetBookSellerFromId( $results[0]->{'booksellerid'} );
+my $bookseller = GetBookSellerFromId( $supplierid );
 
 my $date = $results[0]->{'entrydate'};
 
@@ -197,6 +197,7 @@ $template->param(
     name             => $bookseller->{'name'},
     freight          => $freight,
     gst              => $gst,
+    previousurl      => $input->referer(),
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
index 8ebd485998..f64b1e2456 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
@@ -22,7 +22,7 @@ fieldset.rows .itemblock fieldset.action { padding:.5em; }
 	<div class="yui-b">
 
 <h1>Receive items from : <!-- TMPL_VAR NAME="name" --> <!-- TMPL_IF NAME="invoice" -->[<!-- TMPL_VAR NAME="invoice" -->] <!-- /TMPL_IF --> (order #<!-- TMPL_VAR NAME="ordernumber" -->)</h1>
-
+<a href="<!-- TMPL_VAR NAME="previousurl" -->">Back to receive summary</a>
 <!-- TMPL_IF name="count" -->
     <form action="/cgi-bin/koha/acqui/finishreceive.pl" method="post">
 <div class="yui-g">
-- 
2.39.5