From 7ac8a822f025f6d51ca851bc39c24a1e4b7fce90 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Thu, 19 Oct 2017 13:41:12 +0000 Subject: [PATCH] Bug 14576: Followup Fix (remove) extra call for item Fix rebase error code duplication --- C4/Circulation.pm | 2 - .../intranet-tmpl/prog/en/modules/circ/returns.tt | 61 +++++----------------- 2 files changed, 13 insertions(+), 50 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 5c68dd6..9ed4163 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -1850,8 +1850,6 @@ sub AddReturn { } } - my $item = GetItem($itemnumber) or die "GetItem($itemnumber) failed"; - # full item data, but no borrowernumber or checkout info (no issue) my $hbr = GetBranchItemRule($item->{'homebranch'}, $item->{'itype'})->{'returnbranch'} || "homebranch"; # get the proper branch to which to return the item diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 3089282..f24dfc8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -468,19 +468,19 @@ [% IF ( errmsgloo.NotForLoanStatusUpdated ) %]

Not for loan status updated. -
Old value: - [% IF errmsgloo.NotForLoanStatusUpdated.from %] - [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.from ) %]. - [% ELSE %] - Available for loan. - [% END %] -
New value: - [% IF errmsgloo.NotForLoanStatusUpdated.to %] - [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.to ) %]. - [% ELSE %] - Available for loan. - [% END %] -

+
Old value: + [% IF errmsgloo.NotForLoanStatusUpdated.from %] + [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.from ) %]. + [% ELSE %] + Available for loan. + [% END %] +
New value: + [% IF errmsgloo.NotForLoanStatusUpdated.to %] + [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.to ) %]. + [% ELSE %] + Available for loan. + [% END %] +

[% END %] [% IF ( errmsgloo.ItemLocationUpdated ) %]

@@ -524,41 +524,6 @@ [% END %] [% IF ( errmsgloo.waslost ) %]

Item was lost, now found.

- [% IF ( LostItemFeeRefunded ) %] -

A refund has been applied to the borrowing patron's account.

- [% ELSE %] -

Any lost item fees for this item will remain on the patron's account.

- [% END %] - [% END %] - [% IF ( errmsgloo.withdrawn ) %] - [% IF BlockReturnOfWithdrawnItems %] -
Cannot check in
-

NOT CHECKED IN

-

Item is withdrawn.

- [% ELSE %] -

Item is withdrawn.

- [% END %] - [% END %] - [% IF ( errmsgloo.debarred ) %] -

[% errmsgloo.debarname %]([% errmsgloo.debarcardnumber %]) is now debarred until [% errmsgloo.debarred | $KohaDates %].

- [% END %] - [% IF ( errmsgloo.prevdebarred ) %] -

Reminder: Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %].

- [% END %] - [% IF ( errmsgloo.badbarcode ) %] -

No item with barcode: [% errmsgloo.msg | html %]

- [% END %] - [% IF ( errmsgloo.ispermanent ) %] -

Please return item to: [% Branches.GetName( errmsgloo.msg ) %]

- [% END %] - [% IF ( errmsgloo.notissued ) %] -

Not checked out.

- [% END %] - [% IF ( errmsgloo.localuse) %] -

Local use recorded

- [% END %] - [% IF ( errmsgloo.waslost ) %] -

Item was lost, now found.

[% IF LostItemFeeRefunded and not Koha.Preference('BlockReturnOfLostItems') %]

A refund has been applied to the borrowing patron's account.

[% ELSIF Koha.Preference('BlockReturnOfLostItems') %] -- 2.1.4