Bugzilla – Attachment 68297 Details for
Bug 14576
Allow automatic update of location on checkin
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 14576: Followup
Bug-14576-Followup.patch (text/plain), 3.49 KB, created by
Nick Clemens (kidclamp)
on 2017-10-19 13:51:22 UTC
(
hide
)
Description:
Bug 14576: Followup
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2017-10-19 13:51:22 UTC
Size:
3.49 KB
patch
obsolete
>From 788c642fe79a891ed8d47267f064e3fd4699948a Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >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 | 35 ---------------------- > 2 files changed, 37 deletions(-) > >diff --git a/C4/Circulation.pm b/C4/Circulation.pm >index 225a2d1..15d1a0c 100644 >--- a/C4/Circulation.pm >+++ b/C4/Circulation.pm >@@ -1845,8 +1845,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 1a9166b..1482940 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -653,41 +653,6 @@ $(document).ready(function () { > [% END %] > [% IF ( errmsgloo.withdrawn ) %] > [% IF BlockReturnOfWithdrawnItems %] >- <h5>Cannot check in</h5> >- <p><strong>NOT CHECKED IN</strong></p> >- <p class="problem">Item is withdrawn.</p> >- [% ELSE %] >- <p class="problem">Item is withdrawn.</p> >- [% END %] >- [% END %] >- [% IF ( errmsgloo.debarred ) %] >- <p class="problem"><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% errmsgloo.debarborrowernumber %]">[% errmsgloo.debarname %]([% errmsgloo.debarcardnumber %])</a> is now debarred until [% errmsgloo.debarred | $KohaDates %].</p> >- [% END %] >- [% IF ( errmsgloo.prevdebarred ) %] >- <p class="problem"><b>Reminder: </b>Patron was earlier restricted until [% errmsgloo.prevdebarred | $KohaDates %].</p> >- [% END %] >- [% IF ( errmsgloo.badbarcode ) %] >- <p class="problem">No item with barcode: [% errmsgloo.msg | html %]</p> >- [% END %] >- [% IF ( errmsgloo.ispermanent ) %] >- <p class="problem">Please return item to: [% Branches.GetName( errmsgloo.msg ) %]</p> >- [% END %] >- [% IF ( errmsgloo.notissued ) %] >- <p class="problem">Not checked out.</p> >- [% END %] >- [% IF ( errmsgloo.localuse) %] >- <p class="problem">Local use recorded</p> >- [% END %] >- [% IF ( errmsgloo.waslost ) %] >- <p class="problem">Item was lost, now found.</p> >- [% IF ( LostItemFeeRefunded ) %] >- <p class="problem">A refund has been applied to the borrowing patron's account.</p> >- [% ELSE %] >- <p class="problem">Any lost item fees for this item will remain on the patron's account.</p> >- [% END %] >- [% END %] >- [% IF ( errmsgloo.withdrawn ) %] >- [% IF BlockReturnOfWithdrawnItems %] > <h5>Cannot check in</h5> > <p><strong>NOT CHECKED IN</strong></p> > <p class="problem">Item is withdrawn.</p> >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 14576
:
46454
|
46455
|
46456
|
48258
|
48259
|
50662
|
50663
|
52195
|
52196
|
52197
|
52204
|
52205
|
52206
|
52222
|
52223
|
52224
|
52365
|
53112
|
53113
|
53114
|
53115
|
54281
|
54644
|
54645
|
54646
|
54647
|
54648
|
54654
|
55587
|
60658
|
60659
|
60660
|
60661
|
60662
|
60663
|
60747
|
60748
|
60751
|
61940
|
61941
|
61942
|
61944
|
61945
|
61946
|
61947
|
61948
|
61949
|
61950
|
64656
|
64657
|
64658
|
67610
|
67611
|
68297
|
70795
|
70796
|
70797
|
72032
|
72033
|
72034
|
75661
|
75662
|
75663
|
79245
|
79246
|
79995
|
79996
|
83113
|
83114
|
83115
|
83696
|
83697
|
83698
|
85406
|
85850
|
85851
|
85852
|
85853
|
86812
|
86813
|
86814
|
86815
|
86816
|
87040
|
87061
|
87144
|
87145
|
87146
|
87147
|
87148
|
87149
|
87150
|
87151
|
87925
|
88451
|
88452
|
88453
|
88454
|
88455
|
88456
|
88457
|
88458
|
88459
|
88646
|
88647
|
88648
|
88649
|
88650
|
88651
|
88652
|
88653
|
88654