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)

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl
index 72aba66..cb82ffc 100755 (executable)
--- 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 d5d03a9..f8fccc7 100644 (file)
--- 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 54c853d..3ecf748 100644 (file)
--- 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