Bugzilla – Attachment 160043 Details for
Bug 28530
Allow configuration of floating limits by item type
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 28530: Implement float limits
Bug-28530-Implement-float-limits.patch (text/plain), 8.42 KB, created by
Kyle M Hall (khall)
on 2023-12-19 16:51:17 UTC
(
hide
)
Description:
Bug 28530: Implement float limits
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2023-12-19 16:51:17 UTC
Size:
8.42 KB
patch
obsolete
>From b32ff8e98165ac9d4f481a16f717eb601a96a6e3 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Mon, 18 Dec 2023 14:21:57 -0500 >Subject: [PATCH] Bug 28530: Implement float limits > >Test Plan: >1) Apply this patch set >2) Run updatedatabase.pl >3) Restart all the things! >4) Enable UseLibraryFloatLimits >5) Verify items float correctly as per your circulation rules >6) Set some float limits from the Library Float Limits configuration > page in the Administration section > The simplest solution is to set the float limit from one branch > to 1 item, a second to 100 items, and a third to 300 items for > a single itemtype >7) Verify checked in items that should have floated at this branch > are now transfered to the branch with the best float ratio >--- > C4/Circulation.pm | 17 ++++++++++ > circ/returns.pl | 31 +++++++++++++------ > .../prog/en/modules/admin/admin-home.tt | 2 ++ > .../prog/en/modules/circ/returns.tt | 3 +- > 4 files changed, 43 insertions(+), 10 deletions(-) > >diff --git a/C4/Circulation.pm b/C4/Circulation.pm >index ac28b2e74b5..2ed4da42bf4 100644 >--- a/C4/Circulation.pm >+++ b/C4/Circulation.pm >@@ -51,6 +51,7 @@ use Koha::Patrons; > use Koha::Patron::Debarments qw( DelUniqueDebarment AddUniqueDebarment ); > use Koha::Database; > use Koha::Libraries; >+use Koha::Library::FloatLimits; > use Koha::Account::Lines; > use Koha::Holds; > use Koha::Account::Lines; >@@ -2195,6 +2196,22 @@ sub AddReturn { > # if $hbr was "noreturn" or any other non-item table value, then it should 'float' (i.e. stay at this branch) > my $transfer_trigger = $hbr eq 'homebranch' ? 'ReturnToHome' : $hbr eq 'holdingbranch' ? 'ReturnToHolding' : undef; > >+ # check library float limits if enabled if the item isn't being transferred away >+ if ( ( $returnbranch eq $branch ) && C4::Context->preference('UseLibraryFloatLimits') ) { >+ my $effective_itemtype = $item->effective_itemtype; >+ my $limit = Koha::Library::FloatLimits->find({ itemtype => $effective_itemtype, branchcode => $branch }); >+ if ( $limit ) { >+ my $count = Koha::Items->count({ itype => $limit->itemtype }); >+ if ( $count >= $limit->limit ) { >+ my $transfer_branchcode = Koha::Library::FloatLimits->lowest_ratio_library( $item, $branch ); >+ if ( $transfer_branchcode ne $branch ) { >+ $returnbranch = $transfer_branchcode; >+ $transfer_trigger = 'LibraryFloatLimit'; >+ } >+ } >+ } >+ } >+ > my $borrowernumber = $patron ? $patron->borrowernumber : undef; # we don't know if we had a borrower or not > my $patron_unblessed = $patron ? $patron->unblessed : {}; > >diff --git a/circ/returns.pl b/circ/returns.pl >index c0df0611390..292baf2fef3 100755 >--- a/circ/returns.pl >+++ b/circ/returns.pl >@@ -320,7 +320,6 @@ if ($barcode) { > my $biblio = $item->biblio; > $template->param( > title => $biblio->title, >- returnbranch => $returnbranch, > author => $biblio->author, > itembiblionumber => $biblio->biblionumber, > biblionumber => $biblio->biblionumber, >@@ -430,6 +429,8 @@ if ($barcode) { > ); > } > >+ $returnbranch = $messages->{NeedsTransfer} if $messages->{NeedsTransfer}; >+ > # Mark missing bundle items as lost and report unexpected items > if ( $item && $item->is_bundle && $query->param('confirm_items_bundle_return') && !$query->param('do_not_verify_items_bundle_contents') ) { > my $BundleLostValue = C4::Context->preference('BundleLostValue'); >@@ -517,6 +518,13 @@ my $recalled = 0; > # new op dev : we check if the document must be returned to his homebranch directly, > # if the document is transferred, we have warning message . > >+if ( $messages->{'LibraryFloatLimitTransferRequest'} ) { >+ $template->param( >+ LibraryFloatLimitTransferRequest => 1, >+ itemnumber => $itemnumber, >+ ); >+} >+ > if ( $messages->{'WasTransfered'} ) { > $template->param( > found => 1, >@@ -744,6 +752,8 @@ foreach my $code ( keys %$messages ) { > ; > } elsif ( $code eq 'TransferredRecall' ) { > ; >+ } elsif ( $code eq 'LibraryFloatLimitTransferRequest' ) { >+ ; > } elsif ( $code eq 'InBundle' ) { > $template->param( InBundle => $messages->{InBundle} ); > } else { >@@ -824,14 +834,14 @@ foreach ( sort { $a <=> $b } keys %returneditems ) { > } > > $template->param( >- riloop => \@riloop, >- errmsgloop => \@errmsgloop, >- exemptfine => $exemptfine, >- dropboxmode => $dropboxmode, >- dropboxdate => $dropboxdate, >+ riloop => \@riloop, >+ errmsgloop => \@errmsgloop, >+ exemptfine => $exemptfine, >+ dropboxmode => $dropboxmode, >+ dropboxdate => $dropboxdate, > forgivemanualholdsexpire => $forgivemanualholdsexpire, >- overduecharges => $overduecharges, >- AudioAlerts => C4::Context->preference("AudioAlerts"), >+ overduecharges => $overduecharges, >+ AudioAlerts => C4::Context->preference("AudioAlerts"), > ); > > if ( $barcode ) { >@@ -852,7 +862,10 @@ if ( $barcode ) { > } > } > >-$template->param( itemnumber => $itemnumber ); >+$template->param( >+ itemnumber => $itemnumber, >+ returnbranch => $returnbranch, >+); > > # Checking if there is a Fast Cataloging Framework > $template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' ); >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt >index 28b17808e1b..73e9d00475b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt >@@ -107,6 +107,8 @@ > <dd>Limit the ability to transfer items between libraries based on the library sending, the library receiving, and the item type involved. These rules only go into effect if the preference UseBranchTransferLimits is set to ON</dd> > <dt><a href="/cgi-bin/koha/admin/transport-cost-matrix.pl">Transport cost matrix</a></dt> > <dd>Define transport costs between branches</dd> >+ <dt><a href="/cgi-bin/koha/admin/float_limits.pl">Library float limits</a></dt> >+ <dd>Define when items should be transferred to other libraries on checkin to balance floating collections</dd> > [% END %] > [% IF ( CAN_user_parameters_manage_item_circ_alerts ) %] > <dt><a href="/cgi-bin/koha/admin/item_circulation_alerts.pl">Item circulation alerts</a></dt> >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 2abde7f9c5a..3bca75624dc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt >@@ -126,6 +126,7 @@ > <h3>Reason for transfer</h3> > <p> > [%- SWITCH trigger -%] >+ [%- CASE 'LibraryFloatLimit' -%]<span>Library has exceeded float limit for this item type</span> > [%- CASE 'Manual' -%]<span>Manual</span> > [%- CASE 'StockrotationAdvance' -%]<span>Stock rotation advance</span> > [%- CASE 'StockrotationRepatriation' -%]<span>Stock rotation repatriation</span> >@@ -737,7 +738,7 @@ > > <div class="modal-header"> > <h3> >- Please return this item to [% IF transfer %][% Branches.GetName( transfer ) | html %][% ELSE %][% Branches.GetName( returnbranch ) | html %][% END %] >+ Please return this item to [% IF transfer || needstransfer %][% Branches.GetName( transfer || needstransfer ) | html %][% ELSE %][% Branches.GetName( returnbranch ) | html %][% END %] > </h3> > </div> > <div class="modal-body"> >-- >2.30.2
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 28530
:
160038
|
160039
|
160040
|
160041
|
160042
|
160043
|
160044
|
160045
|
160046
|
160047
|
160048
|
160049
|
160050
|
160053
|
160054
|
160055
|
160056
|
160057
|
160058
|
160061
|
160062
|
160063
|
160064
|
160065
|
160066
|
160067
|
160068
|
160071
|
160072
|
160073
|
160074
|
160075
|
160076
|
160077
|
160078
|
160079
|
160080
|
160081
|
160082
|
160083
|
160084
|
163919
|
168343
|
168344
|
168345
|
168346
|
168347
|
168348
|
168349
|
168350