From d60eb3e7aadef9f542bd2e1f1fae186201c77577 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Fri, 17 Jul 2020 23:07:07 +0000
Subject: [PATCH] Bug 26014: Add publication year and edition to Z39.50 results
 in acquisition
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The publication year and edition columns were present in
the Z39.50 results in cataloguing, but were missing in
acquisitions.

To test:
- Go to acquisitions
- Create a new basket
- Create an order within it from 'external source'
- Search for a title, for example with LOC
- In a separate tab, go to cataloguing
- Search the same record with Z39.50
- Compare result lists, date and edition are missing from acq
- Apply the patch
- Repeat search in acquisitions
- Verify result lists now match up
- Bonus: Date was changed to Year which is more fitting and
  will translate better.

Signed-off-by: Amit Gupta <amit.gupta@informaticsglobal.com>
Signed-off-by: Joonas Kylmälä <joonas.kylmala@helsinki.fi>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt       | 4 ++++
 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
index f8d2ee7286..7958e89d26 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
@@ -106,6 +106,8 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
         <th>Server</th>
         <th>Title</th>
         <th>Author</th>
+        <th>Year</th>
+        <th>Edition</th>
         <th>ISBN</th>
         <th>LCCN</th>
         [% IF ( Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' ) %]
@@ -121,6 +123,8 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
             <td>[% breeding_loo.server | html %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" class="previewData">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | html %]" class="previewData">Preview card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&amp;breedingid=[% breeding_loo.breedingid | html %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">[% tp('verb', 'Order') | html %]</a> <a href="#" id="closemenu" title="Close this menu"> X </a></div></td>
             <td>[% breeding_loo.title | html %]</td>
             <td>[% breeding_loo.author | html %]</td>
+            <td>[% breeding_loo.date | html %]</td>
+            <td>[% breeding_loo.edition | html %]</td>
             <td>[% breeding_loo.isbn | html %]</td>
             <td>[% breeding_loo.lccn | html %]</td>
             [% IF ( Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
index 1eade1036c..7053d81a25 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
@@ -121,7 +121,7 @@
                                     <th>Server</th>
                                     <th>Title</th>
                                     <th>Author</th>
-                                    <th>Date</th>
+                                    <th>Year</th>
                                     <th>Edition</th>
                                     <th>ISBN</th>
                                     <th>LCCN</th>
-- 
2.11.0