View | Details | Raw Unified | Return to bug 13321
Collapse All | Expand All

(-)a/C4/Acquisition.pm (-1 / +16 lines)
Lines 1390-1399 sub ModReceiveOrder { Link Here
1390
            $order->{ordernumber}
1390
            $order->{ordernumber}
1391
        );
1391
        );
1392
1392
1393
        # Recalculate tax_value
1394
        $dbh->do(q|
1395
            UPDATE aqorders
1396
            SET tax_value = quantity * ecost_tax_excluded * tax_rate
1397
            WHERE ordernumber = ?
1398
        |, undef, $order->{ordernumber});
1399
1393
        delete $order->{ordernumber};
1400
        delete $order->{ordernumber};
1394
        $order->{budget_id} = ( $budget_id || $order->{budget_id} );
1401
        $order->{budget_id} = ( $budget_id || $order->{budget_id} );
1395
        $order->{quantity} = $quantrec;
1402
        $order->{quantity} = $quantrec;
1396
        $order->{quantityreceived} = $quantrec;
1403
        $order->{quantityreceived} = $quantrec;
1404
        $order->{tax_value} = $order->{quantity} * $order->{unitprice_tax_excluded} * $order->{tax_rate};
1397
        $order->{datereceived} = $datereceived;
1405
        $order->{datereceived} = $datereceived;
1398
        $order->{invoiceid} = $invoice->{invoiceid};
1406
        $order->{invoiceid} = $invoice->{invoiceid};
1399
        $order->{orderstatus} = 'complete';
1407
        $order->{orderstatus} = 'complete';
Lines 1546-1551 sub CancelReceipt { Link Here
1546
                " receipt";
1554
                " receipt";
1547
            return;
1555
            return;
1548
        }
1556
        }
1557
1558
        # Recalculate tax_value
1559
        $dbh->do(q|
1560
            UPDATE aqorders
1561
            SET tax_value = quantity * ecost_tax_excluded * tax_rate
1562
            WHERE ordernumber = ?
1563
        |, undef, $parent_ordernumber);
1564
1549
        _cancel_items_receipt( $ordernumber, $parent_ordernumber );
1565
        _cancel_items_receipt( $ordernumber, $parent_ordernumber );
1550
        # Delete order line
1566
        # Delete order line
1551
        $query = qq{
1567
        $query = qq{
1552
- 

Return to bug 13321