Attachment 63406 Details for Bug 11122 – [SIGNED-OFF] Bug 11122: Address MARC21 vs. UNIMARC issue

[patch] [SIGNED-OFF] Bug 11122: Address MARC21 vs. UNIMARC issue

SIGNED-OFF-Bug-11122-Address-MARC21-vs-UNIMARC-iss.patch (text/plain), 4.75 KB, created by Josef Moravec on 2017-05-12 07:08:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Moravec

Created: 2017-05-12 07:08:56 UTC

Size: 4.75 KB

patch

obsolete

>From 15c82bbe04fb7ea1ffe5fdce89c93157fe84d3b3 Mon Sep 17 00:00:00 2001
>From: Mark Tompsett <mtompset@hotmail.com>
>Date: Sun, 19 Apr 2015 20:28:21 -0400
>Subject: [PATCH] [SIGNED-OFF] 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>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 8 ++++++--
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt | 4 +++-
> koha-tmpl/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 8374114..d8adad8 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 ) %]
> 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 ) %]
> 
>@@ -422,7 +424,9 @@
> [% IF ( order.isbn ) %] - [% order.isbn %][% END %]
> [% IF ( order.publishercode ) %]
> 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 ) %]
> 
>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 478801e..6d1064e 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 ) %]
> 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-default btn-xs" 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 7eb822d..659308a 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 ) %] by [% uncertainpriceorder.author %][% END %]
> [% IF ( uncertainpriceorder.publishercode ) %]
> Publisher: [% 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 ) %] [% uncertainpriceorder.isbn %][% END %]
> 
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 11122: 22306 | 23227 | 38130 | 38146 | 38667 | 44710 | 44711 | 44712 | 62935 | 62936 | 62937 | 63405 | 63406 | 63407 | 63538 | 63539 | 63540