Bugzilla – Attachment 121672 Details for
Bug 27064
Transferring an item with a hold allows the user to set a hold waiting without transferring to the correct branch
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 27064: (QA follow-up) Do not create transfer prior to accepting it
Bug-27064-QA-follow-up-Do-not-create-transfer-prio.patch (text/plain), 3.73 KB, created by
Martin Renvoize (ashimema)
on 2021-06-07 13:31:12 UTC
(
hide
)
Description:
Bug 27064: (QA follow-up) Do not create transfer prior to accepting it
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2021-06-07 13:31:12 UTC
Size:
3.73 KB
patch
obsolete
>From b2fdac8c9a852bb9f291c0c1ed388cdb105b5aa0 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Mon, 17 May 2021 15:51:46 +0100 >Subject: [PATCH] Bug 27064: (QA follow-up) Do not create transfer prior to > accepting it > >This patch prevents the cancellations we were seeing. Transfers were >being created pre-emtively for reserves in branchtransfers before the >librarian had selected their prefered action. As such, we were getting >double lines in the branchtransfers table. >--- > C4/Circulation.pm | 4 ++-- > circ/branchtransfers.pl | 3 +-- > .../intranet-tmpl/prog/en/modules/circ/branchtransfers.tt | 3 +-- > 3 files changed, 4 insertions(+), 6 deletions(-) > >diff --git a/C4/Circulation.pm b/C4/Circulation.pm >index 10db0d226a..f0e39b7583 100644 >--- a/C4/Circulation.pm >+++ b/C4/Circulation.pm >@@ -375,10 +375,10 @@ sub transferbook { > # That'll save a database query. > my ( $resfound, $resrec, undef ) = > CheckReserves( $itemnumber ); >- if ( $resfound and not $ignoreRs ) { >+ if ( $resfound ) { > $resrec->{'ResFound'} = $resfound; > $messages->{'ResFound'} = $resrec; >- $dotransfer = 1; >+ $dotransfer = 0 unless $ignoreRs; > } > > #actually do the transfer.... >diff --git a/circ/branchtransfers.pl b/circ/branchtransfers.pl >index 59b4f24fec..bb508f77a0 100755 >--- a/circ/branchtransfers.pl >+++ b/circ/branchtransfers.pl >@@ -127,7 +127,6 @@ defined $barcode and $barcode =~ s/^\s*|\s*$//g; # FIXME: barcodeInputFilter > if ($barcode) { > > ( $transferred, $messages ) = >- > transferbook({ > from_branch => C4::Context->userenv->{'branch'}, > to_branch => $tobranchcd, >@@ -136,7 +135,7 @@ if ($barcode) { > trigger => 'Manual' > }); > my $item = Koha::Items->find({ barcode => $barcode }); >- $found = $messages->{'ResFound'}; >+ $found = $messages->{'ResFound'} unless $settransit; > if ($transferred) { > my %trsfitem; > my $frbranchcd = C4::Context->userenv->{'branch'}; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt >index 4aedfc4c97..2ee5e9e3bc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt >@@ -67,8 +67,8 @@ > <input type="hidden" name="itemnumber" value="[% itemnumber | html %]" /> > <input type="hidden" name="borrowernumber" value="[% borrowernumber | html %]" /> > <input type="hidden" name="tobranchcd" value="[% tobranchcd | html %]" /> >+ <input type="hidden" name="barcode" value="[% barcode | html %]" /> > [% IF ( waiting or transferred or processing ) %] >- <input type="hidden" name="barcode" value="[% barcode | html %]" /> > <input type="hidden" name="request" value="KillWaiting" /> > <input type="submit" value="Cancel" /> > [% END %] >@@ -93,7 +93,6 @@ > <input type="hidden" name="biblionumber" value="[% biblionumber | html %]" /> > <input type="hidden" name="borrowernumber" value="[% borrowernumber | html %]" /> > <input type="hidden" name="tobranchcd" value="[% tobranchcd | html %]" /> >- <input type="hidden" name="barcode" value="[% barcode | html %]" /> > <input type="hidden" name="request" value="KillReserved" /> > <input type="submit" value="Cancel" /> > </form> >-- >2.20.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 27064
:
113877
|
114712
|
120222
|
120759
|
120764
|
121065
|
121066
|
121067
|
121090
|
121091
|
121092
|
121093
|
121141
|
121142
|
121143
|
121144
|
121670
|
121671
|
121672
|
121673
|
121674
|
121675
|
121676
|
121677
|
121678
|
121679
|
121680
|
121681
|
121682
|
121683
|
121684
|
121685
|
121981