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

(-)a/C4/Serials.pm (-1 / +3 lines)
Lines 778-785 sub GetLatestSerials { Link Here
778
    my $dbh = C4::Context->dbh;
778
    my $dbh = C4::Context->dbh;
779
779
780
    my $statuses = join( ',', ( ARRIVED, MISSING_STATUSES ) );
780
    my $statuses = join( ',', ( ARRIVED, MISSING_STATUSES ) );
781
    my $strsth = "SELECT   serialid,serialseq, status, planneddate, publisheddate, notes
781
    my $strsth = "SELECT   serial.serialid,serialseq, status, planneddate, publisheddate, notes, price
782
                        FROM     serial
782
                        FROM     serial
783
                        INNER JOIN serialitems ON (serial.serialid=serialitems.serialid)
784
                        INNER JOIN items ON (serialitems.itemnumber=items.itemnumber)
783
                        WHERE    subscriptionid = ?
785
                        WHERE    subscriptionid = ?
784
                        AND      status IN ($statuses)
786
                        AND      status IN ($statuses)
785
                        ORDER BY publisheddate DESC LIMIT 0,$limit
787
                        ORDER BY publisheddate DESC LIMIT 0,$limit
(-)a/catalogue/detail.pl (+12 lines)
Lines 192-197 foreach my $subscription (@subscriptions) { Link Here
192
    $cell{staffdisplaycount} = $serials_to_display;
192
    $cell{staffdisplaycount} = $serials_to_display;
193
    $cell{latestserials} =
193
    $cell{latestserials} =
194
      GetLatestSerials( $subscription->{subscriptionid}, $serials_to_display );
194
      GetLatestSerials( $subscription->{subscriptionid}, $serials_to_display );
195
196
    # Get subscription price
197
    my $order = Koha::Acquisition::Orders->search(
198
        {
199
            subscriptionid => $subscription->{subscriptionid},
200
        }
201
    )->next->unblessed;
202
    if ( $order->{unitprice_tax_included} > 0 ) {
203
        $cell{price} = $order->{quantity} * $order->{unitprice_tax_included};
204
    } else {
205
        $cell{price} = $order->{quantity} * $order->{ecost_tax_included};
206
    }
195
    push @subs, \%cell;
207
    push @subs, \%cell;
196
}
208
}
197
209
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-1 / +3 lines)
Lines 709-714 Note that permanent location is a code, and location may be an authval. Link Here
709
            [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes | html | html_line_break %] </p>[% END %]
709
            [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes | html | html_line_break %] </p>[% END %]
710
            [% IF ( subscription.missinglist ) %]<p>Missing issues: [% subscription.missinglist | html %] </p>[% END %]
710
            [% IF ( subscription.missinglist ) %]<p>Missing issues: [% subscription.missinglist | html %] </p>[% END %]
711
            [% IF ( subscription.librariannote ) %]<p>([% subscription.librariannote | html %])</p>[% END %]
711
            [% IF ( subscription.librariannote ) %]<p>([% subscription.librariannote | html %])</p>[% END %]
712
            [% IF ( subscription.price ) %]<p>Total cost of the subscription is: [% subscription.price | $Price %] </p>[% END %]
712
            [% IF ( subscription.latestserials ) %]
713
            [% IF ( subscription.latestserials ) %]
713
            <p> The [% subscription.staffdisplaycount | html %] latest issues related to this subscription:</p>
714
            <p> The [% subscription.staffdisplaycount | html %] latest issues related to this subscription:</p>
714
            <table>
715
            <table>
Lines 718-723 Note that permanent location is a code, and location may be an authval. Link Here
718
                    <th>Date published</th>
719
                    <th>Date published</th>
719
                    <th>Status</th>
720
                    <th>Status</th>
720
                    <th>Note</th>
721
                    <th>Note</th>
722
                    <th>Issue Price</th>
721
                </tr>
723
                </tr>
722
            [% FOREACH latestserial IN subscription.latestserials %]
724
            [% FOREACH latestserial IN subscription.latestserials %]
723
                <tr>
725
                <tr>
Lines 739-744 Note that permanent location is a code, and location may be an authval. Link Here
739
                      [% IF ( latestserial.status8 ) %]Stopped[% END %]
741
                      [% IF ( latestserial.status8 ) %]Stopped[% END %]
740
                    </td>
742
                    </td>
741
                    <td>[% latestserial.notes | html %]</td>
743
                    <td>[% latestserial.notes | html %]</td>
744
                    <td>[% latestserial.price | $Price %]</td>
742
                </tr>
745
                </tr>
743
            [% END %]
746
            [% END %]
744
            </table>
747
            </table>
745
- 

Return to bug 23450