From 81dc988559f399b5f4d0e9f13ede284f79fdb9e9 Mon Sep 17 00:00:00 2001 From: Chris Hall <chrish@catalyst.net.nz> Date: Fri, 22 Mar 2013 15:34:17 +1300 Subject: [PATCH] bug 10365 change routing slips to use date published rather than planned date Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> --- koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt | 2 +- .../intranet-tmpl/prog/en/modules/serials/serials-collection.tt | 2 +- serials/routing.pl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt index 6caa3d5..7dfa120 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tt @@ -43,7 +43,7 @@ function search_member(subscriptionid){ <li><label for="date_selected">Issue: </label> <select name="date_selected" id="date_selected"> [% FOREACH date IN dates %] -[% IF ( date.selected ) %]<option value="[% date.serialseq %] ([% date.planneddate %])" selected="selected">[% date.serialseq %] ([% date.planneddate %])</option>[% ELSE %]<option value="[% date.serialseq %] ([% date.planneddate %])">[% date.serialseq %] ([% date.planneddate %])</option>[% END %] +[% IF ( date.selected ) %]<option value="[% date.serialseq %] ([% date.publisheddate %])" selected="selected">[% date.serialseq %] ([% date.publisheddate %])</option>[% ELSE %]<option value="[% date.serialseq %] ([% date.publisheddate %])">[% date.serialseq %] ([% date.publisheddate %])</option>[% END %] [% END %] </select> [% issue %]</li> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt index 668fa38..4141200 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt @@ -319,7 +319,7 @@ $(document).ready(function() { </td> [% IF ( routing ) %] <td> - <a href="" onclick="print_slip([% serial.subscriptionid |html %], '[% serial.serialseq |html %] ([% serial.planneddate %])'); return false" >Print list</a> + <a href="" onclick="print_slip([% serial.subscriptionid |html %], '[% serial.serialseq |html %] ([% serial.publisheddate %])'); return false" >Print list</a> </td> [% END %] </tr> diff --git a/serials/routing.pl b/serials/routing.pl index a95631b..5f697ea 100755 --- a/serials/routing.pl +++ b/serials/routing.pl @@ -74,7 +74,7 @@ my $serialdates = GetLatestSerials($subscriptionid,$count); my $dates = []; foreach my $dateseq (@{$serialdates}) { my $d = {}; - $d->{planneddate} = $dateseq->{planneddate}; + $d->{publisheddate} = $dateseq->{publisheddate}; $d->{serialseq} = $dateseq->{serialseq}; $d->{serialid} = $dateseq->{serialid}; if($date_selected eq $dateseq->{serialid}){ -- 1.7.10.4