diff --git a/catalogue/detail.pl b/catalogue/detail.pl index 3af82774ce..5cb556ae05 100755 --- a/catalogue/detail.pl +++ b/catalogue/detail.pl @@ -402,11 +402,8 @@ foreach my $item (@items) { # Check the transit status my $transfer = $item->get_transfer; - if ( $transfer && $transfer->in_transit ) { - $item_info->{transfertwhen} = $transfer->datesent; - $item_info->{transfertfrom} = $transfer->frombranch; - $item_info->{transfertto} = $transfer->tobranch; - $item_info->{nocancel} = 1; + if ( $transfer ) { + $item_info->{transfer} = $transfer; } foreach my $f (qw( itemnotes )) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 5a14e60aaa..93aa33516e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -475,8 +475,13 @@ Note that permanent location is a code, and location may be an authval. [% END %] : due [% item.checkout.date_due | $KohaDates as_due_date => 1 %] - [% ELSIF ( item.transfertwhen ) %] - In transit from [% Branches.GetName( item.transfertfrom ) | html %] to [% Branches.GetName( item.transfertto ) | html %] since [% item.transfertwhen | $KohaDates %] + [% ELSIF ( item.transfer ) %] + [% IF (item.transfer.datesent) %] + In transit from [% Branches.GetName( item.transfer.frombranch ) | html %] to [% Branches.GetName( item.transfer.tobranch ) | html %] since [% item.transfer.datesent | $KohaDates %] + [% ELSE %] + Transit pending from [% Branches.GetName( item.transfer.frombranch ) | html %] to [% Branches.GetName( item.transfer.tobranch ) | html %] since [% item.transfer.daterequested | $KohaDates %] + + [% END %] [% END %] [% IF ( item.itemlost ) %] @@ -547,7 +552,7 @@ Note that permanent location is a code, and location may be an authval. [% END %] [% END %] - [% UNLESS ( item.itemnotforloan || item.notforloan_per_itemtype || item.onloan || item.itemlost || item.withdrawn || item.damaged || item.transfertwhen || hold || ( Koha.Preference('UseRecalls') && recall ) ) %] + [% UNLESS ( item.itemnotforloan || item.notforloan_per_itemtype || item.onloan || item.itemlost || item.withdrawn || item.damaged || item.transfer || hold || ( Koha.Preference('UseRecalls') && recall ) ) %] Available [% END %]