@@ -, +, @@ - Apply patch - Go to Home > Circulation > Check in - Do check ins with different expected results / messages - Verify that the messages are meaningful and display nicely - Play with items checked out / checked in at different branches (home branch, holding branch, other branch) and different settings for syspref 'AllowREturnToBranch' and verify that the messages display properly (with correct home rsp. holding branch) - Carfully review code changes. --- circ/returns.pl | 2 + .../intranet-tmpl/prog/en/modules/circ/returns.tt | 63 +++++++++++++------- 2 files changed, 44 insertions(+), 21 deletions(-) --- a/circ/returns.pl +++ a/circ/returns.pl @@ -280,6 +280,7 @@ if ($barcode) { $template->param( title => $biblio->{'title'}, homebranch => $biblio->{'homebranch'}, + holdingbranch => $biblio->{'holdingbranch'}, returnbranch => $returnbranch, author => $biblio->{'author'}, itembarcode => $biblio->{'barcode'}, @@ -373,6 +374,7 @@ if ( $messages->{'NeedsTransfer'} ){ if ( $messages->{'Wrongbranch'} ){ $template->param( wrongbranch => 1, + rightbranch => $messages->{'Wrongbranch'}->{'Rightbranch'}, ); } --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -133,7 +133,11 @@ $(document).ready(function () { [% END %] [% IF ( collectionItemNeedsTransferred ) %] -
+ [% END %] @@ -165,11 +169,19 @@ $(document).ready(function () { [% END %] [% IF ( wrongbranch ) %] -This item must be checked in at its home library. NOT CHECKED IN
-[% itembarcode |html %]: [% title |html %]
+ NOT CHECKED IN +This item must be checked in at following library: [% Branches.GetName( rightbranch ) %]
+