Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug fixing on query getlateorders.

Browse source 
Adding subtotal.
Changing information display orders.
next work is pretty printing.
This commit is contained in:
hdl 2005-08-10 10:22:57 +00:00
parent 139d01cf13
commit 27c2d1a72e
2 changed files with 67 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
C4/Acquisition.pm
View file

@ -529,7 +529,7 @@ sub getsupplierlistwithlateorders {
#should be tested with other DBMs
my $strsth;
my$dbdriver = C4::Context->config("db_scheme")||"mysql";
my $dbdriver = C4::Context->config("db_scheme")||"mysql";
if ($dbdriver eq "mysql"){
$strsth="SELECT DISTINCT aqbasket.booksellerid, aqbooksellers.name
FROM aqorders, aqbasket
@ -545,7 +545,7 @@ sub getsupplierlistwithlateorders {
(closedate < (CURDATE( )-(INTERVAL $delay DAY))) AND (datereceived = '' or datereceived is null))
";
}
warn "C4::Acquisition getsupplierlistwithlateorders : ".$strsth;
# warn "C4::Acquisition getsupplierlistwithlateorders : ".$strsth;
my $sth = $dbh->prepare($strsth);
$sth->execute;
my %supplierlist;
@ -570,26 +570,50 @@ sub getlateorders {
my $dbh = C4::Context->dbh;
#BEWARE, order of parenthesis and LEFT JOIN is important for speed
my $strsth ="SELECT DISTINCT aqbasket.basketno,
DATE(aqbasket.closedate) as orderdate, aqorders.quantity, aqorders.unitprice,
aqbookfund.bookfundname as budget, aqorderbreakdown.branchcode as branch,
my $strsth;
my $dbdriver = C4::Context->config("db_scheme")||"mysql";
warn " $dbdriver";
if ($dbdriver eq "mysql"){
$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,
DATEDIFF(DATE_SUB(CURDATE( ),INTERVAL $delay DAY),closedate) AS latesince
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 LEFT JOIN aqbookfund on aqorderbreakdown.bookfundid = aqbookfund.bookfundid)
on aqorders.ordernumber = aqorderbreakdown.ordernumber,
aqbasket 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))
";
$strsth .= " AND aqbasket.booksellerid = $supplierid " if ($supplierid);
$strsth .= " AND aqorderbreakdown.branchcode like \'".$branch."\'" if ($branch);
$strsth .= " ORDER BY latesince,basketno,branch, supplier";
warn "C4::Acquisition : getlateorders SQL:".$strsth;
(( (
(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->{flags}!=1);
$strsth .= " ORDER BY latesince,basketno,borrowers.branchcode, supplier";
} 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,
(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";
}
# warn "C4::Acquisition : getlateorders SQL:".$strsth;
my $sth = $dbh->prepare($strsth);
$sth->execute;
my @results;

39
koha-tmpl/intranet-tmpl/default/en/acqui/lateorders.tmpl
View file

@ -5,16 +5,18 @@
<table>
<tr>
<th class="acquisition">Supplier</th>
<th class="acquisition">Budget</th>
<th class="acquisition">Order Date</th>
<th class="acquisition">Late since</th>
<th class="acquisition">Including Basket</th>
<th class="acquisition">Title</th>
<th class="acquisition">Author</th>
<th class="acquisition">Publisher</th>
<th class="acquisition">Branch</th>
<th class="acquisition">Order Date</th>
<th class="acquisition">Including Basket</th>
<th class="acquisition">Estimated Unit Price</th>
<th class="acquisition">Retailer Catalogue Unit Price</th>
<th class="acquisition">Quantity</th>
<th class="acquisition">Unit Price</th>
<th class="acquisition">Late since</th>
<th class="acquisition">Total cost</th>
<th class="acquisition">Budget</th>
<th class="acquisition">&nbsp;</th>
</tr>
<tr>
@ -22,18 +24,19 @@
<td>
<!-- TMPL_VAR name="CGIsupplier" -->
</td>
<td> &nbsp;</td>
<td>
<input type="text" name="delay" value="<!--TMPL_VAR Name="delay" -->"> days
</td>
<td colspan="4">
&nbsp;
</td>
<td>
<!-- TMPL_VAR name="CGIbranch" -->
</td>
<td colspan="4">
<td colspan="5">
&nbsp;
</td>
<td>
<input type="text" name="delay" value="<!--TMPL_VAR Name="delay" -->"> days
</td>
<td>
<input type="submit" value="filter" class="button acquisition">
@ -46,7 +49,13 @@
<!-- TMPL_VAR name="supplier" -->
</td>
<td>
<!-- TMPL_VAR name="budget" -->
<!-- TMPL_VAR name="orderdate" -->
</td>
<td class="number">
<!-- TMPL_VAR name="latesince" -->
</td>
<td align="center">
<!-- TMPL_VAR name="basketno" -->
</td>
<td>
<!-- TMPL_VAR name="title" -->
@ -61,19 +70,19 @@
<!-- TMPL_VAR name="branch" -->
</td>
<td>
<!-- TMPL_VAR name="orderdate" -->
<!-- TMPL_VAR name="unitpricelib" -->
</td>
<td align="center">
<!-- TMPL_VAR name="basketno" -->
<td>
<!-- TMPL_VAR name="unitpricesupplier" -->
</td>
<td>
<!-- TMPL_VAR name="quantity" -->
</td>
<td>
<!-- TMPL_VAR name="unitprice" -->
<!-- TMPL_VAR name="subtotal" -->
</td>
<td>
<!-- TMPL_VAR name="latesince" -->
<!-- TMPL_VAR name="budget" -->
</td>
<td>
&nbsp;