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

(-)a/C4/Serials.pm (-6 / +6 lines)
Lines 1261-1267 sub ModSubscription { Link Here
1261
        $lastvalue2,      $innerloop2,      $add3,              $every3,           $whenmorethan3, $setto3,      $lastvalue3,    $innerloop3,
1261
        $lastvalue2,      $innerloop2,      $add3,              $every3,           $whenmorethan3, $setto3,      $lastvalue3,    $innerloop3,
1262
        $numberingmethod, $status,          $biblionumber,      $callnumber,       $notes,         $letter,      $hemisphere,    $manualhistory,
1262
        $numberingmethod, $status,          $biblionumber,      $callnumber,       $notes,         $letter,      $hemisphere,    $manualhistory,
1263
        $internalnotes,   $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod,   $location,    $enddate,       $subscriptionid,
1263
        $internalnotes,   $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod,   $location,    $enddate,       $subscriptionid,
1264
        $seriallifespan
1264
        $serial_lifespan
1265
    ) = @_;
1265
    ) = @_;
1266
1266
1267
    #     warn $irregularity;
1267
    #     warn $irregularity;
Lines 1275-1281 sub ModSubscription { Link Here
1275
                        numberingmethod=?, status=?, biblionumber=?, callnumber=?, notes=?, 
1275
                        numberingmethod=?, status=?, biblionumber=?, callnumber=?, notes=?, 
1276
						letter=?, hemisphere=?,manualhistory=?,internalnotes=?,serialsadditems=?,
1276
						letter=?, hemisphere=?,manualhistory=?,internalnotes=?,serialsadditems=?,
1277
						staffdisplaycount = ?,opacdisplaycount = ?, graceperiod = ?, location = ?
1277
						staffdisplaycount = ?,opacdisplaycount = ?, graceperiod = ?, location = ?
1278
                                           ,enddate=?, seriallifespan=?
1278
                                           ,enddate=?, serial_lifespan=?
1279
                    WHERE subscriptionid = ?";
1279
                    WHERE subscriptionid = ?";
1280
1280
1281
    #warn "query :".$query;
1281
    #warn "query :".$query;
Lines 1292-1298 sub ModSubscription { Link Here
1292
        $numberingmethod, $status,         $biblionumber,   $callnumber,
1292
        $numberingmethod, $status,         $biblionumber,   $callnumber,
1293
        $notes, $letter, $hemisphere, ( $manualhistory ? $manualhistory : 0 ),
1293
        $notes, $letter, $hemisphere, ( $manualhistory ? $manualhistory : 0 ),
1294
        $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount,
1294
        $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount,
1295
        $graceperiod,   $location,        $enddate,  $seriallifespan, $subscriptionid
1295
        $graceperiod,   $location,        $enddate,  $serial_lifespan, $subscriptionid
1296
    );
1296
    );
1297
    my $rows = $sth->rows;
1297
    my $rows = $sth->rows;
1298
1298
Lines 1324-1330 sub NewSubscription { Link Here
1324
        $lastvalue1,    $innerloop1,      $add2,              $every2,           $whenmorethan2, $setto2,       $lastvalue2,      $innerloop2,
1324
        $lastvalue1,    $innerloop1,      $add2,              $every2,           $whenmorethan2, $setto2,       $lastvalue2,      $innerloop2,
1325
        $add3,          $every3,          $whenmorethan3,     $setto3,           $lastvalue3,    $innerloop3,   $numberingmethod, $status,
1325
        $add3,          $every3,          $whenmorethan3,     $setto3,           $lastvalue3,    $innerloop3,   $numberingmethod, $status,
1326
        $notes,         $letter,          $firstacquidate,    $irregularity,     $numberpattern, $callnumber,   $hemisphere,      $manualhistory,
1326
        $notes,         $letter,          $firstacquidate,    $irregularity,     $numberpattern, $callnumber,   $hemisphere,      $manualhistory,
1327
        $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod,   $location,     $enddate,         $seriallifespan
1327
        $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod,   $location,     $enddate,         $serial_lifespan
1328
    ) = @_;
1328
    ) = @_;
1329
    my $dbh = C4::Context->dbh;
1329
    my $dbh = C4::Context->dbh;
1330
1330
Lines 1338-1344 sub NewSubscription { Link Here
1338
            add3,every3,whenmorethan3,setto3,lastvalue3,innerloop3,
1338
            add3,every3,whenmorethan3,setto3,lastvalue3,innerloop3,
1339
            numberingmethod, status, notes, letter,firstacquidate,irregularity,
1339
            numberingmethod, status, notes, letter,firstacquidate,irregularity,
1340
            numberpattern, callnumber, hemisphere,manualhistory,internalnotes,serialsadditems,
1340
            numberpattern, callnumber, hemisphere,manualhistory,internalnotes,serialsadditems,
1341
            staffdisplaycount,opacdisplaycount,graceperiod,location,enddate,seriallifespan)
1341
            staffdisplaycount,opacdisplaycount,graceperiod,location,enddate,serial_lifespan)
1342
        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
1342
        VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
1343
        |;
1343
        |;
1344
    my $sth = $dbh->prepare($query);
1344
    my $sth = $dbh->prepare($query);
Lines 1348-1354 sub NewSubscription { Link Here
1348
        $lastvalue1,    $innerloop1,      $add2,              $every2,           $whenmorethan2, $setto2,       $lastvalue2,      $innerloop2,
1348
        $lastvalue1,    $innerloop1,      $add2,              $every2,           $whenmorethan2, $setto2,       $lastvalue2,      $innerloop2,
1349
        $add3,          $every3,          $whenmorethan3,     $setto3,           $lastvalue3,    $innerloop3,   $numberingmethod, "$status",
1349
        $add3,          $every3,          $whenmorethan3,     $setto3,           $lastvalue3,    $innerloop3,   $numberingmethod, "$status",
1350
        $notes,         $letter,          $firstacquidate,    $irregularity,     $numberpattern, $callnumber,   $hemisphere,      $manualhistory,
1350
        $notes,         $letter,          $firstacquidate,    $irregularity,     $numberpattern, $callnumber,   $hemisphere,      $manualhistory,
1351
        $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod,   $location,     $enddate,         $seriallifespan
1351
        $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod,   $location,     $enddate,         $serial_lifespan
1352
    );
1352
    );
1353
1353
1354
    my $subscriptionid = $dbh->{'mysql_insertid'};
1354
    my $subscriptionid = $dbh->{'mysql_insertid'};
(-)a/installer/data/mysql/kohastructure.sql (-1 / +1 lines)
Lines 2031-2037 CREATE TABLE `subscription` ( Link Here
2031
  `enddate` date default NULL,
2031
  `enddate` date default NULL,
2032
  `closed` INT(1) NOT NULL DEFAULT 0,
2032
  `closed` INT(1) NOT NULL DEFAULT 0,
2033
  `reneweddate` date default NULL,
2033
  `reneweddate` date default NULL,
2034
  `seriallifespan` TINYINT(1) DEFAULT -1,
2034
  `serial_lifespan` TINYINT(1) DEFAULT -1,
2035
  PRIMARY KEY  (`subscriptionid`)
2035
  PRIMARY KEY  (`subscriptionid`)
2036
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
2036
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
2037
2037
(-)a/installer/data/mysql/updatedatabase.pl (-2 / +2 lines)
Lines 7019-7026 if ( CheckVersion($DBversion) ) { Link Here
7019
7019
7020
$DBversion = 'XXX';
7020
$DBversion = 'XXX';
7021
if ( CheckVersion($DBversion) ) {
7021
if ( CheckVersion($DBversion) ) {
7022
   $dbh->do("ALTER TABLE subscription ADD `seriallifespan` TINYINT(1) DEFAULT -1");
7022
   $dbh->do("ALTER TABLE subscription ADD `serial_lifespan` TINYINT(1) DEFAULT -1");
7023
   print "Upgrade to $DBversion done (Add seriallifespan to subscription)\n";
7023
   print "Upgrade to $DBversion done (Add serial_lifespan to subscription)\n";
7024
   SetVersion ($DBversion);
7024
   SetVersion ($DBversion);
7025
}
7025
}
7026
7026
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt (-13 / +13 lines)
Lines 1030-1088 $(document).ready(function() { Link Here
1030
            [% END %]
1030
            [% END %]
1031
        </li>
1031
        </li>
1032
        <li>
1032
        <li>
1033
            <label for="seriallifespan">Serial lifespan:</label>
1033
            <label for="serial_lifespan">Serial lifespan:</label>
1034
            <select name="seriallifespan" id="seriallifespan">
1034
            <select name="serial_lifespan" id="serial_lifespan">
1035
            [% IF ( seriallifespan == -1 ) %]
1035
            [% IF ( serial_lifespan == -1 ) %]
1036
                <option value="-1" selected="selected">Permanent</option>
1036
                <option value="-1" selected="selected">Permanent</option>
1037
            [% ELSE %]
1037
            [% ELSE %]
1038
                <option value="-1">Permanent</option>
1038
                <option value="-1">Permanent</option>
1039
            [% END %]
1039
            [% END %]
1040
            [% IF ( seriallifespan == 1 ) %]
1040
            [% IF ( serial_lifespan == 1 ) %]
1041
                <option value="1" selected="selected">1 year</option>
1041
                <option value="1" selected="selected">1 year</option>
1042
            [% ELSE %]
1042
            [% ELSE %]
1043
                <option value="1">1 year</option>
1043
                <option value="1">1 year</option>
1044
            [% END %]
1044
            [% END %]
1045
            [% IF ( seriallifespan == 2 ) %]
1045
            [% IF ( serial_lifespan == 2 ) %]
1046
                <option value="2" selected="selected">2 years</option>
1046
                <option value="2" selected="selected">2 years</option>
1047
            [% ELSE %]
1047
            [% ELSE %]
1048
                <option value="2">2 years</option>
1048
                <option value="2">2 years</option>
1049
            [% END %]
1049
            [% END %]
1050
            [% IF ( seriallifespan == 3 ) %]
1050
            [% IF ( serial_lifespan == 3 ) %]
1051
                <option value="3" selected="selected">3 years</option>
1051
                <option value="3" selected="selected">3 years</option>
1052
            [% ELSE %]
1052
            [% ELSE %]
1053
                <option value="3">3 years</option>
1053
                <option value="3">3 years</option>
1054
            [% END %]
1054
            [% END %]
1055
            [% IF ( seriallifespan == 4 ) %]
1055
            [% IF ( serial_lifespan == 4 ) %]
1056
                <option value="4" selected="selected">4 years</option>
1056
                <option value="4" selected="selected">4 years</option>
1057
            [% ELSE %]
1057
            [% ELSE %]
1058
                <option value="4">4 years</option>
1058
                <option value="4">4 years</option>
1059
            [% END %]
1059
            [% END %]
1060
            [% IF ( seriallifespan == 5 ) %]
1060
            [% IF ( serial_lifespan == 5 ) %]
1061
                <option value="5" selected="selected">5 years</option>
1061
                <option value="5" selected="selected">5 years</option>
1062
            [% ELSE %]
1062
            [% ELSE %]
1063
                <option value="5">5 years</option>
1063
                <option value="5">5 years</option>
1064
            [% END %]
1064
            [% END %]
1065
            [% IF ( seriallifespan == 6 ) %]
1065
            [% IF ( serial_lifespan == 6 ) %]
1066
                <option value="6" selected="selected">6 years</option>
1066
                <option value="6" selected="selected">6 years</option>
1067
            [% ELSE %]
1067
            [% ELSE %]
1068
                <option value="6">6 years</option>
1068
                <option value="6">6 years</option>
1069
            [% END %]
1069
            [% END %]
1070
            [% IF ( seriallifespan == 7 ) %]
1070
            [% IF ( serial_lifespan == 7 ) %]
1071
                <option value="7" selected="selected">7 years</option>
1071
                <option value="7" selected="selected">7 years</option>
1072
            [% ELSE %]
1072
            [% ELSE %]
1073
                <option value="7">7 years</option>
1073
                <option value="7">7 years</option>
1074
            [% END %]
1074
            [% END %]
1075
            [% IF ( seriallifespan == 8 ) %]
1075
            [% IF ( serial_lifespan == 8 ) %]
1076
                <option value="8" selected="selected">8 years</option>
1076
                <option value="8" selected="selected">8 years</option>
1077
            [% ELSE %]
1077
            [% ELSE %]
1078
                <option value="8">8 years</option>
1078
                <option value="8">8 years</option>
1079
            [% END %]
1079
            [% END %]
1080
            [% IF ( seriallifespan == 9 ) %]
1080
            [% IF ( serial_lifespan == 9 ) %]
1081
                <option value="9" selected="selected">9 years</option>
1081
                <option value="9" selected="selected">9 years</option>
1082
            [% ELSE %]
1082
            [% ELSE %]
1083
                <option value="9">9 years</option>
1083
                <option value="9">9 years</option>
1084
            [% END %]
1084
            [% END %]
1085
            [% IF ( seriallifespan == 10 ) %]
1085
            [% IF ( serial_lifespan == 10 ) %]
1086
                <option value="10" selected="selected">10 years</option>
1086
                <option value="10" selected="selected">10 years</option>
1087
            [% ELSE %]
1087
            [% ELSE %]
1088
                <option value="10">10 years</option>
1088
                <option value="10">10 years</option>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-22 / +22 lines)
Lines 262-288 $(document).ready(function() { Link Here
262
        [% IF ( weeklength ) %]<li><span class="label">Number of weeks:</span> [% weeklength %]</li>[% END %]
262
        [% IF ( weeklength ) %]<li><span class="label">Number of weeks:</span> [% weeklength %]</li>[% END %]
263
        [% IF ( monthlength ) %]<li><span class="label">Number of months:</span> [% monthlength %]</li>[% END %]
263
        [% IF ( monthlength ) %]<li><span class="label">Number of months:</span> [% monthlength %]</li>[% END %]
264
                <li><span class="label">Serial lifespan:</span>
264
                <li><span class="label">Serial lifespan:</span>
265
                [% IF seriallifespan == -1 %]
265
                [% IF serial_lifespan == -1 %]
266
                    <span>Permanent</span>
266
                    <span>Permanent</span>
267
                [% ELSIF ( seriallifespan == 1 ) %]
267
                [% ELSIF ( serial_lifespan == 1 ) %]
268
                    <span>1 year</span>
268
                    <span>1 year</span>
269
                [% ELSIF ( seriallifespan == 2 ) %]
269
                [% ELSIF ( serial_lifespan == 2 ) %]
270
                    <span>2 years</span>
270
                    <span>2 years</span>
271
                [% ELSIF ( seriallifespan == 3 ) %]
271
                [% ELSIF ( serial_lifespan == 3 ) %]
272
                    <span>3 years</span>
272
                    <span>3 years</span>
273
                [% ELSIF ( seriallifespan == 4 ) %]
273
                [% ELSIF ( serial_lifespan == 4 ) %]
274
                    <span>4 years</span>
274
                    <span>4 years</span>
275
                [% ELSIF ( seriallifespan == 5 ) %]
275
                [% ELSIF ( serial_lifespan == 5 ) %]
276
                    <span>5 years</span>
276
                    <span>5 years</span>
277
                [% ELSIF ( seriallifespan == 6 ) %]
277
                [% ELSIF ( serial_lifespan == 6 ) %]
278
                    <span>6 years</span>
278
                    <span>6 years</span>
279
                [% ELSIF ( seriallifespan == 7 ) %]
279
                [% ELSIF ( serial_lifespan == 7 ) %]
280
                    <span>7 years</span>
280
                    <span>7 years</span>
281
                [% ELSIF ( seriallifespan == 8 ) %]
281
                [% ELSIF ( serial_lifespan == 8 ) %]
282
                    <span>8 years</span>
282
                    <span>8 years</span>
283
                [% ELSIF ( seriallifespan == 9 ) %]
283
                [% ELSIF ( serial_lifespan == 9 ) %]
284
                    <span>9 years</span>
284
                    <span>9 years</span>
285
                [% ELSIF ( seriallifespan == 10 ) %]
285
                [% ELSIF ( serial_lifespan == 10 ) %]
286
                    <span>10 years</span>
286
                    <span>10 years</span>
287
                [% END %]
287
                [% END %]
288
            </li>
288
            </li>
Lines 355-381 $(document).ready(function() { Link Here
355
        <h2>Serial issues</h2>
355
        <h2>Serial issues</h2>
356
        <p>
356
        <p>
357
            <label>Serial lifespan :</label>
357
            <label>Serial lifespan :</label>
358
            [% IF seriallifespan == -1 %]
358
            [% IF serial_lifespan == -1 %]
359
                <span>Permanent</span>
359
                <span>Permanent</span>
360
            [% ELSIF ( seriallifespan == 1 ) %]
360
            [% ELSIF ( serial_lifespan == 1 ) %]
361
                <span>1 year</span>
361
                <span>1 year</span>
362
            [% ELSIF ( seriallifespan == 2 ) %]
362
            [% ELSIF ( serial_lifespan == 2 ) %]
363
                <span>2 years</span>
363
                <span>2 years</span>
364
            [% ELSIF ( seriallifespan == 3 ) %]
364
            [% ELSIF ( serial_lifespan == 3 ) %]
365
                <span>3 years</span>
365
                <span>3 years</span>
366
            [% ELSIF ( seriallifespan == 4 ) %]
366
            [% ELSIF ( serial_lifespan == 4 ) %]
367
                <span>4 years</span>
367
                <span>4 years</span>
368
            [% ELSIF ( seriallifespan == 5 ) %]
368
            [% ELSIF ( serial_lifespan == 5 ) %]
369
                <span>5 years</span>
369
                <span>5 years</span>
370
            [% ELSIF ( seriallifespan == 6 ) %]
370
            [% ELSIF ( serial_lifespan == 6 ) %]
371
                <span>6 years</span>
371
                <span>6 years</span>
372
            [% ELSIF ( seriallifespan == 7 ) %]
372
            [% ELSIF ( serial_lifespan == 7 ) %]
373
                <span>7 years</span>
373
                <span>7 years</span>
374
            [% ELSIF ( seriallifespan == 8 ) %]
374
            [% ELSIF ( serial_lifespan == 8 ) %]
375
                <span>8 years</span>
375
                <span>8 years</span>
376
            [% ELSIF ( seriallifespan == 9 ) %]
376
            [% ELSIF ( serial_lifespan == 9 ) %]
377
                <span>9 years</span>
377
                <span>9 years</span>
378
            [% ELSIF ( seriallifespan == 10 ) %]
378
            [% ELSIF ( serial_lifespan == 10 ) %]
379
                <span>10 years</span>
379
                <span>10 years</span>
380
            [% END %]
380
            [% END %]
381
        </p>
381
        </p>
(-)a/serials/subscription-add.pl (-5 / +5 lines)
Lines 108-114 if ($op eq 'modify' || $op eq 'dup' || $op eq 'modsubscription') { Link Here
108
                    history => ($op eq 'modify'),
108
                    history => ($op eq 'modify'),
109
                    "periodicity".$subs->{'periodicity'} => 1,
109
                    "periodicity".$subs->{'periodicity'} => 1,
110
                    "numberpattern".$subs->{'numberpattern'} => 1,
110
                    "numberpattern".$subs->{'numberpattern'} => 1,
111
                    "seriallifespan" => $subs->{'seriallifespan'},
111
                    "serial_lifespan" => $subs->{'serial_lifespan'},
112
                    firstacquiyear => substr($firstissuedate,0,4),
112
                    firstacquiyear => substr($firstissuedate,0,4),
113
                    );
113
                    );
114
    }
114
    }
Lines 256-262 sub redirect_add_subscription { Link Here
256
    my $missinglist = $query->param('missinglist');
256
    my $missinglist = $query->param('missinglist');
257
    my $opacnote = $query->param('opacnote');
257
    my $opacnote = $query->param('opacnote');
258
    my $librariannote = $query->param('librariannote');
258
    my $librariannote = $query->param('librariannote');
259
    my $seriallifespan = $query->param('seriallifespan');
259
    my $serial_lifespan = $query->param('serial_lifespan');
260
	my $subscriptionid = NewSubscription($auser,$branchcode,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,
260
	my $subscriptionid = NewSubscription($auser,$branchcode,$aqbooksellerid,$cost,$aqbudgetid,$biblionumber,
261
        $startdate,$periodicity,$dow,$numberlength,$weeklength,$monthlength,
261
        $startdate,$periodicity,$dow,$numberlength,$weeklength,$monthlength,
262
        $add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1,
262
        $add1,$every1,$whenmorethan1,$setto1,$lastvalue1,$innerloop1,
Lines 264-270 sub redirect_add_subscription { Link Here
264
        $add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
264
        $add3,$every3,$whenmorethan3,$setto3,$lastvalue3,$innerloop3,
265
        $numberingmethod, $status, $notes,$letter,$firstacquidate,join(",",@irregularity),
265
        $numberingmethod, $status, $notes,$letter,$firstacquidate,join(",",@irregularity),
266
        $numberpattern, $callnumber, $hemisphere,($manualhistory?$manualhistory:0),$internalnotes,
266
        $numberpattern, $callnumber, $hemisphere,($manualhistory?$manualhistory:0),$internalnotes,
267
        $serialsadditems,$staffdisplaycount,$opacdisplaycount,$graceperiod,$location,$enddate,$seriallifespan
267
        $serialsadditems,$staffdisplaycount,$opacdisplaycount,$graceperiod,$location,$enddate,$serial_lifespan
268
    );
268
    );
269
269
270
    ModSubscriptionHistory ($subscriptionid,$histstartdate,$histenddate,$recievedlist,$missinglist,$opacnote,$librariannote);
270
    ModSubscriptionHistory ($subscriptionid,$histstartdate,$histenddate,$recievedlist,$missinglist,$opacnote,$librariannote);
Lines 333-339 sub redirect_mod_subscription { Link Here
333
    my $graceperiod     = $query->param('graceperiod') || 0;
333
    my $graceperiod     = $query->param('graceperiod') || 0;
334
    my $location = $query->param('location');
334
    my $location = $query->param('location');
335
    my $nextexpected = GetNextExpected($subscriptionid);
335
    my $nextexpected = GetNextExpected($subscriptionid);
336
    my $seriallifespan = $query->param('seriallifespan');
336
    my $serial_lifespan = $query->param('serial_lifespan');
337
	#  If it's  a mod, we need to check the current 'expected' issue, and mod it in the serials table if necessary.
337
	#  If it's  a mod, we need to check the current 'expected' issue, and mod it in the serials table if necessary.
338
    if ( $nextacquidate ne $nextexpected->{planneddate}->output('iso') ) {
338
    if ( $nextacquidate ne $nextexpected->{planneddate}->output('iso') ) {
339
        ModNextExpected($subscriptionid,C4::Dates->new($nextacquidate,'iso'));
339
        ModNextExpected($subscriptionid,C4::Dates->new($nextacquidate,'iso'));
Lines 351-357 sub redirect_mod_subscription { Link Here
351
            $whenmorethan3,   $setto3,       $lastvalue3,     $innerloop3,
351
            $whenmorethan3,   $setto3,       $lastvalue3,     $innerloop3,
352
            $numberingmethod, $status,       $biblionumber,   $callnumber,
352
            $numberingmethod, $status,       $biblionumber,   $callnumber,
353
            $notes,           $letter,       $hemisphere,     $manualhistory,$internalnotes,
353
            $notes,           $letter,       $hemisphere,     $manualhistory,$internalnotes,
354
            $serialsadditems, $staffdisplaycount,$opacdisplaycount,$graceperiod,$location,$enddate,$subscriptionid,$seriallifespan
354
            $serialsadditems, $staffdisplaycount,$opacdisplaycount,$graceperiod,$location,$enddate,$subscriptionid,$serial_lifespan
355
        );
355
        );
356
356
357
        ModSubscriptionHistory ($subscriptionid,$histstartdate,$histenddate,$recievedlist,$missinglist,$opacnote,$librariannote);
357
        ModSubscriptionHistory ($subscriptionid,$histstartdate,$histenddate,$recievedlist,$missinglist,$opacnote,$librariannote);
(-)a/serials/subscription-detail.pl (-2 / +1 lines)
Lines 178-184 $template->param( Link Here
178
    show_acquisition_details => defined $tmpl_infos->{ordered_exists} || defined $tmpl_infos->{spent_exists} ? 1 : 0,
178
    show_acquisition_details => defined $tmpl_infos->{ordered_exists} || defined $tmpl_infos->{spent_exists} ? 1 : 0,
179
    basketno => $order->{basketno},
179
    basketno => $order->{basketno},
180
    %$tmpl_infos,
180
    %$tmpl_infos,
181
    seriallifespan => $subs->{'seriallifespan'},
181
    serial_lifespan => $subs->{'serial_lifespan'},
182
);
182
);
183
183
184
output_html_with_http_headers $query, $cookie, $template->output;
184
output_html_with_http_headers $query, $cookie, $template->output;
185
- 

Return to bug 8587