Lines 1326-1383
sub ModItemOrder {
Link Here
|
1326 |
|
1326 |
|
1327 |
=head3 ModReceiveOrder |
1327 |
=head3 ModReceiveOrder |
1328 |
|
1328 |
|
1329 |
&ModReceiveOrder({ |
1329 |
my ( $date_received, $new_ordernumber ) = ModReceiveOrder( |
1330 |
biblionumber => $biblionumber, |
1330 |
{ |
1331 |
ordernumber => $ordernumber, |
1331 |
biblionumber => $biblionumber, |
1332 |
quantityreceived => $quantityreceived, |
1332 |
order => $order, |
1333 |
user => $user, |
1333 |
quantityreceived => $quantityreceived, |
1334 |
cost => $cost, |
1334 |
user => $user, |
1335 |
ecost => $ecost, |
1335 |
invoice => $invoice, |
1336 |
invoiceid => $invoiceid, |
1336 |
budget_id => $budget_id, |
1337 |
rrp => $rrp, |
1337 |
received_itemnumbers => \@received_itemnumbers, |
1338 |
budget_id => $budget_id, |
1338 |
order_internalnote => $order_internalnote, |
1339 |
datereceived => $datereceived, |
1339 |
} |
1340 |
received_itemnumbers => \@received_itemnumbers, |
1340 |
); |
1341 |
order_internalnote => $order_internalnote, |
|
|
1342 |
order_vendornote => $order_vendornote, |
1343 |
}); |
1344 |
|
1341 |
|
1345 |
Updates an order, to reflect the fact that it was received, at least |
1342 |
Updates an order, to reflect the fact that it was received, at least |
1346 |
in part. All arguments not mentioned below update the fields with the |
1343 |
in part. |
1347 |
same name in the aqorders table of the Koha database. |
|
|
1348 |
|
1344 |
|
1349 |
If a partial order is received, splits the order into two. |
1345 |
If a partial order is received, splits the order into two. |
1350 |
|
1346 |
|
1351 |
Updates the order with bibilionumber C<$biblionumber> and ordernumber |
1347 |
Updates the order with biblionumber C<$biblionumber> and ordernumber |
1352 |
C<$ordernumber>. |
1348 |
C<$order->{ordernumber}>. |
1353 |
|
1349 |
|
1354 |
=cut |
1350 |
=cut |
1355 |
|
1351 |
|
1356 |
|
1352 |
|
1357 |
sub ModReceiveOrder { |
1353 |
sub ModReceiveOrder { |
1358 |
my ( $params ) = @_; |
1354 |
my ($params) = @_; |
1359 |
my $biblionumber = $params->{biblionumber}; |
1355 |
my $biblionumber = $params->{biblionumber}; |
1360 |
my $ordernumber = $params->{ordernumber}; |
1356 |
my $order = { %{ $params->{order} } }; # Copy the order, we don't want to modify it |
1361 |
my $quantrec = $params->{quantityreceived}; |
1357 |
my $invoice = $params->{invoice}; |
1362 |
my $user = $params->{user}; |
1358 |
my $quantrec = $params->{quantityreceived}; |
1363 |
my $cost = $params->{cost}; |
1359 |
my $user = $params->{user}; |
1364 |
my $ecost = $params->{ecost}; |
1360 |
my $budget_id = $params->{budget_id}; |
1365 |
my $invoiceid = $params->{invoiceid}; |
|
|
1366 |
my $rrp = $params->{rrp}; |
1367 |
my $budget_id = $params->{budget_id}; |
1368 |
my $datereceived = $params->{datereceived}; |
1369 |
my $received_items = $params->{received_items}; |
1361 |
my $received_items = $params->{received_items}; |
1370 |
my $order_internalnote = $params->{order_internalnote}; |
|
|
1371 |
my $order_vendornote = $params->{order_vendornote}; |
1372 |
|
1362 |
|
1373 |
my $dbh = C4::Context->dbh; |
1363 |
my $dbh = C4::Context->dbh; |
1374 |
$datereceived = output_pref( |
1364 |
my $datereceived = ( $invoice and $invoice->{datereceived} ) ? $invoice->{datereceived} : dt_from_string; |
1375 |
{ |
|
|
1376 |
dt => ( $datereceived ? dt_from_string( $datereceived ) : dt_from_string ), |
1377 |
dateformat => 'iso', |
1378 |
dateonly => 1, |
1379 |
} |
1380 |
); |
1381 |
my $suggestionid = GetSuggestionFromBiblionumber( $biblionumber ); |
1365 |
my $suggestionid = GetSuggestionFromBiblionumber( $biblionumber ); |
1382 |
if ($suggestionid) { |
1366 |
if ($suggestionid) { |
1383 |
ModSuggestion( {suggestionid=>$suggestionid, |
1367 |
ModSuggestion( {suggestionid=>$suggestionid, |
Lines 1386-1400
sub ModReceiveOrder {
Link Here
|
1386 |
); |
1370 |
); |
1387 |
} |
1371 |
} |
1388 |
|
1372 |
|
1389 |
my $result_set = $dbh->selectall_arrayref( |
1373 |
my $new_ordernumber = $order->{ordernumber}; |
1390 |
q{SELECT * FROM aqorders WHERE biblionumber=? AND aqorders.ordernumber=?}, |
|
|
1391 |
{ Slice => {} }, $biblionumber, $ordernumber |
1392 |
); |
1393 |
|
1394 |
# we assume we have a unique order |
1395 |
my $order = $result_set->[0]; |
1396 |
|
1397 |
my $new_ordernumber = $ordernumber; |
1398 |
if ( $order->{quantity} > $quantrec ) { |
1374 |
if ( $order->{quantity} > $quantrec ) { |
1399 |
# Split order line in two parts: the first is the original order line |
1375 |
# Split order line in two parts: the first is the original order line |
1400 |
# without received items (the quantity is decreased), |
1376 |
# without received items (the quantity is decreased), |
Lines 1404-1431
q{SELECT * FROM aqorders WHERE biblionumber=? AND aqorders.ordernumber=?},
Link Here
|
1404 |
UPDATE aqorders |
1380 |
UPDATE aqorders |
1405 |
SET quantity = ?, |
1381 |
SET quantity = ?, |
1406 |
orderstatus = 'partial'|; |
1382 |
orderstatus = 'partial'|; |
1407 |
$query .= q|, order_internalnote = ?| if defined $order_internalnote; |
1383 |
$query .= q|, order_internalnote = ?| if defined $order->{order_internalnote}; |
1408 |
$query .= q|, order_vendornote = ?| if defined $order_vendornote; |
|
|
1409 |
$query .= q| WHERE ordernumber = ?|; |
1384 |
$query .= q| WHERE ordernumber = ?|; |
1410 |
my $sth = $dbh->prepare($query); |
1385 |
my $sth = $dbh->prepare($query); |
1411 |
|
1386 |
|
1412 |
$sth->execute( |
1387 |
$sth->execute( |
1413 |
$order->{quantity} - $quantrec, |
1388 |
$order->{quantity} - $quantrec, |
1414 |
( defined $order_internalnote ? $order_internalnote : () ), |
1389 |
( defined $order->{order_internalnote} ? $order->{order_internalnote} : () ), |
1415 |
( defined $order_vendornote ? $order_vendornote : () ), |
1390 |
$order->{ordernumber} |
1416 |
$ordernumber |
|
|
1417 |
); |
1391 |
); |
1418 |
|
1392 |
|
1419 |
delete $order->{'ordernumber'}; |
1393 |
delete $order->{ordernumber}; |
1420 |
$order->{'budget_id'} = ( $budget_id || $order->{'budget_id'} ); |
1394 |
$order->{budget_id} = ( $budget_id || $order->{budget_id} ); |
1421 |
$order->{'quantity'} = $quantrec; |
1395 |
$order->{quantity} = $quantrec; |
1422 |
$order->{'quantityreceived'} = $quantrec; |
1396 |
$order->{quantityreceived} = $quantrec; |
1423 |
$order->{'datereceived'} = $datereceived; |
1397 |
$order->{datereceived} = $datereceived; |
1424 |
$order->{'invoiceid'} = $invoiceid; |
1398 |
$order->{invoiceid} = $invoice->{invoiceid}; |
1425 |
$order->{'unitprice'} = $cost; |
1399 |
$order->{orderstatus} = 'complete'; |
1426 |
$order->{'rrp'} = $rrp; |
|
|
1427 |
$order->{ecost} = $ecost; |
1428 |
$order->{'orderstatus'} = 'complete'; |
1429 |
$new_ordernumber = Koha::Acquisition::Order->new($order)->insert->{ordernumber}; |
1400 |
$new_ordernumber = Koha::Acquisition::Order->new($order)->insert->{ordernumber}; |
1430 |
|
1401 |
|
1431 |
if ($received_items) { |
1402 |
if ($received_items) { |
Lines 1435-1460
q{SELECT * FROM aqorders WHERE biblionumber=? AND aqorders.ordernumber=?},
Link Here
|
1435 |
} |
1406 |
} |
1436 |
} else { |
1407 |
} else { |
1437 |
my $query = q| |
1408 |
my $query = q| |
1438 |
update aqorders |
1409 |
UPDATE aqorders |
1439 |
set quantityreceived=?,datereceived=?,invoiceid=?, |
1410 |
SET quantityreceived = ?, |
1440 |
unitprice=?,rrp=?,ecost=?,budget_id=?,orderstatus='complete'|; |
1411 |
datereceived = ?, |
1441 |
$query .= q|, order_internalnote = ?| if defined $order_internalnote; |
1412 |
invoiceid = ?, |
1442 |
$query .= q|, order_vendornote = ?| if defined $order_vendornote; |
1413 |
budget_id = ?, |
|
|
1414 |
orderstatus = 'complete' |
1415 |
|; |
1416 |
|
1417 |
$query .= q| |
1418 |
, unitprice = ?, unitprice_tax_included = ?, unitprice_tax_excluded = ? |
1419 |
| if defined $order->{unitprice}; |
1420 |
|
1421 |
$query .= q| |
1422 |
, rrp = ?, rrp_tax_included = ?, rrp_tax_excluded = ? |
1423 |
| if defined $order->{rrp}; |
1424 |
|
1425 |
$query .= q| |
1426 |
, ecost = ?, ecost_tax_included = ?, ecost_tax_excluded = ? |
1427 |
| if defined $order->{ecost}; |
1428 |
|
1429 |
$query .= q| |
1430 |
, order_internalnote = ? |
1431 |
| if defined $order->{order_internalnote}; |
1432 |
|
1443 |
$query .= q| where biblionumber=? and ordernumber=?|; |
1433 |
$query .= q| where biblionumber=? and ordernumber=?|; |
|
|
1434 |
|
1444 |
my $sth = $dbh->prepare( $query ); |
1435 |
my $sth = $dbh->prepare( $query ); |
1445 |
$sth->execute( |
1436 |
my @params = ( $quantrec, $datereceived, $invoice->{invoiceid}, $budget_id ); |
1446 |
$quantrec, |
1437 |
|
1447 |
$datereceived, |
1438 |
if ( defined $order->{unitprice} ) { |
1448 |
$invoiceid, |
1439 |
push @params, $order->{unitprice}, $order->{unitprice_tax_included}, $order->{unitprice_tax_excluded}; |
1449 |
$cost, |
1440 |
} |
1450 |
$rrp, |
1441 |
if ( defined $order->{rrp} ) { |
1451 |
$ecost, |
1442 |
push @params, $order->{rrp}, $order->{rrp_tax_included}, $order->{rrp_tax_excluded}; |
1452 |
( $budget_id ? $budget_id : $order->{budget_id} ), |
1443 |
} |
1453 |
( defined $order_internalnote ? $order_internalnote : () ), |
1444 |
if ( defined $order->{ecost} ) { |
1454 |
( defined $order_vendornote ? $order_vendornote : () ), |
1445 |
push @params, $order->{ecost}, $order->{ecost_tax_included}, $order->{ecost_tax_excluded}; |
1455 |
$biblionumber, |
1446 |
} |
1456 |
$ordernumber |
1447 |
if ( defined $order->{order_internalnote} ) { |
1457 |
); |
1448 |
push @params, $order->{order_internalnote}; |
|
|
1449 |
} |
1450 |
|
1451 |
push @params, ( $biblionumber, $order->{ordernumber} ); |
1452 |
|
1453 |
$sth->execute( @params ); |
1458 |
|
1454 |
|
1459 |
# All items have been received, sent a notification to users |
1455 |
# All items have been received, sent a notification to users |
1460 |
NotifyOrderUsers( $ordernumber ); |
1456 |
NotifyOrderUsers( $ordernumber ); |
Lines 2828-2877
sub populate_order_with_prices {
Link Here
|
2828 |
$order->{ecost} = Koha::Number::Price->new( $order->{ecost} )->round; |
2824 |
$order->{ecost} = Koha::Number::Price->new( $order->{ecost} )->round; |
2829 |
if ($ordering) { |
2825 |
if ($ordering) { |
2830 |
if ( $bookseller->{listincgst} ) { |
2826 |
if ( $bookseller->{listincgst} ) { |
2831 |
$order->{rrpgsti} = $order->{rrp}; |
2827 |
$order->{rrp_tax_included} = $order->{rrp}; |
2832 |
$order->{rrpgste} = Koha::Number::Price->new( |
2828 |
$order->{rrp_tax_excluded} = Koha::Number::Price->new( |
2833 |
$order->{rrpgsti} / ( 1 + $order->{gstrate} ) )->round; |
2829 |
$order->{rrp_tax_included} / ( 1 + $order->{tax_rate} ) )->round; |
2834 |
$order->{ecostgsti} = $order->{ecost}; |
2830 |
$order->{ecost_tax_included} = $order->{ecost}; |
2835 |
$order->{ecostgste} = Koha::Number::Price->new( |
2831 |
$order->{ecost_tax_excluded} = Koha::Number::Price->new( |
2836 |
$order->{ecost} / ( 1 + $order->{gstrate} ) )->round; |
2832 |
$order->{ecost} / ( 1 + $order->{tax_rate} ) )->round; |
2837 |
$order->{gstvalue} = Koha::Number::Price->new( |
2833 |
$order->{tax_value} = Koha::Number::Price->new( |
2838 |
( $order->{ecostgsti} - $order->{ecostgste} ) * |
2834 |
( $order->{ecost_tax_included} - $order->{ecost_tax_excluded} ) * |
2839 |
$order->{quantity} )->round; |
2835 |
$order->{quantity} )->round; |
2840 |
$order->{totalgste} = $order->{ecostgste} * $order->{quantity}; |
|
|
2841 |
$order->{totalgsti} = $order->{ecostgsti} * $order->{quantity}; |
2842 |
} |
2836 |
} |
2843 |
else { |
2837 |
else { |
2844 |
$order->{rrpgste} = $order->{rrp}; |
2838 |
$order->{rrp_tax_excluded} = $order->{rrp}; |
2845 |
$order->{rrpgsti} = Koha::Number::Price->new( |
2839 |
$order->{rrp_tax_included} = Koha::Number::Price->new( |
2846 |
$order->{rrp} * ( 1 + $order->{gstrate} ) )->round; |
2840 |
$order->{rrp} * ( 1 + $order->{tax_rate} ) )->round; |
2847 |
$order->{ecostgste} = $order->{ecost}; |
2841 |
$order->{ecost_tax_excluded} = $order->{ecost}; |
2848 |
$order->{ecostgsti} = Koha::Number::Price->new( |
2842 |
$order->{ecost_tax_included} = Koha::Number::Price->new( |
2849 |
$order->{ecost} * ( 1 + $order->{gstrate} ) )->round; |
2843 |
$order->{ecost} * ( 1 + $order->{tax_rate} ) )->round; |
2850 |
$order->{gstvalue} = Koha::Number::Price->new( |
2844 |
$order->{tax_value} = Koha::Number::Price->new( |
2851 |
( $order->{ecostgsti} - $order->{ecostgste} ) * |
2845 |
( $order->{ecost_tax_included} - $order->{ecost_tax_excluded} ) * |
2852 |
$order->{quantity} )->round; |
2846 |
$order->{quantity} )->round; |
2853 |
$order->{totalgste} = $order->{ecostgste} * $order->{quantity}; |
|
|
2854 |
$order->{totalgsti} = $order->{ecostgsti} * $order->{quantity}; |
2855 |
} |
2847 |
} |
2856 |
} |
2848 |
} |
2857 |
|
2849 |
|
2858 |
if ($receiving) { |
2850 |
if ($receiving) { |
2859 |
if ( $bookseller->{listincgst} ) { |
2851 |
if ( $bookseller->{listincgst} ) { |
2860 |
$order->{unitpricegsti} = Koha::Number::Price->new( $order->{unitprice} )->round; |
2852 |
$order->{unitprice_tax_included} = Koha::Number::Price->new( $order->{unitprice} )->round; |
2861 |
$order->{unitpricegste} = Koha::Number::Price->new( |
2853 |
$order->{unitprice_tax_excluded} = Koha::Number::Price->new( |
2862 |
$order->{unitpricegsti} / ( 1 + $order->{gstrate} ) )->round; |
2854 |
$order->{unitprice_tax_included} / ( 1 + $order->{tax_rate} ) )->round; |
2863 |
} |
2855 |
} |
2864 |
else { |
2856 |
else { |
2865 |
$order->{unitpricegste} = Koha::Number::Price->new( $order->{unitprice} )->round; |
2857 |
$order->{unitprice_tax_excluded} = Koha::Number::Price->new( $order->{unitprice} )->round; |
2866 |
$order->{unitpricegsti} = Koha::Number::Price->new( |
2858 |
$order->{unitprice_tax_included} = Koha::Number::Price->new( |
2867 |
$order->{unitpricegste} * ( 1 + $order->{gstrate} ) )->round; |
2859 |
$order->{unitprice_tax_excluded} * ( 1 + $order->{tax_rate} ) )->round; |
2868 |
} |
2860 |
} |
2869 |
$order->{gstvalue} = Koha::Number::Price->new( |
2861 |
$order->{tax_value} = Koha::Number::Price->new( |
2870 |
( $order->{unitpricegsti} - $order->{unitpricegste} ) |
2862 |
( $order->{unitprice_tax_included} - $order->{unitprice_tax_excluded} ) |
2871 |
* $order->{quantityreceived} )->round; |
2863 |
* $order->{quantityreceived} )->round; |
2872 |
|
2864 |
|
2873 |
$order->{totalgste} = $order->{unitpricegste} * $order->{quantity}; |
|
|
2874 |
$order->{totalgsti} = $order->{unitpricegsti} * $order->{quantity}; |
2875 |
} |
2865 |
} |
2876 |
|
2866 |
|
2877 |
return $order; |
2867 |
return $order; |