From 8b119a75aef2b7a43d0367bfe40eecbf871a1dce Mon Sep 17 00:00:00 2001
From: Emmi Takkinen <emmi.takkinen@koha-suomi.fi>
Date: Tue, 2 Nov 2021 10:04:46 +0200
Subject: [PATCH] Bug 16223: Fix QA issues

To test repeat original test plan and
prove t/db_dependent/Patron/Borrower_Debarments.t

Sponsored-by: Koha-Suomi Oy
---
 ...atically_remove_any_borrower_debarments_after_a_payment.perl | 2 +-
 installer/data/mysql/mandatory/sysprefs.sql                     | 2 +-
 .../prog/en/modules/admin/preferences/patrons.pref              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/installer/data/mysql/atomicupdate/Bug_16223-Automatically_remove_any_borrower_debarments_after_a_payment.perl b/installer/data/mysql/atomicupdate/Bug_16223-Automatically_remove_any_borrower_debarments_after_a_payment.perl
index 7038eaa585..1ae612ae83 100644
--- a/installer/data/mysql/atomicupdate/Bug_16223-Automatically_remove_any_borrower_debarments_after_a_payment.perl
+++ b/installer/data/mysql/atomicupdate/Bug_16223-Automatically_remove_any_borrower_debarments_after_a_payment.perl
@@ -3,7 +3,7 @@ if( CheckVersion( $DBversion ) ) {
     # you can use $dbh here like:
     # $dbh->do( "ALTER TABLE biblio ADD COLUMN badtaste int" );
 
-    $dbh->do("INSERT INTO systempreferences (variable, value, options, explanation, type) VALUES ('DebarmentsToLiftAfterPayment', '', '', 'Lift these debarments after Borrower has paid his/her fees', 'textarea')");
+    $dbh->do("INSERT IGNORE INTO systempreferences (variable, value, options, explanation, type) VALUES ('DebarmentsToLiftAfterPayment', '', '', 'Lift these debarments after Borrower has paid their charges', 'textarea')");
 
     # Always end with this (adjust the bug info)
     NewVersion( $DBversion, 16223, "Automatically remove any borrower debarments after a payment");
diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql
index 2f8b67e9c3..20f07edbda 100644
--- a/installer/data/mysql/mandatory/sysprefs.sql
+++ b/installer/data/mysql/mandatory/sysprefs.sql
@@ -151,7 +151,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('CustomCoverImages','0',NULL,'If enabled, the custom cover images will be displayed in the staff interface. CustomCoverImagesURL must be defined.','YesNo'),
 ('CustomCoverImagesURL','',NULL,'Define an URL serving book cover images, using the following patterns: %issn%, %isbn%, FIXME ADD MORE (use it with CustomCoverImages and/or OPACCustomCoverImages)','free'),
 ('dateformat','us','metric|us|iso|dmydot','Define global date format (us mm/dd/yyyy, metric dd/mm/yyy, ISO yyyy-mm-dd, dmydot dd.mm.yyyy)','Choice'),
-('DebarmentsToLiftAfterPayment', '', '', 'Lift these debarments after Borrower has paid his/her fees', 'textarea'),
+('DebarmentsToLiftAfterPayment', '', '', 'Lift these debarments after Borrower has paid their charges', 'textarea'),
 ('DebugLevel','2','0|1|2','Define the level of debugging information sent to the browser when errors are encountered (set to 0 in production). 0=none, 1=some, 2=most','Choice'),
 ('decreaseLoanHighHolds','0','','Decreases the loan period for items with number of holds above the threshold specified in decreaseLoanHighHoldsValue','YesNo'),
 ('decreaseLoanHighHoldsControl', 'static', 'static|dynamic', "Chooses between static and dynamic high holds checking", 'Choice'),
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
index e997a9d9b9..c99c2ed796 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
@@ -110,7 +110,7 @@ Patrons:
          - pref: DebarmentsToLiftAfterPayment
            type: textarea
            class: code
-         - Lift these debarments after Borrower has paid his/her fees. Matches dynamic content in debarment comment.
+         - Lift these debarments after Borrower has paid their charges. Matches dynamic content in debarment comment.
          - "<p>Example, debarments with comment (either exact match or dynamic content, e.g. 'Debarment message for Patron 123') that match 'Debarment message' are lifted after all fees are paid:</p>"
          - "<pre>Debarment message:</pre>
             <pre>  outstanding: 0</pre>"
-- 
2.25.1