From 2bf3628df668bf193a0a447cd2a09f0f5addc9c1 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Tue, 19 Mar 2013 02:52:27 -0700 Subject: [PATCH] Bug 8956 - Split serials enumeration data into separate fields - Part 8 - Perltidy serials/subscription-add.pl again --- serials/subscription-add.pl | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl index 1ef36a1..d17611a 100755 --- a/serials/subscription-add.pl +++ b/serials/subscription-add.pl @@ -137,7 +137,8 @@ my $branches = GetBranches($onlymine); my $branchloop; for my $thisbranch ( sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } - keys %{$branches} ) + keys %{$branches} + ) { my $selected = 0; $selected = 1 if ( defined($subs) && $thisbranch eq $subs->{'branchcode'} ); @@ -275,9 +276,9 @@ sub redirect_add_subscription { my $missinglist = $query->param('missinglist'); my $opacnote = $query->param('opacnote'); my $librariannote = $query->param('librariannote'); - my $x_label = $query->param('x_label'); - my $y_label = $query->param('y_label'); - my $z_label = $query->param('z_label'); + my $x_label = $query->param('x_label'); + my $y_label = $query->param('y_label'); + my $z_label = $query->param('z_label'); my $subscriptionid = NewSubscription( $auser, $branchcode, $aqbooksellerid, $cost, @@ -302,8 +303,8 @@ sub redirect_add_subscription { $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, - $enddate, - $x_label, $y_label, $z_label, + $enddate, $x_label, + $y_label, $z_label, ); ModSubscriptionHistory( $subscriptionid, $histstartdate, $histenddate, $recievedlist, @@ -380,11 +381,11 @@ sub redirect_mod_subscription { my $nextexpected = GetNextExpected($subscriptionid); # field labels - my $x_label = $query->param('x_label'); - my $y_label = $query->param('y_label'); - my $z_label = $query->param('z_label'); + my $x_label = $query->param('x_label'); + my $y_label = $query->param('y_label'); + my $z_label = $query->param('z_label'); - # If it's a mod, we need to check the current 'expected' issue, and mod it in the serials table if necessary. +# 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' ) ); @@ -418,7 +419,8 @@ sub redirect_mod_subscription { $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate, $subscriptionid, - $x_label, $y_label, $z_label + $x_label, $y_label, + $z_label ); ModSubscriptionHistory( $subscriptionid, $histstartdate, $histenddate, $recievedlist, -- 1.7.2.5