Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'bug_8164' into 3.12-master

Browse source
This commit is contained in:
Jared Camins-Esakov 2012-11-28 19:08:39 -05:00
commit b1fc803122
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
C4/Acquisition.pm
View file

@ -1795,8 +1795,8 @@ sub GetLateOrders {
my $having = "";
if ($dbdriver eq "mysql") {
$select .= "
aqorders.quantity - IFNULL(aqorders.quantityreceived,0) AS quantity,
(aqorders.quantity - IFNULL(aqorders.quantityreceived,0)) * aqorders.rrp AS subtotal,
aqorders.quantity - COALESCE(aqorders.quantityreceived,0) AS quantity,
(aqorders.quantity - COALESCE(aqorders.quantityreceived,0)) * aqorders.rrp AS subtotal,
DATEDIFF(CAST(now() AS date),closedate) AS latesince
";
if ( defined $delay ) {

2
C4/Bookseller.pm
View file

@ -125,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 ) {

2
C4/VirtualShelves.pm
View file

@ -460,7 +460,7 @@ sub ShelfPossibleAction {
my $dbh = C4::Context->dbh;
my $query = qq/
SELECT IFNULL(owner,0) AS owner, category, allow_add, allow_delete_own, allow_delete_other, IFNULL(sh.borrowernumber,0) AS borrowernumber
SELECT COALESCE(owner,0) AS owner, category, allow_add, allow_delete_own, allow_delete_other, COALESCE(sh.borrowernumber,0) AS borrowernumber
FROM virtualshelves vs
LEFT JOIN virtualshelfshares sh ON sh.shelfnumber=vs.shelfnumber
AND sh.borrowernumber=?