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

(-)a/serials/acqui-search-result.pl (-3 / +3 lines)
Lines 47-53 use C4::Biblio; Link Here
47
use C4::Output;
47
use C4::Output;
48
use CGI qw ( -utf8 );
48
use CGI qw ( -utf8 );
49
use C4::Acquisition qw( SearchOrders );
49
use C4::Acquisition qw( SearchOrders );
50
use C4::Dates qw/format_date/;
50
use Koha::DateUtils;
51
51
52
use Koha::Acquisition::Bookseller;
52
use Koha::Acquisition::Bookseller;
53
53
Lines 79-86 for my $s (@suppliers) { Link Here
79
            basketno     => $ord->{'basketno'},
79
            basketno     => $ord->{'basketno'},
80
            total        => $ord->{'count(*)'},
80
            total        => $ord->{'count(*)'},
81
            authorisedby => $ord->{'authorisedby'},
81
            authorisedby => $ord->{'authorisedby'},
82
            creationdate => format_date($ord->{'creationdate'}),
82
            creationdate => eval { output_pref( { dt => dt_from_string( $ord->{'creationdate'} ), dateonly => 1 }); } ,
83
            closedate    => format_date($ord->{'closedate'}),
83
            closedate    => eval { output_pref( { dt => dt_from_string( $ord->{'closedate'} ), dateonly => 1 }); } ,
84
        };
84
        };
85
    }
85
    }
86
    push @{$loop_suppliers}, {
86
    push @{$loop_suppliers}, {
(-)a/serials/checkexpiration.pl (-6 / +12 lines)
Lines 50-57 use C4::Serials; # GetExpirationDate Link Here
50
use C4::Branch;
50
use C4::Branch;
51
use C4::Output;
51
use C4::Output;
52
use C4::Context;
52
use C4::Context;
53
use C4::Dates qw/format_date format_date_in_iso/;
54
use Date::Calc qw/Today Date_to_Days/;
53
use Date::Calc qw/Today Date_to_Days/;
54
use Koha::DateUtils;
55
55
56
my $query = new CGI;
56
my $query = new CGI;
57
57
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  = format_date_in_iso($query->param('date'));
72
my $date  = '';
73
$date  = eval { output_pref( { dt => dt_from_string( $query->param('date') ), dateonly => 1, dateformat => 'iso' }); }
74
    if ( $query->param('date') );
73
75
74
if ($date) {
76
if ($date) {
75
    my @subscriptions = SearchSubscriptions({ title => $title, issn => $issn, orderby => 'title' });
77
    my @subscriptions = SearchSubscriptions({ title => $title, issn => $issn, orderby => 'title' });
Lines 78-85 if ($date) { Link Here
78
    foreach my $subscription ( @subscriptions ) {
80
    foreach my $subscription ( @subscriptions ) {
79
        my $subscriptionid = $subscription->{'subscriptionid'};
81
        my $subscriptionid = $subscription->{'subscriptionid'};
80
        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
81
        $subscription->{expirationdate} = $expirationdate;
88
        $subscription->{expirationdate} = $expirationdate;
82
        next if $expirationdate !~ /\d{4}-\d{2}-\d{2}/; # next if not in ISO format.
83
        next if $subscription->{closed};
89
        next if $subscription->{closed};
84
        if (   !C4::Context->preference("IndependentBranches")
90
        if (   !C4::Context->preference("IndependentBranches")
85
            or C4::Context->IsSuperLibrarian()
91
            or C4::Context->IsSuperLibrarian()
Lines 90-98 if ($date) { Link Here
90
        }
96
        }
91
        next if $subscription->{cannotedit};
97
        next if $subscription->{cannotedit};
92
        if ( Date_to_Days(split "-",$expirationdate) < Date_to_Days(split "-",$date) &&
98
        if ( Date_to_Days(split "-",$expirationdate) < Date_to_Days(split "-",$date) &&
93
             Date_to_Days(split "-",$expirationdate) > Date_to_Days(&Today) &&
94
             ( !$branch || ($subscription->{'branchcode'} eq $branch) ) ) {
99
             ( !$branch || ($subscription->{'branchcode'} eq $branch) ) ) {
95
            $subscription->{expirationdate}=format_date($subscription->{expirationdate});
100
            $subscription->{expirationdate} =
101
                eval { output_pref( { dt => dt_from_string( $subscription->{expirationdate} ), dateonly => 1 }); };
96
            push @subscriptions_loop,$subscription;
102
            push @subscriptions_loop,$subscription;
97
        }
103
        }
98
    }
104
    }
Lines 101-107 if ($date) { Link Here
101
        title           => $title,
107
        title           => $title,
102
        issn            => $issn,
108
        issn            => $issn,
103
        numsubscription => scalar @subscriptions_loop,
109
        numsubscription => scalar @subscriptions_loop,
104
        date => format_date($date),
110
        date => output_pref( { dt => dt_from_string( $date ), dateonly => 1 }) ,
105
        subscriptions_loop => \@subscriptions_loop,
111
        subscriptions_loop => \@subscriptions_loop,
106
        "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
112
        "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
107
    );
113
    );
(-)a/serials/routing-preview.pl (-1 lines)
Lines 23-29 use warnings; Link Here
23
use CGI qw ( -utf8 );
23
use CGI qw ( -utf8 );
24
use C4::Koha;
24
use C4::Koha;
25
use C4::Auth;
25
use C4::Auth;
26
use C4::Dates;
27
use C4::Output;
26
use C4::Output;
28
use C4::Acquisition;
27
use C4::Acquisition;
29
use C4::Reserves;
28
use C4::Reserves;
(-)a/serials/routing.pl (-1 lines)
Lines 30-36 use warnings; Link Here
30
use CGI qw ( -utf8 );
30
use CGI qw ( -utf8 );
31
use C4::Koha;
31
use C4::Koha;
32
use C4::Auth;
32
use C4::Auth;
33
use C4::Dates;
34
use C4::Output;
33
use C4::Output;
35
use C4::Acquisition;
34
use C4::Acquisition;
36
use C4::Output;
35
use C4::Output;
(-)a/serials/serial-issues.pl (-1 lines)
Lines 46-52 use warnings; Link Here
46
use CGI qw ( -utf8 );
46
use CGI qw ( -utf8 );
47
use C4::Auth;
47
use C4::Auth;
48
use C4::Koha;
48
use C4::Koha;
49
use C4::Dates;
50
use C4::Serials;
49
use C4::Serials;
51
use C4::Output;
50
use C4::Output;
52
use C4::Context;
51
use C4::Context;
(-)a/serials/serials-collection.pl (-9 / +11 lines)
Lines 24-34 use warnings; Link Here
24
use CGI qw ( -utf8 );
24
use CGI qw ( -utf8 );
25
use C4::Auth;
25
use C4::Auth;
26
use C4::Koha;
26
use C4::Koha;
27
use C4::Dates qw/format_date/;
28
use C4::Serials;
27
use C4::Serials;
29
use C4::Letters;
28
use C4::Letters;
30
use C4::Output;
29
use C4::Output;
31
use C4::Context;
30
use C4::Context;
31
use Koha::DateUtils;
32
32
use List::MoreUtils qw/uniq/;
33
use List::MoreUtils qw/uniq/;
33
34
34
35
Lines 111-124 if (@subscriptionid){ Link Here
111
    $subs->{missinglist}  =~ s/\n/\<br\/\>/g;
112
    $subs->{missinglist}  =~ s/\n/\<br\/\>/g;
112
    $subs->{recievedlist} =~ s/\n/\<br\/\>/g;
113
    $subs->{recievedlist} =~ s/\n/\<br\/\>/g;
113
    ##these are display information
114
    ##these are display information
114
    $subs->{startdate}     = format_date( $subs->{startdate} );
115
    $subs->{startdate}     = eval { dt_from_string( $subs->{startdate} ) } if ( $subs->{startdate} );
115
    $subs->{histstartdate} = format_date( $subs->{histstartdate} );
116
    $subs->{startdate}     = output_pref( { dt => $subs->{startdate}, dateonly => 1 } ) if ($subs->{startdate} );
116
    if ( !defined $subs->{enddate} || $subs->{enddate} eq '0000-00-00' ) {
117
117
        $subs->{enddate} = '';
118
    $subs->{histstartdate} = eval { dt_from_string( $subs->{histstartdate} ) } if ( $subs->{histstartdate} );
118
    }
119
    $subs->{histdate}     = output_pref( { dt => $subs->{histdate}, dateonly => 1 } ) if ($subs->{histdate} );
119
    else {
120
120
        $subs->{enddate} = format_date( $subs->{enddate} );
121
    $subs->{enddate}     = eval { dt_from_string( $subs->{enddate} ) } if ( $subs->{enddate} );
121
    }
122
    $subs->{enddate}     = output_pref( { dt => $subs->{enddate}, dateonly => 1 } ) if ($subs->{enddate} );
123
122
    $subs->{'abouttoexpire'}=abouttoexpire($subs->{'subscriptionid'});
124
    $subs->{'abouttoexpire'}=abouttoexpire($subs->{'subscriptionid'});
123
    $subs->{'subscriptionexpired'}=HasSubscriptionExpired($subs->{'subscriptionid'});
125
    $subs->{'subscriptionexpired'}=HasSubscriptionExpired($subs->{'subscriptionid'});
124
    $subs->{'subscriptionid'} = $subscriptionid;  # FIXME - why was this lost ?
126
    $subs->{'subscriptionid'} = $subscriptionid;  # FIXME - why was this lost ?
(-)a/serials/serials-edit.pl (-7 / +8 lines)
Lines 66-72 use warnings; Link Here
66
use CGI qw ( -utf8 );
66
use CGI qw ( -utf8 );
67
use Encode qw( decode is_utf8 );
67
use Encode qw( decode is_utf8 );
68
use C4::Auth;
68
use C4::Auth;
69
use C4::Dates qw/format_date format_date_in_iso/;
70
use C4::Biblio;
69
use C4::Biblio;
71
use C4::Items;
70
use C4::Items;
72
use C4::Koha;
71
use C4::Koha;
Lines 74-79 use C4::Output; Link Here
74
use C4::Context;
73
use C4::Context;
75
use C4::Serials;
74
use C4::Serials;
76
use C4::Search qw/enabled_staff_search_views/;
75
use C4::Search qw/enabled_staff_search_views/;
76
use Koha::DateUtils;
77
77
use List::MoreUtils qw/uniq/;
78
use List::MoreUtils qw/uniq/;
78
79
79
my $query           = CGI->new();
80
my $query           = CGI->new();
Lines 126-132 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
126
my @serialdatalist;
127
my @serialdatalist;
127
my %processedserialid;
128
my %processedserialid;
128
129
129
my $today = C4::Dates->new();
130
my $today = dt_from_string;
130
foreach my $serialid (@serialids) {
131
foreach my $serialid (@serialids) {
131
132
132
    #filtering serialid for duplication
133
    #filtering serialid for duplication
Lines 142-151 foreach my $serialid (@serialids) { Link Here
142
                $serinfo->{$d} = q{};
143
                $serinfo->{$d} = q{};
143
            }
144
            }
144
            else {
145
            else {
145
                $serinfo->{$d} = format_date( $serinfo->{$d} );
146
                $serinfo->{$d} = eval { output_pref( { dt => dt_from_string( $serinfo ), dateonly => 1 } ); };
146
            }
147
            }
147
        }
148
        }
148
        $serinfo->{arriveddate}=$today->output('syspref');
149
        $serinfo->{arriveddate}=$today;
149
150
150
        $serinfo->{'editdisable'} = (
151
        $serinfo->{'editdisable'} = (
151
            (
152
            (
Lines 186-192 foreach my $subscriptionid (@subscriptionids) { Link Here
186
        $cell->{'itemid'}         = 'NNEW';
187
        $cell->{'itemid'}         = 'NNEW';
187
        $cell->{'serialid'}       = 'NEW';
188
        $cell->{'serialid'}       = 'NEW';
188
        $cell->{'issuesatonce'}   = 1;
189
        $cell->{'issuesatonce'}   = 1;
189
        $cell->{arriveddate}=$today->output('syspref');
190
        $cell->{arriveddate}=$today;
190
191
191
        push @newserialloop, $cell;
192
        push @newserialloop, $cell;
192
        push @subscriptionloop,
193
        push @subscriptionloop,
Lines 213-222 if ( $op and $op eq 'serialchangestatus' ) { Link Here
213
        my ($plan_date, $pub_date);
214
        my ($plan_date, $pub_date);
214
215
215
        if (defined $planneddates[$i] && $planneddates[$i] ne 'XXX') {
216
        if (defined $planneddates[$i] && $planneddates[$i] ne 'XXX') {
216
            $plan_date = format_date_in_iso( $planneddates[$i] );
217
            $plan_date = eval { output_pref( { dt => dt_from_string( $planneddates[$i] ), dateonly => 1, dateformat => 'iso' } ); };
217
        }
218
        }
218
        if (defined $publisheddates[$i] && $publisheddates[$i] ne 'XXX') {
219
        if (defined $publisheddates[$i] && $publisheddates[$i] ne 'XXX') {
219
            $pub_date = format_date_in_iso( $publisheddates[$i] );
220
            $pub_date = eval { output_pref( { dt => dt_from_string( $publisheddates[$i] ), dateonly => 1, dateformat => 'iso' } ); };
220
        }
221
        }
221
222
222
        if ( $serialids[$i] && $serialids[$i] eq 'NEW' ) {
223
        if ( $serialids[$i] && $serialids[$i] eq 'NEW' ) {
(-)a/serials/showpredictionpattern.pl (-8 / +8 lines)
Lines 36-41 use C4::Auth; Link Here
36
use C4::Output;
36
use C4::Output;
37
use C4::Serials;
37
use C4::Serials;
38
use C4::Serials::Frequency;
38
use C4::Serials::Frequency;
39
use Koha::DateUtils;
39
40
40
my $input = new CGI;
41
my $input = new CGI;
41
my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
42
my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
Lines 76-94 my %pattern = ( Link Here
76
    every3          => $input->param('every3') // '',
77
    every3          => $input->param('every3') // '',
77
);
78
);
78
79
79
if(!defined $firstacquidate || $firstacquidate eq ''){
80
$firstacquidate = eval { output_pref( { dt => dt_from_string( $firstacquidate ), dateonly => 1, dateformat => 'iso' } ); }
80
    my ($year, $month, $day) = Today();
81
    if ( $firstacquidate );
81
    $firstacquidate = sprintf "%04d-%02d-%02d", $year, $month, $day;
82
82
} else {
83
$firstacquidate = eval { output_pref( { dt => dt_from_string, dateonly => 1, dateformat => 'iso' } ); }
83
    $firstacquidate = C4::Dates->new($firstacquidate)->output('iso');
84
    unless ( $firstacquidate );
84
}
85
85
86
if($enddate){
86
if($enddate){
87
    $enddate = C4::Dates->new($enddate)->output('iso');
87
    $enddate = eval { output_pref( { dt => dt_from_string( $enddate ), dateonly => 1, dateformat => 'iso' } ); };
88
}
88
}
89
89
90
if($nextacquidate) {
90
if($nextacquidate) {
91
    $nextacquidate = C4::Dates->new($nextacquidate)->output('iso');
91
    $nextacquidate =  eval { output_pref( { dt => dt_from_string( $nextacquidate ), dateonly => 1, dateformat => 'iso' } ); };
92
} else {
92
} else {
93
    $nextacquidate = $firstacquidate;
93
    $nextacquidate = $firstacquidate;
94
}
94
}
(-)a/serials/subscription-add.pl (-10 / +31 lines)
Lines 23-29 use Date::Calc qw(Today Day_of_Year Week_of_Year Add_Delta_Days Add_Delta_YM); Link Here
23
use C4::Koha;
23
use C4::Koha;
24
use C4::Biblio;
24
use C4::Biblio;
25
use C4::Auth;
25
use C4::Auth;
26
use C4::Dates qw/format_date format_date_in_iso/;
27
use C4::Acquisition;
26
use C4::Acquisition;
28
use C4::Output;
27
use C4::Output;
29
use C4::Context;
28
use C4::Context;
Lines 33-38 use C4::Serials::Frequency; Link Here
33
use C4::Serials::Numberpattern;
32
use C4::Serials::Numberpattern;
34
use C4::Letters;
33
use C4::Letters;
35
use Koha::AdditionalField;
34
use Koha::AdditionalField;
35
use Koha::DateUtils;
36
use Carp;
36
use Carp;
37
37
38
#use Smart::Comments;
38
#use Smart::Comments;
Lines 322-330 sub redirect_add_subscription { Link Here
322
    my $opacdisplaycount  = $query->param('opacdisplaycount');
322
    my $opacdisplaycount  = $query->param('opacdisplaycount');
323
    my $location          = $query->param('location');
323
    my $location          = $query->param('location');
324
    my $skip_serialseq    = $query->param('skip_serialseq');
324
    my $skip_serialseq    = $query->param('skip_serialseq');
325
    my $startdate = format_date_in_iso( $query->param('startdate') );
325
326
    my $enddate = format_date_in_iso( $query->param('enddate') );
326
    my $startdate = $query->param('startdate');
327
    my $firstacquidate  = format_date_in_iso($query->param('firstacquidate'));
327
    $startdate = eval { dt_from_string( $startdate ); } if ( $startdate );
328
    $startdate = output_pref( { dt => $startdate, dateonly => 1, dateformat => 'iso' } ) if ( $startdate );
329
330
    my $enddate = $query->param('enddate');
331
    $enddate = eval { dt_from_string( $enddate ); } if ( $enddate );
332
    $enddate = output_pref( { dt => $enddate, dateonly => 1, dateformat => 'iso' } ) if ( $enddate );
333
    my $firstacquidate  = $query->param('firstacquidate');
334
    $firstacquidate = eval { dt_from_string( $firstacquidate ); } if ( $firstacquidate );
335
    $firstacquidate = output_pref( { dt => $enddate, dateonly => 1, dateformat => 'iso' } ) if ( $firstacquidate );
336
328
    if(!defined $enddate || $enddate eq '') {
337
    if(!defined $enddate || $enddate eq '') {
329
        if($subtype eq "issues") {
338
        if($subtype eq "issues") {
330
            $enddate = _guess_enddate($firstacquidate, $periodicity, $numberlength, $weeklength, $monthlength);
339
            $enddate = _guess_enddate($firstacquidate, $periodicity, $numberlength, $weeklength, $monthlength);
Lines 361-372 sub redirect_mod_subscription { Link Here
361
    my $aqbooksellerid = $query->param('aqbooksellerid');
370
    my $aqbooksellerid = $query->param('aqbooksellerid');
362
    my $biblionumber = $query->param('biblionumber');
371
    my $biblionumber = $query->param('biblionumber');
363
    my $aqbudgetid = $query->param('aqbudgetid');
372
    my $aqbudgetid = $query->param('aqbudgetid');
364
    my $startdate = format_date_in_iso($query->param('startdate'));
373
365
    my $firstacquidate = format_date_in_iso( $query->param('firstacquidate') );
374
    my $startdate = $query->param('startdate');
366
    my $nextacquidate = $query->param('nextacquidate') ?
375
    $startdate = eval { dt_from_string( $startdate ); } if ( $startdate );
367
                            format_date_in_iso($query->param('nextacquidate')):
376
    $startdate = output_pref( { dt => $startdate, dateonly => 1, dateformat => 'iso' } ) if ( $startdate );
368
                            $firstacquidate;
377
369
    my $enddate = format_date_in_iso($query->param('enddate'));
378
    my $enddate = $query->param('enddate');
379
    $enddate = eval { dt_from_string( $enddate ); } if ( $enddate );
380
    $enddate = output_pref( { dt => $enddate, dateonly => 1, dateformat => 'iso' } ) if ( $enddate );
381
382
    my $firstacquidate  = $query->param('firstacquidate');
383
    $firstacquidate = eval { dt_from_string( $firstacquidate ); } if ( $firstacquidate );
384
    $firstacquidate = output_pref( { dt => $firstacquidate, dateonly => 1, dateformat => 'iso' } ) if ( $firstacquidate );
385
386
    my $nextacquidate  = $query->param('nextacquidate');
387
    $nextacquidate = eval { dt_from_string( $nextacquidate ); } if ( $nextacquidate );
388
    $nextacquidate = output_pref( { dt => $nextacquidate, dateonly => 1, dateformat => 'iso' } ) if ( $nextacquidate );
389
    $nextacquidate = $firstacquidate unless $nextacquidate;
390
370
    my $periodicity = $query->param('frequency');
391
    my $periodicity = $query->param('frequency');
371
392
372
    my $subtype = $query->param('subtype');
393
    my $subtype = $query->param('subtype');
(-)a/serials/subscription-detail.pl (-2 / +3 lines)
Lines 21-31 use C4::Acquisition; Link Here
21
use C4::Auth;
21
use C4::Auth;
22
use C4::Budgets;
22
use C4::Budgets;
23
use C4::Koha;
23
use C4::Koha;
24
use C4::Dates qw/format_date/;
25
use C4::Serials;
24
use C4::Serials;
26
use C4::Output;
25
use C4::Output;
27
use C4::Context;
26
use C4::Context;
28
use C4::Search qw/enabled_staff_search_views/;
27
use C4::Search qw/enabled_staff_search_views/;
28
use Koha::DateUtils;
29
29
30
use Koha::Acquisition::Bookseller;
30
use Koha::Acquisition::Bookseller;
31
31
Lines 100-106 my $hasRouting = check_routing($subscriptionid); Link Here
100
# COMMENT hdl : IMHO, we should think about passing more and more data hash to template->param rather than duplicating code a new coding Guideline ?
100
# COMMENT hdl : IMHO, we should think about passing more and more data hash to template->param rather than duplicating code a new coding Guideline ?
101
101
102
for my $date ( qw(startdate enddate firstacquidate histstartdate histenddate) ) {
102
for my $date ( qw(startdate enddate firstacquidate histstartdate histenddate) ) {
103
    $$subs{$date}      = format_date($$subs{$date}) if $date && $$subs{$date};
103
    $$subs{$date} = eval { output_pref( { dt => dt_from_string( $$subs{$date} ), dateonly => 1 }); }
104
        if $date && $$subs{$date};
104
}
105
}
105
$subs->{location} = GetKohaAuthorisedValueLib("LOC",$subs->{location});
106
$subs->{location} = GetKohaAuthorisedValueLib("LOC",$subs->{location});
106
$subs->{abouttoexpire}  = abouttoexpire($subs->{subscriptionid});
107
$subs->{abouttoexpire}  = abouttoexpire($subs->{subscriptionid});
(-)a/serials/subscription-history.pl (-4 / +9 lines)
Lines 34-41 use C4::Auth; Link Here
34
use C4::Output;
34
use C4::Output;
35
35
36
use C4::Biblio;
36
use C4::Biblio;
37
use C4::Dates qw(format_date_in_iso);
38
use C4::Serials;
37
use C4::Serials;
38
use Koha::DateUtils;
39
39
40
my $input = new CGI;
40
my $input = new CGI;
41
my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
41
my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( {
Lines 63-71 if($op && $op eq 'mod') { Link Here
63
    my $opacnote        = $input->param('opacnote');
63
    my $opacnote        = $input->param('opacnote');
64
    my $librariannote   = $input->param('librariannote');
64
    my $librariannote   = $input->param('librariannote');
65
65
66
    ModSubscriptionHistory( $subscriptionid, format_date_in_iso($histstartdate),
66
    $histstartdate = eval { output_pref( { dt => $histstartdate, dateonly => 1, dateformat => 'iso' } ); }
67
        format_date_in_iso($histenddate), $receivedlist, $missinglist, $opacnote,
67
        if ( $histstartdate );
68
        $librariannote );
68
69
    $histenddate = eval { output_pref( { dt => $histenddate, dateonly => 1, dateformat => 'iso' } ); }
70
        if ( $histenddate );
71
72
    ModSubscriptionHistory( $subscriptionid, $histstartdate, $histenddate, $receivedlist,
73
        $missinglist, $opacnote, $librariannote );
69
74
70
    print $input->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
75
    print $input->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
71
    exit;
76
    exit;
(-)a/serials/subscription-renew.pl (-8 / +8 lines)
Lines 50-60 use CGI qw ( -utf8 ); Link Here
50
use Carp;
50
use Carp;
51
use C4::Koha;
51
use C4::Koha;
52
use C4::Auth;
52
use C4::Auth;
53
use C4::Dates qw/format_date/;
54
use C4::Context;
53
use C4::Context;
55
use C4::Auth;
54
use C4::Auth;
56
use C4::Output;
55
use C4::Output;
57
use C4::Serials;
56
use C4::Serials;
57
use Koha::DateUtils;
58
58
59
my $query = new CGI;
59
my $query = new CGI;
60
my $dbh   = C4::Context->dbh;
60
my $dbh   = C4::Context->dbh;
Lines 74-82 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
74
    }
74
    }
75
);
75
);
76
if ( $op eq "renew" ) {
76
if ( $op eq "renew" ) {
77
    my $renewstartdate = eval { output_pref( { dt => dt_from_string( $query->param('startdate') ), dateonly => 1, dateformat => 'iso' } ); };
77
    ReNewSubscription(
78
    ReNewSubscription(
78
        $subscriptionid,             $loggedinuser,
79
        $subscriptionid, $loggedinuser,
79
        C4::Dates->new($query->param('startdate'))->output('iso'),  $query->param('numberlength'),
80
        $renewstartdate, $query->param('numberlength'),
80
        $query->param('weeklength'), $query->param('monthlength'),
81
        $query->param('weeklength'), $query->param('monthlength'),
81
        $query->param('note')
82
        $query->param('note')
82
    );
83
    );
Lines 88-98 if ($subscription->{'cannotedit'}){ Link Here
88
  print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
89
  print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
89
}
90
}
90
91
92
my $newstartdate = eval { output_pref( { dt => dt_from_string( $subscription->{enddate} ), dateonly => 1 } ); };
93
$newstartdate = output_pref( { dt => dt_from_string, dateonly => 1 } ) unless ( $newstartdate );
94
91
$template->param(
95
$template->param(
92
    startdate => format_date(
96
    startdate      => $newstartdate,
93
             $subscription->{enddate}
94
          || POSIX::strftime( "%Y-%m-%d", localtime )
95
    ),
96
    numberlength   => $subscription->{numberlength},
97
    numberlength   => $subscription->{numberlength},
97
    weeklength     => $subscription->{weeklength},
98
    weeklength     => $subscription->{weeklength},
98
    monthlength    => $subscription->{monthlength},
99
    monthlength    => $subscription->{monthlength},
99
- 

Return to bug 14969