From 097cb23688da32340f59a953616619b4ac7e9761 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <Katrin.Fischer.83@web.de>
Date: Sat, 21 Feb 2015 19:22:33 +0100
Subject: [PATCH] Bug 10971: Hide EAN search for MARC21 / template corrections

This patch hides the EAN filter on the page for ordering from
a subscription when the marcflavour is not UNIMARC as it will
only work for this flavour currently.

It also corrects
- branch to library
- supplier to vendor
- the library code in the result list to the branch name

To test:
- Make sure you have a subscription, not the vendor
- Create a new basket for the subscription vendor
- Choose 'from a subscription' to create your order line
- Look at the filters on the left side, switch
  the marcflavour system preference to see change for
  the EAN filter
- Verify changes

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit 83a923e11a97f5328ce6b0715c4e86069c7861e0)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
---
 .../intranet-tmpl/prog/en/includes/subscriptions-search.inc | 6 ++++--
 .../prog/en/modules/acqui/newordersubscription.tt           | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc
index db65f93378..4f6f1caed1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc
@@ -12,20 +12,22 @@
                 <label for="title">Title:</label>
                 <input type="text" id="title" name="title_filter" value="[% title_filter %]" />
               </li>
+              [% IF Koha.Preference( 'marcflavour' ) == "UNIMARC" %]
               <li>
                 <label for="ean">EAN:</label>
                 <input type="text" id="ean" name="EAN_filter" value="[% EAN_filter %]" />
               </li>
+              [% END %]
               <li>
                 <label for="publisher">Publisher:</label>
                 <input type="text" id="publisher" name="publisher_filter" value="[% publisher_filter %]" />
               </li>
               <li>
-                <label for="supplier">Supplier:</label>
+                <label for="supplier">Vendor:</label>
                 <input type="text" id="supplier" name="supplier_filter" value="[% supplier_filter %]" />
               </li>
               <li>
-                <label for="branch">Branch:</label>
+                <label for="branch">Library:</label>
                 <select id="branch" name="branch_filter">
                   <option value="">All</option>
                   [% FOREACH branch IN branches_loop %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
index fadfa6a3ff..2e069559f7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
@@ -1,4 +1,6 @@
 [% USE KohaDates %]
+[% USE Branches %]
+[% USE Koha %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Serials [% biblionumber %]</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
@@ -76,7 +78,7 @@
                                     [% IF (sub.internalnotes) %]([% sub.internalnotes %])[% END %]
                                 </td>
                                 <td>
-                                    [% IF (sub.branchcode) %][% sub.branchcode %][% END %]
+                                    [% IF (sub.branchcode) %][% Branches.GetName( sub.branchcode ) %][% END %]
                                 </td>
                                 <td>
                                     [% IF (sub.callnumber) %][% sub.callnumber %][% END %]
-- 
2.39.5