@@ -, +, @@ --- 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 ) %] -
- -

Please return item to: [% Branches.GetName( TransferWaitingAt ) | html %]

-

[% itembarcode | html %]: [% title | html %]

- - -[% IF ( patron.cardnumber ) %]
Hold for:
- - -
- - - - - - - - - - -
- [% END %]
+ +[% IF ( transfer || ( WrongTransfer && !reserved ) ) %] + [% END %] [% IF ( found ) %] @@ -295,7 +290,7 @@ [% END %] [% IF ( diffbranch ) %] - +

Hold needing transfer found

[% itembarcode | html %]: [% title | html %]

@@ -314,40 +309,30 @@

Hold at [% Branches.GetName( destbranch ) | html %]

[% END %] -
- - - - - - [% FOREACH inputloo IN inputloop %] - - - - [% END %] - - - - - - - - -
-
- [% END %] - - [% IF ( transfer ) %] - -
-

Please return item to: [% Branches.GetName( returnbranch ) | html %]

-

[% itembarcode | html %]: [% title | html %]

-

+
+ + + + + + [% FOREACH inputloo IN inputloop %] + + + + [% END %] + + + + + + + +
[% END %] [% IF ( needstransfer ) %] - +

This item needs to be transferred to [% Branches.GetName( returnbranch ) | html %]

Transfer now?
@@ -357,23 +342,23 @@ - - - - - [% FOREACH inputloo IN inputloop %] - - - - [% END %] - - - -
+ + + + + [% FOREACH inputloo IN inputloop %] + + + + [% END %] + + + + [% END %] [% IF ( diffbranch ) %] - +

Item consigned:

@@ -398,10 +383,9 @@ [% END %] - [% IF ( reserved ) %] - +
[% title | html %]