@@ -, +, @@
---
C4/Serials.pm | 11 ++++++++++-
.../prog/en/modules/serials/subscription-add.tt | 5 +++++
.../prog/en/modules/serials/subscription-detail.tt | 2 +-
.../prog/en/modules/opac-serial-issues.tt | 3 +++
4 files changed, 19 insertions(+), 2 deletions(-)
--- a/C4/Serials.pm
+++ a/C4/Serials.pm
@@ -2154,7 +2154,7 @@ sub abouttoexpire {
@res=Date::Calc::Today;
}
my @endofsubscriptiondate=split(/-/,$expirationdate);
- my @per_list = (0, 7, 7, 14, 21, 31, 62, 93, 93, 190, 365, 730, 0, 0, 0, 0);
+ my @per_list = (0, 7, 7, 14, 21, 31, 62, 93, 93, 190, 365, 730, 0, 124, 0, 0);
my @datebeforeend;
@datebeforeend = Add_Delta_Days( $endofsubscriptiondate[0],$endofsubscriptiondate[1],$endofsubscriptiondate[2],
- (3 * $per_list[$per])) if (@endofsubscriptiondate && $endofsubscriptiondate[0]*$endofsubscriptiondate[1]*$endofsubscriptiondate[2]);
@@ -2317,6 +2317,15 @@ sub GetNextDate(@) {
}
@resultdate = Add_Delta_YMD( $year, $month, $day, 0, 3, 0 );
}
+ if ( $subscription->{periodicity} == 13 ) {
+ for ( my $i = 0 ; $i < @irreg ; $i++ ) {
+ if ( $irreg[$i] == ( ( $tmpmonth != 8 ) ? ( $tmpmonth + 4 ) % 12 : 12 ) ) {
+ ( $year, $month, $day ) = Add_Delta_YMD( $year, $month, $day, 0, 4, 0 );
+ $tmpmonth = ( ( $tmpmonth != 8 ) ? ( $tmpmonth + 4 ) % 12 : 12 );
+ }
+ }
+ @resultdate = Add_Delta_YMD( $year, $month, $day, 0, 4, 0 );
+ }
if ( $subscription->{periodicity} == 9 ) {
for ( my $i = 0 ; $i < @irreg ; $i++ ) {
if ( $irreg[$i] == ( ( $tmpmonth != 9 ) ? ( $tmpmonth + 3 ) % 12 : 12 ) ) {
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
@@ -1216,6 +1216,11 @@ $(document).ready(function() {
[% ELSE %]
[% END %]
+ [% IF ( periodicity13 ) %]
+
+ [% ELSE %]
+
+ [% END %]
[% IF ( periodicity9 ) %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
@@ -140,7 +140,7 @@ $(document).ready(function() {
1/day
[% END %]
[% IF ( periodicity13 ) %]
- 3/week
+ 1/4 months (3/year)
[% END %]
[% IF ( periodicity2 ) %]
1/week
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt
+++ a/koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tt
@@ -42,6 +42,9 @@
[% IF ( subscription_LOO.periodicity7 ) %]
3 months
[% END %]
+ [% IF ( subscription_LOO.periodicity13 ) %]
+ 4 months
+ [% END %]
[% IF ( subscription_LOO.periodicity8 ) %]
quarter
[% END %]
--