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

(-)a/C4/Serials.pm (-1 / +2 lines)
Lines 754-760 sub GetLatestSerials { Link Here
754
    my $dbh = C4::Context->dbh;
754
    my $dbh = C4::Context->dbh;
755
755
756
    # status = 2 is "arrived"
756
    # status = 2 is "arrived"
757
    my $strsth = "SELECT   serialid,serialseq, status, planneddate, notes
757
    my $strsth = "SELECT   serialid,serialseq, status, planneddate, notes, publisheddate
758
                        FROM     serial
758
                        FROM     serial
759
                        WHERE    subscriptionid = ?
759
                        WHERE    subscriptionid = ?
760
                        AND      (status =2 or status=4)
760
                        AND      (status =2 or status=4)
Lines 766-771 sub GetLatestSerials { Link Here
766
    while ( my $line = $sth->fetchrow_hashref ) {
766
    while ( my $line = $sth->fetchrow_hashref ) {
767
        $line->{ "status" . $line->{status} } = 1;                        # fills a "statusX" value, used for template status select list
767
        $line->{ "status" . $line->{status} } = 1;                        # fills a "statusX" value, used for template status select list
768
        $line->{"planneddate"} = format_date( $line->{"planneddate"} );
768
        $line->{"planneddate"} = format_date( $line->{"planneddate"} );
769
        $line->{"publisheddate"} = format_date( $line->{"publisheddate"} );
769
        push @serials, $line;
770
        push @serials, $line;
770
    }
771
    }
771
772
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing-preview-slip.tmpl (-1 / +2 lines)
Lines 26-32 Link Here
26
            <td>&nbsp;</td></tr>
26
            <td>&nbsp;</td></tr>
27
<!-- /TMPL_LOOP -->
27
<!-- /TMPL_LOOP -->
28
</table>
28
</table>
29
<p><b>Notes:</b> Please return this item promptly as others are waiting for it.
29
<p><b>Notes:</b> Please return this item promptly
30
<br />as others are waiting for it.
30
<br /><!-- TMPL_VAR NAME="routingnotes" --></p>
31
<br /><!-- TMPL_VAR NAME="routingnotes" --></p>
31
   <div id="slip-block-links" class="noprint">
32
   <div id="slip-block-links" class="noprint">
32
   <a class="button" href="javascript:window.print();self.close()">Print</a> &nbsp; <a class="button" href="javascript:self.close()">Close</a>
33
   <a class="button" href="javascript:window.print();self.close()">Print</a> &nbsp; <a class="button" href="javascript:self.close()">Close</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl (-1 / +4 lines)
Lines 43-49 function search_member(subscriptionid){ Link Here
43
		<li><label for="date_selected">Issue: </label>
43
		<li><label for="date_selected">Issue: </label>
44
<select name="date_selected" id="date_selected">
44
<select name="date_selected" id="date_selected">
45
<!-- TMPL_LOOP NAME="dates" -->
45
<!-- TMPL_LOOP NAME="dates" -->
46
<!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="serialseq" --> (<!-- TMPL_VAR NAME="planneddate" -->)" selected="selected"><!-- TMPL_VAR NAME="serialseq" --> (<!-- TMPL_VAR NAME="planneddate" -->)</option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="serialseq" --> (<!-- TMPL_VAR NAME="planneddate" -->)"><!-- TMPL_VAR NAME="serialseq" --> (<!-- TMPL_VAR NAME="planneddate" -->)</option><!-- /TMPL_IF -->
46
<!-- TMPL_IF NAME="selected" -->
47
<option value="<!-- TMPL_VAR NAME="serialseq" --> (<!-- TMPL_VAR Name="publisheddate" ESCAPE="HTML" -->) (Rec'd: <!-- TMPL_VAR NAME="planneddate" -->)" selected="selected"><!-- TMPL_VAR NAME="serialseq" --> (<!-- TMPL_VAR Name="publisheddate" ESCAPE="HTML" -->) (Rec'd: <!-- TMPL_VAR Name="planneddate" ESCAPE="HTML" -->)</option>
48
<!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="serialseq" --> (<!-- TMPL_VAR NAME="planneddate" -->)"><!-- TMPL_VAR NAME="serialseq" --> (<!-- TMPL_VAR Name="publisheddate" ESCAPE="HTML" -->) (Rec'd: <!-- TMPL_VAR Name="planneddate" ESCAPE="HTML" -->)</option>
49
<!-- /TMPL_IF -->
47
<!-- /TMPL_LOOP -->
50
<!-- /TMPL_LOOP -->
48
</select> <!-- TMPL_VAR NAME="issue" --></li>
51
</select> <!-- TMPL_VAR NAME="issue" --></li>
49
52
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tmpl (-1 / +1 lines)
Lines 226-232 $(document).ready(function() { Link Here
226
                    <!-- TMPL_VAR Name="branchcode" -->
226
                    <!-- TMPL_VAR Name="branchcode" -->
227
                </td>
227
                </td>
228
		<td>
228
		<td>
229
		   <a href="" onclick="print_slip(<!-- TMPL_VAR NAME="subscriptionid" ESCAPE="HTML" -->, '<!-- TMPL_VAR NAME="serialseq" ESCAPE="HTML" -->'); return false" >Print list</a>
229
		   <a href="" onclick="print_slip(<!-- TMPL_VAR NAME="subscriptionid" ESCAPE="HTML" -->, '<!-- TMPL_VAR NAME="serialseq" ESCAPE="HTML" --> (<!-- TMPL_VAR Name="publisheddate" ESCAPE="HTML" -->) (Rec\'d: <!-- TMPL_VAR Name="planneddate" ESCAPE="HTML" -->)'); return false" >Print list</a>
230
		</td>
230
		</td>
231
                <td>
231
                <td>
232
                  <!--TMPL_IF Name="cannotedit"-->
232
                  <!--TMPL_IF Name="cannotedit"-->
(-)a/serials/routing.pl (-1 / +1 lines)
Lines 74-79 my $serialdates = GetLatestSerials($subscriptionid,$count); Link Here
74
my $dates = [];
74
my $dates = [];
75
foreach my $dateseq (@{$serialdates}) {
75
foreach my $dateseq (@{$serialdates}) {
76
    my $d = {};
76
    my $d = {};
77
    $d->{publisheddate} = $dateseq->{publisheddate};
77
    $d->{planneddate} = $dateseq->{planneddate};
78
    $d->{planneddate} = $dateseq->{planneddate};
78
    $d->{serialseq} = $dateseq->{serialseq};
79
    $d->{serialseq} = $dateseq->{serialseq};
79
    $d->{serialid} = $dateseq->{serialid};
80
    $d->{serialid} = $dateseq->{serialid};
80
- 

Return to bug 5841