@@ -, +, @@ * Should give 3 options - Yes, Yes with print, or No. * Yes and Yes with print should trigger a transfer back home. * No should do nothing. * Print should open a window for printing, with correct information. * All three options should close the modal. TO TEST: 1) Set AutomaticItemREturn to Don't. 2) Check in an item with no issues, holds or transfers set, at a location other than the owning library. 3) Test conditions above. home (AutomaticItemReturn set to Do) * Should give 2 options - Print or OK. * Should automatically set transfer. * Print should open a window for printing, with correct information. * Both buttons should close modal. TO TEST: 1) Set AutomaticItemReturn to Do. 2) Check in an item with no issues, holds or transfers set, at a location other than the owning library. 3) Test conditions above. * Should give 3 options - OK, Print or Cancel. * OK and print should not touch existing transfer. * Cancel should remove the exisiting transfer. * Print should open a window for printing, with correct information. * All three options should close the modal. TO TEST: 1) Check in an item following step 2 of either test above. 2) Check in item again, while a transfer exists. 3) Test conditions above. * Should give 1 option - OK. * Should not check anything in or initiate a transfer. * OK should close the modal. TO TEST: 1) Set AllowReturnToBranch to "only the library the item is from". You can test the other settings, as long as you pay attention to where you are checking the item in at. 2) Check in an item at a branch other than the owning library. 3) Test conditions above. --- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 179 +++++++++++++-------- 1 file changed, 113 insertions(+), 66 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -162,44 +162,70 @@ [% END %] -[% IF ( wrongbranch ) %] -

Cannot check in

-

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

-

NOT CHECKED IN

-

This item must be checked in at following library: [% Branches.GetName( rightbranch ) | html %]

+[% IF wrongbranch %] + [% END %] -[% IF ( WrongTransfer && !transfertodo ) %] -
- -

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

-

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

- - -[% IF ( patron.cardnumber ) %]
Hold for:
- - -
- - - - - - - - - - -
- [% END %]
+[% IF WrongTransfer %] + [% END %] [% IF ( found ) %] @@ -337,41 +363,62 @@
[% END %] - [% IF ( transfer ) %] - -
-

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

-

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

-

+ [% IF transfer || needstransfer %] + [% END %] - [% IF ( needstransfer ) %] - -

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

- Transfer now?
-
- [% IF itemnumber %] - - [% END %] - - - - - - - - [% FOREACH inputloo IN inputloop %] - - - - [% END %] - - - -
- [% END %] - [% IF ( diffbranch ) %]

Item consigned:

--