From 4414a91678b055ee10ab8d4f95d4e831e1da83b8 Mon Sep 17 00:00:00 2001
From: Michael Hafen <michael.hafen@washk12.org>
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 <marion.durand@biblibre.com>
Signed-off-by: Martin Renvoize <martin.renvoize@openfifth.co.uk>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit c84de245e3f6b721433d4c49b87836334908c1b0)
Signed-off-by: Jacob O'Mara <Jacob.omara@openfifth.co.uk>
---
 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 37f416ba36..9d7c499fdb 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -3445,7 +3445,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 a2d7bee45c..1abb408a34 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: