@@ -, +, @@ --- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 130 ++++++++++++--------- 1 file changed, 78 insertions(+), 52 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -183,12 +183,12 @@ $(document).ready(function () { [% END %] -[% IF ( collectionItemNeedsTransferred ) %] +[% IF collectionItemNeedsTransferred %]

Transferring item to: [% Branches.GetName( collectionBranch ) %]

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

This item is part of a rotating collection.

-

+

[% END %] @@ -203,7 +203,7 @@ $(document).ready(function () { [% END %] -[% IF ( fines ) %] +[% IF fines %]

Patron has outstanding fines of [% fines %].

Make payment.

@@ -211,7 +211,7 @@ $(document).ready(function () { [% END %] -[% IF ( waiting_holds ) %] +[% IF waiting_holds %]

[% holdsfirstname %] [% holdssurname %] has [% waiting_holds %] hold(s) waiting for pickup.

Check out to this patron.

@@ -230,7 +230,7 @@ $(document).ready(function () {
[% END %] -[% IF ( wrongbranch ) %] +[% IF wrongbranch %]

Cannot check in

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

NOT CHECKED IN

@@ -238,40 +238,60 @@ $(document).ready(function () {
[% END %] - -[% IF ( WrongTransfer ) %] -
- -

Transferring item to: [% Branches.GetName( TransferWaitingAt ) %]

-

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

- - - [% IF ( wborcnum ) %]
Hold for:
- - -
- - - - - - - - - - -
- [% END %] -
+ +[% IF WrongTransfer %] + [% IF !wborcnum %] + +
+

Transfer in progress to:
+ [% Branches.GetName( TransferWaitingAt ) %]

+

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

+ + +
+ [% ELSIF wborcnum %] + + + [% END %] [% END %] [% IF ( found ) %] @@ -387,11 +407,11 @@ $(document).ready(function () { [% END %]
- + - + [% FOREACH inputloo IN inputloop %] @@ -409,26 +429,31 @@ $(document).ready(function () {
[% END %] - [% IF ( transfer ) %] + [% IF transfer || ( WrongTransfer && !wborcnum ) %]

Transferring item to: [% Branches.GetName( returnbranch ) %]

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

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

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

- Transfer now?
+
+

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

+ Transfer now?
+

[% IF itemnumber %] - + [% END %] - - + + @@ -688,19 +713,20 @@ $(document).ready(function () { [% ELSE %] [% END %] - + [% IF Koha.Preference('SpecifyReturnDate') %]
Specify return date [% INCLUDE 'date-format.inc' %]:
+ +
[% IF ( return_date_override_remember ) %] [% ELSE %] [% END %] -
[% END %] [% FOREACH inputloo IN inputloop %] --