@@ -, +, @@ --- C4/Acquisition.pm | 4 ++-- .../prog/en/modules/acqui/lateorders.tt | 2 +- serials/lateissues-export.pl | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) --- a/C4/Acquisition.pm +++ a/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 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -40,7 +40,7 @@ $(document).ready(function() { var selected = $("input[name='ordernumber']:checked"); if (selected.length == 0) { - alert(_('Please select at least one item to export.')); + alert(_("Please select at least one item to export.")); return false; } --- a/serials/lateissues-export.pl +++ a/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'}"; } } --