@@ -, +, @@ --- circ/returns.pl | 2 + .../intranet-tmpl/prog/en/modules/circ/returns.tt | 139 +++++++++------------ 2 files changed, 63 insertions(+), 78 deletions(-) --- a/circ/returns.pl +++ a/circ/returns.pl @@ -448,6 +448,8 @@ if ( $messages->{'ResFound'}) { if ( $reserve->{'ResFound'} eq "Waiting" ) { $template->param( waiting => ($userenv_branch eq $reserve->{'branchcode'} ? 1 : 0 ), + transfertodo => ($userenv_branch eq $reserve->{'branchcode'} ? 0 : 1 ), + reserved => 1, ); } elsif ( $reserve->{'ResFound'} eq "Reserved" ) { $template->param( --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -170,36 +170,31 @@ [% END %] - -[% IF ( WrongTransfer ) %] -
+ +[% IF ( transfer || ( WrongTransfer && !reserved ) ) %] +