Bugzilla – Attachment 44711 Details for
Bug 11122
Fix display of publication year/copyrightdate and publishercode on various pages in acquisitions
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11122: Address MARC21 vs. UNIMARC issue
Bug-11122-Address-MARC21-vs-UNIMARC-issue.patch (text/plain), 4.53 KB, created by
Fridolin Somers
on 2015-11-10 15:20:07 UTC
(
hide
)
Description:
Bug 11122: Address MARC21 vs. UNIMARC issue
Filename:
MIME Type:
Creator:
Fridolin Somers
Created:
2015-11-10 15:20:07 UTC
Size:
4.53 KB
patch
obsolete
>From 429fc86b4487eb64941e6fc170296f3528269517 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. >--- > 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 6be6470..0652a6b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -258,7 +258,9 @@ > [% IF ( loop_order.isbn ) %] – [% 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/> >@@ -408,7 +410,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 af2527d..bf64c8e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/transferorder.tt >@@ -99,7 +99,9 @@ > [% IF ( ordersloo.isbn ) %] – [% 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 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 598f5f9..29fbc29 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt >@@ -114,7 +114,9 @@ function check(form) { > [% 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.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
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