Lines 235-241
sub CloseBasket {
Link Here
|
235 |
foreach my $order (@orders) { |
235 |
foreach my $order (@orders) { |
236 |
$query = qq{ |
236 |
$query = qq{ |
237 |
UPDATE aqorders |
237 |
UPDATE aqorders |
238 |
SET orderstatus = 1 |
238 |
SET orderstatus = 'ordered' |
239 |
WHERE ordernumber = ?; |
239 |
WHERE ordernumber = ?; |
240 |
}; |
240 |
}; |
241 |
$sth = $dbh->prepare($query); |
241 |
$sth = $dbh->prepare($query); |
Lines 266-272
sub ReopenBasket {
Link Here
|
266 |
foreach my $order (@orders) { |
266 |
foreach my $order (@orders) { |
267 |
$query = qq{ |
267 |
$query = qq{ |
268 |
UPDATE aqorders |
268 |
UPDATE aqorders |
269 |
SET orderstatus = 0 |
269 |
SET orderstatus = 'new' |
270 |
WHERE ordernumber = ?; |
270 |
WHERE ordernumber = ?; |
271 |
}; |
271 |
}; |
272 |
$sth = $dbh->prepare($query); |
272 |
$sth = $dbh->prepare($query); |
Lines 1394-1400
sub ModReceiveOrder {
Link Here
|
1394 |
$sth=$dbh->prepare(" |
1394 |
$sth=$dbh->prepare(" |
1395 |
UPDATE aqorders |
1395 |
UPDATE aqorders |
1396 |
SET quantity = ?, |
1396 |
SET quantity = ?, |
1397 |
orderstatus = 2 |
1397 |
orderstatus = 'partial' |
1398 |
WHERE ordernumber = ? |
1398 |
WHERE ordernumber = ? |
1399 |
"); |
1399 |
"); |
1400 |
|
1400 |
|
Lines 1410-1416
sub ModReceiveOrder {
Link Here
|
1410 |
$order->{'unitprice'} = $cost; |
1410 |
$order->{'unitprice'} = $cost; |
1411 |
$order->{'rrp'} = $rrp; |
1411 |
$order->{'rrp'} = $rrp; |
1412 |
$order->{ecost} = $ecost; |
1412 |
$order->{ecost} = $ecost; |
1413 |
$order->{'orderstatus'} = 3; # totally received |
1413 |
$order->{'orderstatus'} = 'complete'; |
1414 |
my $basketno; |
1414 |
my $basketno; |
1415 |
( $basketno, $new_ordernumber ) = NewOrder($order); |
1415 |
( $basketno, $new_ordernumber ) = NewOrder($order); |
1416 |
|
1416 |
|
Lines 1422-1428
sub ModReceiveOrder {
Link Here
|
1422 |
} else { |
1422 |
} else { |
1423 |
$sth=$dbh->prepare("update aqorders |
1423 |
$sth=$dbh->prepare("update aqorders |
1424 |
set quantityreceived=?,datereceived=?,invoiceid=?, |
1424 |
set quantityreceived=?,datereceived=?,invoiceid=?, |
1425 |
unitprice=?,rrp=?,ecost=?,orderstatus=3 |
1425 |
unitprice=?,rrp=?,ecost=?,orderstatus='complete' |
1426 |
where biblionumber=? and ordernumber=?"); |
1426 |
where biblionumber=? and ordernumber=?"); |
1427 |
$sth->execute($quantrec,$datereceived,$invoiceid,$cost,$rrp,$ecost,$biblionumber,$ordernumber); |
1427 |
$sth->execute($quantrec,$datereceived,$invoiceid,$cost,$rrp,$ecost,$biblionumber,$ordernumber); |
1428 |
$sth->finish; |
1428 |
$sth->finish; |
Lines 1473-1479
sub CancelReceipt {
Link Here
|
1473 |
SET quantityreceived = ?, |
1473 |
SET quantityreceived = ?, |
1474 |
datereceived = ?, |
1474 |
datereceived = ?, |
1475 |
invoiceid = ?, |
1475 |
invoiceid = ?, |
1476 |
orderstatus = 1 |
1476 |
orderstatus = 'ordered' |
1477 |
WHERE ordernumber = ? |
1477 |
WHERE ordernumber = ? |
1478 |
}; |
1478 |
}; |
1479 |
$sth = $dbh->prepare($query); |
1479 |
$sth = $dbh->prepare($query); |
Lines 1501-1507
sub CancelReceipt {
Link Here
|
1501 |
$query = qq{ |
1501 |
$query = qq{ |
1502 |
UPDATE aqorders |
1502 |
UPDATE aqorders |
1503 |
SET quantity = ?, |
1503 |
SET quantity = ?, |
1504 |
orderstatus = 1 |
1504 |
orderstatus = 'ordered' |
1505 |
WHERE ordernumber = ? |
1505 |
WHERE ordernumber = ? |
1506 |
}; |
1506 |
}; |
1507 |
$sth = $dbh->prepare($query); |
1507 |
$sth = $dbh->prepare($query); |
Lines 1641-1647
sub DelOrder {
Link Here
|
1641 |
my $dbh = C4::Context->dbh; |
1641 |
my $dbh = C4::Context->dbh; |
1642 |
my $query = " |
1642 |
my $query = " |
1643 |
UPDATE aqorders |
1643 |
UPDATE aqorders |
1644 |
SET datecancellationprinted=now(), orderstatus=4 |
1644 |
SET datecancellationprinted=now(), orderstatus='cancelled' |
1645 |
WHERE biblionumber=? AND ordernumber=? |
1645 |
WHERE biblionumber=? AND ordernumber=? |
1646 |
"; |
1646 |
"; |
1647 |
my $sth = $dbh->prepare($query); |
1647 |
my $sth = $dbh->prepare($query); |
Lines 1992-1998
sub GetLateOrders {
Link Here
|
1992 |
$from .= ' AND borrowers.branchcode LIKE ? '; |
1992 |
$from .= ' AND borrowers.branchcode LIKE ? '; |
1993 |
push @query_params, C4::Context->userenv->{branch}; |
1993 |
push @query_params, C4::Context->userenv->{branch}; |
1994 |
} |
1994 |
} |
1995 |
$from .= " AND orderstatus <> 4 "; |
1995 |
$from .= " AND orderstatus <> 'cancelled' "; |
1996 |
my $query = "$select $from $having\nORDER BY latesince, basketno, borrowers.branchcode, supplier"; |
1996 |
my $query = "$select $from $having\nORDER BY latesince, basketno, borrowers.branchcode, supplier"; |
1997 |
$debug and print STDERR "GetLateOrders query: $query\nGetLateOrders args: " . join(" ",@query_params); |
1997 |
$debug and print STDERR "GetLateOrders query: $query\nGetLateOrders args: " . join(" ",@query_params); |
1998 |
my $sth = $dbh->prepare($query); |
1998 |
my $sth = $dbh->prepare($query); |
Lines 2115-2121
sub GetHistory {
Link Here
|
2115 |
|
2115 |
|
2116 |
$query .= " WHERE 1 "; |
2116 |
$query .= " WHERE 1 "; |
2117 |
|
2117 |
|
2118 |
$query .= " AND (datecancellationprinted is NULL or datecancellationprinted='0000-00-00') " if $orderstatus ne '4'; |
2118 |
$query .= " AND (datecancellationprinted is NULL or datecancellationprinted='0000-00-00') " if $orderstatus ne 'cancelled'; |
2119 |
|
2119 |
|
2120 |
my @query_params = (); |
2120 |
my @query_params = (); |
2121 |
|
2121 |
|