@@ -, +, @@ * removing a few tabs * fixed a few silly indents * replaced bibnumb by biblionumber in DelOrder sub, for consistency --- C4/Acquisition.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) --- a/C4/Acquisition.pm +++ a/C4/Acquisition.pm @@ -1589,7 +1589,7 @@ cancelled. =cut sub DelOrder { - my ($ordernumber,$bibnum) = @_; + my ($ordernumber,$biblionumber) = @_; my $dbh = C4::Context->dbh; my $query = " UPDATE aqorders @@ -1599,10 +1599,10 @@ sub DelOrder { my $sth = $dbh->prepare($query); $sth->execute($ordernumber ); $sth->finish; - if ($bibnum) { + if ($biblionumber) { my @itemnumbers = GetItemnumbersFromOrder( $ordernumber ); foreach my $itemnumber (@itemnumbers){ - C4::Items::DelItem( $dbh, $bibnum, $itemnumber ); + C4::Items::DelItem( $dbh, $biblionumber, $itemnumber ); } } } @@ -2023,8 +2023,8 @@ sub GetHistory { SELECT biblio.title, biblio.author, - biblioitems.isbn, - biblioitems.ean, + biblioitems.isbn, + biblioitems.ean, aqorders.basketno, aqbasket.basketname, aqbasket.basketgroupid, @@ -2044,9 +2044,9 @@ sub GetHistory { LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno LEFT JOIN aqbasketgroups ON aqbasket.basketgroupid=aqbasketgroups.id LEFT JOIN aqbooksellers ON aqbasket.booksellerid=aqbooksellers.id - LEFT JOIN biblioitems ON biblioitems.biblionumber=aqorders.biblionumber + LEFT JOIN biblioitems ON biblioitems.biblionumber=aqorders.biblionumber LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber - LEFT JOIN aqinvoices ON aqorders.invoiceid = aqinvoices.invoiceid"; + LEFT JOIN aqinvoices ON aqorders.invoiceid = aqinvoices.invoiceid"; $query .= " LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber" if ( C4::Context->preference("IndependentBranches") ); --