Bugzilla – Attachment 51687 Details for
Bug 16534
Error when checking out already checked out item (depending on AllowReturnToBranch)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 16534: Do not process the checkout if the checkin has failed
Bug-16534-Do-not-process-the-checkout-if-the-check.patch (text/plain), 3.17 KB, created by
Jonathan Druart
on 2016-05-21 13:18:56 UTC
(
hide
)
Description:
Bug 16534: Do not process the checkout if the checkin has failed
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2016-05-21 13:18:56 UTC
Size:
3.17 KB
patch
obsolete
>From ab0e6d6c3074ce3d8dff126858c8c33dd71013fc Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Sat, 21 May 2016 14:18:04 +0100 >Subject: [PATCH] Bug 16534: Do not process the checkout if the checkin has > failed > >--- > C4/Circulation.pm | 21 +++++++++++++++------ > .../prog/en/modules/circ/circulation.tt | 4 ++++ > 2 files changed, 19 insertions(+), 6 deletions(-) > >diff --git a/C4/Circulation.pm b/C4/Circulation.pm >index 913ec0b..12fccdc 100644 >--- a/C4/Circulation.pm >+++ b/C4/Circulation.pm >@@ -1046,12 +1046,19 @@ sub CanBookBeIssued { > # issued to someone else > my $currborinfo = C4::Members::GetMember( borrowernumber => $issue->{borrowernumber} ); > >-# warn "=>.$currborinfo->{'firstname'} $currborinfo->{'surname'} ($currborinfo->{'cardnumber'})"; >- $needsconfirmation{ISSUED_TO_ANOTHER} = 1; >- $needsconfirmation{issued_firstname} = $currborinfo->{'firstname'}; >- $needsconfirmation{issued_surname} = $currborinfo->{'surname'}; >- $needsconfirmation{issued_cardnumber} = $currborinfo->{'cardnumber'}; >- $needsconfirmation{issued_borrowernumber} = $currborinfo->{'borrowernumber'}; >+ >+ my ( $can_be_returned, $message ) = CanBookBeReturned( $item, C4::Context->userenv->{branch} ); >+ >+ unless ( $can_be_returned ) { >+ $issuingimpossible{RETURN_IMPOSSIBLE} = 1; >+ $issuingimpossible{branch_to_return} = $message; >+ } else { >+ $needsconfirmation{ISSUED_TO_ANOTHER} = 1; >+ $needsconfirmation{issued_firstname} = $currborinfo->{'firstname'}; >+ $needsconfirmation{issued_surname} = $currborinfo->{'surname'}; >+ $needsconfirmation{issued_cardnumber} = $currborinfo->{'cardnumber'}; >+ $needsconfirmation{issued_borrowernumber} = $currborinfo->{'borrowernumber'}; >+ } > } > > unless ( $ignore_reserves ) { >@@ -1379,6 +1386,8 @@ sub AddIssue { > if ( $actualissue->{borrowernumber}) { > # This book is currently on loan, but not to the person > # who wants to borrow it now. mark it returned before issuing to the new borrower >+ my ( $allowed, $message ) = CanBookBeReturned( $item, C4::Context->userenv->{branch} ); >+ return unless $allowed; > AddReturn( > $item->{'barcode'}, > C4::Context->userenv->{'branch'} >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >index cd3fc35..90c2d42 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -554,6 +554,10 @@ $(document).ready(function() { > <li>This item belongs to [% Branches.GetName( itemhomebranch ) %] and cannot be checked out from this location.</li> > [% END %] > >+ [% IF RETURN_IMPOSSIBLE %] >+ <li>This item must be return to [% Branches.GetName( branch_to_return ) %].</li> >+ [% END %] >+ > [% IF ( USERBLOCKEDWITHENDDATE ) %] > <li>Patron has a restriction until [% USERBLOCKEDWITHENDDATE | $KohaDates %].</li> > [% END %] >-- >2.8.1
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 16534
:
51687
|
51697
|
51698
|
51699
|
51700
|
51706
|
51707
|
51708
|
51709
|
51710
|
52487
|
52488
|
52489
|
52490
|
52491
|
52492
|
52493