From f57df28f96898f47a3c4c6e6a5520bcaaf7afe2e Mon Sep 17 00:00:00 2001
From: Andreas Roussos <arouss1980@gmail.com>
Date: Tue, 13 Sep 2016 17:41:16 +0300
Subject: [PATCH] Bug 9896 - Show vendor in subscription search when creating
 an order for a subscription
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In the staff client, when creating an order from a subscription
the vendor name should be shown in a separate column.

This patch adds that feature. The 'Vendor' column is added before
the 'Library' column since they appear in that order in Advanced
search.

Test plan:
0) [PREREQUISITES] In the Staff client, under Acquisitions, create
   a Vendor and associated Basket if you don't already have them.
   Then, under Serials, add a new Subscription using the Vendor
   you've just created.
1) Go to Acquisitions, and under 'Manage orders' search for a vendor,
   then click on 'Add to basket' and select 'From a subscription'.
2) Click 'Search' on the left hand side to search for all subscriptions.
   Notice how there is no 'Vendor' column in the results table.
3) Apply the patch.
4) Repeat step 2. Confirm that the patch works, i.e. there is now
   a 'Vendor' column which displays the vendor name.

Followed test plan, works as expected.

Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer  <katrin.fischer@bsz-bw.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 C4/Serials.pm                                                 | 1 +
 .../prog/en/modules/acqui/newordersubscription.tt             | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/C4/Serials.pm b/C4/Serials.pm
index 3c76cd8260..543b1dceb0 100644
--- a/C4/Serials.pm
+++ b/C4/Serials.pm
@@ -553,6 +553,7 @@ sub SearchSubscriptions {
             biblio.title,
             biblio.author,
             biblio.biblionumber,
+            aqbooksellers.name AS vendorname,
             biblioitems.issn
         FROM subscription
             LEFT JOIN subscriptionhistory USING(subscriptionid)
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 f68d36141b..b97b20a6d2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
@@ -60,6 +60,7 @@
                                 <th>ISSN</th>
                                 <th class="anti-the">Title</th>
                                 <th> Notes </th>
+                                <th>Vendor</th>
                                 <th>Library</th>
                                 <th>Call number</th>
                                 <th class="title-string">Expiration date</th>
@@ -77,6 +78,9 @@
                                 <td>[% IF (sub.publicnotes) %][% sub.publicnotes %][% END %]
                                     [% IF (sub.internalnotes) %]([% sub.internalnotes %])[% END %]
                                 </td>
+                                <td>
+                                    [% IF (sub.vendorname) %][% sub.vendorname %][% END %]
+                                </td>
                                 <td>
                                     [% IF (sub.branchcode) %][% Branches.GetName( sub.branchcode ) %][% END %]
                                 </td>