From 46d6795d7db516aeaa7d954f8bb635f9b52e4960 Mon Sep 17 00:00:00 2001 From: Mason James Date: Mon, 31 Jul 2017 00:29:18 +1200 Subject: [PATCH] Revert "Bug 11122: Follow up - Fix some display issues and typos" This reverts commit 3b2cb8a3c3ae3b83ae596394663c839b0b44ff8a. --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 6 ++---- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt | 7 +++++-- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/acqui/transferorder.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt | 4 ++-- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index b8bdaf0ed0..1611244c35 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -518,8 +518,7 @@ [% IF ( books_loo.isbn ) %] - [% books_loo.isbn %][% END %] [% IF ( books_loo.issn ) %] - [% books_loo.issn %][% END %] [% IF ( books_loo.publishercode ) %], [% books_loo.publishercode %][% END %] - [% IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear %] - [% ELSIF ( books_loo.copyrightdate ) %] [% books_loo.copyrightdate %][% END %] + [% IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear %][% END %] [% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %] [% IF ( books_loo.suggestionid ) %]
@@ -645,8 +644,7 @@ [% IF ( order.isbn ) %] - [% order.isbn %][% END %] [% IF ( order.issn ) %] - [% order.issn %][% END %] [% IF ( order.publishercode ) %], [% order.publishercode %][% END %] - [% IF ( order.publicationyear ) %], [% order.publicationyear %] - [% ELSIF ( order.copyrightdate ) %] [% order.copyrightdate %][% END %] + [% IF ( order.publicationyear ) %], [% order.publicationyear %][% END %] [% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %] [% IF ( order.cancellationreason ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt index 7e7fd3884d..cdaf6ea3c7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -161,8 +161,11 @@ [% IF ( order.isbn ) %] – [% order.isbn %][% END %] [% IF ( order.publishercode ) %]
[% order.publishercode %] - [% IF order.publicationyear %], [% order.publicationyear %] - [% ELSIF ( order.copyrightdate ) %][% order.copyrightdate %][% END %] + [% IF order.publicationyear > 0 %] + - [% order.publicationyear %] + [% ELSIF ( order.copyrightdate > 0) %] + - [% order.copyrightdate %] + [% END %] [% END %]

[% order.branchcode %]

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 5d386b2cc8..79665fe5f4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -273,7 +273,7 @@ [% IF ( loop_order.publishercode ) %]
Publisher: [% loop_order.publishercode %] [%- IF ( loop_order.publicationyear > 0) -%], [% loop_order.publicationyear %] - [%- ELSIF ( loop_order.copyrightdate > 0) -%] [% loop_order.copyrightdate %] + [%- ELSIF ( loop_order.copyrightdate > 0) -%], [% loop_order.copyrightdate %] [% END %] [% END %] [% IF ( loop_order.suggestionid ) %] @@ -425,7 +425,7 @@ [% IF ( order.publishercode ) %]
Publisher: [% order.publishercode %] [%- IF ( order.publicationyear > 0) -%], [% order.publicationyear %] - [%- ELSIF ( order.copyrightdate > 0) -%] [% order.copyrightdate %] + [%- ELSIF ( order.copyrightdate > 0) -%], [% order.copyrightdate %] [% END %] [% END %] [% IF ( order.suggestionid ) %] 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 d8d26210bf..d9ad86918c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt @@ -101,7 +101,7 @@ [% IF ( ordersloo.publishercode ) %]
Publisher: [% ordersloo.publishercode %] [%- IF ( ordersloo.publicationyear > 0) -%], [% ordersloo.publicationyear %] - [%- ELSIF ( ordersloo.copyrightdate > 0) -%] [% ordersloo.copyrightdate %] + [%- ELSIF ( ordersloo.copyrightdate > 0) -%], [% ordersloo.copyrightdate %] [% END %] [% END %] 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 9494f2ad2f..e0967cfa2d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt @@ -114,8 +114,8 @@ function check(form) { [% IF ( uncertainpriceorder.author ) %] by [% uncertainpriceorder.author %][% END %] [% IF ( uncertainpriceorder.publishercode ) %]
Publisher: [% uncertainpriceorder.publishercode %] - [%- IF ( uncertainpriceorder.publicationyear ) -%], [% uncertainpriceorder.publicationyear %] - [%- ELSIF ( uncertainpriceorder.copyrightdate ) -%] [% uncertainpriceorder.copyrightdate %] + [%- IF ( uncertanpriceorder.publicationyear > 0) -%], [% uncertanpriceorder.publicationyear %] + [%- ELSIF ( uncertanpriceorder.copyrightdate > 0) -%], [% uncertanpriceorder.copyrightdate %] [% END %] [% END %] [% IF ( uncertainpriceorder.isbn ) %]
[% uncertainpriceorder.isbn %][% END %]