From 88dc34c75f8df1585269e1bbe4cdb2ff7e0cd2d0 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 29 Mar 2021 14:57:22 +0000 Subject: [PATCH] Bug 27817: Use biblio-title include in some acquisitions pages This patch adds the use of the biblio-title include in acquisitions templates which get the right data from their corresponding scripts. To test, apply the patch and test these Acquisitions pages to confirm that titles with 245$b, 245$h, etc, show all the correct information. - Acquisitions -> Vendor -> Basket - Acquisitions -> Vendor -> Uncertain prices - Acquisitions -> Invoices -> Invoice - Acquisitions -> Invoices -> Invoice -> View an invoice which has an already-received bibliographic record. - Go to receipt page -> Already received. -- The "Pending orders" table is unmodified because I wasn't sure how to use the biblio-title include in an AJAX DataTable. Signed-off-by: Katrin Fischer Signed-off-by: Barbara Johnson --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/orderreceive.tt | 6 +++++- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 3 ++- .../intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt | 2 +- 5 files changed, 12 insertions(+), 7 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 9d2687881d..598b674e34 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -528,9 +528,9 @@

[% IF ( books_loo.order_received ) %] (received)[% END %] - [%- IF books_loo.title %] - [% books_loo.title | html %][% IF books_loo.author %] by [% books_loo.author | html %][% END -%] - [%- ELSE -%] + [% IF books_loo.title %] + [% INCLUDE 'biblio-title.inc' biblio=books_loo link = 1 %] [% IF books_loo.author %] by [% books_loo.author | html %][% END %] + [% ELSE %] Deleted bibliographic record, can't find title
[%- END %]
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 fbaa3fa439..5614d5c692 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -364,7 +364,7 @@ [% IF order.biblionumber %] - [% order.title | html %] + [% INCLUDE 'biblio-title.inc' biblio=order link = 1 %] [% IF ( order.author ) %]
by [% order.author | html %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt index 80a1d9da65..a91fd6751c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -53,7 +53,11 @@

Catalog details -
  1. Title: [% order.biblio.title | html %]
    2. +
      +
    1. + Title: + [% INCLUDE 'biblio-title.inc' biblio=order.biblio link = 1 %] +
    2. Author: [% order.biblio.author | html %]
    3. Copyright: 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 eb3ea035ae..4e4c257477 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -227,7 +227,8 @@ 0 [% END %] - [% order.title | html %] + + [% INCLUDE 'biblio-title.inc' biblio=order link = 1 %] [% IF ( order.author ) %] / [% order.author | html %][% END %] [% IF ( order.isbn ) %] - [% order.isbn | html %][% END %] [% IF ( order.publishercode ) %] 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 598e62dff6..e893def0de 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/uncertainprice.tt @@ -116,7 +116,7 @@ [% uncertainpriceorder.basketname | html %] - [% uncertainpriceorder.title | html %] + [% INCLUDE 'biblio-title.inc' biblio=uncertainpriceorder link = 1 %] [% IF ( uncertainpriceorder.author ) %] by [% uncertainpriceorder.author | html %][% END %] [% IF ( uncertainpriceorder.publishercode ) %]
      Publisher: [% uncertainpriceorder.publishercode | html %] -- 2.30.2