Bug 24430: Remove CountBiblioInOrders and its traces
This patch replaces the only uses of CountBiblioInOrders and makes that code use $biblio->orders->count instead. Test nothing breaks in basket.pl and parcel.pl Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
parent
f30c2874cd
commit
f31993d126
3 changed files with 4 additions and 24 deletions
21
C4/Biblio.pm
21
C4/Biblio.pm
|
@ -54,7 +54,6 @@ BEGIN {
|
||||||
TransformKohaToMarc
|
TransformKohaToMarc
|
||||||
PrepHostMarcField
|
PrepHostMarcField
|
||||||
CountItemsIssued
|
CountItemsIssued
|
||||||
CountBiblioInOrders
|
|
||||||
ModBiblio
|
ModBiblio
|
||||||
ModZebra
|
ModZebra
|
||||||
UpdateTotalIssues
|
UpdateTotalIssues
|
||||||
|
@ -3180,26 +3179,6 @@ sub ModBiblioMarc {
|
||||||
return $biblionumber;
|
return $biblionumber;
|
||||||
}
|
}
|
||||||
|
|
||||||
=head2 CountBiblioInOrders
|
|
||||||
|
|
||||||
$count = &CountBiblioInOrders( $biblionumber);
|
|
||||||
|
|
||||||
This function return count of biblios in orders with $biblionumber
|
|
||||||
|
|
||||||
=cut
|
|
||||||
|
|
||||||
sub CountBiblioInOrders {
|
|
||||||
my ($biblionumber) = @_;
|
|
||||||
my $dbh = C4::Context->dbh;
|
|
||||||
my $query = "SELECT count(*)
|
|
||||||
FROM aqorders
|
|
||||||
WHERE biblionumber=? AND datecancellationprinted IS NULL";
|
|
||||||
my $sth = $dbh->prepare($query);
|
|
||||||
$sth->execute($biblionumber);
|
|
||||||
my $count = $sth->fetchrow;
|
|
||||||
return ($count);
|
|
||||||
}
|
|
||||||
|
|
||||||
=head2 prepare_host_field
|
=head2 prepare_host_field
|
||||||
|
|
||||||
$marcfield = prepare_host_field( $hostbiblioitem, $marcflavour );
|
$marcfield = prepare_host_field( $hostbiblioitem, $marcflavour );
|
||||||
|
|
|
@ -136,7 +136,7 @@ if ( $op eq 'delete_confirm' ) {
|
||||||
foreach my $myorder (@orders){
|
foreach my $myorder (@orders){
|
||||||
my $biblionumber = $myorder->{'biblionumber'};
|
my $biblionumber = $myorder->{'biblionumber'};
|
||||||
my $biblio = Koha::Biblios->find( $biblionumber );
|
my $biblio = Koha::Biblios->find( $biblionumber );
|
||||||
my $countbiblio = CountBiblioInOrders($biblionumber);
|
my $countbiblio = $biblio->active_orders_count;
|
||||||
my $ordernumber = $myorder->{'ordernumber'};
|
my $ordernumber = $myorder->{'ordernumber'};
|
||||||
my $cnt_subscriptions = $biblio->subscriptions->count;
|
my $cnt_subscriptions = $biblio->subscriptions->count;
|
||||||
my $itemcount = $biblio->items->count;
|
my $itemcount = $biblio->items->count;
|
||||||
|
@ -477,7 +477,8 @@ sub get_order_infos {
|
||||||
my $biblionumber = $order->{'biblionumber'};
|
my $biblionumber = $order->{'biblionumber'};
|
||||||
if ( $biblionumber ) { # The biblio still exists
|
if ( $biblionumber ) { # The biblio still exists
|
||||||
my $biblio = Koha::Biblios->find( $biblionumber );
|
my $biblio = Koha::Biblios->find( $biblionumber );
|
||||||
my $countbiblio = CountBiblioInOrders($biblionumber);
|
my $countbiblio = $biblio->active_orders_count;
|
||||||
|
|
||||||
my $ordernumber = $order->{'ordernumber'};
|
my $ordernumber = $order->{'ordernumber'};
|
||||||
my $cnt_subscriptions = $biblio->subscriptions->count;
|
my $cnt_subscriptions = $biblio->subscriptions->count;
|
||||||
my $itemcount = $biblio->items->count;
|
my $itemcount = $biblio->items->count;
|
||||||
|
|
|
@ -241,7 +241,7 @@ unless( defined $invoice->{closedate} ) {
|
||||||
|
|
||||||
my $biblionumber = $line{'biblionumber'};
|
my $biblionumber = $line{'biblionumber'};
|
||||||
my $biblio = Koha::Biblios->find( $biblionumber );
|
my $biblio = Koha::Biblios->find( $biblionumber );
|
||||||
my $countbiblio = CountBiblioInOrders($biblionumber);
|
my $countbiblio = $biblio->active_orders_count;
|
||||||
my $ordernumber = $line{'ordernumber'};
|
my $ordernumber = $line{'ordernumber'};
|
||||||
my $order_object = Koha::Acquisition::Orders->find($ordernumber);
|
my $order_object = Koha::Acquisition::Orders->find($ordernumber);
|
||||||
my $cnt_subscriptions = $biblio ? $biblio->subscriptions->count: 0;
|
my $cnt_subscriptions = $biblio ? $biblio->subscriptions->count: 0;
|
||||||
|
|
Loading…
Reference in a new issue