Attachment #148113 for bug #23450

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

Lines 746-753 sub GetLatestSerials { Link Here

(-)a/C4/Serials.pm (-1 / +3 lines)
746	my $dbh = C4::Context->dbh;	746	my $dbh = C4::Context->dbh;
747		747
748	my $statuses = join( ',', ( ARRIVED, MISSING_STATUSES ) );	748	my $statuses = join( ',', ( ARRIVED, MISSING_STATUSES ) );
749	my $strsth = "SELECT serialid,serialseq, status, planneddate, publisheddate, notes	749	my $strsth = "SELECT serial.serialid,serialseq, status, planneddate, publisheddate, notes, price
750	FROM serial	750	FROM serial
		751	INNER JOIN serialitems ON (serial.serialid=serialitems.serialid)
		752	INNER JOIN items ON (serialitems.itemnumber=items.itemnumber)
751	WHERE subscriptionid = ?	753	WHERE subscriptionid = ?
752	AND status IN ($statuses)	754	AND status IN ($statuses)
753	ORDER BY publisheddate DESC LIMIT 0,$limit	755	ORDER BY publisheddate DESC LIMIT 0,$limit




    $cell{staffdisplaycount} = $serials_to_display;
    $cell{latestserials} =
      GetLatestSerials( $subscription->{subscriptionid}, $serials_to_display );
    # Get subscription price
    my $order = Koha::Acquisition::Orders->search(
        {
            subscriptionid => $subscription->{subscriptionid},
        }
    )->next;
    if ( $order->unitprice_tax_included > 0 ) {
        $cell{price} = $order->quantity * $order->unitprice_tax_included;
    } else {
        $cell{price} = $order->quantity * $order->ecost_tax_included;
    }
    push @subs, \%cell;
}





            [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes | html | html_line_break %] </p>[% END %]
            [% IF ( subscription.missinglist ) %]<p>Missing issues: [% subscription.missinglist | html %] </p>[% END %]
            [% IF ( subscription.librariannote ) %]<p>([% subscription.librariannote | html %])</p>[% END %]
            [% IF ( subscription.price ) %]<p>Total cost of the subscription is: [% subscription.price | $Price %] </p>[% END %]
            [% IF ( subscription.latestserials ) %]
            <p> The [% subscription.staffdisplaycount | html %] latest issues related to this subscription:</p>
            <table>

                    <th>Date published</th>
                    <th>Status</th>
                    <th>Note</th>
                    <th>Issue Price</th>
                </tr>
            [% FOREACH latestserial IN subscription.latestserials %]
                <tr>

                      [% IF ( latestserial.status8 ) %]<span>Stopped</span>[% END %]
                    </td>
                    <td>[% latestserial.notes | html %]</td>
                    <td>[% latestserial.price | $Price %]</td>
                </tr>
            [% END %]
            </table>
- 

Return to bug 23450

Lines 239-244 foreach my $subscription (@subscriptions) { Link Here

(-)a/catalogue/detail.pl (+11 lines)
239	$cell{staffdisplaycount} = $serials_to_display;	239	$cell{staffdisplaycount} = $serials_to_display;
240	$cell{latestserials} =	240	$cell{latestserials} =
241	GetLatestSerials( $subscription->{subscriptionid}, $serials_to_display );	241	GetLatestSerials( $subscription->{subscriptionid}, $serials_to_display );
		242	# Get subscription price
		243	my $order = Koha::Acquisition::Orders->search(
		244	{
		245	subscriptionid => $subscription->{subscriptionid},
		246	}
		247	)->next;
		248	if ( $order->unitprice_tax_included > 0 ) {
		249	$cell{price} = $order->quantity * $order->unitprice_tax_included;
		250	} else {
		251	$cell{price} = $order->quantity * $order->ecost_tax_included;
		252	}
242	push @subs, \%cell;	253	push @subs, \%cell;
243	}	254	}
244		255

Lines 791-796 Note that permanent location is a code, and location may be an authval. Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-1 / +3 lines)
791	[% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes \| html \| html_line_break %] </p>[% END %]	791	[% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes \| html \| html_line_break %] </p>[% END %]
792	[% IF ( subscription.missinglist ) %]<p>Missing issues: [% subscription.missinglist \| html %] </p>[% END %]	792	[% IF ( subscription.missinglist ) %]<p>Missing issues: [% subscription.missinglist \| html %] </p>[% END %]
793	[% IF ( subscription.librariannote ) %]<p>([% subscription.librariannote \| html %])</p>[% END %]	793	[% IF ( subscription.librariannote ) %]<p>([% subscription.librariannote \| html %])</p>[% END %]
		794	[% IF ( subscription.price ) %]<p>Total cost of the subscription is: [% subscription.price \| $Price %] </p>[% END %]
794	[% IF ( subscription.latestserials ) %]	795	[% IF ( subscription.latestserials ) %]
795	<p> The [% subscription.staffdisplaycount \| html %] latest issues related to this subscription:</p>	796	<p> The [% subscription.staffdisplaycount \| html %] latest issues related to this subscription:</p>
796	<table>	797	<table>
Lines 800-805 Note that permanent location is a code, and location may be an authval. Link Here
800	<th>Date published</th>	801	<th>Date published</th>
801	<th>Status</th>	802	<th>Status</th>
802	<th>Note</th>	803	<th>Note</th>
		804	<th>Issue Price</th>
803	</tr>	805	</tr>
804	[% FOREACH latestserial IN subscription.latestserials %]	806	[% FOREACH latestserial IN subscription.latestserials %]
805	<tr>	807	<tr>
Lines 821-826 Note that permanent location is a code, and location may be an authval. Link Here
821	[% IF ( latestserial.status8 ) %]<span>Stopped</span>[% END %]	823	[% IF ( latestserial.status8 ) %]<span>Stopped</span>[% END %]
822	</td>	824	</td>
823	<td>[% latestserial.notes \| html %]</td>	825	<td>[% latestserial.notes \| html %]</td>
		826	<td>[% latestserial.price \| $Price %]</td>
824	</tr>	827	</tr>
825	[% END %]	828	[% END %]
826	</table>	829	</table>
827	-