Attachment 46226 Details for Bug 15443 – Bug 15443 - Re-code RESERVESLIP as HOLD_SLIP

[patch] Bug 15443 - Re-code RESERVESLIP as HOLD_SLIP

Bug-15443---Re-code-RESERVESLIP-as-HOLDSLIP.patch (text/plain), 8.96 KB, created by Jonathan Druart on 2016-01-04 11:50:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2016-01-04 11:50:56 UTC

Size: 8.96 KB

patch

obsolete

>From 7ee8d02ca12c02d36bc45291f88b3d8fc9ee8ada Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Wed, 30 Dec 2015 15:03:23 +0000
>Subject: [PATCH] Bug 15443 - Re-code RESERVESLIP as HOLD_SLIP
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>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
>
>Followed test plan. The slip is triggered if you want to check out
>an item that is reserved / on hold for another patron. Works as expected.
>Signed-off-by: Marc VÃ©ron <veron@veron.ch>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> 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 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt | 2 +-
> 12 files changed, 13 insertions(+), 12 deletions(-)
> create mode 100644 installer/data/mysql/atomicupdate/bug_15443.sql
>
>diff --git a/C4/Reserves.pm b/C4/Reserves.pm
>index 77c7bd9..7bb5d69 100644
>--- a/C4/Reserves.pm
>+++ b/C4/Reserves.pm
>@@ -2338,7 +2338,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
>@@ -2363,7 +2363,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: <<items.itemcallnumber>><br/>
> FÃ¤llig am: <<issues.date_due>><br />
> </p>
> </checkedout>', 1),
>-('circulation','RESERVESLIP','Vormerkquittung','Vormerkquittung', '<h2>Vormerkung</h2>
>+('circulation','HOLD_SLIP','Vormerkquittung','Vormerkquittung', '<h2>Vormerkung</h2>
> <h4>Abholbereit seit: <<today>></h4>
> <br/>
> Bibliothek: <<branches.branchname>> <br/>
>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: <<items.barcode>><br />
> Date due: <<issues.date_due>><br />
> </p>
> </checkedout>', 1),
>-('circulation','RESERVESLIP','Hold Slip','Hold Slip', '<h5>Date: <<today>></h5>
>+('circulation','HOLD_SLIP','Hold Slip','Hold Slip', '<h5>Date: <<today>></h5>
> 
> <h3> Transfer to/Hold in <<branches.branchname>></h3>
> 
>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: <<items.barcode>><br />
> Date due: <<issues.date_due>><br />
> </p>
> </checkedout>', 1),
>-('circulation','RESERVESLIP','Hold Slip','Hold Slip', '<h5>Date: <<today>></h5>
>+('circulation','HOLD_SLIP','Hold Slip','Hold Slip', '<h5>Date: <<today>></h5>
> 
> <h3> Transfer to/Hold in <<branches.branchname>></h3>
> 
>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 : <<items.barcode>><br />
> Retour le : <<issues.date_due>><br />
> </p>
> </checkedout>', 1),
>-('circulation','RESERVESLIP','Ticket de rÃ©servation','Ticket de rÃ©servation', '<h5>Date : <<today>></h5>
>+('circulation','HOLD_SLIP','Ticket de rÃ©servation','Ticket de rÃ©servation', '<h5>Date : <<today>></h5>
> 
> <h3> Transfert vers/RÃ©servÃ© Ã  <<branches.branchname>></h3>
> 
>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: <<items.barcode>><br />
> Data di scadenza: <<issues.date_due>><br />
> </p>
> </checkedout>', 1),
>-('circulation','RESERVESLIP','Hold Slip','Ricevuta (prenotazione)', '<h5>Data: <<today>></h5>
>+('circulation','HOLD_SLIP','Hold Slip','Ricevuta (prenotazione)', '<h5>Data: <<today>></h5>
> 
> <h3> Trasferita a/Prenotata in <<branches.branchname>></h3>
> 
>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: <<items.barcode>><br />
> Innleveringsfrist: <<issues.date_due>><br />
> </p>
> </checkedout>', 1),
>-('circulation','RESERVESLIP','Reservasjon','Reservasjon', '<h5>Dato: <<today>></h5>
>+('circulation','HOLD_SLIP','Reservasjon','Reservasjon', '<h5>Dato: <<today>></h5>
> 
> <h3> OverfÃ¸r til/Reservasjon hos <<branches.branchname>></h3>
> 
>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: <<items.barcode>><br />
> Date due: <<issues.date_due>><br />
> </p>
> </checkedout>', 1),
>-('circulation','RESERVESLIP','Hold Slip','Hold Slip', '<h5>Date: <<today>></h5>
>+('circulation','HOLD_SLIP','Hold Slip','Hold Slip', '<h5>Date: <<today>></h5>
> 
> <h3> Transfer to/Hold in <<branches.branchname>></h3>
> 
>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: <<items.barcode>><br />
> Date due: <<issues.date_due>><br />
> </p>
> </checkedout>', 1),
>-('circulation','RESERVESLIP','Hold Slip','Hold Slip', '<h5>Date: <<today>></h5>
>+('circulation','HOLD_SLIP','Hold Slip','Hold Slip', '<h5>Date: <<today>></h5>
> 
> <h3> Transfer to/Hold in <<branches.branchname>></h3>
> 
>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: <<items.barcode>><br />
> Date due: <<issues.date_due>><br />
> </p>
> </checkedout>', 1),
>-('circulation','RESERVESLIP','Hold Slip','Hold Slip', '<h5>Date: <<today>></h5>
>+('circulation','HOLD_SLIP','Hold Slip','Hold Slip', '<h5>Date: <<today>></h5>
> 
> <h3> Transfer to/Hold in <<branches.branchname>></h3>
> 
>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: &lt;&lt;items.barcode&gt;&gt; , Checkout date:
>     <li>The slip or receipt will show items checked out today as well as items that are still checked out</li>
> </ul>
> </li>
>-    <li>RESERVESLIP
>+    <li>HOLD_SLIP
> <ul>
>     <li>Used to print a holds slip</li>
>     <li>The holds slip is generated when a hold is confirmed</li>
>-- 
>2.1.0

Actions: View | Diff | Splinter Review

Attachments on bug 15443: 46087 | 46088 | 46153 | 46226