From 1ead1f2b4919729dbf6501f85c12fc5e861b848d Mon Sep 17 00:00:00 2001
From: Mark Tompsett <mtompset@hotmail.com>
Date: Sun, 19 Apr 2015 20:28:21 -0400
Subject: [PATCH] Bug 11122: Address MARC21 vs. UNIMARC issue

In comment #6 and comment #17, Katrin pointed out the discrepancy
between UNIMARC (using publisheryear) vs. Other MARC installations
(using copyrightdate). This was dealt with in invoice.tt already.
This patch does similar logic for the other 3 template files.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit c470b3e38486e3c6040a10f6b0bf90af069f4566)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit 003e52896eeb74ca8c9d9ea253eff4f6022e52c0)
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt   | 8 ++++++--
 .../intranet-tmpl/prog/en/modules/acqui/transferorder.tt  | 4 +++-
 .../intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt | 4 +++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
index 749f536fdf..79c01be7db 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -272,7 +272,9 @@
                 [% IF ( loop_order.isbn ) %] &ndash; [% loop_order.isbn %][% END %]
                 [% IF ( loop_order.publishercode ) %]
                     <br />Publisher: [% loop_order.publishercode %]
-                    [%- IF ( loop_order.publicationyear ) %], [% loop_order.publicationyear %][% END %]
+                    [%- IF    ( loop_order.publicationyear > 0) -%], [% loop_order.publicationyear %]
+                    [%- ELSIF ( loop_order.copyrightdate   > 0) -%], [% loop_order.copyrightdate %]
+                    [% END %]
                 [% END %]
                 [% IF ( loop_order.suggestionid ) %]
                     <br/>
@@ -422,7 +424,9 @@
                 [% IF ( order.isbn ) %] - [% order.isbn %][% END %]
                 [% IF ( order.publishercode ) %]
                     <br />Publisher: [% order.publishercode %]
-                    [%- IF ( order.publicationyear ) %], [% order.publicationyear %][% END %]
+                    [%- IF    ( order.publicationyear > 0) -%], [% order.publicationyear %]
+                    [%- ELSIF ( order.copyrightdate   > 0) -%], [% order.copyrightdate %]
+                    [% END %]
                 [% END %]
                 [% IF ( order.suggestionid ) %]
                     <br/>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
index f9546b2713..cf80de8e8a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
@@ -105,7 +105,9 @@
                             [% IF ( ordersloo.isbn ) %] &ndash; [% ordersloo.isbn %][% END %]
                             [% IF ( ordersloo.publishercode ) %]
                                 <br />Publisher: [% ordersloo.publishercode %]
-                                [%- IF ( ordersloo.publicationyear ) %], [% ordersloo.publicationyear %][% END %]
+                                [%- IF    ( ordersloo.publicationyear > 0) -%], [% ordersloo.publicationyear %]
+                                [%- ELSIF ( ordersloo.copyrightdate   > 0) -%], [% ordersloo.copyrightdate %]
+                                [% END %]
                             [% END %]
                         </td>
                         <td><a class="btn btn-mini" href="transferorder.pl?bookselleridfrom=[% ordersloo.bookselleridfrom %]&ordernumber=[% ordersloo.ordernumber %]">Transfer</a></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
index 7eb822de28..659308a39f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
@@ -112,7 +112,9 @@ var MSG_INVALIDPRICE = _("ERROR: Price is not a valid number, please check the p
             [% IF ( uncertainpriceorder.author ) %] <em>by</em> [% uncertainpriceorder.author %][% END %]
             [% IF ( uncertainpriceorder.publishercode ) %]
                 <br /><em>Publisher:</em> [% uncertainpriceorder.publishercode %]
-                [%- IF ( uncertainpriceorder.publicationyear ) %], [% uncertainpriceorder.publicationyear %][% END %]
+                [%- IF    ( uncertanpriceorder.publicationyear > 0) -%], [% uncertanpriceorder.publicationyear %]
+                [%- ELSIF ( uncertanpriceorder.copyrightdate   > 0) -%], [% uncertanpriceorder.copyrightdate %]
+                [% END %]
             [% END %]
             [% IF ( uncertainpriceorder.isbn ) %]<br />[% uncertainpriceorder.isbn %][% END %]
             <br />
-- 
2.39.5