@@ -, +, @@ --- serials/subscription-add.pl | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- a/serials/subscription-add.pl +++ a/serials/subscription-add.pl @@ -34,7 +34,7 @@ use Carp; #use Smart::Comments; -my $query = CGI->new; +our $query = CGI->new; my $op = $query->param('op') || ''; my $dbh = C4::Context->dbh; my $sub_length; @@ -64,7 +64,6 @@ my @sub_type_data; my $subs; my $firstissuedate; -my $nextexpected; if ($op eq 'modify' || $op eq 'dup' || $op eq 'modsubscription') { @@ -89,7 +88,7 @@ if ($op eq 'modify' || $op eq 'dup' || $op eq 'modsubscription') { $subs->{letter}= q{}; } letter_loop($subs->{'letter'}, $template); - $nextexpected = GetNextExpected($subscriptionid); + my $nextexpected = GetNextExpected($subscriptionid); $nextexpected->{'isfirstissue'} = $nextexpected->{planneddate}->output('iso') eq $firstissuedate ; $subs->{nextacquidate} = $nextexpected->{planneddate}->output() if($op eq 'modify'); unless($op eq 'modsubscription') { @@ -326,6 +325,7 @@ sub redirect_mod_subscription { my $opacdisplaycount = $query->param('opacdisplaycount'); my $graceperiod = $query->param('graceperiod') || 0; my $location = $query->param('location'); + my $nextexpected = GetNextExpected($subscriptionid); # If it's a mod, we need to check the current 'expected' issue, and mod it in the serials table if necessary. if ( $nextacquidate ne $nextexpected->{planneddate}->output('iso') ) { ModNextExpected($subscriptionid,C4::Dates->new($nextacquidate,'iso')); --