@@ -, +, @@
---
.../prog/en/modules/catalogue/detail.tt | 32 +++++++++++++---------
1 file changed, 19 insertions(+), 13 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -570,16 +570,19 @@ function verify_images() {
[% UNLESS ( item.NOTSAMEBRANCH ) %]
to
[% IF ( item.hidepatronname ) %]
- [% item.cardnumber %]
+ [% item.cardnumber %]
[% ELSE %]
- [% item.firstname %] [% item.surname %]
+ [% item.firstname %] [% item.surname %]
[% END %]
[% END %]
- : due [% item.datedue %]
+ : due [% '' _ item.datedue _ '' %]
- [% ELSIF ( item.transfertwhen ) %]
- In transit from [% item.transfertfrom %] to [% item.transfertto %] since [% item.transfertwhen %]
+ [% ELSIF ( item.transfertwhen );
+ tmp_transfertfrom = '' _ item.transfertfrom _ '';
+ tmp_transfertto = '' _ item.transfertto _ '';
+ tmp_transfertwhen = '' _ item.transfertwhen _ ''; %]
+ In transit from [% tmp_transfertfrom %] to [% tmp_transfertto %] since [% tmp_transfertwhen %]
[% END %]
[% IF ( item.itemlost ) %]
@@ -611,13 +614,15 @@ function verify_images() {
[% END %]
[% IF ( item.itemnotforloan ) %]
- Not for loan
+ Not for loan
[% IF ( item.notforloanvalue ) %]
- ([% item.notforloanvalue %])
+ ([% item.notforloanvalue %])
[% END %]
+
[% END %]
[% IF ( item.reservedate ) %]
+
[% IF ( item.waitingdate ) %]
Waiting
[% ELSE %]
@@ -626,26 +631,27 @@ function verify_images() {
[% IF ( canreservefromotherbranches ) %]
for
[% IF ( item.hidepatronname ) %]
- [% item.Reservedcardnumber %]
+ [% item.Reservedcardnumber %]
[% ELSE %]
- [% item.ReservedForFirstname %] [% item.ReservedForSurname %]
+ [% item.ReservedForFirstname %] [% item.ReservedForSurname %]
[% END %]
[% END %]
[% IF ( item.waitingdate ) %]
at[% ELSE %]for delivery at
[% END %]
- [% item.ExpectedAtLibrary %]
+ [% item.ExpectedAtLibrary %]
[% IF ( item.waitingdate ) %]
- since [% item.waitingdate | $KohaDates %]
+ since [% item.waitingdate | $KohaDates %]
[% ELSE %]
[% IF ( item.reservedate ) %]
- (placed [% item.reservedate %])
+ (placed [% item.reservedate %])
[% END %]
[% END %]
+
[% END %]
[% UNLESS ( item.itemnotforloan or item.onloan or item.itemlost or item.withdrawn or item.damaged or item.transfertwhen or item.reservedate ) %]
- Available
+ Available
[% END %]
[% IF ( item.restricted ) %]
--