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

[paul poulain]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_3_0
Changes by:     paul poulain <tipaul>   07/01/24 13:47:02

Modified files:
        C4             : Acquisition.pm 

Log message:
        - adding some information to PendingOrders result list (order date)
        - improving a SQL query, to use LEFT JOIN instead of where
        - removal of Smart::Comment

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Acquisition.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.43.2.8&r2=1.43.2.9

Patches:
Index: Acquisition.pm
===================================================================
RCS file: /sources/koha/koha/C4/Acquisition.pm,v
retrieving revision 1.43.2.8
retrieving revision 1.43.2.9
diff -u -b -r1.43.2.8 -r1.43.2.9
--- Acquisition.pm      9 Jan 2007 17:21:20 -0000       1.43.2.8
+++ Acquisition.pm      24 Jan 2007 13:47:02 -0000      1.43.2.9
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Acquisition.pm,v 1.43.2.8 2007/01/09 17:21:20 toins Exp $
+# $Id: Acquisition.pm,v 1.43.2.9 2007/01/24 13:47:02 tipaul Exp $
 
 use strict;
 require Exporter;
@@ -30,7 +30,7 @@
 use vars qw($VERSION @ISA @EXPORT);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.43.2.8 $' =~ /\d+/g; shift(@v) . "." . 
join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.43.2.9 $' =~ /\d+/g; shift(@v) . "." . 
join( "_", map { sprintf "%03d", $_ } @v ); };
 
 # used in receiveorder subroutine
 # to provide library specific handling
@@ -212,7 +212,8 @@
     my $dbh = C4::Context->dbh;
     my $strsth = "
         SELECT    count(*),aqbasket.basketno,
-                  surname,firstname,aqorders.*
+                    surname,firstname,aqorders.*,
+                    aqbasket.closedate, aqbasket.creationdate
         FROM      aqorders
         LEFT JOIN aqbasket ON aqbasket.basketno=aqorders.basketno
         LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber
@@ -347,11 +348,12 @@
     my $dbh      = C4::Context->dbh;
     my $query = "
         SELECT *
-        FROM   biblio,biblioitems,aqorders
+        FROM   aqorders
         LEFT JOIN aqorderbreakdown ON 
aqorders.ordernumber=aqorderbreakdown.ordernumber
+        LEFT JOIN biblio on           biblio.biblionumber=aqorders.biblionumber
+        LEFT JOIN biblioitems on       
biblioitems.biblionumber=aqorders.biblionumber
         WHERE aqorders.ordernumber=?
-        AND   biblio.biblionumber=aqorders.biblionumber
-        AND   biblioitems.biblioitemnumber=aqorders.biblioitemnumber
+
     ";
     my $sth= $dbh->prepare($query);
     $sth->execute($ordnum);
@@ -790,7 +792,6 @@
 =cut
 
 sub GetParcel {
-use Smart::Comments;
     #gets all orders from a certain supplier, orders them alphabetically
     my ( $supplierid, $code, $datereceived ) = @_;
     my $dbh     = C4::Context->dbh;