Lines 234-240
sub CloseBasket {
Link Here
|
234 |
foreach my $order (@orders) { |
234 |
foreach my $order (@orders) { |
235 |
$query = qq{ |
235 |
$query = qq{ |
236 |
UPDATE aqorders |
236 |
UPDATE aqorders |
237 |
SET orderstatus = 1 |
237 |
SET orderstatus = 'ordered' |
238 |
WHERE ordernumber = ?; |
238 |
WHERE ordernumber = ?; |
239 |
}; |
239 |
}; |
240 |
$sth = $dbh->prepare($query); |
240 |
$sth = $dbh->prepare($query); |
Lines 265-271
sub ReopenBasket {
Link Here
|
265 |
foreach my $order (@orders) { |
265 |
foreach my $order (@orders) { |
266 |
$query = qq{ |
266 |
$query = qq{ |
267 |
UPDATE aqorders |
267 |
UPDATE aqorders |
268 |
SET orderstatus = 0 |
268 |
SET orderstatus = 'new' |
269 |
WHERE ordernumber = ?; |
269 |
WHERE ordernumber = ?; |
270 |
}; |
270 |
}; |
271 |
$sth = $dbh->prepare($query); |
271 |
$sth = $dbh->prepare($query); |
Lines 1471-1477
sub ModReceiveOrder {
Link Here
|
1471 |
$sth=$dbh->prepare(" |
1471 |
$sth=$dbh->prepare(" |
1472 |
UPDATE aqorders |
1472 |
UPDATE aqorders |
1473 |
SET quantity = ?, |
1473 |
SET quantity = ?, |
1474 |
orderstatus = 2 |
1474 |
orderstatus = 'partial' |
1475 |
WHERE ordernumber = ? |
1475 |
WHERE ordernumber = ? |
1476 |
"); |
1476 |
"); |
1477 |
|
1477 |
|
Lines 1487-1493
sub ModReceiveOrder {
Link Here
|
1487 |
$order->{'unitprice'} = $cost; |
1487 |
$order->{'unitprice'} = $cost; |
1488 |
$order->{'rrp'} = $rrp; |
1488 |
$order->{'rrp'} = $rrp; |
1489 |
$order->{ecost} = $ecost; |
1489 |
$order->{ecost} = $ecost; |
1490 |
$order->{'orderstatus'} = 3; # totally received |
1490 |
$order->{'orderstatus'} = 'complete'; |
1491 |
$new_ordernumber = NewOrder($order); |
1491 |
$new_ordernumber = NewOrder($order); |
1492 |
|
1492 |
|
1493 |
if ($received_items) { |
1493 |
if ($received_items) { |
Lines 1498-1504
sub ModReceiveOrder {
Link Here
|
1498 |
} else { |
1498 |
} else { |
1499 |
$sth=$dbh->prepare("update aqorders |
1499 |
$sth=$dbh->prepare("update aqorders |
1500 |
set quantityreceived=?,datereceived=?,invoiceid=?, |
1500 |
set quantityreceived=?,datereceived=?,invoiceid=?, |
1501 |
unitprice=?,rrp=?,ecost=?,orderstatus=3 |
1501 |
unitprice=?,rrp=?,ecost=?,orderstatus='complete' |
1502 |
where biblionumber=? and ordernumber=?"); |
1502 |
where biblionumber=? and ordernumber=?"); |
1503 |
$sth->execute($quantrec,$datereceived,$invoiceid,$cost,$rrp,$ecost,$biblionumber,$ordernumber); |
1503 |
$sth->execute($quantrec,$datereceived,$invoiceid,$cost,$rrp,$ecost,$biblionumber,$ordernumber); |
1504 |
$sth->finish; |
1504 |
$sth->finish; |
Lines 1549-1555
sub CancelReceipt {
Link Here
|
1549 |
SET quantityreceived = ?, |
1549 |
SET quantityreceived = ?, |
1550 |
datereceived = ?, |
1550 |
datereceived = ?, |
1551 |
invoiceid = ?, |
1551 |
invoiceid = ?, |
1552 |
orderstatus = 1 |
1552 |
orderstatus = 'ordered' |
1553 |
WHERE ordernumber = ? |
1553 |
WHERE ordernumber = ? |
1554 |
}; |
1554 |
}; |
1555 |
$sth = $dbh->prepare($query); |
1555 |
$sth = $dbh->prepare($query); |
Lines 1577-1583
sub CancelReceipt {
Link Here
|
1577 |
$query = qq{ |
1577 |
$query = qq{ |
1578 |
UPDATE aqorders |
1578 |
UPDATE aqorders |
1579 |
SET quantity = ?, |
1579 |
SET quantity = ?, |
1580 |
orderstatus = 1 |
1580 |
orderstatus = 'ordered' |
1581 |
WHERE ordernumber = ? |
1581 |
WHERE ordernumber = ? |
1582 |
}; |
1582 |
}; |
1583 |
$sth = $dbh->prepare($query); |
1583 |
$sth = $dbh->prepare($query); |
Lines 1717-1723
sub DelOrder {
Link Here
|
1717 |
my $dbh = C4::Context->dbh; |
1717 |
my $dbh = C4::Context->dbh; |
1718 |
my $query = " |
1718 |
my $query = " |
1719 |
UPDATE aqorders |
1719 |
UPDATE aqorders |
1720 |
SET datecancellationprinted=now(), orderstatus=4 |
1720 |
SET datecancellationprinted=now(), orderstatus='cancelled' |
1721 |
WHERE biblionumber=? AND ordernumber=? |
1721 |
WHERE biblionumber=? AND ordernumber=? |
1722 |
"; |
1722 |
"; |
1723 |
my $sth = $dbh->prepare($query); |
1723 |
my $sth = $dbh->prepare($query); |
Lines 2010-2016
sub GetLateOrders {
Link Here
|
2010 |
$from .= ' AND borrowers.branchcode LIKE ? '; |
2010 |
$from .= ' AND borrowers.branchcode LIKE ? '; |
2011 |
push @query_params, C4::Context->userenv->{branch}; |
2011 |
push @query_params, C4::Context->userenv->{branch}; |
2012 |
} |
2012 |
} |
2013 |
$from .= " AND orderstatus <> 4 "; |
2013 |
$from .= " AND orderstatus <> 'cancelled' "; |
2014 |
my $query = "$select $from $having\nORDER BY latesince, basketno, borrowers.branchcode, supplier"; |
2014 |
my $query = "$select $from $having\nORDER BY latesince, basketno, borrowers.branchcode, supplier"; |
2015 |
$debug and print STDERR "GetLateOrders query: $query\nGetLateOrders args: " . join(" ",@query_params); |
2015 |
$debug and print STDERR "GetLateOrders query: $query\nGetLateOrders args: " . join(" ",@query_params); |
2016 |
my $sth = $dbh->prepare($query); |
2016 |
my $sth = $dbh->prepare($query); |
Lines 2133-2139
sub GetHistory {
Link Here
|
2133 |
|
2133 |
|
2134 |
$query .= " WHERE 1 "; |
2134 |
$query .= " WHERE 1 "; |
2135 |
|
2135 |
|
2136 |
$query .= " AND (datecancellationprinted is NULL or datecancellationprinted='0000-00-00') " if $orderstatus ne '4'; |
2136 |
$query .= " AND (datecancellationprinted is NULL or datecancellationprinted='0000-00-00') " if $orderstatus ne 'cancelled'; |
2137 |
|
2137 |
|
2138 |
my @query_params = (); |
2138 |
my @query_params = (); |
2139 |
|
2139 |
|