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

(-)a/C4/Serials.pm (-5 / +4 lines)
Lines 467-475 sub GetSubscriptionsFromBiblionumber { Link Here
467
    $sth->execute($biblionumber);
467
    $sth->execute($biblionumber);
468
    my @res;
468
    my @res;
469
    while ( my $subs = $sth->fetchrow_hashref ) {
469
    while ( my $subs = $sth->fetchrow_hashref ) {
470
        $subs->{startdate}     = output_pref( { dt => dt_from_string( $subs->{startdate}), dateonly => 1 } );
470
        $subs->{startdate} = output_pref( { dt => dt_from_string( $subs->{startdate}), dateonly => 1 } );
471
        $subs->{histstartdate} =  output_pref( { dt => dt_from_string( $subs->{startdate}), dateonly => 1 } );
471
        $subs->{histstartdate} = output_pref( { dt => dt_from_string( $subs->{startdate}), dateonly => 1 } );
472
        $subs->{histenddate}   =  output_pref( { dt => dt_from_string( $subs->{startdate}), dateonly => 1 } );
472
        $subs->{histenddate} = output_pref( { dt => dt_from_string( $subs->{startdate}), dateonly => 1 } );
473
        $subs->{opacnote}     =~ s/\n/\<br\/\>/g;
473
        $subs->{opacnote}     =~ s/\n/\<br\/\>/g;
474
        $subs->{missinglist}  =~ s/\n/\<br\/\>/g;
474
        $subs->{missinglist}  =~ s/\n/\<br\/\>/g;
475
        $subs->{recievedlist} =~ s/\n/\<br\/\>/g;
475
        $subs->{recievedlist} =~ s/\n/\<br\/\>/g;
Lines 1631-1638 sub ItemizeSerials { Link Here
1631
            $sth->execute( $data->{'biblionumber'} );
1631
            $sth->execute( $data->{'biblionumber'} );
1632
            my $biblioitem = $sth->fetchrow_hashref;
1632
            my $biblioitem = $sth->fetchrow_hashref;
1633
            $biblioitem->{'volumedate'}  = $data->{planneddate};
1633
            $biblioitem->{'volumedate'}  = $data->{planneddate};
1634
            my $tmpPlannedDate = output_pref( { dt => dt_from_string( $data->{planneddate} ), dateonly => 1 } );
1634
            $biblioitem->{'volumeddesc'} = $data->{serialseq} . ' (' . output_pref( { dt => dt_from_string( $data->{planneddate} ), dateonly => 1 } ) . ')';
1635
            $biblioitem->{'volumeddesc'} = $data->{serialseq} . ' (' . $tmpPlannedDate. ')';
1636
            $biblioitem->{'dewey'}       = $info->{itemcallnumber};
1635
            $biblioitem->{'dewey'}       = $info->{itemcallnumber};
1637
        }
1636
        }
1638
    }
1637
    }
(-)a/serials/checkexpiration.pl (-6 / +4 lines)
Lines 69-75 my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user ( Link Here
69
my $title = $query->param('title');
69
my $title = $query->param('title');
70
my $issn  = $query->param('issn');
70
my $issn  = $query->param('issn');
71
my $branch = $query->param('branch');
71
my $branch = $query->param('branch');
72
my $date  = '';
72
my $date;
73
$date  = eval { output_pref( { dt => dt_from_string( $query->param('date') ), dateonly => 1, dateformat => 'iso' }); }
73
$date  = eval { output_pref( { dt => dt_from_string( $query->param('date') ), dateonly => 1, dateformat => 'iso' }); }
74
    if ( $query->param('date') );
74
    if ( $query->param('date') );
75
75
Lines 80-91 if ($date) { Link Here
80
    foreach my $subscription ( @subscriptions ) {
80
    foreach my $subscription ( @subscriptions ) {
81
        my $subscriptionid = $subscription->{'subscriptionid'};
81
        my $subscriptionid = $subscription->{'subscriptionid'};
82
        my $expirationdate = GetExpirationDate($subscriptionid);
82
        my $expirationdate = GetExpirationDate($subscriptionid);
83
        $expirationdate = eval { output_pref( { dt => dt_from_string( $expirationdate ), dateonly => 1, dateformat => 'iso' }); }
84
            if ( $expirationdate );
85
86
        next unless ( $expirationdate );
87
83
88
        $subscription->{expirationdate} = $expirationdate;
84
        $subscription->{expirationdate} = $expirationdate;
85
86
        next if $expirationdate !~ /\d{4}-\d{2}-\d{2}/; # next if not in ISO format.
87
89
        next if $subscription->{closed};
88
        next if $subscription->{closed};
90
        if (   !C4::Context->preference("IndependentBranches")
89
        if (   !C4::Context->preference("IndependentBranches")
91
            or C4::Context->IsSuperLibrarian()
90
            or C4::Context->IsSuperLibrarian()
92
- 

Return to bug 14969