From df93547a1d2d0370d31a01bfd1c1c943836195f2 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Mon, 2 Sep 2013 11:21:00 +0200
Subject: [PATCH] Bug 10855: FIX: Add additional fields for closed
 subscriptions

---
 .../prog/en/modules/serials/serials-search.tt         |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
index d7920b5..b22ec79 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt
@@ -184,8 +184,6 @@
                         <td>
                           [% IF ( subscription.enddate ) %][% subscription.enddate | $KohaDates %][% END %]
                         </td>
-                        [% IF ( routing && CAN_user_serials_routing ) %]
-                        [% END %]
                         [% FOR field IN additional_fields_for_subscription %]
                           [% IF field.authorised_value_category %]
                             <td>[% KohaAuthorisedValues.GetByCode( field.authorised_value_category, subscription.additional_fields.${field.name} ) %]</td>
@@ -195,6 +193,7 @@
                         [% END %]
                         <td><a href="/cgi-bin/koha/serials/serials-collection.pl?subscriptionid=[% subscription.subscriptionid %]">Issue history</a>
                         </td>
+                        [% IF ( routing && CAN_user_serials_routing ) %]
                         <td>
                           [% IF ( subscription.cannotedit ) %]
                             &nbsp;
@@ -207,6 +206,7 @@
                             [% END %]
                           [% END %]
                         </td>
+                        [% END %]
                         <td>
                         [% IF ( subscription.cannotedit ) %]
                           &nbsp;
@@ -235,6 +235,9 @@
                         <th> Notes </th>
                         <th>Library</th>
                         <th>Call number</th>
+                        [% FOR field IN additional_fields_for_subscription %]
+                          <th>[% field.name %]</th>
+                        [% END %]
                         <th>&nbsp;</th>
                         <th>&nbsp;</th>
                     </tr>
@@ -246,6 +249,9 @@
                       <td><input type="text" class="filter" data-column_num="2" placeholder="Search notes" /></td>
                       <td><input type="text" class="filter" data-column_num="3" placeholder="Search library" /></td>
                       <td><input type="text" class="filter" data-column_num="4" placeholder="Search callnumber" /></td>
+                      [% FOR field IN additional_fields_for_subscription %]
+                        <td><input type="text" class="filter" data-column_num="[% loop.count + 4 %]" placeholder="Search [% field.name %]" /></td>
+                      [% END %]
                       <td></td>
                       <td></td>
                     </tr>
@@ -271,6 +277,13 @@
                         <td>
                           [% IF ( subscription.callnumber ) %][% subscription.callnumber %][% END %]
                         </td>
+                        [% FOR field IN additional_fields_for_subscription %]
+                          [% IF field.authorised_value_category %]
+                            <td>[% KohaAuthorisedValues.GetByCode( field.authorised_value_category, subscription.additional_fields.${field.name} ) %]</td>
+                          [% ELSE %]
+                            <td>[% subscription.additional_fields.${field.name} %]</td>
+                          [% END %]
+                        [% END %]
                         <td>
                           [% UNLESS subscription.cannotedit %]
                             <a href="/cgi-bin/koha/serials/serials-search.pl?subscriptionid=[% subscription.subscriptionid %]&amp;op=reopen&amp;routing=[% subscription.routing %]&amp;searched=1&amp;title_filter=[% title_filter %]&amp;ISSN_filter=[% ISSN_filter %]&amp;EAN_filter=[% EAN_filter %]&amp;published_filter=[% publisher_filter %]&amp;bookseller_filter=[% bookseller_filter %]&amp;branch_filter=[% branch_filter %]" id="reopensub">Reopen</a>
-- 
1.7.10.4