View | Details | Raw Unified | Return to bug 8956
Collapse All | Expand All

(-)a/serials/subscription-add.pl (-12 / +13 lines)
Lines 138-144 my $branches = GetBranches($onlymine); Link Here
138
my $branchloop;
138
my $branchloop;
139
for my $thisbranch (
139
for my $thisbranch (
140
    sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} }
140
    sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} }
141
    keys %{$branches} )
141
    keys %{$branches}
142
  )
142
{
143
{
143
    my $selected = 0;
144
    my $selected = 0;
144
    $selected = 1 if ( defined($subs) && $thisbranch eq $subs->{'branchcode'} );
145
    $selected = 1 if ( defined($subs) && $thisbranch eq $subs->{'branchcode'} );
Lines 276-284 sub redirect_add_subscription { Link Here
276
    my $missinglist    = $query->param('missinglist');
277
    my $missinglist    = $query->param('missinglist');
277
    my $opacnote       = $query->param('opacnote');
278
    my $opacnote       = $query->param('opacnote');
278
    my $librariannote  = $query->param('librariannote');
279
    my $librariannote  = $query->param('librariannote');
279
    my $x_label           = $query->param('x_label');
280
    my $x_label        = $query->param('x_label');
280
    my $y_label           = $query->param('y_label');
281
    my $y_label        = $query->param('y_label');
281
    my $z_label           = $query->param('z_label');
282
    my $z_label        = $query->param('z_label');
282
    my $subscriptionid = NewSubscription(
283
    my $subscriptionid = NewSubscription(
283
        $auser,           $branchcode,
284
        $auser,           $branchcode,
284
        $aqbooksellerid,  $cost,
285
        $aqbooksellerid,  $cost,
Lines 303-310 sub redirect_add_subscription { Link Here
303
        $internalnotes,     $serialsadditems,
304
        $internalnotes,     $serialsadditems,
304
        $staffdisplaycount, $opacdisplaycount,
305
        $staffdisplaycount, $opacdisplaycount,
305
        $graceperiod,       $location,
306
        $graceperiod,       $location,
306
        $enddate,
307
        $enddate,           $x_label,
307
        $x_label, $y_label, $z_label,
308
        $y_label,           $z_label,
308
    );
309
    );
309
    ModSubscriptionHistory(
310
    ModSubscriptionHistory(
310
        $subscriptionid, $histstartdate, $histenddate, $recievedlist,
311
        $subscriptionid, $histstartdate, $histenddate, $recievedlist,
Lines 381-391 sub redirect_mod_subscription { Link Here
381
    my $nextexpected      = GetNextExpected($subscriptionid);
382
    my $nextexpected      = GetNextExpected($subscriptionid);
382
383
383
    # field labels
384
    # field labels
384
    my $x_label           = $query->param('x_label');
385
    my $x_label = $query->param('x_label');
385
    my $y_label           = $query->param('y_label');
386
    my $y_label = $query->param('y_label');
386
    my $z_label           = $query->param('z_label');
387
    my $z_label = $query->param('z_label');
387
388
388
    #  If it's  a mod, we need to check the current 'expected' issue, and mod it in the serials table if necessary.
389
#  If it's  a mod, we need to check the current 'expected' issue, and mod it in the serials table if necessary.
389
    if ( $nextacquidate ne $nextexpected->{planneddate}->output('iso') ) {
390
    if ( $nextacquidate ne $nextexpected->{planneddate}->output('iso') ) {
390
        ModNextExpected( $subscriptionid,
391
        ModNextExpected( $subscriptionid,
391
            C4::Dates->new( $nextacquidate, 'iso' ) );
392
            C4::Dates->new( $nextacquidate, 'iso' ) );
Lines 419-425 sub redirect_mod_subscription { Link Here
419
        $staffdisplaycount, $opacdisplaycount,
420
        $staffdisplaycount, $opacdisplaycount,
420
        $graceperiod,       $location,
421
        $graceperiod,       $location,
421
        $enddate,           $subscriptionid,
422
        $enddate,           $subscriptionid,
422
        $x_label,           $y_label,          $z_label
423
        $x_label,           $y_label,
424
        $z_label
423
    );
425
    );
424
    ModSubscriptionHistory(
426
    ModSubscriptionHistory(
425
        $subscriptionid, $histstartdate, $histenddate, $recievedlist,
427
        $subscriptionid, $histstartdate, $histenddate, $recievedlist,
426
- 

Return to bug 8956