Void a Transaction: fixed GRN voiding.

[fa-stable.git] / purchasing / includes / purchasing_db.inc

diff --git a/purchasing/includes/purchasing_db.inc b/purchasing/includes/purchasing_db.inc
index 2a2c2399399bae73c1549bd4bed7303f8f2bcd8b..983085769894f972b327eda71eae97da4fc9dc34 100644 (file)
--- a/purchasing/includes/purchasing_db.inc
+++ b/purchasing/includes/purchasing_db.inc
@@ -12,10 +12,10 @@
 include_once($path_to_root . "/purchasing/includes/supp_trans_class.inc");
 
 include_once($path_to_root . "/includes/banking.inc");
+include_once($path_to_root . "/includes/inventory.inc");
 
 include_once($path_to_root . "/includes/date_functions.inc");
 
-include_once($path_to_root . "/includes/db/inventory_db.inc");
 include_once($path_to_root . "/includes/db/allocations_db.inc");
 
 include_once($path_to_root . "/purchasing/includes/db/supp_trans_db.inc");
@@ -184,11 +184,11 @@ function add_direct_supp_trans($cart)
        $inv->supplier_id = $cart->supplier_id;
        $inv->tran_date = $cart->orig_order_date;
        $inv->due_date = $cart->due_date;
+       $inv->dimension = $cart->dimension;
+       $inv->dimension2 = $cart->dimension2;
        $inv->reference = $ref;
        $inv->supp_reference = $cart->supp_ref;
        $inv->tax_included = $cart->tax_included;
-       $inv->tax_algorithm = $cart->tax_algorithm;
-       $inv->stored_algorithm = $cart->stored_algorithm;
        $supp = get_supplier($cart->supplier_id);
        $inv->tax_group_id = $supp['tax_group_id'];
        $inv->ov_amount = $inv->ov_gst = $inv->ov_discount = 0;
@@ -201,7 +201,7 @@ function add_direct_supp_trans($cart)
        }
        $inv->tax_overrides = $cart->tax_overrides;
        if (!$inv->tax_included) {
-               $taxes = $inv->get_taxes($inv->tax_group_id, 0, false, $inv->tax_algorithm);
+               $taxes = $inv->get_taxes($inv->tax_group_id, 0, false);
                foreach( $taxes as $taxitem) {
                        $total += isset($taxitem['Override']) ? $taxitem['Override'] : $taxitem['Value'];
                }
@@ -210,16 +210,12 @@ function add_direct_supp_trans($cart)
 
        $inv_no = add_supp_invoice($inv);
 
-       // presume supplier data need correction
-       if ($inv->stored_algorithm != $inv->tax_algorithm)
-               update_supp_tax_algorithm($inv->supplier_id, $inv->tax_algorithm);
-
        if ($cart->cash_account) {
-               $pmt_no = write_supp_payment(0, $inv->supplier_id, $cart->cash_account, $inv->tran_date, $Refs->get_next(ST_SUPPAYMENT), 
+               $pmt_no = write_supp_payment(0, $inv->supplier_id, $cart->cash_account, $inv->tran_date, $Refs->get_next(ST_SUPPAYMENT, null, $inv->tran_date), 
                        $total, 0, _('Payment for:').$inv->supp_reference .' ('.$type_shortcuts[ST_SUPPINVOICE].$inv_no.')');
-               add_supp_allocation($total, ST_SUPPAYMENT, $pmt_no, ST_SUPPINVOICE, $inv_no, $inv->tran_date);
-               update_supp_trans_allocation(ST_SUPPINVOICE, $inv_no);
-               update_supp_trans_allocation(ST_SUPPAYMENT, $pmt_no);
+               add_supp_allocation($total, ST_SUPPAYMENT, $pmt_no, ST_SUPPINVOICE, $inv_no, $inv->supplier_id, $inv->tran_date);
+               update_supp_trans_allocation(ST_SUPPINVOICE, $inv_no, $inv->supplier_id);
+               update_supp_trans_allocation(ST_SUPPAYMENT, $pmt_no, $inv->supplier_id);
        }
        commit_transaction(); // save PO+GRN+PI(+SP)
        return $inv_no;