From b014ec920810424bb549c75df961f3a0b335341a Mon Sep 17 00:00:00 2001
From: Kyle M Hall
Date: Wed, 30 Dec 2015 15:03:23 +0000
Subject: [PATCH] Bug 15443 - Re-code RESERVESLIP as HOLD_SLIP
It's a bit confusing to have RESERVESLIP named "Hold Slip", we should
finish the job and recode the slip.
Test Plan:
1) Apply this patch
2) Run updatedatabase.pl
3) Try printing a hold slip, you should note no difference
from pre-patch behavior
---
C4/Reserves.pm | 4 ++--
installer/data/mysql/atomicupdate/bug_15443.sql | 1 +
installer/data/mysql/de-DE/mandatory/sample_notices.sql | 2 +-
installer/data/mysql/en/mandatory/sample_notices.sql | 2 +-
installer/data/mysql/es-ES/mandatory/sample_notices.sql | 2 +-
installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql | 2 +-
installer/data/mysql/it-IT/necessari/notices.sql | 2 +-
installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql | 2 +-
installer/data/mysql/pl-PL/mandatory/sample_notices.sql | 2 +-
installer/data/mysql/ru-RU/mandatory/sample_notices.sql | 2 +-
installer/data/mysql/uk-UA/mandatory/sample_notices.sql | 2 +-
installer/data/mysql/updatedatabase.pl | 4 ++--
koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt | 2 +-
13 files changed, 15 insertions(+), 14 deletions(-)
create mode 100644 installer/data/mysql/atomicupdate/bug_15443.sql
diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index 529623a..c3ae22c 100644
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -2336,7 +2336,7 @@ sub GetReserveId {
Returns letter hash ( see C4::Letters::GetPreparedLetter ) or undef
-The letter code will be RESERVESLIP, and the following tables are
+The letter code will be HOLD_SLIP, and the following tables are
available within the slip:
reserves
@@ -2361,7 +2361,7 @@ sub ReserveSlip {
return C4::Letters::GetPreparedLetter (
module => 'circulation',
- letter_code => 'RESERVESLIP',
+ letter_code => 'HOLD_SLIP',
branchcode => $branch,
tables => {
'reserves' => $reserve,
diff --git a/installer/data/mysql/atomicupdate/bug_15443.sql b/installer/data/mysql/atomicupdate/bug_15443.sql
new file mode 100644
index 0000000..742e996
--- /dev/null
+++ b/installer/data/mysql/atomicupdate/bug_15443.sql
@@ -0,0 +1 @@
+UPDATE letter SET code = "HOLD_SLIP" WHERE code = "RESERVESLIP";
diff --git a/installer/data/mysql/de-DE/mandatory/sample_notices.sql b/installer/data/mysql/de-DE/mandatory/sample_notices.sql
index b968cff..fec6f7e 100644
--- a/installer/data/mysql/de-DE/mandatory/sample_notices.sql
+++ b/installer/data/mysql/de-DE/mandatory/sample_notices.sql
@@ -71,7 +71,7 @@ Signatur: <>
Fällig am: <>
', 1),
-('circulation','RESERVESLIP','Vormerkquittung','Vormerkquittung', 'Vormerkung
+('circulation','HOLD_SLIP','Vormerkquittung','Vormerkquittung', 'Vormerkung
Abholbereit seit: <>
Bibliothek: <>
diff --git a/installer/data/mysql/en/mandatory/sample_notices.sql b/installer/data/mysql/en/mandatory/sample_notices.sql
index ec07c94..2e25cff 100644
--- a/installer/data/mysql/en/mandatory/sample_notices.sql
+++ b/installer/data/mysql/en/mandatory/sample_notices.sql
@@ -77,7 +77,7 @@ Barcode: <>
Date due: <>
', 1),
-('circulation','RESERVESLIP','Hold Slip','Hold Slip', 'Date: <>
+('circulation','HOLD_SLIP','Hold Slip','Hold Slip', 'Date: <>
Transfer to/Hold in <>
diff --git a/installer/data/mysql/es-ES/mandatory/sample_notices.sql b/installer/data/mysql/es-ES/mandatory/sample_notices.sql
index e2141a6..8aa2a4b 100644
--- a/installer/data/mysql/es-ES/mandatory/sample_notices.sql
+++ b/installer/data/mysql/es-ES/mandatory/sample_notices.sql
@@ -69,7 +69,7 @@ Barcode: <>
Date due: <>
', 1),
-('circulation','RESERVESLIP','Hold Slip','Hold Slip', 'Date: <>
+('circulation','HOLD_SLIP','Hold Slip','Hold Slip', 'Date: <>
Transfer to/Hold in <>
diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
index a5d3591..2e66a2e 100644
--- a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
@@ -71,7 +71,7 @@ Code à barres : <>
Retour le : <>
', 1),
-('circulation','RESERVESLIP','Ticket de réservation','Ticket de réservation', 'Date : <>
+('circulation','HOLD_SLIP','Ticket de réservation','Ticket de réservation', 'Date : <>
Transfert vers/Réservé à <>
diff --git a/installer/data/mysql/it-IT/necessari/notices.sql b/installer/data/mysql/it-IT/necessari/notices.sql
index e6cc9f4..53869dd 100644
--- a/installer/data/mysql/it-IT/necessari/notices.sql
+++ b/installer/data/mysql/it-IT/necessari/notices.sql
@@ -71,7 +71,7 @@ Codice a barre: <>
Data di scadenza: <>
', 1),
-('circulation','RESERVESLIP','Hold Slip','Ricevuta (prenotazione)', 'Data: <>
+('circulation','HOLD_SLIP','Hold Slip','Ricevuta (prenotazione)', 'Data: <>
Trasferita a/Prenotata in <>
diff --git a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
index 8a1b51d..9ff5576 100644
--- a/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
+++ b/installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql
@@ -92,7 +92,7 @@ Strekkode: <>
Innleveringsfrist: <>
', 1),
-('circulation','RESERVESLIP','Reservasjon','Reservasjon', 'Dato: <>
+('circulation','HOLD_SLIP','Reservasjon','Reservasjon', 'Dato: <>
Overfør til/Reservasjon hos <>
diff --git a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
index be95f0d..2277cfb 100644
--- a/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
+++ b/installer/data/mysql/pl-PL/mandatory/sample_notices.sql
@@ -70,7 +70,7 @@ Barcode: <>
Date due: <>
', 1),
-('circulation','RESERVESLIP','Hold Slip','Hold Slip', 'Date: <>
+('circulation','HOLD_SLIP','Hold Slip','Hold Slip', 'Date: <>
Transfer to/Hold in <>
diff --git a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
index b51660d..dc3e340 100644
--- a/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
+++ b/installer/data/mysql/ru-RU/mandatory/sample_notices.sql
@@ -70,7 +70,7 @@ Barcode: <>
Date due: <>
', 1),
-('circulation','RESERVESLIP','Hold Slip','Hold Slip', 'Date: <>
+('circulation','HOLD_SLIP','Hold Slip','Hold Slip', 'Date: <>
Transfer to/Hold in <>
diff --git a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
index cd4da03..db35561 100644
--- a/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
+++ b/installer/data/mysql/uk-UA/mandatory/sample_notices.sql
@@ -69,7 +69,7 @@ Barcode: <>
Date due: <>
', 1),
-('circulation','RESERVESLIP','Hold Slip','Hold Slip', 'Date: <>
+('circulation','HOLD_SLIP','Hold Slip','Hold Slip', 'Date: <>
Transfer to/Hold in <>
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 7e5e06b..9f92675 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -4846,7 +4846,7 @@ Date due: <>
', 1)");
$dbh->do("INSERT INTO `letter` (module, code, name, title, content, is_html)
- VALUES ('circulation','RESERVESLIP','Reserve Slip','Reserve Slip', 'Date: <>
+ VALUES ('circulation','HOLD_SLIP','Reserve Slip','Reserve Slip', 'Date: <>
Transfer to/Hold in <>
@@ -4890,7 +4890,7 @@ Date due: <>
$dbh->do("UPDATE `letter` SET content = replace(content, '<>', '<>') WHERE code = 'HOLDPLACED'");
- print "Upgrade to $DBversion done (Add branchcode and is_html to letter table; Default ISSUESLIP, RESERVESLIP and TRANSFERSLIP letters; Add NoticeCSS and SlipCSS sysprefs)\n";
+ print "Upgrade to $DBversion done (Add branchcode and is_html to letter table; Default ISSUESLIP, HOLD_SLIP and TRANSFERSLIP letters; Add NoticeCSS and SlipCSS sysprefs)\n";
SetVersion($DBversion);
}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt
index 09692d3..ef1c5e4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt
@@ -278,7 +278,7 @@ Barcode: <<items.barcode>> , Checkout date:
The slip or receipt will show items checked out today as well as items that are still checked out
- RESERVESLIP
+ HOLD_SLIP
- Used to print a holds slip
- The holds slip is generated when a hold is confirmed
--
2.1.4