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'); |