Bugzilla – Attachment 30636 Details for
Bug 8587
Add a serial lifespan to serial subscriptions
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 8587 - Add a serial lifespan field to serial subscriptions
Bug-8587---Add-a-serial-lifespan-field-to-serial-s.patch (text/plain), 25.74 KB, created by
Maxime Beaulieu
on 2014-08-08 17:44:38 UTC
(
hide
)
Description:
Bug 8587 - Add a serial lifespan field to serial subscriptions
Filename:
MIME Type:
Creator:
Maxime Beaulieu
Created:
2014-08-08 17:44:38 UTC
Size:
25.74 KB
patch
obsolete
>From 278c217034bee1d1efed44218fc0dff71f531fbe Mon Sep 17 00:00:00 2001 >From: Maxime Pelletier <maxime.pelletier@libeo.com> >Date: Mon, 22 Apr 2013 15:56:36 -0400 >Subject: [PATCH] Bug 8587 - Add a serial lifespan field to serial > subscriptions > >http://bugs.koha-community.org/show_bug.cgi?id=8587 >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > C4/Serials.pm | 17 +- > installer/data/mysql/kohastructure.sql | 1 + > installer/data/mysql/updatedatabase.pl | 7 + > .../prog/en/modules/serials/subscription-add.tt | 258 +++++++++++++++++++- > .../prog/en/modules/serials/subscription-detail.tt | 52 ++++ > serials/subscription-add.pl | 10 +- > serials/subscription-detail.pl | 1 + > 7 files changed, 334 insertions(+), 12 deletions(-) > >diff --git a/C4/Serials.pm b/C4/Serials.pm >index bcb37e3..c1120e2 100644 >--- a/C4/Serials.pm >+++ b/C4/Serials.pm >@@ -1385,7 +1385,7 @@ sub ModSubscription { > $lastvalue2, $innerloop2, $lastvalue3, $innerloop3, $status, > $biblionumber, $callnumber, $notes, $letter, $manualhistory, > $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, >- $graceperiod, $location, $enddate, $subscriptionid, $skip_serialseq >+ $graceperiod, $location, $enddate, $subscriptionid, $skip_serialseq, $seriallifespan > ) = @_; > > my $dbh = C4::Context->dbh; >@@ -1398,7 +1398,8 @@ sub ModSubscription { > callnumber=?, notes=?, letter=?, manualhistory=?, > internalnotes=?, serialsadditems=?, staffdisplaycount=?, > opacdisplaycount=?, graceperiod=?, location = ?, enddate=?, >- skip_serialseq=? >+ skip_serialseq=?, >+ seriallifespan=? > WHERE subscriptionid = ?"; > > my $sth = $dbh->prepare($query); >@@ -1412,7 +1413,7 @@ sub ModSubscription { > $letter, ($manualhistory ? $manualhistory : 0), > $internalnotes, $serialsadditems, $staffdisplaycount, $opacdisplaycount, > $graceperiod, $location, $enddate, $skip_serialseq, >- $subscriptionid >+ $seriallifespan, $subscriptionid > ); > my $rows = $sth->rows; > >@@ -1444,7 +1445,7 @@ sub NewSubscription { > $innerloop3, $status, $notes, $letter, $firstacquidate, $irregularity, > $numberpattern, $locale, $callnumber, $manualhistory, $internalnotes, > $serialsadditems, $staffdisplaycount, $opacdisplaycount, $graceperiod, >- $location, $enddate, $skip_serialseq >+ $location, $enddate, $skip_serialseq, $seriallifespan > ) = @_; > my $dbh = C4::Context->dbh; > >@@ -1457,8 +1458,9 @@ sub NewSubscription { > lastvalue3, innerloop3, status, notes, letter, firstacquidate, > irregularity, numberpattern, locale, callnumber, > manualhistory, internalnotes, serialsadditems, staffdisplaycount, >- opacdisplaycount, graceperiod, location, enddate, skip_serialseq) >- VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) >+ opacdisplaycount, graceperiod, location, enddate, skip_serialseq, >+ seriallifespan) >+ VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?) > |; > my $sth = $dbh->prepare($query); > $sth->execute( >@@ -1468,7 +1470,8 @@ sub NewSubscription { > $lastvalue3, $innerloop3, $status, $notes, $letter, > $firstacquidate, $irregularity, $numberpattern, $locale, $callnumber, > $manualhistory, $internalnotes, $serialsadditems, $staffdisplaycount, >- $opacdisplaycount, $graceperiod, $location, $enddate, $skip_serialseq >+ $opacdisplaycount, $graceperiod, $location, $enddate, $skip_serialseq, >+ $seriallifespan > ); > > my $subscriptionid = $dbh->{'mysql_insertid'}; >diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql >index b46dc6a..c15da18 100644 >--- a/installer/data/mysql/kohastructure.sql >+++ b/installer/data/mysql/kohastructure.sql >@@ -2099,6 +2099,7 @@ CREATE TABLE `subscription` ( > `enddate` date default NULL, > `closed` INT(1) NOT NULL DEFAULT 0, > `reneweddate` date default NULL, >+ `seriallifespan` TINYINT(1) DEFAULT -1, > PRIMARY KEY (`subscriptionid`), > CONSTRAINT subscription_ibfk_1 FOREIGN KEY (periodicity) REFERENCES subscription_frequencies (id) ON DELETE SET NULL ON UPDATE CASCADE, > CONSTRAINT subscription_ibfk_2 FOREIGN KEY (numberpattern) REFERENCES subscription_numberpatterns (id) ON DELETE SET NULL ON UPDATE CASCADE >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index 3f1af57..5b8b082 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -8603,6 +8603,13 @@ if ( CheckVersion($DBversion) ) { > SetVersion($DBversion); > } > >+$DBversion = 'XXX'; >+if ( CheckVersion($DBversion) ) { >+ $dbh->do("ALTER TABLE subscription ADD `seriallifespan` TINYINT(1) DEFAULT -1"); >+ print "Upgrade to $DBversion done (Add seriallifespan to subscription)\n"; >+ SetVersion ($DBversion); >+} >+ > =head1 FUNCTIONS > > =head2 TableExists($table) >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >index 62da614..b9d6d6c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt >@@ -460,9 +460,261 @@ $(document).ready(function() { > <div class="yui-g"> > <h1>[% IF ( modify ) %] Modify subscription for <i>[% bibliotitle |html %]</i>[% ELSE %]Add a new subscription[% END %] (<span id="page_number">1/2</span>)</h1> > <form method="post" name="f" action="/cgi-bin/koha/serials/subscription-add.pl" class="validated" onsubmit="return Check_page2();" > >- [% IF ( modify ) %] >- <input type="hidden" name="op" value="modsubscription" /> >- <input type="hidden" name="subscriptionid" value="[% subscriptionid %]" /> >+ >+[% IF ( modify ) %] >+ <input type="hidden" name="op" value="modsubscription" /> >+ <input type="hidden" name="subscriptionid" value="[% subscriptionid %]" /> >+[% ELSE %] >+ <input type="hidden" name="op" value="addsubscription" /> >+[% END %] >+<input type="hidden" name="user" value="[% loggedinusername %]" /> >+<input type="hidden" name="irreg_check" value="0" /> >+<input type="hidden" name="issuesexpected1" id="issuesexpected1" value="0" /> >+ >+ <div class="yui-u first"> >+ <fieldset id="subscription_add_information" class="rows"> >+ <legend>Subscription details</legend> >+ <ol> >+ [% IF ( subscriptionid ) %] >+ <li><span class="label">Subscription #</span> [% subscriptionid %]</li> >+ [% END %] >+ <li> >+ <label for="aqbooksellerid">Vendor: </label> >+ <input type="text" name="aqbooksellerid" id="aqbooksellerid" value="[% aqbooksellerid %]" size="8" /> (<input type="text" name="aqbooksellername" value="[% aqbooksellername %]" disabled="disabled" readonly="readonly" />) <a href="#" onclick="FindAcqui(f)">Search for a vendor</a> >+ </li> >+ <li> >+ <label for="biblionumber" class="required" title="Subscriptions must be associated with a bibliographic record">Biblio:</label> >+ >+ <input type="text" name="biblionumber" id="biblionumber" value="[% bibnum %]" size="8" /> >+ (<input type="text" name="title" value="[% bibliotitle %]" disabled="disabled" readonly="readonly" />) <span class="required" title="Subscriptions must be associated with a bibliographic record">Required</span> >+ <div class="inputnote"> <a href="#" onclick="Plugin(f)">Search for Biblio</a> >+ [% IF ( CAN_user_editcatalogue ) %] >+ [% IF ( modify ) %] >+ | <a href="#" onclick="addbiblioPopup([% bibnum %]); return false;">Edit biblio</a> >+ [% ELSE %] >+ | <a href="#" onclick="addbiblioPopup(); return false;">Create Biblio</a> >+ [% END %] >+ [% END %] >+ </div> >+ >+ </li> >+ <li class="radio"> >+ [% IF ( serialsadditems ) %] >+ <p><input type="radio" id="serialsadditems-yes" name="serialsadditems" value="1" checked="checked" /><label class="widelabel" for="serialsadditems-yes">create an item record when receiving this serial</label></p> >+ <p><input type="radio" id="serialsadditems-no" name="serialsadditems" value="0" /><label class="widelabel" for="serialsadditems-no">do not create an item record when receiving this serial </label></p> >+ [% ELSE %] >+ <p><input type="radio" id="serialsadditems-yes" name="serialsadditems" value="1"/><label class="widelabel" for="serialsadditems-yes">create an item record when receiving this serial</label></p> >+ <p><input type="radio" id="serialsadditems-no" name="serialsadditems" value="0" checked="checked" /><label class="widelabel" for="serialsadditems-no">do not create an item record when receiving this serial</label></p> >+ [% END %] >+ </li> >+ <li> >+ <label for="seriallifespan">Serial lifespan:</label> >+ <select name="seriallifespan" id="seriallifespan"> >+ [% IF ( seriallifespan == -1 ) %] >+ <option value="-1" selected="selected">Permanent</option> >+ [% ELSE %] >+ <option value="-1">Permanent</option> >+ [% END %] >+ [% IF ( seriallifespan == 1 ) %] >+ <option value="1" selected="selected">1 year</option> >+ [% ELSE %] >+ <option value="1">1 year</option> >+ [% END %] >+ [% IF ( seriallifespan == 2 ) %] >+ <option value="2" selected="selected">2 years</option> >+ [% ELSE %] >+ <option value="2">2 years</option> >+ [% END %] >+ [% IF ( seriallifespan == 3 ) %] >+ <option value="3" selected="selected">3 years</option> >+ [% ELSE %] >+ <option value="3">3 years</option> >+ [% END %] >+ [% IF ( seriallifespan == 4 ) %] >+ <option value="4" selected="selected">4 years</option> >+ [% ELSE %] >+ <option value="4">4 years</option> >+ [% END %] >+ [% IF ( seriallifespan == 5 ) %] >+ <option value="5" selected="selected">5 years</option> >+ [% ELSE %] >+ <option value="5">5 years</option> >+ [% END %] >+ [% IF ( seriallifespan == 6 ) %] >+ <option value="6" selected="selected">6 years</option> >+ [% ELSE %] >+ <option value="6">6 years</option> >+ [% END %] >+ [% IF ( seriallifespan == 7 ) %] >+ <option value="7" selected="selected">7 years</option> >+ [% ELSE %] >+ <option value="7">7 years</option> >+ [% END %] >+ [% IF ( seriallifespan == 8 ) %] >+ <option value="8" selected="selected">8 years</option> >+ [% ELSE %] >+ <option value="8">8 years</option> >+ [% END %] >+ [% IF ( seriallifespan == 9 ) %] >+ <option value="9" selected="selected">9 years</option> >+ [% ELSE %] >+ <option value="9">9 years</option> >+ [% END %] >+ [% IF ( seriallifespan == 10 ) %] >+ <option value="10" selected="selected">10 years</option> >+ [% ELSE %] >+ <option value="10">10 years</option> >+ [% END %] >+ </select> >+ <div class="hint">Set the subscription's serial lifespan. A serial will be considered "out of date" after the chosen time period.</div> >+ </li> >+ <li> >+ <label for="branchcode">Library:</label> >+ >+ <select name="branchcode" id="branchcode" style="width: 20em;"> >+ [% UNLESS ( IndependentBranches ) %]<option value="">None</option>[% END %] >+ [% FOREACH branchloo IN branchloop %][% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option> >+ [% ELSE %] >+ <option value="[% branchloo.value %]">[% branchloo.branchname %]</option> >+ [% END %] >+ [% END %] >+ </select> (select a library) >+ >+ </li> >+ <li> >+ <label for="location">Location:</label> >+ <select name="location" id="location"> >+ <option value="">None</option> >+ [% FOREACH locations_loo IN locations_loop %][% IF ( locations_loo.selected ) %]<option value="[% locations_loo.authorised_value %]" selected="selected">[% locations_loo.lib %]</option>[% ELSE %]<option value="[% locations_loo.authorised_value %]">[% locations_loo.lib %]</option>[% END %][% END %] >+ </select> >+ </li> >+ <li> >+ <label for="callnumber">Call number:</label> >+ <input type="text" name="callnumber" id="callnumber" value="[% callnumber %]" size="20" /> >+ </li> >+ <li> >+ <label for="graceperiod">Grace period:</label> <input type="text" name="graceperiod" id="graceperiod" value="[% graceperiod %]" size="5"/> day(s) >+ </li> >+ <li> >+ <label for="notes">OPAC note:</label> >+ <textarea name="notes" id="notes" cols="30" rows="2">[% notes %]</textarea> >+ </li> >+ <li> >+ <label for="internalnotes">Nonpublic note:</label> >+ <textarea name="internalnotes" id="internalnotes" cols="30" rows="2">[% internalnotes %]</textarea> >+ </li> >+ <li> >+ >+ [% IF ( letterloop ) %] >+ <label for="letter">Patron notification: </label> >+ <select name="letter" id="letter"> >+ <option value="">None</option> >+ [% FOREACH letterloo IN letterloop %] >+ [% IF ( letterloo.selected ) %] >+ <option value="[% letterloo.value %]" selected="selected">[% letterloo.lettername %]</option> >+[% ELSE %] >+ <option value="[% letterloo.value %]">[% letterloo.lettername %]</option> >+[% END %] >+ [% END %] >+ </select> >+ <div class="hint">Select a notice and subscribers will be notified when new issues are received.</div> >+ [% ELSE %] >+ <span class="label">Patron notification: </span> >+ <div class="hint">To notify patrons of new serial issues, you must <a href="/cgi-bin/koha/tools/letter.pl">define a notice</a>.</div> >+ [% END %] >+ </li> >+ <li> >+ <label class="widelabel" for="staffdisplaycount">Number of issues to display to staff: </label> >+ <input type="text" name="staffdisplaycount" id="staffdisplaycount" value="[% staffdisplaycount %]" size="4"/> >+ </li> >+ <li> >+ <label class="widelabel" for="opacdisplaycount">Number of issues to display in OPAC: </label> >+ <input type="text" name="opacdisplaycount" id="opacdisplaycount" value="[% opacdisplaycount %]" size="4"/> >+ </li> >+ </ol> >+ </fieldset> >+ </div> >+ >+<div class="yui-u"> >+<div id="subscription_form_history" style="display:none"><h3 style="display:inline">Subscription history</h3> <a href="#" id="cancel_manual_history">[cancel manual history]</a> >+ <p>Hint: you can update the serial history manually. This can be useful for an old subscription or to clean the existing history. Modify these fields with care, as future serial receive will continue to update them automatically.</p> >+ <fieldset class="rows"> >+ <ol> >+ <li> >+ <label for="histstartdate">Subscription start date: </label> >+ <input type="text" name="histstartdate" id="histstartdate" value="[% histstartdate %]" /><div class="hint"> (start date of the 1st subscription)</div> >+ </li> >+ <li> >+ <label for="histenddate">Subscription end date: </label> >+ <input type="text" name="histenddate" id="histenddate" value="[% histenddate %]" /> <div class="hint">(if empty, subscription is still active)</div> >+ </li> >+ <li> >+ <label for="recievedlist">Received issues: </label> >+ <textarea name="recievedlist" id="recievedlist" cols="60" rows="5">[% recievedlist %]</textarea> >+ </li> >+ <li> >+ <label for="missinglist">Missing issues: </label> >+ <textarea name="missinglist" id="missinglist" cols="60" rows="5">[% missinglist %]</textarea> >+ </li> >+ <li> >+ <label for="opacnote">Note for OPAC: </label> >+ <textarea name="opacnote" id="opacnote" cols="60" rows="5">[% opacnote %]</textarea> >+ </li> >+ <li> >+ <label for="librariannote">Note for staff: </label> >+ <textarea name="librariannote" id="librariannote" cols="60" rows="5">[% librariannote %]</textarea> >+ </li> >+ </ol> >+ </fieldset> >+ <fieldset class="action"><input type="submit" value="Save subscription history" /></fieldset> >+</div> >+ >+<div id="subscription_form_planning"> >+ <fieldset class="rows"> >+ <legend>Serials planning</legend> >+ <ol> >+ <li> >+ <label for="acqui_date"> First issue publication date:</label> >+ [% IF ( modify ) %]<input type="text" name="firstacquidate" value="[% firstacquidate %]" size="13" maxlength="10" id="acqui_date" disabled="disabled" /> >+ [% ELSE %]<input type="text" name="firstacquidate" value="[% firstacquidate %]" size="13" maxlength="10" id="acqui_date" class="datepicker" />[% END %] >+ </li> >+ [% IF ( modify ) %]<li><label for="next_acqui_date"> Next issue publication date:</label> >+ <input type="text" name="nextacquidate" value="[% nextacquidate %]" size="13" maxlength="10" id="next_acqui_date" class="datepicker" /> >+ </li>[% END %] >+ >+ <li> >+ <label for="periodicity" class="required">Frequency:</label> >+ <select name="periodicity" size="1" id="periodicity" onchange="javascript:document.getElementsByName('manualhist')[0].checked=(this.value==1); reset_num_pattern();"> >+ <option value="" selected="selected">-- please choose --</option> >+ [% IF ( periodicity16 ) %] >+ <option value="16" selected="selected">Without periodicity</option> >+ [% ELSE %] >+ <option value="16">Without periodicity</option> >+ [% END %] >+ [% IF ( periodicity48 ) %] >+ <option value="48" selected="selected">Unknown</option> >+ [% ELSE %] >+ <option value="48">Unknown</option> >+ [% END %] >+ [% IF ( periodicity32 ) %] >+ <option value="32" selected="selected">Irregular</option> >+ [% ELSE %] >+ <option value="32">Irregular</option> >+ [% END %] >+ >+ [% IF ( periodicity12 ) %] >+ <option value="12" selected="selected">2/day</option> >+ [% ELSE %] >+ <option value="12">2/day</option> >+ [% END %] >+ [% IF ( periodicity1 ) %] >+ <option value="1" selected="selected">daily (n/week)</option> >+ [% ELSE %] >+ <option value="1">daily (n/week)</option> >+ [% END %] >+ [% IF ( periodicity2 ) %] >+ <option value="2" selected="selected">1/week</option> >+>>>>>>> Bug 8587 - Add a serial lifespan field to serial subscriptions > [% ELSE %] > <input type="hidden" name="op" value="addsubscription" /> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >index b684e5e..3b7dcf0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt >@@ -180,6 +180,31 @@ $(document).ready(function() { > [% IF ( numberlength ) %]<li><span class="label">Number of issues:</span> [% numberlength %]</li>[% END %] > [% IF ( weeklength ) %]<li><span class="label">Number of weeks:</span> [% weeklength %]</li>[% END %] > [% IF ( monthlength ) %]<li><span class="label">Number of months:</span> [% monthlength %]</li>[% END %] >+ <li><span class="label">Serial lifespan:</span> >+ [% IF seriallifespan == -1 %] >+ <span>Permanent</span> >+ [% ELSIF ( seriallifespan == 1 ) %] >+ <span>1 year</span> >+ [% ELSIF ( seriallifespan == 2 ) %] >+ <span>2 years</span> >+ [% ELSIF ( seriallifespan == 3 ) %] >+ <span>3 years</span> >+ [% ELSIF ( seriallifespan == 4 ) %] >+ <span>4 years</span> >+ [% ELSIF ( seriallifespan == 5 ) %] >+ <span>5 years</span> >+ [% ELSIF ( seriallifespan == 6 ) %] >+ <span>6 years</span> >+ [% ELSIF ( seriallifespan == 7 ) %] >+ <span>7 years</span> >+ [% ELSIF ( seriallifespan == 8 ) %] >+ <span>8 years</span> >+ [% ELSIF ( seriallifespan == 9 ) %] >+ <span>9 years</span> >+ [% ELSIF ( seriallifespan == 10 ) %] >+ <span>10 years</span> >+ [% END %] >+ </li> > </ol> > </div> > </div> >@@ -246,6 +271,33 @@ $(document).ready(function() { > </table> > </div> > <div id="subscription_issues"> >+ <h2>Serial issues</h2> >+ <p> >+ <label>Serial lifespan :</label> >+ [% IF seriallifespan == -1 %] >+ <span>Permanent</span> >+ [% ELSIF ( seriallifespan == 1 ) %] >+ <span>1 year</span> >+ [% ELSIF ( seriallifespan == 2 ) %] >+ <span>2 years</span> >+ [% ELSIF ( seriallifespan == 3 ) %] >+ <span>3 years</span> >+ [% ELSIF ( seriallifespan == 4 ) %] >+ <span>4 years</span> >+ [% ELSIF ( seriallifespan == 5 ) %] >+ <span>5 years</span> >+ [% ELSIF ( seriallifespan == 6 ) %] >+ <span>6 years</span> >+ [% ELSIF ( seriallifespan == 7 ) %] >+ <span>7 years</span> >+ [% ELSIF ( seriallifespan == 8 ) %] >+ <span>8 years</span> >+ [% ELSIF ( seriallifespan == 9 ) %] >+ <span>9 years</span> >+ [% ELSIF ( seriallifespan == 10 ) %] >+ <span>10 years</span> >+ [% END %] >+ </p> > <table> > <tr> > <th>Issue number</th> >diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl >index b17fc60..165b8b4 100755 >--- a/serials/subscription-add.pl >+++ b/serials/subscription-add.pl >@@ -106,6 +106,9 @@ if ($op eq 'modify' || $op eq 'dup' || $op eq 'modsubscription') { > "subtype_$sub_on" => 1, > sublength =>$sub_length, > history => ($op eq 'modify'), >+ "periodicity".$subs->{'periodicity'} => 1, >+ "numberpattern".$subs->{'numberpattern'} => 1, >+ "seriallifespan" => $subs->{'seriallifespan'}, > firstacquiyear => substr($firstissuedate,0,4), > ); > >@@ -322,6 +325,7 @@ sub redirect_add_subscription { > my $startdate = format_date_in_iso( $query->param('startdate') ); > my $enddate = format_date_in_iso( $query->param('enddate') ); > my $firstacquidate = format_date_in_iso($query->param('firstacquidate')); >+ my $seriallifespan = $query->param('seriallifespan'); > if(!defined $enddate || $enddate eq '') { > if($subtype eq "issues") { > $enddate = _guess_enddate($firstacquidate, $periodicity, $numberlength, $weeklength, $monthlength); >@@ -338,8 +342,9 @@ sub redirect_add_subscription { > join(";",@irregularity), $numberpattern, $locale, $callnumber, > $manualhistory, $internalnotes, $serialsadditems, > $staffdisplaycount, $opacdisplaycount, $graceperiod, $location, $enddate, >- $skip_serialseq >+ $skip_serialseq, $seriallifespan > ); >+ ModSubscriptionHistory ($subscriptionid,$histstartdate,$histenddate,$recievedlist,$missinglist,$opacnote,$librariannote); > > print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid"); > return; >@@ -413,9 +418,10 @@ sub redirect_mod_subscription { > $status, $biblionumber, $callnumber, $notes, $letter, > $manualhistory, $internalnotes, $serialsadditems, $staffdisplaycount, > $opacdisplaycount, $graceperiod, $location, $enddate, $subscriptionid, >- $skip_serialseq >+ $skip_serialseq, $seiallifespan > ); > >+ ModSubscriptionHistory ($subscriptionid,$histstartdate,$histenddate,$recievedlist,$missinglist,$opacnote,$librariannote); > print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid"); > return; > } >diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl >index 0cceb34..7a3f096 100755 >--- a/serials/subscription-detail.pl >+++ b/serials/subscription-detail.pl >@@ -157,6 +157,7 @@ $template->param( > show_acquisition_details => defined $tmpl_infos->{ordered_exists} || defined $tmpl_infos->{spent_exists} ? 1 : 0, > basketno => $order->{basketno}, > %$tmpl_infos, >+ seriallifespan => $subs->{'seriallifespan'}, > ); > > output_html_with_http_headers $query, $cookie, $template->output; >-- >1.7.9.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 8587
:
11424
|
11437
|
11447
|
11513
|
17600
|
19415
|
19416
|
30636
|
30637
|
30953
|
41217