View | Details | Raw Unified | Return to bug 13813
Collapse All | Expand All

(-)a/reserve/request.pl (-7 / +5 lines)
Lines 39-45 use C4::Biblio; Link Here
39
use C4::Items;
39
use C4::Items;
40
use C4::Koha;
40
use C4::Koha;
41
use C4::Circulation;
41
use C4::Circulation;
42
use C4::Dates qw/format_date/;
43
use C4::Members;
42
use C4::Members;
44
use C4::Search;		# enabled_staff_search_views
43
use C4::Search;		# enabled_staff_search_views
45
use Koha::DateUtils;
44
use Koha::DateUtils;
Lines 81-87 my $maxreserves; Link Here
81
my $warnings;
80
my $warnings;
82
my $messages;
81
my $messages;
83
82
84
my $date = C4::Dates->today('iso');
83
my $date = output_pref({ dt => DateTime->now(), dateformat => 'iso', dateonly => 1 });
85
my $action = $input->param('action');
84
my $action = $input->param('action');
86
$action ||= q{};
85
$action ||= q{};
87
86
Lines 351-357 foreach my $biblionumber (@biblionumbers) { Link Here
351
350
352
            if ( defined $reservedate ) {
351
            if ( defined $reservedate ) {
353
                $item->{backgroundcolor} = 'reserved';
352
                $item->{backgroundcolor} = 'reserved';
354
                $item->{reservedate}     = format_date($reservedate);
353
                $item->{reservedate}     = output_pref({ dt => dt_from_string( $reservedate, 'iso' ), dateonly => 1 });
355
                $item->{ReservedForBorrowernumber}     = $reservedfor;
354
                $item->{ReservedForBorrowernumber}     = $reservedfor;
356
                $item->{ReservedForSurname}     = $ItemBorrowerReserveInfo->{'surname'};
355
                $item->{ReservedForSurname}     = $ItemBorrowerReserveInfo->{'surname'};
357
                $item->{ReservedForFirstname}     = $ItemBorrowerReserveInfo->{'firstname'};
356
                $item->{ReservedForFirstname}     = $ItemBorrowerReserveInfo->{'firstname'};
Lines 386-392 foreach my $biblionumber (@biblionumbers) { Link Here
386
              GetTransfers($itemnumber);
385
              GetTransfers($itemnumber);
387
386
388
            if ( defined $transfertwhen && $transfertwhen ne '' ) {
387
            if ( defined $transfertwhen && $transfertwhen ne '' ) {
389
                $item->{transfertwhen} = format_date($transfertwhen);
388
                $item->{transfertwhen} = output_pref({ dt => dt_from_string( $transfertwhen, 'iso' ), dateonly => 1 });
390
                $item->{transfertfrom} =
389
                $item->{transfertfrom} =
391
                  $branches->{$transfertfrom}{branchname};
390
                  $branches->{$transfertfrom}{branchname};
392
                $item->{transfertto} = $branches->{$transfertto}{branchname};
391
                $item->{transfertto} = $branches->{$transfertto}{branchname};
Lines 517-525 foreach my $biblionumber (@biblionumbers) { Link Here
517
	    $reserve{'hidename'} = 1;
516
	    $reserve{'hidename'} = 1;
518
	    $reserve{'cardnumber'} = $reserveborrowerinfo->{'cardnumber'};
517
	    $reserve{'cardnumber'} = $reserveborrowerinfo->{'cardnumber'};
519
	}
518
	}
520
        $reserve{'expirationdate'} = format_date( $res->{'expirationdate'} )
519
        $reserve{'expirationdate'} = output_pref({ dt => dt_from_string( $res->{'expirationdate'}, 'iso' ), dateonly => 1 })
521
            unless ( !defined($res->{'expirationdate'}) || $res->{'expirationdate'} eq '0000-00-00' );
520
            unless ( !defined($res->{'expirationdate'}) || $res->{'expirationdate'} eq '0000-00-00' );
522
        $reserve{'date'}           = format_date( $res->{'reservedate'} );
521
        $reserve{'date'}           = output_pref({ dt => dt_from_string( $res->{'reservedate'}, 'iso' ), dateonly => 1 });
523
        $reserve{'borrowernumber'} = $res->{'borrowernumber'};
522
        $reserve{'borrowernumber'} = $res->{'borrowernumber'};
524
        $reserve{'biblionumber'}   = $res->{'biblionumber'};
523
        $reserve{'biblionumber'}   = $res->{'biblionumber'};
525
        $reserve{'borrowernumber'} = $res->{'borrowernumber'};
524
        $reserve{'borrowernumber'} = $res->{'borrowernumber'};
526
- 

Return to bug 13813