Bug 11122: Follow up - Fix some display issues and typos

This patch fixes the display of copyrightdate for MARC21 installations.
As MARC21 already requires you to add punctuation in cataloguing, there
is usually no need for punctutation in the templates.

Also fixes a template variable name typo and the basket summary page.

To test (all 3 patches):
- Add several order lines to an order, one should be uncertain
- Verify that the publisher and publication year are displayed
- Check the uncertain price page
- Verify that the publisher code and publication year are displayed
- Fix uncertain price and close your order
- Basket summary: Verify... (you know what)
- Cancel one of your orders
- Verify... for cancelled orders
- Receive shipment
- Verify... for unreceived orders
- Receive order
- Verify ... for received orders
- Finish receiving
- Verify ... on the invoice summary page

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 cbb5096934907ec56df27d6ee3e77d752cd5e401)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit 428467a0228429ba78020e9097ede7c43ad6d04e)
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

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 c39a9a5..2695796 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -545,7 +545,8 @@
                                 [% 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 %][% END %]
+                                [% IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear %]
+                                [% ELSIF ( books_loo.copyrightdate ) %] [% books_loo.copyrightdate %][% END %]
                                 [% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]
                                 [% IF ( books_loo.suggestionid ) %]
                                     <br/>
@@ -671,7 +672,8 @@
                         [% IF ( order.isbn ) %] - [% order.isbn %][% END %]
                         [% IF ( order.issn ) %] - [% order.issn %][% END %]
                         [% IF ( order.publishercode ) %], [% order.publishercode %][% END %]
-                        [% IF ( order.publicationyear ) %], [% order.publicationyear %][% END %]
+                        [% IF ( order.publicationyear ) %], [% order.publicationyear %]
+                        [% ELSIF ( order.copyrightdate ) %] [% order.copyrightdate %][% END %]
                         [% IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement %][% END %]
                         [% IF ( order.cancellationreason ) %]
                           <br />

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 216b68d..ba56547 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
@@ -167,11 +167,8 @@
                     [% IF ( order.isbn ) %] – [% order.isbn %][% END %]
                     [% IF ( order.publishercode ) %]
                       <br/>[% order.publishercode %]
-                        [% IF order.publicationyear > 0 %]
-                          - [% order.publicationyear %]
-                        [% ELSIF ( order.copyrightdate > 0) %]
-                          - [% order.copyrightdate %]
-                        [% END %]
+                        [% IF order.publicationyear %], [% order.publicationyear %]
+                        [% ELSIF ( order.copyrightdate ) %][% order.copyrightdate %][% END %]
                     [% END %]
                   </td>
                   <td><p>[% order.branchcode %]</p></td>

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 79c01be..a24bffc 100644 (file)
--- 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 ) %]
                     <br />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 ) %]
                     <br />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 cf80de8..1030eae 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt
@@ -106,7 +106,7 @@
                             [% IF ( ordersloo.publishercode ) %]
                                 <br />Publisher: [% ordersloo.publishercode %]
                                 [%- IF    ( ordersloo.publicationyear > 0) -%], [% ordersloo.publicationyear %]
-                                [%- ELSIF ( ordersloo.copyrightdate   > 0) -%], [% ordersloo.copyrightdate %]
+                                [%- ELSIF ( ordersloo.copyrightdate   > 0) -%] [% ordersloo.copyrightdate %]
                                 [% END %]
                             [% END %]
                         </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 659308a..5068053 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt
@@ -112,8 +112,8 @@ 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    ( uncertanpriceorder.publicationyear > 0) -%], [% uncertanpriceorder.publicationyear %]
-                [%- ELSIF ( uncertanpriceorder.copyrightdate   > 0) -%], [% uncertanpriceorder.copyrightdate %]
+                [%- IF    ( uncertainpriceorder.publicationyear ) -%], [% uncertainpriceorder.publicationyear %]
+                [%- ELSIF ( uncertainpriceorder.copyrightdate ) -%] [% uncertainpriceorder.copyrightdate %]
                 [% END %]
             [% END %]
             [% IF ( uncertainpriceorder.isbn ) %]<br />[% uncertainpriceorder.isbn %][% END %]