From 17b435d1be8e9ecd51a3564581340db9248e83c9 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 15 Apr 2015 11:30:17 +0200 Subject: [PATCH] Bug 10181: Acq - Improve message for deleted records MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There are some issues here: 1/ Message not translatable (set in the pl file) 2/ ' by 'displayed even if no author defined 3/ Message not the same every where 4/ Nothing displayed on the invoice page Test plan: 1/ Create a basket 2/ Add 4 orders A, B, C, D 3/ On the basket, you see "$title by $author", or "$title" if no author defined 4/ Delete order A, B 5/ Close the basket 6/ Receive B, C 7/ Delete record created for A, C 8/ Go on the basket page, you should see the title and "Deleted bibliographic record, can't find title" for the deleted record 9/ Go on the invoice page, you should see the title and "Deleted bibliographic record, can't find title" for the deleted record Signed-off-by: Joonas Kylmälä --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 7 ++++--- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt | 10 +++++++--- 2 files changed, 11 insertions(+), 6 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 6c67fbc..ad06568 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -454,7 +454,7 @@

[% IF ( books_loo.order_received ) %] (rcvd)[% END %] [% IF books_loo.title %] - [% books_loo.title |html %] by [% books_loo.author %] + [% books_loo.title |html %][% IF books_loo.author %] by [% books_loo.author %][% END %] [% ELSE %] Deleted bibliographic record, can't find title
[% END %] @@ -578,10 +578,11 @@

[% IF ( order.order_received ) %] (rcvd)[% END %] [% IF (order.title) %] - [% order.title |html %] by [% order.author %]
+ [% order.title |html %][% IF order.author %] by [% order.author %][% END %] [% ELSE %] - Deleted bibliographic record, can't find title
+ Deleted bibliographic record, can't find title [% END %] +
[% IF ( order.order_internalnote ) %] [% order.order_internalnote %][% END %] [% IF ( order.isbn ) %] - [% order.isbn %][% END %] [% IF ( order.issn ) %] - [% order.issn %][% 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 927697b..6a0c9cf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -147,9 +147,13 @@ [% FOREACH order IN orders_loop %] - [% order.title %] - [% IF ( order.author ) %] -
by [% order.author %] + [% IF order.biblionumber %] + [% order.title %] + [% IF ( order.author ) %] +
by [% order.author %] + [% END %] + [% ELSE %] + Deleted bibliographic record, can't find title [% END %] [% IF ( order.publishercode ) %]
[% order.publishercode %] -- 1.9.1