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

(-)a/Koha/Patron/Category.pm (-1 / +1 lines)
Lines 218-224 sub get_expiry_date { Link Here
218
    if ( $self->enrolmentperiod ) {
218
    if ( $self->enrolmentperiod ) {
219
        $date ||= dt_from_string;
219
        $date ||= dt_from_string;
220
        $date = dt_from_string( $date ) unless ref $date;
220
        $date = dt_from_string( $date ) unless ref $date;
221
        return $date->add( months => $self->enrolmentperiod );
221
        return $date->add( months => $self->enrolmentperiod, end_of_month => 'limit' );
222
    } else {
222
    } else {
223
        return $self->enrolmentperioddate;
223
        return $self->enrolmentperioddate;
224
    }
224
    }
(-)a/t/db_dependent/Koha/Patrons.t (-6 / +5 lines)
Lines 248-258 subtest 'renew_account' => sub { Link Here
248
    for my $date ( '2016-03-31', '2016-11-30', dt_from_string() ) {
248
    for my $date ( '2016-03-31', '2016-11-30', dt_from_string() ) {
249
        my $dt = dt_from_string( $date, 'iso' );
249
        my $dt = dt_from_string( $date, 'iso' );
250
        Time::Fake->offset( $dt->epoch );
250
        Time::Fake->offset( $dt->epoch );
251
        my $a_month_ago                = $dt->clone->subtract( months => 1, end_of_month => "wrap" )->truncate( to => 'day' );
251
        my $a_month_ago                = $dt->clone->subtract( months => 1, end_of_month => 'limit' )->truncate( to => 'day' );
252
        my $a_year_later               = $dt->clone->add( months => 12 )->truncate( to => 'day' );
252
        my $a_year_later               = $dt->clone->add( months => 12, end_of_month => 'limit' )->truncate( to => 'day' );
253
        my $a_year_later_minus_a_month = $dt->clone->add( months => 11 )->truncate( to => 'day' );
253
        my $a_year_later_minus_a_month = $dt->clone->add( months => 11, end_of_month => 'limit' )->truncate( to => 'day' );
254
        my $a_month_later              = $dt->clone->add( months => 1  )->truncate( to => 'day' );
254
        my $a_month_later              = $dt->clone->add( months => 1 , end_of_month => 'limit' )->truncate( to => 'day' );
255
        my $a_year_later_plus_a_month  = $dt->clone->add( months => 13 )->truncate( to => 'day' );
255
        my $a_year_later_plus_a_month  = $dt->clone->add( months => 13, end_of_month => 'limit' )->truncate( to => 'day' );
256
        my $patron_category = $builder->build(
256
        my $patron_category = $builder->build(
257
            {   source => 'Category',
257
            {   source => 'Category',
258
                value  => {
258
                value  => {
259
- 

Return to bug 17699