@@ -, +, @@ detail page --- catalogue/detail.pl | 10 ++++-- .../prog/en/modules/catalogue/detail.tt | 37 +++++++++++++++------- 2 files changed, 33 insertions(+), 14 deletions(-) --- a/catalogue/detail.pl +++ a/catalogue/detail.pl @@ -20,7 +20,6 @@ use Modern::Perl; use CGI qw ( -utf8 ); use HTML::Entities; -use C4::Acquisition qw( GetHistory ); use C4::Auth; use C4::Koha; use C4::Serials; #uses getsubscriptionfrom biblionumber @@ -180,7 +179,14 @@ foreach my $subscription (@subscriptions) { # Get acquisition details if ( C4::Context->preference('AcquisitionDetails') ) { - my $orders = C4::Acquisition::GetHistory( biblionumber => $biblionumber, get_canceled_order => 1 ); + my $orders = Koha::Acquisition::Orders->search( + { biblionumber => $biblionumber }, + { + join => 'basketno', + order_by => 'basketno.booksellerid' + } + ); # GetHistory sorted by aqbooksellerid, but does it make sense? + $template->param( orders => $orders, ); --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -709,43 +709,46 @@ Receive date Status Quantity + Subscription + Subscription callnumber [% FOR order IN orders %] + [% SET basket = order.basket %] + [% SET vendor = basket.bookseller %] - [% IF (order.id) %] - [% order.name %] - [% END %] + [% vendor.name %] - [% IF (order.invoiceid) %] + [% IF order.invoiceid %] [% IF CAN_user_acquisition %] - [% order.invoicenumber %] + [% order.invoice.invoicenumber %] [% ELSE %] - [% order.invoicenumber %] + [% order.invoice.invoicenumber %] [% END %] [% END %] - [% IF (order.basketgroupid) %] + [% IF basket.basketgroupid %] + [% SET basket_group = basket.basket_group %] [% IF CAN_user_acquisition_group_manage %] - [% order.groupname %] ([% order.basketgroupid %]) + [% basket_group.name %] ([% basket_group.id %]) [% ELSE %] - [% order.groupname %] ([% order.basketgroupid %]) + [% basket_group.name %] ([% basket_group.id %]) [% END %] [% END %] [% IF CAN_user_acquisition_order_manage %] - [% order.basketname %] ([% order.basketno %]) + [% basket.basketname %] ([% basket.basketno %]) [% ELSE %] - [% order.basketname %] ([% order.basketno %]) + [% basket.basketname %] ([% basket.basketno %]) [% END %] [% order.ordernumber %] - [% order.creationdate | $KohaDates%] + [% basket.creationdate | $KohaDates%] [% order.datereceived | $KohaDates%] [% SWITCH order.orderstatus %] @@ -757,6 +760,16 @@ [% END %] [% order.quantity %] + + [% IF order.subscriptionid %] + [% order.subscriptionid %] + [% END %] + + + [% IF order.subscriptionid %] + [% order.subscription.callnumber %] + [% END %] + [% END %] --