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 (+5 lines)
Lines 1216-1221 $(document).ready(function() { Link Here
1216
                [% ELSE %]
1216
                [% ELSE %]
1217
                    <option value="8">1/quarter (seasonal)</option>
1217
                    <option value="8">1/quarter (seasonal)</option>
1218
                [% END %]
1218
                [% END %]
1219
                [% IF ( periodicity13 ) %]
1220
                    <option value="13" selected="selected">1/4 months (3/year)</option>
1221
                [% ELSE %]
1222
                    <option value="13">1/4 months (3/year)</option>
1223
                [% END %]
1219
1224
1220
                [% IF ( periodicity9 ) %]
1225
                [% IF ( periodicity9 ) %]
1221
                    <option value="9" selected="selected">2/years</option>
1226
                    <option value="9" selected="selected">2/years</option>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-1 / +1 lines)
Lines 140-146 $(document).ready(function() { Link Here
140
                        1/day
140
                        1/day
141
                [% END %]
141
                [% END %]
142
                [% IF ( periodicity13 ) %]
142
                [% IF ( periodicity13 ) %]
143
                        3/week
143
                        1/4 months (3/year)
144
                [% END %]
144
                [% END %]
145
                [% IF ( periodicity2 ) %]
145
                [% IF ( periodicity2 ) %]
146
                        1/week
146
                        1/week
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt (-1 / +3 lines)
Lines 42-47 Link Here
42
		[% IF ( subscription_LOO.periodicity7 ) %]
42
		[% IF ( subscription_LOO.periodicity7 ) %]
43
				3 months
43
				3 months
44
		[% END %]
44
		[% END %]
45
		[% IF ( subscription_LOO.periodicity13 ) %]
46
				4 months
47
		[% END %]
45
		[% IF ( subscription_LOO.periodicity8 ) %]
48
		[% IF ( subscription_LOO.periodicity8 ) %]
46
				quarter
49
				quarter
47
		[% END %]
50
		[% END %]
48
- 

Return to bug 6321