[Koha-cvs] koha/C4 Acquisition.pm [dev_week]

[Chris Cormack]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Chris Cormack <rangi>	07/06/18 21:50:11

Modified files:
	C4             : Acquisition.pm 

Log message:
	Fix for MySQL 5

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Acquisition.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.9.2.16.2.2&r2=1.9.2.16.2.3

Patches:
Index: Acquisition.pm
===================================================================
RCS file: /sources/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.9.2.16.2.2
retrieving revision 1.9.2.16.2.3
diff -u -b -r1.9.2.16.2.2 -r1.9.2.16.2.3
--- Acquisition.pm	13 Feb 2007 15:03:06 -0000	1.9.2.16.2.2
+++ Acquisition.pm	18 Jun 2007 21:50:11 -0000	1.9.2.16.2.3
@@ -110,7 +110,7 @@
 sub getbasketcontent {
 	my ($basketno,$supplier,$orderby)=@_;
 	my $dbh = C4::Context->dbh;
-	my $query="Select aqorderbreakdown.*,biblio.*,biblioitems.*,aqorders.*,biblio.title from aqorders,biblio,biblioitems
+	my $query="Select aqorderbreakdown.*,biblio.*,biblioitems.*,aqorders.*,biblio.title from biblio,biblioitems,aqorders
 	left join aqorderbreakdown on aqorderbreakdown.ordernumber=aqorders.ordernumber
 	where basketno='$basketno'
 	and biblio.biblionumber=aqorders.biblionumber and biblioitems.biblioitemnumber
@@ -526,12 +526,12 @@
   my $dbh = C4::Context->dbh;
   my @results = ();
 	my $strsth ="Select authorisedby,creationdate,aqbasket.basketno,
-closedate,surname,firstname,aqorders.biblionumber,aqorders.title, aqorders.ordernumber, quantity, quantityreceived
+closedate,surname,firstname,aqorders.biblionumber,aqorders.title, aqorders.ordernumber, quantity, quantityreceived, biblioitems.isbn
 from aqorders 
 left join aqbasket on aqbasket.basketno=aqorders.basketno 
+left join biblioitems on aqorders.biblionumber=biblioitems.biblionumber
 left join borrowers on aqbasket.authorisedby=borrowers.borrowernumber
-where booksellerid=? and (quantity > quantityreceived or
-quantityreceived is NULL) and datecancellationprinted is NULL ";
+where booksellerid=? and (quantity > quantityreceived or quantityreceived is NULL) and datecancellationprinted is NULL ";
 		
 	if (C4::Context->preference("IndependantBranches")) {
 		my $userenv = C4::Context->userenv;
@@ -539,7 +539,7 @@
 			$strsth .= " and (borrowers.branchcode = '".$userenv->{branch}."' or borrowers.branchcode ='')";
 		}
 	}
-	$strsth.=" order by aqbasket.basketno";
+	$strsth.=" group by aqorders.ordernumber order by aqbasket.basketno";
 	my $sth=$dbh->prepare($strsth);
   $sth->execute($supplierid);
   my $sth_received=$dbh->prepare("select quantityreceived from aqorders where basketno=? and title=? and quantity=quantityreceived");