From ec258f8ff1986aef2338c7d4f4a5b4167359e171 Mon Sep 17 00:00:00 2001
From: Robin Sheat <robin@catalyst.net.nz>
Date: Thu, 29 Sep 2011 18:05:49 +1300
Subject: [PATCH] Bug 6938 - replace two subscription fields that were
 incorrectly removed

The "Note for OPAC" and "Note for staff" fields in subscriptions were
removed, but they are their own fields in the database and display in
other places too. This patch puts them back so that they can once again
be edited.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 2f11d527a0749e86350d62055f289aaee9435848)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
---
 .../en/modules/serials/subscription-add.tt    | 41 +++++++++++--------
 .../en/modules/serials/subscription-detail.tt |  2 +
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
index f21e72db99..40e1ebee4c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
@@ -1077,25 +1077,32 @@ $(document).ready(function() {
 <div><h3 style="display:inline">Subscription history</h3> <a href="#" id="cancel_manual_history">[cancel manual history]</a></div>
         <p>Hint: you can update the serial history manually. This can be useful for an old subscription or to clean the existing history. Modify these fields with care, as future serial receive will continue to update them automatically.</p>
         <fieldset class="rows">
-		<ol>
-            <li>
-            <label for="histstartdate">Subscription start date</label>
-            <input type="text" name="histstartdate" id="histstartdate" value="[% histstartdate %]" /><div class="hint"> (start date of the 1st subscription)</div>
-            </li>
-            <li>
-            <label for="histenddate">Subscription end date</label>
-            <input type="text" name="histenddate" id="histenddate" value="[% histenddate %]" /> <div class="hint">(if empty, subscription is still active)</div>
-            </li>
-            <li>
+            <ol>
+                <li>
+                <label for="histstartdate">Subscription start date</label>
+                <input type="text" name="histstartdate" id="histstartdate" value="[% histstartdate %]" /><div class="hint"> (start date of the 1st subscription)</div>
+                </li>
+                <li>
+                <label for="histenddate">Subscription end date</label>
+                <input type="text" name="histenddate" id="histenddate" value="[% histenddate %]" /> <div class="hint">(if empty, subscription is still active)</div>
+                </li>
+                <li>
                 <label for="recievedlist">Received issues</label>
-            <textarea name="recievedlist" id="recievedlist" cols="60" rows="5">[% recievedlist %]</textarea>
-            </li>
-            <li>
+                <textarea name="recievedlist" id="recievedlist" cols="60" rows="5">[% recievedlist %]</textarea>
+                </li>
+                <li>
                 <label for="missinglist">Missing issues</label>
-            <textarea name="missinglist" id="missinglist" cols="60" rows="5">[% missinglist %]</textarea>
-            </li>
-            <li>
-		</ol>
+                <textarea name="missinglist" id="missinglist" cols="60" rows="5">[% missinglist %]</textarea>
+                </li>
+                <li>
+                <label for="opacnote">Note for OPAC</label>
+                <textarea name="opacnote" id="opacnote" cols="60" rows="5">[% opacnote %]</textarea>
+                </li>
+                <li>
+                <label for="librariannote">Note for staff</label>
+                <textarea name="librariannote" id="librariannote" cols="60" rows="5">[% librariannote %]</textarea>
+                </li>
+            </ol>
         </fieldset>
     <fieldset class="action"><input type="submit" value="Save subscription history"  /></fieldset>
 </div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
index f3ab9a26cc..8663c94c03 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
@@ -367,6 +367,8 @@ $(document).ready(function() {
             <li><span class="label">Missing issues:</span>[% missinglist %]</li>
             <li><span class="label">Nonpublic note:</span>[% internalnotes %]</li>
             <li><span class="label">Public note:</span>[% notes %]</li>
+            <li><span class="label">History staff note</span>[% librariannote %]</li>
+            <li><span class="label">History OPAC note</span>[% opacnote %]</li>
         </ol>
     </div>
     </div>
-- 
2.39.5