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

(-)a/C4/Acquisition.pm (-1 / +16 lines)
Lines 1400-1409 sub ModReceiveOrder { Link Here
1400
            $order->{ordernumber}
1400
            $order->{ordernumber}
1401
        );
1401
        );
1402
1402
1403
        # Recalculate tax_value
1404
        $dbh->do(q|
1405
            UPDATE aqorders
1406
            SET tax_value = quantity * ecost_tax_excluded * tax_rate
1407
            WHERE ordernumber = ?
1408
        |, undef, $order->{ordernumber});
1409
1403
        delete $order->{ordernumber};
1410
        delete $order->{ordernumber};
1404
        $order->{budget_id} = ( $budget_id || $order->{budget_id} );
1411
        $order->{budget_id} = ( $budget_id || $order->{budget_id} );
1405
        $order->{quantity} = $quantrec;
1412
        $order->{quantity} = $quantrec;
1406
        $order->{quantityreceived} = $quantrec;
1413
        $order->{quantityreceived} = $quantrec;
1414
        $order->{tax_value} = $order->{quantity} * $order->{unitprice_tax_excluded} * $order->{tax_rate};
1407
        $order->{datereceived} = $datereceived;
1415
        $order->{datereceived} = $datereceived;
1408
        $order->{invoiceid} = $invoice->{invoiceid};
1416
        $order->{invoiceid} = $invoice->{invoiceid};
1409
        $order->{orderstatus} = 'complete';
1417
        $order->{orderstatus} = 'complete';
Lines 1556-1561 sub CancelReceipt { Link Here
1556
                " receipt";
1564
                " receipt";
1557
            return;
1565
            return;
1558
        }
1566
        }
1567
1568
        # Recalculate tax_value
1569
        $dbh->do(q|
1570
            UPDATE aqorders
1571
            SET tax_value = quantity * ecost_tax_excluded * tax_rate
1572
            WHERE ordernumber = ?
1573
        |, undef, $parent_ordernumber);
1574
1559
        _cancel_items_receipt( $ordernumber, $parent_ordernumber );
1575
        _cancel_items_receipt( $ordernumber, $parent_ordernumber );
1560
        # Delete order line
1576
        # Delete order line
1561
        $query = qq{
1577
        $query = qq{
1562
- 

Return to bug 13321