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

(-)a/C4/Acquisition.pm (-4 / +8 lines)
Lines 1403-1409 sub ModReceiveOrder { Link Here
1403
        # Recalculate tax_value
1403
        # Recalculate tax_value
1404
        $dbh->do(q|
1404
        $dbh->do(q|
1405
            UPDATE aqorders
1405
            UPDATE aqorders
1406
            SET tax_value = quantity * ecost_tax_excluded * tax_rate
1406
            SET
1407
                tax_value_on_ordering = quantity * ecost_tax_excluded * tax_rate_on_ordering,
1408
                tax_value_on_receiving = quantity * unitprice_tax_excluded * tax_rate_on_receiving
1407
            WHERE ordernumber = ?
1409
            WHERE ordernumber = ?
1408
        |, undef, $order->{ordernumber});
1410
        |, undef, $order->{ordernumber});
1409
1411
Lines 1411-1417 sub ModReceiveOrder { Link Here
1411
        $order->{budget_id} = ( $budget_id || $order->{budget_id} );
1413
        $order->{budget_id} = ( $budget_id || $order->{budget_id} );
1412
        $order->{quantity} = $quantrec;
1414
        $order->{quantity} = $quantrec;
1413
        $order->{quantityreceived} = $quantrec;
1415
        $order->{quantityreceived} = $quantrec;
1414
        $order->{tax_value} = $order->{quantity} * $order->{unitprice_tax_excluded} * $order->{tax_rate};
1416
        $order->{tax_value_on_ordering} = $order->{quantity} * $order->{ecost_tax_excluded} * $order->{tax_rate_on_ordering};
1417
        $order->{tax_value_on_receiving} = $order->{quantity} * $order->{unitprice_tax_excluded} * $order->{tax_rate_on_receiving};
1415
        $order->{datereceived} = $datereceived;
1418
        $order->{datereceived} = $datereceived;
1416
        $order->{invoiceid} = $invoice->{invoiceid};
1419
        $order->{invoiceid} = $invoice->{invoiceid};
1417
        $order->{orderstatus} = 'complete';
1420
        $order->{orderstatus} = 'complete';
Lines 1571-1577 sub CancelReceipt { Link Here
1571
        # Recalculate tax_value
1574
        # Recalculate tax_value
1572
        $dbh->do(q|
1575
        $dbh->do(q|
1573
            UPDATE aqorders
1576
            UPDATE aqorders
1574
            SET tax_value = quantity * ecost_tax_excluded * tax_rate
1577
            SET
1578
                tax_value_on_ordering = quantity * ecost_tax_excluded * tax_rate_on_ordering,
1579
                tax_value_on_receiving = quantity * unitprice_tax_excluded * tax_rate_on_receiving
1575
            WHERE ordernumber = ?
1580
            WHERE ordernumber = ?
1576
        |, undef, $parent_ordernumber);
1581
        |, undef, $parent_ordernumber);
1577
1582
1578
- 

Return to bug 13323