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 348-354 foreach my $biblionumber (@biblionumbers) { Link Here
348
                my $ItemBorrowerReserveInfo = GetMember( borrowernumber => $reservedfor );
347
                my $ItemBorrowerReserveInfo = GetMember( borrowernumber => $reservedfor );
349
348
350
                $item->{backgroundcolor} = 'reserved';
349
                $item->{backgroundcolor} = 'reserved';
351
                $item->{reservedate}     = format_date($reservedate);
350
                $item->{reservedate}     = output_pref({ dt => dt_from_string( $reservedate, 'iso' ), dateonly => 1 });
352
                $item->{ReservedForBorrowernumber}     = $reservedfor;
351
                $item->{ReservedForBorrowernumber}     = $reservedfor;
353
                $item->{ReservedForSurname}     = $ItemBorrowerReserveInfo->{'surname'};
352
                $item->{ReservedForSurname}     = $ItemBorrowerReserveInfo->{'surname'};
354
                $item->{ReservedForFirstname}     = $ItemBorrowerReserveInfo->{'firstname'};
353
                $item->{ReservedForFirstname}     = $ItemBorrowerReserveInfo->{'firstname'};
Lines 383-389 foreach my $biblionumber (@biblionumbers) { Link Here
383
              GetTransfers($itemnumber);
382
              GetTransfers($itemnumber);
384
383
385
            if ( defined $transfertwhen && $transfertwhen ne '' ) {
384
            if ( defined $transfertwhen && $transfertwhen ne '' ) {
386
                $item->{transfertwhen} = format_date($transfertwhen);
385
                $item->{transfertwhen} = output_pref({ dt => dt_from_string( $transfertwhen, 'iso' ), dateonly => 1 });
387
                $item->{transfertfrom} =
386
                $item->{transfertfrom} =
388
                  $branches->{$transfertfrom}{branchname};
387
                  $branches->{$transfertfrom}{branchname};
389
                $item->{transfertto} = $branches->{$transfertto}{branchname};
388
                $item->{transfertto} = $branches->{$transfertto}{branchname};
Lines 514-522 foreach my $biblionumber (@biblionumbers) { Link Here
514
	    $reserve{'hidename'} = 1;
513
	    $reserve{'hidename'} = 1;
515
	    $reserve{'cardnumber'} = $reserveborrowerinfo->{'cardnumber'};
514
	    $reserve{'cardnumber'} = $reserveborrowerinfo->{'cardnumber'};
516
	}
515
	}
517
        $reserve{'expirationdate'} = format_date( $res->{'expirationdate'} )
516
        $reserve{'expirationdate'} = output_pref({ dt => dt_from_string( $res->{'expirationdate'}, 'iso' ), dateonly => 1 })
518
            unless ( !defined($res->{'expirationdate'}) || $res->{'expirationdate'} eq '0000-00-00' );
517
            unless ( !defined($res->{'expirationdate'}) || $res->{'expirationdate'} eq '0000-00-00' );
519
        $reserve{'date'}           = format_date( $res->{'reservedate'} );
518
        $reserve{'date'}           = output_pref({ dt => dt_from_string( $res->{'reservedate'}, 'iso' ), dateonly => 1 });
520
        $reserve{'borrowernumber'} = $res->{'borrowernumber'};
519
        $reserve{'borrowernumber'} = $res->{'borrowernumber'};
521
        $reserve{'biblionumber'}   = $res->{'biblionumber'};
520
        $reserve{'biblionumber'}   = $res->{'biblionumber'};
522
        $reserve{'borrowernumber'} = $res->{'borrowernumber'};
521
        $reserve{'borrowernumber'} = $res->{'borrowernumber'};
523
- 

Return to bug 13813