Bugzilla – Attachment 6899 Details for
Bug 6489
cancelling hold from holds awaiting pickup does not trigger transit
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch
0001-bug_6489-Do-not-raise-WrongTransfer-if-it-is-transre.patch (text/plain), 2.19 KB, created by
Srdjan Jankovic
on 2011-12-21 08:00:20 UTC
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
Srdjan Jankovic
Created:
2011-12-21 08:00:20 UTC
Size:
2.19 KB
patch
obsolete
>From c9bbc2b2699b7ca1c7ae780c9cd522d240c05475 Mon Sep 17 00:00:00 2001 >From: Srdjan Jankovic <srdjan@catalyst.net.nz> >Date: Wed, 21 Dec 2011 20:57:42 +1300 >Subject: [PATCH] bug_6489: Do not raise WrongTransfer if it is transrerring to reserve > branch > >--- > C4/Circulation.pm | 19 ++++++++++--------- > 1 files changed, 10 insertions(+), 9 deletions(-) > >diff --git a/C4/Circulation.pm b/C4/Circulation.pm >index 9a6f4f2..f1b54d0 100644 >--- a/C4/Circulation.pm >+++ b/C4/Circulation.pm >@@ -1574,6 +1574,14 @@ sub AddReturn { > # check if we have a transfer for this document > my ($datesent,$frombranch,$tobranch) = GetTransfers( $item->{'itemnumber'} ); > >+ # find reserves..... >+ # if we don't have a reserve with the status W, we launch the Checkreserves routine >+ my ($resfound, $resrec) = C4::Reserves::CheckReserves( $item->{'itemnumber'} ); >+ if ($resfound) { >+ $resrec->{'ResFound'} = $resfound; >+ $messages->{'ResFound'} = $resrec; >+ } >+ > # if we have a transfer to do, we update the line of transfers with the datearrived > if ($datesent) { > if ( $tobranch eq $branch ) { >@@ -1583,7 +1591,8 @@ sub AddReturn { > $sth->execute( $item->{'itemnumber'} ); > # if we have a reservation with valid transfer, we can set it's status to 'W' > C4::Reserves::ModReserveStatus($item->{'itemnumber'}, 'W'); >- } else { >+ } elsif ( !($resrec && $resrec->{branchcode} eq $tobranch) ) { >+ # Do not raise WrongTransfer if it is transrerring to reserve branch > $messages->{'WrongTransfer'} = $tobranch; > $messages->{'WrongTransferItem'} = $item->{'itemnumber'}; > } >@@ -1606,14 +1615,6 @@ sub AddReturn { > $messages->{'Debarred'} = $debardate if ($debardate); > } > >- # find reserves..... >- # if we don't have a reserve with the status W, we launch the Checkreserves routine >- my ($resfound, $resrec, undef) = C4::Reserves::CheckReserves( $item->{'itemnumber'} ); >- if ($resfound) { >- $resrec->{'ResFound'} = $resfound; >- $messages->{'ResFound'} = $resrec; >- } >- > # update stats? > # Record the fact that this book was returned. > UpdateStats( >-- >1.6.5 >
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 6489
:
6504
| 6899