From 1821f3d6a047d459083c09ce6b5193ff60b6d4d8 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Thu, 14 Oct 2021 16:54:36 +1300 Subject: [PATCH] Bug 19532: (follow-up) Fix calls and syspref settings --- C4/XSLT.pm | 5 +++-- Koha/Recall.pm | 2 +- Koha/Recalls.pm | 2 +- .../intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/logs.pref | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/C4/XSLT.pm b/C4/XSLT.pm index fb304fe04b..cc37a5db5d 100644 --- a/C4/XSLT.pm +++ b/C4/XSLT.pm @@ -352,7 +352,8 @@ sub buildKohaItemsNamespace { if ( $recalls->count ) { # recalls take priority over holds - $status = 'Waiting'; + $status = 'other'; + $substatus = 'Recall waiting'; } elsif ( $item->has_pending_hold ) { $status = 'other'; @@ -360,7 +361,7 @@ sub buildKohaItemsNamespace { } elsif ( $item->holds->waiting->count ) { $status = 'other'; - $substatus = 'Waiting'; + $substatus = 'Hold waiting'; } elsif ($item->get_transfer) { $status = 'other'; diff --git a/Koha/Recall.pm b/Koha/Recall.pm index b74cf6b7f0..03c6167683 100644 --- a/Koha/Recall.pm +++ b/Koha/Recall.pm @@ -20,7 +20,7 @@ package Koha::Recall; use Modern::Perl; use Koha::Database; -use Koha::DateUtils; +use Koha::DateUtils qw( dt_from_string ); use Koha::Patron; use Koha::Biblio; use Koha::Item; diff --git a/Koha/Recalls.pm b/Koha/Recalls.pm index 55b6e3656d..be9f88e11e 100644 --- a/Koha/Recalls.pm +++ b/Koha/Recalls.pm @@ -21,7 +21,7 @@ use Modern::Perl; use Koha::Database; use Koha::Recall; -use Koha::DateUtils; +use Koha::DateUtils qw( dt_from_string ); use C4::Stats qw( UpdateStats ); 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 da69c92545..6f45c1b8ac 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 @@ -1281,6 +1281,6 @@ Circulation: - - pref: UseRecalls choices: - yes: Use - no: "Don't use" + 1: Use + 0: "Don't use" - recalls. Make sure you configure circulation and fines rules for recalls once enabled. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/logs.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/logs.pref index cff4d3f6ff..ba4dcbed7e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/logs.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/logs.pref @@ -111,8 +111,8 @@ Logging: - - pref: RecallsLog choices: - on: Log - off: "Don't log" + 1: Log + 0: "Don't log" - any actions on recalls (create, cancel, expire, fulfill). Debugging: -- 2.11.0