Bug 10101 - make koha-enable more robust

[koha.git] / C4 / Bookseller.pm

diff --git a/C4/Bookseller.pm b/C4/Bookseller.pm
index 3fded79..c8389a3 100644 (file)
--- a/C4/Bookseller.pm
+++ b/C4/Bookseller.pm
@@ -24,7 +24,7 @@ use warnings;
 use base qw( Exporter );
 
 # set the version for version checking
-our $VERSION   = 4.01;
+our $VERSION   = 3.07.00.049;
 our @EXPORT_OK = qw(
   GetBookSeller GetBooksellersWithLateOrders GetBookSellerFromId
   ModBookseller
@@ -63,9 +63,12 @@ aqbooksellers table in the Koha database.
 sub GetBookSeller {
     my $searchstring = shift;
     $searchstring = q{%} . $searchstring . q{%};
-    my $query =
-'select aqbooksellers.*, count(*) as basketcount from aqbooksellers left join aqbasket '
-      . 'on aqbasket.booksellerid = aqbooksellers.id where name like ? group by aqbooksellers.id order by name';
+    my $query = "
+        SELECT aqbooksellers.*, count(*) AS basketcount
+        FROM aqbooksellers
+        LEFT JOIN aqbasket ON aqbasket.booksellerid = aqbooksellers.id
+        WHERE name LIKE ? GROUP BY aqbooksellers.id ORDER BY name
+    ";
 
     my $dbh           = C4::Context->dbh;
     my $sth           = $dbh->prepare($query);
@@ -122,7 +125,7 @@ sub GetBooksellersWithLateOrders {
             )
             AND aqorders.rrp <> 0
             AND aqorders.ecost <> 0
-            AND aqorders.quantity - IFNULL(aqorders.quantityreceived,0) <> 0
+            AND aqorders.quantity - COALESCE(aqorders.quantityreceived,0) <> 0
             AND aqbasket.closedate IS NOT NULL
     ";
     if ( defined $delay ) {