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