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 1384-1390
sub ModReceiveOrder {
Link Here
|
1384 |
$sth=$dbh->prepare(" |
1384 |
$sth=$dbh->prepare(" |
1385 |
UPDATE aqorders |
1385 |
UPDATE aqorders |
1386 |
SET quantity = ?, |
1386 |
SET quantity = ?, |
1387 |
orderstatus = 2 |
1387 |
orderstatus = 'partial' |
1388 |
WHERE ordernumber = ? |
1388 |
WHERE ordernumber = ? |
1389 |
"); |
1389 |
"); |
1390 |
|
1390 |
|
Lines 1400-1406
sub ModReceiveOrder {
Link Here
|
1400 |
$order->{'unitprice'} = $cost; |
1400 |
$order->{'unitprice'} = $cost; |
1401 |
$order->{'rrp'} = $rrp; |
1401 |
$order->{'rrp'} = $rrp; |
1402 |
$order->{ecost} = $ecost; |
1402 |
$order->{ecost} = $ecost; |
1403 |
$order->{'orderstatus'} = 3; # totally received |
1403 |
$order->{'orderstatus'} = 'complete'; |
1404 |
my $basketno; |
1404 |
my $basketno; |
1405 |
( $basketno, $new_ordernumber ) = NewOrder($order); |
1405 |
( $basketno, $new_ordernumber ) = NewOrder($order); |
1406 |
|
1406 |
|
Lines 1412-1418
sub ModReceiveOrder {
Link Here
|
1412 |
} else { |
1412 |
} else { |
1413 |
$sth=$dbh->prepare("update aqorders |
1413 |
$sth=$dbh->prepare("update aqorders |
1414 |
set quantityreceived=?,datereceived=?,invoiceid=?, |
1414 |
set quantityreceived=?,datereceived=?,invoiceid=?, |
1415 |
unitprice=?,rrp=?,ecost=?,orderstatus=3 |
1415 |
unitprice=?,rrp=?,ecost=?,orderstatus='complete' |
1416 |
where biblionumber=? and ordernumber=?"); |
1416 |
where biblionumber=? and ordernumber=?"); |
1417 |
$sth->execute($quantrec,$datereceived,$invoiceid,$cost,$rrp,$ecost,$biblionumber,$ordernumber); |
1417 |
$sth->execute($quantrec,$datereceived,$invoiceid,$cost,$rrp,$ecost,$biblionumber,$ordernumber); |
1418 |
$sth->finish; |
1418 |
$sth->finish; |
Lines 1463-1469
sub CancelReceipt {
Link Here
|
1463 |
SET quantityreceived = ?, |
1463 |
SET quantityreceived = ?, |
1464 |
datereceived = ?, |
1464 |
datereceived = ?, |
1465 |
invoiceid = ?, |
1465 |
invoiceid = ?, |
1466 |
orderstatus = 1 |
1466 |
orderstatus = 'ordered' |
1467 |
WHERE ordernumber = ? |
1467 |
WHERE ordernumber = ? |
1468 |
}; |
1468 |
}; |
1469 |
$sth = $dbh->prepare($query); |
1469 |
$sth = $dbh->prepare($query); |
Lines 1491-1497
sub CancelReceipt {
Link Here
|
1491 |
$query = qq{ |
1491 |
$query = qq{ |
1492 |
UPDATE aqorders |
1492 |
UPDATE aqorders |
1493 |
SET quantity = ?, |
1493 |
SET quantity = ?, |
1494 |
orderstatus = 1 |
1494 |
orderstatus = 'ordered' |
1495 |
WHERE ordernumber = ? |
1495 |
WHERE ordernumber = ? |
1496 |
}; |
1496 |
}; |
1497 |
$sth = $dbh->prepare($query); |
1497 |
$sth = $dbh->prepare($query); |
Lines 1631-1637
sub DelOrder {
Link Here
|
1631 |
my $dbh = C4::Context->dbh; |
1631 |
my $dbh = C4::Context->dbh; |
1632 |
my $query = " |
1632 |
my $query = " |
1633 |
UPDATE aqorders |
1633 |
UPDATE aqorders |
1634 |
SET datecancellationprinted=now(), orderstatus=4 |
1634 |
SET datecancellationprinted=now(), orderstatus='cancelled' |
1635 |
WHERE biblionumber=? AND ordernumber=? |
1635 |
WHERE biblionumber=? AND ordernumber=? |
1636 |
"; |
1636 |
"; |
1637 |
my $sth = $dbh->prepare($query); |
1637 |
my $sth = $dbh->prepare($query); |
Lines 1924-1930
sub GetLateOrders {
Link Here
|
1924 |
$from .= ' AND borrowers.branchcode LIKE ? '; |
1924 |
$from .= ' AND borrowers.branchcode LIKE ? '; |
1925 |
push @query_params, C4::Context->userenv->{branch}; |
1925 |
push @query_params, C4::Context->userenv->{branch}; |
1926 |
} |
1926 |
} |
1927 |
$from .= " AND orderstatus <> 4 "; |
1927 |
$from .= " AND orderstatus <> 'cancelled' "; |
1928 |
my $query = "$select $from $having\nORDER BY latesince, basketno, borrowers.branchcode, supplier"; |
1928 |
my $query = "$select $from $having\nORDER BY latesince, basketno, borrowers.branchcode, supplier"; |
1929 |
$debug and print STDERR "GetLateOrders query: $query\nGetLateOrders args: " . join(" ",@query_params); |
1929 |
$debug and print STDERR "GetLateOrders query: $query\nGetLateOrders args: " . join(" ",@query_params); |
1930 |
my $sth = $dbh->prepare($query); |
1930 |
my $sth = $dbh->prepare($query); |
Lines 2047-2053
sub GetHistory {
Link Here
|
2047 |
|
2047 |
|
2048 |
$query .= " WHERE 1 "; |
2048 |
$query .= " WHERE 1 "; |
2049 |
|
2049 |
|
2050 |
$query .= " AND (datecancellationprinted is NULL or datecancellationprinted='0000-00-00') " if $orderstatus ne '4'; |
2050 |
$query .= " AND (datecancellationprinted is NULL or datecancellationprinted='0000-00-00') " if $orderstatus ne 'cancelled'; |
2051 |
|
2051 |
|
2052 |
my @query_params = (); |
2052 |
my @query_params = (); |
2053 |
|
2053 |
|