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

(-)a/C4/Serials.pm (-1 / +10 lines)
Lines 2154-2160 sub abouttoexpire { Link Here
2154
            @res=Date::Calc::Today;
2154
            @res=Date::Calc::Today;
2155
        }
2155
        }
2156
        my @endofsubscriptiondate=split(/-/,$expirationdate);
2156
        my @endofsubscriptiondate=split(/-/,$expirationdate);
2157
        my @per_list = (0, 7, 7, 14, 21, 31, 62, 93, 93, 190, 365, 730, 0, 0, 0, 0);
2157
        my @per_list = (0, 7, 7, 14, 21, 31, 62, 93, 93, 190, 365, 730, 0, 124, 0, 0);
2158
        my @datebeforeend;
2158
        my @datebeforeend;
2159
        @datebeforeend = Add_Delta_Days(  $endofsubscriptiondate[0],$endofsubscriptiondate[1],$endofsubscriptiondate[2],
2159
        @datebeforeend = Add_Delta_Days(  $endofsubscriptiondate[0],$endofsubscriptiondate[1],$endofsubscriptiondate[2],
2160
            - (3 * $per_list[$per])) if (@endofsubscriptiondate && $endofsubscriptiondate[0]*$endofsubscriptiondate[1]*$endofsubscriptiondate[2]);
2160
            - (3 * $per_list[$per])) if (@endofsubscriptiondate && $endofsubscriptiondate[0]*$endofsubscriptiondate[1]*$endofsubscriptiondate[2]);
Lines 2317-2322 sub GetNextDate(@) { Link Here
2317
            }
2317
            }
2318
            @resultdate = Add_Delta_YMD( $year, $month, $day, 0, 3, 0 );
2318
            @resultdate = Add_Delta_YMD( $year, $month, $day, 0, 3, 0 );
2319
        }
2319
        }
2320
        if ( $subscription->{periodicity} == 13 ) {
2321
            for ( my $i = 0 ; $i < @irreg ; $i++ ) {
2322
                if ( $irreg[$i] == ( ( $tmpmonth != 8 ) ? ( $tmpmonth + 4 ) % 12 : 12 ) ) {
2323
                    ( $year, $month, $day ) = Add_Delta_YMD( $year, $month, $day, 0, 4, 0 );
2324
                    $tmpmonth = ( ( $tmpmonth != 8 ) ? ( $tmpmonth + 4 ) % 12 : 12 );
2325
                }
2326
            }
2327
            @resultdate = Add_Delta_YMD( $year, $month, $day, 0, 4, 0 );
2328
        }
2320
        if ( $subscription->{periodicity} == 9 ) {
2329
        if ( $subscription->{periodicity} == 9 ) {
2321
            for ( my $i = 0 ; $i < @irreg ; $i++ ) {
2330
            for ( my $i = 0 ; $i < @irreg ; $i++ ) {
2322
                if ( $irreg[$i] == ( ( $tmpmonth != 9 ) ? ( $tmpmonth + 3 ) % 12 : 12 ) ) {
2331
                if ( $irreg[$i] == ( ( $tmpmonth != 9 ) ? ( $tmpmonth + 3 ) % 12 : 12 ) ) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt (-1 / +5 lines)
Lines 1215-1220 $(document).ready(function() { Link Here
1215
                [% ELSE %]
1215
                [% ELSE %]
1216
                    <option value="8">1/quarter (seasonal)</option>
1216
                    <option value="8">1/quarter (seasonal)</option>
1217
                [% END %]
1217
                [% END %]
1218
                [% IF ( periodicity13 ) %]
1219
                    <option value="13" selected="selected">1/4 months (3/year)</option>
1220
                [% ELSE %]
1221
                    <option value="13">1/4 months (3/year)</option>
1222
                [% END %]
1218
1223
1219
                [% IF ( periodicity9 ) %]
1224
                [% IF ( periodicity9 ) %]
1220
                    <option value="9" selected="selected">2/years</option>
1225
                    <option value="9" selected="selected">2/years</option>
1221
- 

Return to bug 6321