From d2c424eda2449f963315a6f595ff0d2ab4c2e5fc Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 27 Feb 2014 13:12:40 +0100 Subject: [PATCH] Bug 11689: (follow-up) fix warnings generated when running Serials.t Signed-off-by: Jonathan Druart Signed-off-by: Katrin Fischer Signed-off-by: Galen Charlton --- C4/Serials.pm | 8 +++++--- t/db_dependent/Serials.t | 10 ++++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/C4/Serials.pm b/C4/Serials.pm index e9ac3d89c8..8a74e10177 100644 --- a/C4/Serials.pm +++ b/C4/Serials.pm @@ -2544,10 +2544,12 @@ sub GetNextDate { # irreg1;irreg2;irreg3 # where irregX is the number of issue which will not be received # (the first issue takes the number 1, the 2nd the number 2 and so on) - my @irreg = split /;/, $subscription->{'irregularity'} ; my %irregularities; - foreach my $irregularity (@irreg) { - $irregularities{$irregularity} = 1; + if ( $subscription->{irregularity} ) { + my @irreg = split /;/, $subscription->{'irregularity'} ; + foreach my $irregularity (@irreg) { + $irregularities{$irregularity} = 1; + } } # Get the 'fictive' next issue number diff --git a/t/db_dependent/Serials.t b/t/db_dependent/Serials.t index a363999cb7..f1f5d9d89f 100644 --- a/t/db_dependent/Serials.t +++ b/t/db_dependent/Serials.t @@ -41,7 +41,7 @@ my ($biblionumber, $biblioitemnumber) = AddBiblio(MARC::Record->new, ''); my $budgetid; my $bpid = AddBudgetPeriod({ budget_period_startdate => '01-01-2015', - budget_period_enddate => '12-31-2015', + budget_period_enddate => '31-12-2015', budget_description => "budget desc" }); @@ -58,7 +58,13 @@ my $budget_id = AddBudget({ my $frequency_id = AddSubscriptionFrequency({ description => "Test frequency 1" }); my $pattern_id = AddSubscriptionNumberpattern({ label => 'Test numberpattern 1', - numberingmethod => '{X}' + numberingmethod => '{X}', + label1 => q{}, + add1 => 1, + every1 => 1, + every1 => 1, + numbering1 => 1, + whenmorethan1 => 1, }); my $subscriptionid = NewSubscription( -- 2.39.5