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

(-)a/C4/Circulation.pm (-1 / +1 lines)
Lines 2841-2847 sub AddRenewal { Link Here
2841
        $datedue = (C4::Context->preference('RenewalPeriodBase') eq 'date_due') ?
2841
        $datedue = (C4::Context->preference('RenewalPeriodBase') eq 'date_due') ?
2842
                                        dt_from_string( $issue->date_due, 'sql' ) :
2842
                                        dt_from_string( $issue->date_due, 'sql' ) :
2843
                                        DateTime->now( time_zone => C4::Context->tz());
2843
                                        DateTime->now( time_zone => C4::Context->tz());
2844
        $datedue =  CalcDateDue($datedue, $itemtype, $circ_library, $patron_unblessed, 'is a renewal');
2844
        $datedue =  CalcDateDue($datedue, $itemtype, $circ_library->branchcode, $patron_unblessed, 'is a renewal');
2845
    }
2845
    }
2846
2846
2847
    my $fees = Koha::Charges::Fees->new(
2847
    my $fees = Koha::Charges::Fees->new(
(-)a/t/db_dependent/Circulation.t (-3 / +7 lines)
Lines 18-28 Link Here
18
use Modern::Perl;
18
use Modern::Perl;
19
use utf8;
19
use utf8;
20
20
21
use Test::More tests => 125;
21
use Test::More tests => 126;
22
use Test::MockModule;
22
use Test::MockModule;
23
23
24
use Data::Dumper;
24
use Data::Dumper;
25
use DateTime;
25
use DateTime;
26
use Time::Fake;
26
use POSIX qw( floor );
27
use POSIX qw( floor );
27
use t::lib::Mocks;
28
use t::lib::Mocks;
28
use t::lib::TestBuilder;
29
use t::lib::TestBuilder;
Lines 489-497 my ( $reused_itemnumber_1, $reused_itemnumber_2 ); Link Here
489
        action => "ISSUE"
490
        action => "ISSUE"
490
    );
491
    );
491
    my $old_log_size = Koha::ActionLogs->count( \%params_renewal );
492
    my $old_log_size = Koha::ActionLogs->count( \%params_renewal );
492
    AddRenewal( $renewing_borrower->{borrowernumber}, $item_7->itemnumber, $branch );
493
    my $dt = dt_from_string();
494
    Time::Fake->offset( $dt->epoch );
495
    my $datedue1 = AddRenewal( $renewing_borrower->{borrowernumber}, $item_7->itemnumber, $branch );
493
    my $new_log_size = Koha::ActionLogs->count( \%params_renewal );
496
    my $new_log_size = Koha::ActionLogs->count( \%params_renewal );
494
    is ($new_log_size, $old_log_size, 'renew log not added because of the syspref RenewalLog');
497
    is ($new_log_size, $old_log_size, 'renew log not added because of the syspref RenewalLog');
498
    isnt (DateTime->compare($datedue1, $dt), 0, "AddRenewal returned a good duedate");
499
    Time::Fake->reset;
495
500
496
    t::lib::Mocks::mock_preference('RenewalLog', 1);
501
    t::lib::Mocks::mock_preference('RenewalLog', 1);
497
    $date = output_pref( { dt => dt_from_string(), dateonly => 1, dateformat => 'iso' } );
502
    $date = output_pref( { dt => dt_from_string(), dateonly => 1, dateformat => 'iso' } );
498
- 

Return to bug 20912