From 5247d52db9971dd08fc1a851b700caa7b25956ab Mon Sep 17 00:00:00 2001 From: Jonathan Druart <jonathan.druart@biblibre.com> 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ä <j.kylmala@gmail.com> --- 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 @@ <p> [% IF ( books_loo.order_received ) %] (rcvd)[% END %] [% IF books_loo.title %] - <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% books_loo.biblionumber %]">[% books_loo.title |html %]</a> by [% books_loo.author %] + <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% books_loo.biblionumber %]">[% books_loo.title |html %]</a>[% IF books_loo.author %] by [% books_loo.author %][% END %] [% ELSE %] <em>Deleted bibliographic record, can't find title</em><br /> [% END %] @@ -578,10 +578,11 @@ <p> [% IF ( order.order_received ) %] (rcvd)[% END %] [% IF (order.title) %] - [% order.title |html %] by [% order.author %]<br /> + [% order.title |html %][% IF order.author %] by [% order.author %][% END %] [% ELSE %] - <em>Deleted bibliographic record, can't find title</em><br /> + <em>Deleted bibliographic record, can't find title</em> [% END %] + <br /> [% 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 %] <tr> <td> - <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title %]</a> - [% IF ( order.author ) %] - <br /><em>by</em> [% order.author %] + [% IF order.biblionumber %] + <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title %]</a> + [% IF ( order.author ) %] + <br /><em>by</em> [% order.author %] + [% END %] + [% ELSE %] + <em>Deleted bibliographic record, can't find title</em> [% END %] [% IF ( order.publishercode ) %] <br/>[% order.publishercode %] -- 2.1.0