@@ -, +, @@ --- acqui/parcel.pl | 35 ++++++++++++------ .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 42 ++++++++++++---------- 2 files changed, 47 insertions(+), 30 deletions(-) --- a/acqui/parcel.pl +++ a/acqui/parcel.pl @@ -69,6 +69,7 @@ use Koha::Acquisition::Baskets; use Koha::Acquisition::Bookseller; use Koha::Acquisition::Orders; use Koha::Biblios; +use Koha::Old::Biblios; use Koha::DateUtils; use Koha::Biblios; @@ -140,14 +141,22 @@ for my $order ( @orders ) { my %line = %{ $order }; $line{invoice} = $invoice->{invoicenumber}; - my @itemnumbers = $order_object->items->get_column('itemnumber'); + my $biblio = Koha::Biblios->find( $line{biblionumber} ); - $line{total_holds} = $biblio ? $biblio->holds->count : 0; - $line{item_holds} = $biblio ? $biblio->current_holds->search( - { - itemnumber => { -in => \@itemnumbers }, - } - )->count : 0; + if ( $biblio ) { + my @itemnumbers = $order_object->items->get_column('itemnumber'); + $line{total_holds} = $biblio->holds->count; + $line{item_holds} = $biblio->current_holds->search( + { + itemnumber => { -in => \@itemnumbers }, + } + )->count; + } else { + $biblio = Koha::Old::Biblios->find( $line{biblionumber} ); + $line{total_holds} = 0; + $line{item_holds} = 0; + } + $line{biblio} = $biblio; $line{budget} = GetBudgetByOrderNumber( $line{ordernumber} ); $line{tax_value} = $line{tax_value_on_receiving}; @@ -244,11 +253,15 @@ unless( defined $invoice->{closedate} ) { my $countbiblio = CountBiblioInOrders($biblionumber); my $ordernumber = $line{'ordernumber'}; my $order_object = Koha::Acquisition::Orders->find($ordernumber); - my $cnt_subscriptions = $biblio ? $biblio->subscriptions->count: 0; - my $itemcount = $biblio ? $biblio->items->count : 0; - my $holds_count = $biblio ? $biblio->holds->count : 0; my @itemnumbers = $order_object->items->get_column('itemnumber'); - my $itemholds = $biblio ? $biblio->holds->search({ itemnumber => { -in => \@itemnumbers } })->count : 0; + my ( $cnt_subscriptions, $itemcount, $holds_count, $itemholds ) = (0) x 4; + if ( $biblio ) { + $cnt_subscriptions = $biblio->subscriptions->count; + $itemcount = $biblio->items->count; + $holds_count = $biblio->holds->count; + $itemholds = $biblio->holds->search({ itemnumber => { -in => \@itemnumbers } })->count; + } + $order->{biblio} = $biblio; my $suggestion = GetSuggestionInfoFromBiblionumber($line{biblionumber}); $line{suggestionid} = $suggestion->{suggestionid}; --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -140,13 +140,13 @@