From 7a4b42fe0c0694ac6d485c6ef6500b16f3437cd9 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Fri, 13 Nov 2020 12:12:20 +0000
Subject: [PATCH] Bug 25761: (QA follow-up) Consistent flag names
This follow-up updates the config flag to be consistent with bug 24449
and updates the debian template file to match too.
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
C4/SIP/Sip/MsgType.pm | 2 +-
debian/templates/SIPconfig.xml | 3 ++-
etc/SIPconfig.xml | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/C4/SIP/Sip/MsgType.pm b/C4/SIP/Sip/MsgType.pm
index c297865c50..b5ccce2539 100644
--- a/C4/SIP/Sip/MsgType.pm
+++ b/C4/SIP/Sip/MsgType.pm
@@ -1676,7 +1676,7 @@ sub patron_status_string {
denied( $patron->hold_ok ),
boolspace( $patron->card_lost ),
boolspace( $patron->too_many_charged ),
- $server->{account}->{disable_too_many_overdue} ? q{ } : boolspace( $patron->too_many_overdue ),
+ $server->{account}->{overdues_block_checkout} ? boolspace( $patron->too_many_overdue ) : q{ },
boolspace( $patron->too_many_renewal ),
boolspace( $patron->too_many_claim_return ),
boolspace( $patron->too_many_lost ),
diff --git a/debian/templates/SIPconfig.xml b/debian/templates/SIPconfig.xml
index dd77cb230c..4cdfdd4a85 100644
--- a/debian/templates/SIPconfig.xml
+++ b/debian/templates/SIPconfig.xml
@@ -51,8 +51,9 @@
<login id="lpl-sc-beacock" password="xyzzy"
delimiter="|" error-detect="enabled" institution="LPL"
send_patron_home_library_in_af="1"
+ av_field_template="[% accountline.description %] [% accountline.amountoutstanding | format('%.2f') %]"
holds_block_checkin="0"
- av_field_template="[% accountline.description %] [% accountline.amountoutstanding | format('%.2f') %]" >
+ overdues_block_checkout="1">
<screen_msg_regex find="Greetings from Koha." replace="Welcome to your library!" />
<screen_msg_regex find="Invalid patron barcode." replace="Barcode not found, are you sure this is your library card?" />
</login>
diff --git a/etc/SIPconfig.xml b/etc/SIPconfig.xml
index eb278e622e..c03cd3e689 100644
--- a/etc/SIPconfig.xml
+++ b/etc/SIPconfig.xml
@@ -60,9 +60,9 @@
da_field_template="[% patron.surname %][% IF patron.firstname %], [% patron.firstname %][% END %]"
av_field_template="[% accountline.description %] [% accountline.amountoutstanding | format('%.2f') %]"
hide_fields="BD,BE,BF,PB"
- disable_too_many_overdue="1"
register_id=''
- holds_block_checkin="0">
+ holds_block_checkin="0"
+ overdues_block_checkout="1">
<screen_msg_regex find="Greetings from Koha." replace="Welcome to your library!" />
<screen_msg_regex find="Invalid patron barcode." replace="Barcode not found, are you sure this is your library card?" />
<patron_attribute field="XY" code="CODE" />
--
2.24.1 (Apple Git-126)