From 5ade44101af1fed83480447035b35a7f73d601d9 Mon Sep 17 00:00:00 2001 From: Paul Poulain Date: Mon, 1 Oct 2012 19:31:34 +0200 Subject: [PATCH] Bug 7298 fixing 2 QA errors * replace IFNULL by COALESCE * replace 4 tabs by 4 "4 spaces" --- C4/Acquisition.pm | 4 ++-- serials/lateissues-export.pl | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index edd6302..5214452 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -1005,8 +1005,8 @@ sub GetOrder { biblioitems.publishercode AS publisher, ADDDATE(aqbasket.closedate, INTERVAL aqbooksellers.deliverytime DAY) AS estimateddeliverydate, DATE(aqbasket.closedate) AS orderdate, - 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(CURDATE( ),closedate) AS latesince FROM aqorders LEFT JOIN biblio ON biblio.biblionumber = aqorders.biblionumber LEFT JOIN biblioitems ON biblioitems.biblionumber = biblio.biblionumber diff --git a/serials/lateissues-export.pl b/serials/lateissues-export.pl index e5cc849..57b9ffa 100755 --- a/serials/lateissues-export.pl +++ b/serials/lateissues-export.pl @@ -63,11 +63,11 @@ for (my $k=0;$k<@serialid;$k++){ @missingissues = GetLateOrMissingIssues($supplierid, $serialid[$k]); for (my $j=0;$j<@missingissues;$j++){ - my @rows2 = ($missingissues[$j]->{'name'}, # lets build up a row - $missingissues[$j]->{'title'}, - $missingissues[$j]->{'serialseq'}, - $missingissues[$j]->{'planneddate'}, - ); + my @rows2 = ($missingissues[$j]->{'name'}, # lets build up a row + $missingissues[$j]->{'title'}, + $missingissues[$j]->{'serialseq'}, + $missingissues[$j]->{'planneddate'}, + ); push (@loop2, \@rows2); } $totalcount2 += scalar @missingissues; @@ -79,9 +79,9 @@ my $heading =''; my $filename =''; if($supplierid){ if($missingissues[0]->{'name'}){ # if exists display supplier name in heading for neatness - # not necessarily needed as the name will appear in supplier column also + # not necessarily needed as the name will appear in supplier column also $heading = "FOR $missingissues[0]->{'name'}"; - $filename = "_$missingissues[0]->{'name'}"; + $filename = "_$missingissues[0]->{'name'}"; } } -- 1.7.9.5