From 8b096e91f1c07ba0295ef3fdc700eefb7d3a9834 Mon Sep 17 00:00:00 2001 From: Luke Honiss Date: Tue, 17 Jan 2017 02:27:55 +0000 Subject: [PATCH] Bug 17865 'If a subscription has no history end date, it shows as expired today in OPAC' --TEST PLAN-- 1) View a subscription with no history end date 2) Search for an item with a subcription in OPAC 3) Under subscription tab click more details 4) The end date will be the current date 5) Apply patch and refresh 6) The end date will not be shown Signed-off-by: Baptiste Wojtkowski Signed-off-by: Jonathan Druart Signed-off-by: Mason James --- C4/Serials.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/C4/Serials.pm b/C4/Serials.pm index 202217b5c7..3df2894b0b 100644 --- a/C4/Serials.pm +++ b/C4/Serials.pm @@ -442,7 +442,11 @@ sub GetSubscriptionsFromBiblionumber { while ( my $subs = $sth->fetchrow_hashref ) { $subs->{startdate} = output_pref( { dt => dt_from_string( $subs->{startdate} ), dateonly => 1 } ); $subs->{histstartdate} = output_pref( { dt => dt_from_string( $subs->{histstartdate} ), dateonly => 1 } ); - $subs->{histenddate} = output_pref( { dt => dt_from_string( $subs->{histenddate} ), dateonly => 1 } ); + if ( defined $subs->{histenddate} ) { + $subs->{histenddate} = output_pref( { dt => dt_from_string( $subs->{histenddate} ), dateonly => 1 } ); + } else { + $subs->{histenddate} = ""; + } $subs->{opacnote} =~ s/\n/\/g; $subs->{missinglist} =~ s/\n/\/g; $subs->{recievedlist} =~ s/\n/\/g; @@ -450,7 +454,7 @@ sub GetSubscriptionsFromBiblionumber { $subs->{ "numberpattern" . $subs->{numberpattern} } = 1; $subs->{ "status" . $subs->{'status'} } = 1; - if ( $subs->{enddate} eq '0000-00-00' ) { + if (not defined $subs->{enddate} ) { $subs->{enddate} = ''; } else { $subs->{enddate} = output_pref( { dt => dt_from_string( $subs->{enddate}), dateonly => 1 } ); -- 2.39.5