From d7855a90390d6542b6c745444eb6c0578f96abb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20V=C3=A9ron?= Date: Sun, 15 Mar 2015 15:04:58 +0100 Subject: [PATCH] Bug 13813 - Remove C4::Dates from reserve/request.pl To test: Apply patch Search a biblio in staff client and place hold. This will take you to reserve/request.pl Add / Suspend / Unsuspend / hold(s) Verify that all dates behave and display OK --- reserve/request.pl | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/reserve/request.pl b/reserve/request.pl index ce0e70f..39bfbeb 100755 --- a/reserve/request.pl +++ b/reserve/request.pl @@ -39,7 +39,6 @@ use C4::Biblio; use C4::Items; use C4::Koha; use C4::Circulation; -use C4::Dates qw/format_date/; use C4::Members; use C4::Search; # enabled_staff_search_views use Koha::DateUtils; @@ -81,7 +80,7 @@ my $maxreserves; my $warnings; my $messages; -my $date = C4::Dates->today('iso'); +my $date = output_pref({ dt => DateTime->now(), dateformat => 'iso', dateonly => 1 }); my $action = $input->param('action'); $action ||= q{}; @@ -351,7 +350,7 @@ foreach my $biblionumber (@biblionumbers) { if ( defined $reservedate ) { $item->{backgroundcolor} = 'reserved'; - $item->{reservedate} = format_date($reservedate); + $item->{reservedate} = output_pref({ dt => dt_from_string( $reservedate, 'iso' ), dateonly => 1 }); $item->{ReservedForBorrowernumber} = $reservedfor; $item->{ReservedForSurname} = $ItemBorrowerReserveInfo->{'surname'}; $item->{ReservedForFirstname} = $ItemBorrowerReserveInfo->{'firstname'}; @@ -386,7 +385,7 @@ foreach my $biblionumber (@biblionumbers) { GetTransfers($itemnumber); if ( defined $transfertwhen && $transfertwhen ne '' ) { - $item->{transfertwhen} = format_date($transfertwhen); + $item->{transfertwhen} = output_pref({ dt => dt_from_string( $transfertwhen, 'iso' ), dateonly => 1 }); $item->{transfertfrom} = $branches->{$transfertfrom}{branchname}; $item->{transfertto} = $branches->{$transfertto}{branchname}; @@ -517,9 +516,9 @@ foreach my $biblionumber (@biblionumbers) { $reserve{'hidename'} = 1; $reserve{'cardnumber'} = $reserveborrowerinfo->{'cardnumber'}; } - $reserve{'expirationdate'} = format_date( $res->{'expirationdate'} ) + $reserve{'expirationdate'} = output_pref({ dt => dt_from_string( $res->{'expirationdate'}, 'iso' ), dateonly => 1 }) unless ( !defined($res->{'expirationdate'}) || $res->{'expirationdate'} eq '0000-00-00' ); - $reserve{'date'} = format_date( $res->{'reservedate'} ); + $reserve{'date'} = output_pref({ dt => dt_from_string( $res->{'reservedate'}, 'iso' ), dateonly => 1 }); $reserve{'borrowernumber'} = $res->{'borrowernumber'}; $reserve{'biblionumber'} = $res->{'biblionumber'}; $reserve{'borrowernumber'} = $res->{'borrowernumber'}; -- 1.7.10.4