From 72f02252d152760127eac5fdccfd590f28ad46c0 Mon Sep 17 00:00:00 2001
From: Mason James <mtj@kohaaloha.com>
Date: Mon, 31 Jul 2017 00:29:29 +1200
Subject: [PATCH] Revert "Bug 11122: Address MARC21 vs. UNIMARC issue"

This reverts commit 2f6823b4350f26a9756e8ccc0f12665fdd44348b.
---
 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, 4 insertions(+), 12 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 79665fe5f4..42fb58c5f0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -272,9 +272,7 @@
                 [% IF ( loop_order.isbn ) %] &ndash; [% loop_order.isbn %][% END %]
                 [% IF ( loop_order.publishercode ) %]
                     <br />Publisher: [% loop_order.publishercode %]
-                    [%- IF    ( loop_order.publicationyear > 0) -%], [% loop_order.publicationyear %]
-                    [%- ELSIF ( loop_order.copyrightdate   > 0) -%], [% loop_order.copyrightdate %]
-                    [% END %]
+                    [%- IF ( loop_order.publicationyear ) %], [% loop_order.publicationyear %][% END %]
                 [% END %]
                 [% IF ( loop_order.suggestionid ) %]
                     <br/>
@@ -424,9 +422,7 @@
                 [% IF ( order.isbn ) %] - [% order.isbn %][% END %]
                 [% IF ( order.publishercode ) %]
                     <br />Publisher: [% order.publishercode %]
-                    [%- IF    ( order.publicationyear > 0) -%], [% order.publicationyear %]
-                    [%- ELSIF ( order.copyrightdate   > 0) -%], [% order.copyrightdate %]
-                    [% END %]
+                    [%- IF ( order.publicationyear ) %], [% order.publicationyear %][% 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 d9ad86918c..5722d3e102 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
@@ -100,9 +100,7 @@
                             [% IF ( ordersloo.isbn ) %] &ndash; [% ordersloo.isbn %][% END %]
                             [% IF ( ordersloo.publishercode ) %]
                                 <br />Publisher: [% ordersloo.publishercode %]
-                                [%- IF    ( ordersloo.publicationyear > 0) -%], [% ordersloo.publicationyear %]
-                                [%- ELSIF ( ordersloo.copyrightdate   > 0) -%], [% ordersloo.copyrightdate %]
-                                [% END %]
+                                [%- IF ( ordersloo.publicationyear ) %], [% ordersloo.publicationyear %][% END %]
                             [% END %]
                         </td>
                         <td><a 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 e0967cfa2d..19d961bfec 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
@@ -114,9 +114,7 @@ function check(form) {
             [% IF ( uncertainpriceorder.author ) %] <em>by</em> [% uncertainpriceorder.author %][% END %]
             [% IF ( uncertainpriceorder.publishercode ) %]
                 <br /><em>Publisher:</em> [% uncertainpriceorder.publishercode %]
-                [%- IF    ( uncertanpriceorder.publicationyear > 0) -%], [% uncertanpriceorder.publicationyear %]
-                [%- ELSIF ( uncertanpriceorder.copyrightdate   > 0) -%], [% uncertanpriceorder.copyrightdate %]
-                [% END %]
+                [%- IF ( uncertainpriceorder.publicationyear ) %], [% uncertainpriceorder.publicationyear %][% END %]
             [% END %]
             [% IF ( uncertainpriceorder.isbn ) %]<br />[% uncertainpriceorder.isbn %][% END %]
             <br />
-- 
2.39.5