# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id$
use strict;
-require Exporter;
use C4::Context;
-use C4::Date;
+use C4::Debug;
+use C4::Dates qw(format_date);
use MARC::Record;
use C4::Suggestions;
use Time::localtime;
use vars qw($VERSION @ISA @EXPORT);
-# set the version for version checking
-$VERSION = do { my @v = '$Revision$' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+BEGIN {
+ # set the version for version checking
+ $VERSION = 3.01;
+ require Exporter;
+ @ISA = qw(Exporter);
+ @EXPORT = qw(
+ &GetBasket &NewBasket &CloseBasket
+ &GetPendingOrders &GetOrder &GetOrders
+ &GetOrderNumber &GetLateOrders &NewOrder &DelOrder
+ &SearchOrder &GetHistory &GetRecentAcqui
+ &ModOrder &ModReceiveOrder &ModOrderBiblioNumber
+ &GetParcels &GetParcel
+ );
+}
# used in receiveorder subroutine
# to provide library specific handling
=over 2
-=cut
-
-@ISA = qw(Exporter);
-@EXPORT = qw(
- &GetBasket &NewBasket &CloseBasket
- &GetPendingOrders &GetOrder &GetOrders
- &GetOrderNumber &GetLateOrders &NewOrder &DelOrder
- &SearchOrder &GetHistory &GetRecentAcqui
- &ModOrder &ModReceiveOrder &ModOrderBiblioNumber
- &GetParcels &GetParcel
-);
-
=head2 FUNCTIONS ABOUT BASKETS
=over 2
-=cut
-
-#------------------------------------------------------------#
-
=head3 GetBasket
=over 4
my $dbh = C4::Context->dbh;
my $query = "
SELECT aqbasket.*,
- borrowers.firstname+' '+borrowers.surname AS authorisedbyname,
- borrowers.branchcode AS branch
+ concat( b.firstname,' ',b.surname) AS authorisedbyname,
+ b.branchcode AS branch
FROM aqbasket
- LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber
+ LEFT JOIN borrowers b ON aqbasket.authorisedby=b.borrowernumber
WHERE basketno=?
";
my $sth=$dbh->prepare($query);
$sth->execute($basketno);
- return ( $sth->fetchrow_hashref );
+ my $basket = $sth->fetchrow_hashref;
+ return ( $basket );
}
#------------------------------------------------------------#
AND (to_days(now())-to_days(closedate) < 180 OR closedate IS NULL)
";
## FIXME Why 180 days ???
+ my @query_params = ( $supplierid );
if ( C4::Context->preference("IndependantBranches") ) {
my $userenv = C4::Context->userenv;
if ( ($userenv) && ( $userenv->{flags} != 1 ) ) {
- $strsth .=
- " and (borrowers.branchcode = '"
- . $userenv->{branch}
- . "' or borrowers.branchcode ='')";
+ $strsth .= " and (borrowers.branchcode = ?
+ or borrowers.branchcode = '')";
+ push @query_params, $userenv->{branch};
}
}
$strsth .= " group by aqbasket.basketno" if $grouped;
$strsth .= " order by aqbasket.basketno";
my $sth = $dbh->prepare($strsth);
- $sth->execute($supplierid);
+ $sth->execute( @query_params );
my $results = $sth->fetchall_arrayref({});
$sth->finish;
return $results;
my $dbh = C4::Context->dbh;
my $query ="
SELECT aqorderbreakdown.*,
- biblio.*,biblioitems.*,
+ biblio.*,biblioitems.publishercode,
aqorders.*,
aqbookfund.bookfundname,
biblio.title
FROM aqorders
LEFT JOIN aqorderbreakdown ON aqorders.ordernumber=aqorderbreakdown.ordernumber
- LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber
- LEFT JOIN biblioitems ON biblioitems.biblioitemnumber=aqorders.biblioitemnumber
LEFT JOIN aqbookfund ON aqbookfund.bookfundid=aqorderbreakdown.bookfundid
+ LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber
+ LEFT JOIN biblioitems ON biblioitems.biblionumber=biblio.biblionumber
WHERE basketno=?
AND (datecancellationprinted IS NULL OR datecancellationprinted='0000-00-00')
";
- $orderby = "biblioitems.publishercode" unless $orderby;
+ $orderby = "biblioitems.publishercode,biblio.title" unless $orderby;
$query .= " ORDER BY $orderby";
my $sth = $dbh->prepare($query);
$sth->execute($basketno);
my ($ordnum) = @_;
my $dbh = C4::Context->dbh;
my $query = "
- SELECT *
+ SELECT biblioitems.*, biblio.*, aqorderbreakdown.*, aqorders.*
FROM aqorders
LEFT JOIN aqorderbreakdown ON aqorders.ordernumber=aqorderbreakdown.ordernumber
LEFT JOIN biblio on biblio.biblionumber=aqorders.biblionumber
&NewOrder($basket, $biblionumber, $title, $quantity, $listprice,
$booksellerid, $who, $notes, $bookfund, $biblioitemnumber, $rrp,
$ecost, $gst, $budget, $unitprice, $subscription,
- $booksellerinvoicenumber);
+ $booksellerinvoicenumber, $purchaseorder);
Adds a new order to the database. Any argument that isn't described
below is the new value of the field with the same name in the aqorders
and the book fund ID of the newly-added order.
C<$budget> is effectively ignored.
+ If it's undef (anything false) or the string 'now', the current day is used.
+ Else, the upcoming July 1st is used.
C<$subscription> may be either "yes", or anything else for "no".
$listprice, $booksellerid, $authorisedby, $notes,
$bookfund, $bibitemnum, $rrp, $ecost,
$gst, $budget, $cost, $sub,
- $invoice, $sort1, $sort2
+ $invoice, $sort1, $sort2, $purchaseorder
)
= @_;
my $month = localtime->mon() + 1; # months starts at 0, add 1
if ( !$budget || $budget eq 'now' ) {
- $budget = "now()";
+ $budget = undef;
}
# if month is july or more, budget start is 1 jul, next year.
elsif ( $month >= '7' ) {
++$year; # add 1 to year , coz its next year
- $budget = "'$year-07-01'";
+ $budget = "$year-07-01";
}
else {
# START OF NEW BUDGET, 1ST OF JULY, THIS YEAR
- $budget = "'$year-07-01'";
+ $budget = "$year-07-01";
}
if ( $sub eq 'yes' ) {
my $dbh = C4::Context->dbh;
my $query = "
INSERT INTO aqorders
- ( biblionumber,title,basketno,quantity,listprice,notes,
- biblioitemnumber,rrp,ecost,gst,unitprice,subscription,sort1,sort2,budgetdate,entrydate)
- VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,$budget,now() )
+ ( biblionumber, title, basketno, quantity, listprice,
+ notes, biblioitemnumber, rrp, ecost, gst,
+ unitprice, subscription, sort1, sort2, budgetdate,
+ entrydate, purchaseordernumber)
+ VALUES ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?,COALESCE(?,NOW()),NOW(),? )
";
my $sth = $dbh->prepare($query);
$sth->execute(
$bibnum, $title, $basketno, $quantity, $listprice,
$notes, $bibitemnum, $rrp, $ecost, $gst,
- $cost, $sub, $sort1, $sort2
+ $cost, $sub, $sort1, $sort2, $budget,
+ $purchaseorder
);
$sth->finish;
&ModOrder($title, $ordernumber, $quantity, $listprice,
$biblionumber, $basketno, $supplier, $who, $notes,
$bookfundid, $bibitemnum, $rrp, $ecost, $gst, $budget,
- $unitprice, $booksellerinvoicenumber);
+ $unitprice, $booksellerinvoicenumber, $branchcode);
Modifies an existing order. Updates the order with order number
C<$ordernumber> and biblionumber C<$biblionumber>. All other arguments
database.
Entries with order number C<$ordernumber> in the aqorderbreakdown
-table are also updated to the new book fund ID.
+table are also updated to the new book fund ID or branchcode.
=back
$title, $ordnum, $quantity, $listprice, $bibnum,
$basketno, $supplier, $who, $notes, $bookfund,
$bibitemnum, $rrp, $ecost, $gst, $budget,
- $cost, $invoice, $sort1, $sort2
+ $cost, $invoice, $sort1, $sort2, $purchaseorder, $branchcode
)
= @_;
+ # FIXME : Refactor to pass a hashref instead of fifty params.
my $dbh = C4::Context->dbh;
my $query = "
UPDATE aqorders
SET title=?,
quantity=?,listprice=?,basketno=?,
rrp=?,ecost=?,unitprice=?,booksellerinvoicenumber=?,
- notes=?,sort1=?, sort2=?
+ notes=?,sort1=?, sort2=?, purchaseordernumber=?
WHERE ordernumber=? AND biblionumber=?
";
my $sth = $dbh->prepare($query);
$sth->execute(
$title, $quantity, $listprice, $basketno, $rrp,
$ecost, $cost, $invoice, $notes, $sort1,
- $sort2, $ordnum, $bibnum
+ $sort2, $purchaseorder,
+ $ordnum, $bibnum
);
$sth->finish;
$query = "
UPDATE aqorderbreakdown
- SET bookfundid=?
+ SET bookfundid=?,branchcode=?
WHERE ordernumber=?
";
$sth = $dbh->prepare($query);
- unless ( $sth->execute( $bookfund, $ordnum ) )
- { # zero rows affected [Bug 734]
+ my $rv = $sth->execute( $bookfund,$branchcode, $ordnum );
+ unless($rv && ( $rv ne '0E0' )) { # zero rows affected [Bug 734]
my $query ="
INSERT INTO aqorderbreakdown
- (ordernumber,bookfundid)
- VALUES (?,?)
+ (ordernumber,branchcode,bookfundid)
+ VALUES (?,?,?)
";
$sth = $dbh->prepare($query);
- $sth->execute( $ordnum, $bookfund );
+ $sth->execute( $ordnum,$branchcode, $bookfund );
}
$sth->finish;
}
in part. All arguments not mentioned below update the fields with the
same name in the aqorders table of the Koha database.
+If a partial order is received, splits the order into two. The received
+portion must have a booksellerinvoicenumber.
+
Updates the order with bibilionumber C<$biblionumber> and ordernumber
C<$ordernumber>.
sub ModReceiveOrder {
my (
$biblionumber, $ordnum, $quantrec, $user, $cost,
- $invoiceno, $freight, $rrp, $bookfund, $daterecieved
+ $invoiceno, $freight, $rrp, $bookfund, $datereceived
)
= @_;
my $dbh = C4::Context->dbh;
# warn "DATE BEFORE : $daterecieved";
- $daterecieved=POSIX::strftime("%Y-%m-%d",CORE::localtime) unless $daterecieved;
+# $daterecieved=POSIX::strftime("%Y-%m-%d",CORE::localtime) unless $daterecieved;
# warn "DATE REC : $daterecieved";
- my $query = "
- UPDATE aqorders
- SET quantityreceived=?,datereceived=?,booksellerinvoicenumber=?,
- unitprice=?,freight=?,rrp=?
- WHERE biblionumber=? AND ordernumber=?
- ";
- my $sth = $dbh->prepare($query);
+ $datereceived = C4::Dates->output('iso') unless $datereceived;
my $suggestionid = GetSuggestionFromBiblionumber( $dbh, $biblionumber );
if ($suggestionid) {
ModStatus( $suggestionid, 'AVAILABLE', '', $biblionumber );
}
- $sth->execute( $quantrec,$daterecieved, $invoiceno, $cost, $freight, $rrp, $biblionumber,
- $ordnum);
- $sth->finish;
-
# Allows libraries to change their bookfund during receiving orders
# allows them to adjust budgets
- if ( C4::Context->preferene("LooseBudgets") ) {
+ if ( C4::Context->preference("LooseBudgets") && $bookfund ) {
my $query = "
UPDATE aqorderbreakdown
SET bookfundid=?
$sth->execute( $bookfund, $ordnum );
$sth->finish;
}
- return $daterecieved;
+
+ my $sth=$dbh->prepare("SELECT * FROM aqorders LEFT JOIN aqorderbreakdown ON aqorders.ordernumber=aqorderbreakdown.ordernumber
+ WHERE biblionumber=? AND aqorders.ordernumber=?");
+ $sth->execute($biblionumber,$ordnum);
+ my $order = $sth->fetchrow_hashref();
+ $sth->finish();
+
+ if ( $order->{quantity} > $quantrec ) {
+ $sth=$dbh->prepare("update aqorders
+ set quantityreceived=?,datereceived=?,booksellerinvoicenumber=?,
+ unitprice=?,freight=?,rrp=?,quantity=?
+ where biblionumber=? and ordernumber=?");
+ $sth->execute($quantrec,$datereceived,$invoiceno,$cost,$freight,$rrp,$quantrec,$biblionumber,$ordnum);
+ $sth->finish;
+ # create a new order for the remaining items, and set its bookfund.
+ my $newOrder = NewOrder($order->{'basketno'},$order->{'biblionumber'},$order->{'title'}, $order->{'quantity'} - $quantrec,
+ $order->{'listprice'},$order->{'booksellerid'},$order->{'authorisedby'},$order->{'notes'},
+ $order->{'bookfundid'},$order->{'biblioitemnumber'},$order->{'rrp'},$order->{'ecost'},$order->{'gst'},
+ $order->{'budget'},$order->{'unitcost'},$order->{'sub'},'',$order->{'sort1'},$order->{'sort2'},$order->{'purchaseordernumber'});
+ } else {
+ $sth=$dbh->prepare("update aqorders
+ set quantityreceived=?,datereceived=?,booksellerinvoicenumber=?,
+ unitprice=?,freight=?,rrp=?
+ where biblionumber=? and ordernumber=?");
+ $sth->execute($quantrec,$datereceived,$invoiceno,$cost,$freight,$rrp,$biblionumber,$ordnum);
+ $sth->finish;
+ }
+ return $datereceived;
}
-
#------------------------------------------------------------#
=head3 SearchOrder
aqorders.listprice,
aqorders.rrp,
aqorders.ecost
- FROM aqorders,aqbasket
+ FROM aqorders
+ LEFT JOIN aqbasket ON aqbasket.basketno=aqorders.basketno
LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber
- WHERE aqbasket.basketno=aqorders.basketno
- AND aqbasket.booksellerid=?
- AND aqorders.booksellerinvoicenumber LIKE \"$code\"
- AND aqorders.datereceived= \'$datereceived\'";
+ WHERE
+ aqbasket.booksellerid = ?
+ AND aqorders.booksellerinvoicenumber LIKE ?
+ AND aqorders.datereceived = ? ";
+ my @query_params = ( $supplierid, $code, $datereceived );
if ( C4::Context->preference("IndependantBranches") ) {
my $userenv = C4::Context->userenv;
if ( ($userenv) && ( $userenv->{flags} != 1 ) ) {
- $strsth .=
- " and (borrowers.branchcode = '"
- . $userenv->{branch}
- . "' or borrowers.branchcode ='')";
+ $strsth .= " and (borrowers.branchcode = ?
+ or borrowers.branchcode = '')";
+ push @query_params, $userenv->{branch};
}
}
- $strsth .= " order by aqbasket.basketno";
+ $strsth .= " ORDER BY aqbasket.basketno";
### parcelinformation : $strsth
my $sth = $dbh->prepare($strsth);
- $sth->execute($supplierid);
+ $sth->execute( @query_params );
while ( my $data = $sth->fetchrow_hashref ) {
push( @results, $data );
}
sub GetParcels {
my ($bookseller,$order, $code, $datefrom, $dateto) = @_;
my $dbh = C4::Context->dbh;
+ my @query_params = ();
my $strsth ="
SELECT aqorders.booksellerinvoicenumber,
- datereceived,
+ datereceived,purchaseordernumber,
count(DISTINCT biblionumber) AS biblio,
sum(quantity) AS itemsexpected,
sum(quantityreceived) AS itemsreceived
WHERE aqbasket.booksellerid = $bookseller and datereceived IS NOT NULL
";
- $strsth .= "and aqorders.booksellerinvoicenumber like \"$code%\" " if ($code);
-
- $strsth .= "and datereceived >=" . $dbh->quote($datefrom) . " " if ($datefrom);
+ if ( defined $code ) {
+ $strsth .= ' and aqorders.booksellerinvoicenumber like ? ';
+ # add a % to the end of the code to allow stemming.
+ push @query_params, "$code%";
+ }
+
+ if ( defined $datefrom ) {
+ $strsth .= ' and datereceived >= ? ';
+ push @query_params, $datefrom;
+ }
- $strsth .= "and datereceived <=" . $dbh->quote($dateto) . " " if ($dateto);
+ if ( defined $dateto ) {
+ $strsth .= 'and datereceived <= ? ';
+ push @query_params, $dateto;
+ }
$strsth .= "group by aqorders.booksellerinvoicenumber,datereceived ";
+
+ # can't use a placeholder to place this column name.
+ # but, we could probably be checking to make sure it is a column that will be fetched.
$strsth .= "order by $order " if ($order);
-### $strsth
+
my $sth = $dbh->prepare($strsth);
- $sth->execute;
+ $sth->execute( @query_params );
my $results = $sth->fetchall_arrayref({});
$sth->finish;
return @$results;
my $dbh = C4::Context->dbh;
#BEWARE, order of parenthesis and LEFT JOIN is important for speed
- my $strsth;
my $dbdriver = C4::Context->config("db_scheme") || "mysql";
- # warn " $dbdriver";
- if ( $dbdriver eq "mysql" ) {
- $strsth = "
- SELECT aqbasket.basketno,aqorders.ordernumber,
- DATE(aqbasket.closedate) AS orderdate,
- aqorders.quantity - IFNULL(aqorders.quantityreceived,0) AS quantity,
- aqorders.rrp AS unitpricesupplier,
- aqorders.ecost AS unitpricelib,
- (aqorders.quantity - IFNULL(aqorders.quantityreceived,0)) * aqorders.rrp AS subtotal,
- aqbookfund.bookfundname AS budget,
- borrowers.branchcode AS branch,
- aqbooksellers.name AS supplier,
- aqorders.title,
- biblio.author,
- biblioitems.publishercode AS publisher,
- biblioitems.publicationyear,
- DATEDIFF(CURDATE( ),closedate) AS latesince
- FROM (((
- (aqorders LEFT JOIN biblio ON biblio.biblionumber = aqorders.biblionumber)
- LEFT JOIN biblioitems ON biblioitems.biblionumber=biblio.biblionumber)
- LEFT JOIN aqorderbreakdown ON aqorders.ordernumber = aqorderbreakdown.ordernumber)
- LEFT JOIN aqbookfund ON aqorderbreakdown.bookfundid = aqbookfund.bookfundid),
- (aqbasket LEFT JOIN borrowers ON aqbasket.authorisedby = borrowers.borrowernumber)
- LEFT JOIN aqbooksellers ON aqbasket.booksellerid = aqbooksellers.id
- WHERE aqorders.basketno = aqbasket.basketno
- AND (closedate < DATE_SUB(CURDATE( ),INTERVAL $delay DAY))
- AND ((datereceived = '' OR datereceived is null)
- OR (aqorders.quantityreceived < aqorders.quantity) )
- ";
- $strsth .= " AND aqbasket.booksellerid = $supplierid " if ($supplierid);
- $strsth .= " AND borrowers.branchcode like \'" . $branch . "\'"
- if ($branch);
- $strsth .=
- " AND borrowers.branchcode like \'"
- . C4::Context->userenv->{branch} . "\'"
- if ( C4::Context->preference("IndependantBranches")
- && C4::Context->userenv
- && C4::Context->userenv->{flags} != 1 );
- $strsth .=" HAVING quantity<>0
- AND unitpricesupplier<>0
- AND unitpricelib<>0
- ORDER BY latesince,basketno,borrowers.branchcode, supplier
- ";
+ my @query_params = ($delay); # delay is the first argument regardless
+ my $select = "
+ SELECT aqbasket.basketno,
+ aqorders.ordernumber,
+ DATE(aqbasket.closedate) AS orderdate,
+ aqorders.rrp AS unitpricesupplier,
+ aqorders.ecost AS unitpricelib,
+ aqbookfund.bookfundname AS budget,
+ borrowers.branchcode AS branch,
+ aqbooksellers.name AS supplier,
+ aqorders.title,
+ biblio.author,
+ biblioitems.publishercode AS publisher,
+ biblioitems.publicationyear,
+ ";
+ my $from = "
+ FROM (((
+ (aqorders LEFT JOIN biblio ON biblio.biblionumber = aqorders.biblionumber)
+ LEFT JOIN biblioitems ON biblioitems.biblionumber = biblio.biblionumber)
+ LEFT JOIN aqorderbreakdown ON aqorders.ordernumber = aqorderbreakdown.ordernumber)
+ LEFT JOIN aqbookfund ON aqorderbreakdown.bookfundid = aqbookfund.bookfundid),
+ (aqbasket LEFT JOIN borrowers ON aqbasket.authorisedby = borrowers.borrowernumber)
+ LEFT JOIN aqbooksellers ON aqbasket.booksellerid = aqbooksellers.id
+ WHERE aqorders.basketno = aqbasket.basketno
+ AND ( (datereceived = '' OR datereceived IS NULL)
+ OR (aqorders.quantityreceived < aqorders.quantity)
+ )
+ ";
+ my $having = "";
+ if ($dbdriver eq "mysql") {
+ $select .= "
+ aqorders.quantity - IFNULL(aqorders.quantityreceived,0) AS quantity,
+ (aqorders.quantity - IFNULL(aqorders.quantityreceived,0)) * aqorders.rrp AS subtotal,
+ DATEDIFF(CURDATE( ),closedate) AS latesince
+ ";
+ $from .= " AND (closedate <= DATE_SUB(CURDATE( ),INTERVAL ? DAY)) ";
+ $having = "
+ HAVING quantity <> 0
+ AND unitpricesupplier <> 0
+ AND unitpricelib <> 0
+ ";
+ } else {
+ # FIXME: account for IFNULL as above
+ $select .= "
+ aqorders.quantity AS quantity,
+ aqorders.quantity * aqorders.rrp AS subtotal,
+ (CURDATE - closedate) AS latesince
+ ";
+ $from .= " AND (closedate <= (CURDATE -(INTERVAL ? DAY)) ";
}
- else {
- $strsth = "
- SELECT aqbasket.basketno,
- DATE(aqbasket.closedate) AS orderdate,
- aqorders.quantity, aqorders.rrp AS unitpricesupplier,
- aqorders.ecost as unitpricelib,
- aqorders.quantity * aqorders.rrp AS subtotal
- aqbookfund.bookfundname AS budget,
- borrowers.branchcode AS branch,
- aqbooksellers.name AS supplier,
- biblio.title,
- biblio.author,
- biblioitems.publishercode AS publisher,
- biblioitems.publicationyear,
- (CURDATE - closedate) AS latesince
- FROM(( (
- (aqorders LEFT JOIN biblio on biblio.biblionumber = aqorders.biblionumber)
- LEFT JOIN biblioitems on biblioitems.biblionumber=biblio.biblionumber)
- LEFT JOIN aqorderbreakdown on aqorders.ordernumber = aqorderbreakdown.ordernumber)
- LEFT JOIN aqbookfund ON aqorderbreakdown.bookfundid = aqbookfund.bookfundid),
- (aqbasket LEFT JOIN borrowers on aqbasket.authorisedby = borrowers.borrowernumber) LEFT JOIN aqbooksellers ON aqbasket.booksellerid = aqbooksellers.id
- WHERE aqorders.basketno = aqbasket.basketno
- AND (closedate < (CURDATE -(INTERVAL $delay DAY))
- AND ((datereceived = '' OR datereceived is null)
- OR (aqorders.quantityreceived < aqorders.quantity) ) ";
- $strsth .= " AND aqbasket.booksellerid = $supplierid " if ($supplierid);
-
- $strsth .= " AND borrowers.branchcode like \'" . $branch . "\'" if ($branch);
- $strsth .=" AND borrowers.branchcode like \'". C4::Context->userenv->{branch} . "\'"
- if (C4::Context->preference("IndependantBranches") && C4::Context->userenv->{flags} != 1 );
- $strsth .=" ORDER BY latesince,basketno,borrowers.branchcode, supplier";
+ if (defined $supplierid) {
+ $from .= ' AND aqbasket.booksellerid = ? ';
+ push @query_params, $supplierid;
}
- my $sth = $dbh->prepare($strsth);
- $sth->execute;
+ if (defined $branch) {
+ $from .= ' AND borrowers.branchcode LIKE ? ';
+ push @query_params, $branch;
+ }
+ if (C4::Context->preference("IndependantBranches")
+ && C4::Context->userenv
+ && C4::Context->userenv->{flags} != 1 ) {
+ $from .= ' AND borrowers.branchcode LIKE ? ';
+ push @query_params, C4::Context->userenv->{branch};
+ }
+ my $query = "$select $from $having\nORDER BY latesince, basketno, borrowers.branchcode, supplier";
+ $debug and print STDERR "GetLateOrders query: $query\nGetLateOrders args: " . join(" ",@query_params);
+ my $sth = $dbh->prepare($query);
+ $sth->execute(@query_params);
my @results;
- my $hilighted = 1;
- while ( my $data = $sth->fetchrow_hashref ) {
- $data->{hilighted} = $hilighted if ( $hilighted > 0 );
- $data->{orderdate} = format_date( $data->{orderdate} );
+ while (my $data = $sth->fetchrow_hashref) {
+ $data->{orderdate} = format_date($data->{orderdate});
push @results, $data;
- $hilighted = -$hilighted;
}
- $sth->finish;
return @results;
}
=over 4
-(\@order_loop, $total_qty, $total_price, $total_qtyreceived)=&GetHistory( $title, $author, $name, $from_placed_on, $to_placed_on )
-
-this function get the search history.
+(\@order_loop, $total_qty, $total_price, $total_qtyreceived) = GetHistory( $title, $author, $name, $from_placed_on, $to_placed_on );
+
+ Retreives some acquisition history information
+
+ returns:
+ $order_loop is a list of hashrefs that each look like this:
+ {
+ 'author' => 'Twain, Mark',
+ 'basketno' => '1',
+ 'biblionumber' => '215',
+ 'count' => 1,
+ 'creationdate' => 'MM/DD/YYYY',
+ 'datereceived' => undef,
+ 'ecost' => '1.00',
+ 'id' => '1',
+ 'invoicenumber' => undef,
+ 'name' => '',
+ 'ordernumber' => '1',
+ 'quantity' => 1,
+ 'quantityreceived' => undef,
+ 'title' => 'The Adventures of Huckleberry Finn'
+ }
+ $total_qty is the sum of all of the quantities in $order_loop
+ $total_price is the cost of each in $order_loop times the quantity
+ $total_qtyreceived is the sum of all of the quantityreceived entries in $order_loop
=back
aqorders.ecost,
aqorders.ordernumber,
aqorders.booksellerinvoicenumber as invoicenumber,
- aqbooksellers.id as id
+ aqbooksellers.id as id,
+ aqorders.biblionumber
FROM aqorders
LEFT JOIN aqbasket ON aqorders.basketno=aqbasket.basketno
- LEFT JOIN aqbooksellers ON aqorders.basketno=aqbasket.basketno
+ LEFT JOIN aqbooksellers ON aqbasket.booksellerid=aqbooksellers.id
LEFT JOIN biblio ON biblio.biblionumber=aqorders.biblionumber";
$query .= " LEFT JOIN borrowers ON aqbasket.authorisedby=borrowers.borrowernumber"
if ( C4::Context->preference("IndependantBranches") );
- $query .= " WHERE 1 ";
- $query .= " AND biblio.title LIKE " . $dbh->quote( "%" . $title . "%" )
- if $title;
+ $query .= " WHERE (datecancellationprinted is NULL or datecancellationprinted='0000-00-00') ";
+
+ my @query_params = ();
+
+ if ( defined $title ) {
+ $query .= " AND biblio.title LIKE ? ";
+ push @query_params, "%$title%";
+ }
- $query .=
- " AND biblio.author LIKE " . $dbh->quote( "%" . $author . "%" )
- if $author;
+ if ( defined $author ) {
+ $query .= " AND biblio.author LIKE ? ";
+ push @query_params, "%$author%";
+ }
- $query .= " AND name LIKE " . $dbh->quote( "%" . $name . "%" ) if $name;
+ if ( defined $name ) {
+ $query .= " AND name LIKE ? ";
+ push @query_params, "%$name%";
+ }
- $query .= " AND creationdate >" . $dbh->quote($from_placed_on)
- if $from_placed_on;
+ if ( defined $from_placed_on ) {
+ $query .= " AND creationdate >= ? ";
+ push @query_params, $from_placed_on;
+ }
- $query .= " AND creationdate<" . $dbh->quote($to_placed_on)
- if $to_placed_on;
+ if ( defined $to_placed_on ) {
+ $query .= " AND creationdate <= ? ";
+ push @query_params, $to_placed_on;
+ }
if ( C4::Context->preference("IndependantBranches") ) {
my $userenv = C4::Context->userenv;
if ( ($userenv) && ( $userenv->{flags} != 1 ) ) {
- $query .=
- " AND (borrowers.branchcode = '"
- . $userenv->{branch}
- . "' OR borrowers.branchcode ='')";
+ $query .= " AND (borrowers.branchcode = ? OR borrowers.branchcode ='' ) ";
+ push @query_params, $userenv->{branch};
}
}
$query .= " ORDER BY booksellerid";
my $sth = $dbh->prepare($query);
- $sth->execute;
+ $sth->execute( @query_params );
my $cnt = 1;
while ( my $line = $sth->fetchrow_hashref ) {
$line->{count} = $cnt++;
return \@results;
}
-END { } # module clean-up code here (global destructor)
-
1;
-
__END__
=back
projects / koha.git / blobdiff