Lines 40-46
use C4::Overdues qw(GetFine GetOverdueMessageTransportTypes parse_overdues_lette
Link Here
|
40 |
use C4::Log; |
40 |
use C4::Log; |
41 |
use Koha::Patron::Debarments qw(AddUniqueDebarment); |
41 |
use Koha::Patron::Debarments qw(AddUniqueDebarment); |
42 |
use Koha::DateUtils; |
42 |
use Koha::DateUtils; |
43 |
use Koha::Calendar; |
43 |
use Koha::DiscreteCalendar; |
44 |
use Koha::Libraries; |
44 |
use Koha::Libraries; |
45 |
use Koha::Acquisition::Currencies; |
45 |
use Koha::Acquisition::Currencies; |
46 |
|
46 |
|
Lines 443-451
elsif ( defined $text_filename ) {
Link Here
|
443 |
} |
443 |
} |
444 |
|
444 |
|
445 |
foreach my $branchcode (@branches) { |
445 |
foreach my $branchcode (@branches) { |
446 |
my $calendar; |
|
|
447 |
if ( C4::Context->preference('OverdueNoticeCalendar') ) { |
446 |
if ( C4::Context->preference('OverdueNoticeCalendar') ) { |
448 |
$calendar = Koha::Calendar->new( branchcode => $branchcode ); |
447 |
my $calendar = Koha::DiscreteCalendar->new( branchcode => $branchcode ); |
449 |
if ( $calendar->is_holiday($date_to_run) ) { |
448 |
if ( $calendar->is_holiday($date_to_run) ) { |
450 |
next; |
449 |
next; |
451 |
} |
450 |
} |
Lines 546-558
END_SQL
Link Here
|
546 |
my $days_between; |
545 |
my $days_between; |
547 |
if ( C4::Context->preference('OverdueNoticeCalendar') ) |
546 |
if ( C4::Context->preference('OverdueNoticeCalendar') ) |
548 |
{ |
547 |
{ |
549 |
$days_between = |
548 |
my $calendar = Koha::DiscreteCalendar->new( branchcode => $branchcode ); |
550 |
$calendar->days_between( dt_from_string($data->{date_due}), |
549 |
$days_between = $calendar->days_between( dt_from_string($data->{date_due}), $date_to_run ); |
551 |
$date_to_run ); |
|
|
552 |
} |
550 |
} |
553 |
else { |
551 |
else { |
554 |
$days_between = |
552 |
$days_between = $date_to_run->delta_days( dt_from_string($data->{date_due}) ); |
555 |
$date_to_run->delta_days( dt_from_string($data->{date_due}) ); |
|
|
556 |
} |
553 |
} |
557 |
$days_between = $days_between->in_units('days'); |
554 |
$days_between = $days_between->in_units('days'); |
558 |
if ($triggered) { |
555 |
if ($triggered) { |
Lines 628-636
END_SQL
Link Here
|
628 |
my $exceededPrintNoticesMaxLines = 0; |
625 |
my $exceededPrintNoticesMaxLines = 0; |
629 |
while ( my $item_info = $sth2->fetchrow_hashref() ) { |
626 |
while ( my $item_info = $sth2->fetchrow_hashref() ) { |
630 |
if ( C4::Context->preference('OverdueNoticeCalendar') ) { |
627 |
if ( C4::Context->preference('OverdueNoticeCalendar') ) { |
631 |
$days_between = |
628 |
my $calendar = Koha::DiscreteCalendar->new( branchcode => $branchcode ); |
632 |
$calendar->days_between( |
629 |
$days_between = $calendar->days_between( dt_from_string( $item_info->{date_due} ), $date_to_run ); |
633 |
dt_from_string( $item_info->{date_due} ), $date_to_run ); |
|
|
634 |
} |
630 |
} |
635 |
else { |
631 |
else { |
636 |
$days_between = |
632 |
$days_between = |