Bugzilla – Attachment 73883 Details for
Bug 19287
Add ability to mark an item 'Lost' from 'Holds to pull' list
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19287: Fix conflict with bug 19974
Bug-19287-Fix-conflict-with-bug-19974.patch (text/plain), 3.41 KB, created by
Jonathan Druart
on 2018-04-09 18:11:26 UTC
(
hide
)
Description:
Bug 19287: Fix conflict with bug 19974
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2018-04-09 18:11:26 UTC
Size:
3.41 KB
patch
obsolete
>From dfc6a24fb71049b4cc0acc92209be4d3aaf65ffe Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Mon, 9 Apr 2018 12:59:26 -0300 >Subject: [PATCH] Bug 19287: Fix conflict with bug 19974 > >Note that these patches should be pushed along with bug 19984 to avoid >regressions (if the syspref is changed between the 2 update DB entries) >--- > circ/pendingreserves.pl | 2 +- > installer/data/mysql/atomicupdate/bug_19287.sql | 2 ++ > .../intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref | 1 + > 3 files changed, 4 insertions(+), 1 deletion(-) > >diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl >index 72aba665c1..cb82ffc1a1 100755 >--- a/circ/pendingreserves.pl >+++ b/circ/pendingreserves.pl >@@ -65,7 +65,7 @@ if ( $op eq 'cancel_reserve' and $reserve_id ) { > my $item = $hold->item; > if ( $item and C4::Context->preference('CanMarkHoldsToPullAsLost') =~ m|^allow| ) { > my $patron = $hold->borrower; >- C4::Circulation::LostItem( $item->itemnumber ); >+ C4::Circulation::LostItem( $item->itemnumber, "pendingreserves" ); > if ( $op eq 'mark_as_lost_and_notify' and C4::Context->preference('CanMarkHoldsToPullAsLost') eq 'allow_and_notify' ) { > my $library = $hold->branch; > my $letter = C4::Letters::GetPreparedLetter( >diff --git a/installer/data/mysql/atomicupdate/bug_19287.sql b/installer/data/mysql/atomicupdate/bug_19287.sql >index d5d03a999d..f8fccc71c2 100644 >--- a/installer/data/mysql/atomicupdate/bug_19287.sql >+++ b/installer/data/mysql/atomicupdate/bug_19287.sql >@@ -3,3 +3,5 @@ INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanat > INSERT IGNORE INTO letter(module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('reserves', 'CANCEL_HOLD_ON_LOST', '', 'Hold has been cancelled', 0, "Hold has been cancelled", "Dear [% borrower.firstname %] [% borrower.surname %],\n\nWe regret to inform you that the following item cannot longer be placed on hold, it has been marked as lost\n\nTitle: [% biblio.title %]\nAuthor: [% biblio.author %]\nCopy: [% item.copynumber %]\nLocation: [% branch.branchname %]", 'email', 'default'); > > INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES ('UpdateItemWhenLostFromHoldList','',NULL,'This is a list of values to update an item when it is marked as lost from the holds to pull screen','Free'); >+ >+update systempreferences set options="batchmod|moredetail|cronjob|additem|pendingreserves", value="batchmod|moredetail|cronjob|additem|pendingreserves" where variable="MarkLostItemsAsReturned"; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >index 54c853d46f..3ecf7480b6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >@@ -420,6 +420,7 @@ Circulation: > batchmod: "from the batch item modification tool" > additem: "when cataloguing an item" > moredetail: "from the items tab of the catalog module" >+ pendingreserves: "from the 'Holds to pull' list" > - . > - > - pref: AllowMultipleIssuesOnABiblio >-- >2.11.0
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 19287
:
68226
|
68227
|
68228
|
68229
|
68230
|
68251
|
68252
|
68253
|
68254
|
68255
|
68284
|
69746
|
70705
|
70764
|
70918
|
70919
|
73881
|
73882
|
73883
|
73884
|
73885
|
73886
|
73887
|
73888
|
73889
|
74696
|
74697
|
74698
|
74699
|
74700
|
74701
|
74702
|
74703
|
74704
|
74705
|
74749
|
75535