diff --git a/circ/returns.pl b/circ/returns.pl
index fb3f135b71..019d8e36c8 100755
--- a/circ/returns.pl
+++ b/circ/returns.pl
@@ -103,6 +103,7 @@ my $returned_counter = C4::Context->preference('numReturnedItemsToShow') || 8;
my %returneditems;
my %riduedate;
my %riborrowernumber;
+my %rinot_returned;
my @inputloop;
foreach ( $query->param ) {
my $counter;
@@ -120,6 +121,7 @@ foreach ( $query->param ) {
my $barcode = $query->param("ri-$counter");
my $duedate = $query->param("dd-$counter");
my $borrowernumber = $query->param("bn-$counter");
+ my $not_returned = $query->param("nr-$counter");
$counter++;
# decode barcode ## Didn't we already decode them before passing them back last time??
@@ -130,12 +132,14 @@ foreach ( $query->param ) {
$returneditems{$counter} = $barcode;
$riduedate{$counter} = $duedate;
$riborrowernumber{$counter} = $borrowernumber;
+ $rinot_returned{$counter} = $not_returned;
#######################
$input{counter} = $counter;
$input{barcode} = $barcode;
$input{duedate} = $duedate;
$input{borrowernumber} = $borrowernumber;
+ $input{not_returned} = $not_returned;
push( @inputloop, \%input );
}
@@ -386,6 +390,7 @@ if ($barcode && $op eq 'cud-checkin') {
$returneditems{0} = $barcode;
$riborrowernumber{0} = $borrower->{'borrowernumber'};
$riduedate{0} = $duedate;
+ $rinot_returned{0} = 0;
$input{borrowernumber} = $borrower->{'borrowernumber'};
$input{duedate} = $duedate;
unless ( $dropboxmode ) {
@@ -429,6 +434,7 @@ if ($barcode && $op eq 'cud-checkin') {
}
$input{duedate} = $duedate;
$input{not_returned} = 1;
+ $rinot_returned{0} = 1;
$returneditems{0} = $barcode;
$riduedate{0} = $duedate;
push( @inputloop, \%input );
@@ -811,7 +817,7 @@ foreach ( sort { $a <=> $b } keys %returneditems ) {
# we could handle that better displaying a message in the template
- $ri{not_returned} = 1 unless $returned;
+ $ri{not_returned} = $rinot_returned{$_};
my $biblio = $item->biblio;
# FIXME pass $item to the template and we are done here...
$ri{itembiblionumber} = $biblio->biblionumber;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index 474a3e6473..7091e5ef8e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -436,6 +436,7 @@
+
[% END %]
@@ -519,6 +520,7 @@
+
[% END %]
[% IF item.onloan %]
@@ -591,6 +593,7 @@
+
[% END %]
@@ -873,6 +878,7 @@
+
[% END %]
@@ -1142,6 +1148,7 @@
+
[% END %]