From 6f9743b913771557754e6beb8dd917e1ce7d7f03 Mon Sep 17 00:00:00 2001 From: Michael Hafen Date: Thu, 19 Sep 2024 12:26:30 -0600 Subject: [PATCH] Bug 37966: When Renewing a book on hold, don't require the due date When renewing a book on hold with the RenewalOnHoldOverride sys pref set to "Allow", if the due date is not specified then it becomes "now". By checking the input is set rather than just defined the due date is set as expected based on circulation rules. Also change the description of the RenewalOnHoldOverride sys pref as the due date would no longer be required to be entered with this change. Test plan: 1. make sure RenewalOnHoldOverride is set to 'Allow' 2. check out a book, then place a title-level hold on it 3. renew the book, see the hold override dialog 4. leave the due date empty and hit the override button 5. observe the new due date is "now" 6. apply patch and restart plack 7. renew the book again, overriding the hold, and see the expected due date as per circulation rules. Signed-off-by: Marion Durand --- C4/Circulation.pm | 2 +- .../prog/en/modules/admin/preferences/circulation.pref | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 31794b7c02..ffe273a4cd 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -3343,7 +3343,7 @@ sub AddRenewal { $borrowernumber ||= $issue->borrowernumber; - if ( defined $datedue && ref $datedue ne 'DateTime' ) { + if ( $datedue && ref $datedue ne 'DateTime' ) { $datedue = dt_from_string( $datedue, 'sql' ); } 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 291c6ccec6..62c6102092 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 @@ -228,7 +228,7 @@ Circulation: choices: 1: Allow 0: "Don't allow" - - staff to renew items that are on hold by manually specifying a due date. + - staff to renew items that are on hold. - - pref: AllowItemsOnHoldCheckoutSIP choices: -- 2.39.5