Fixed payments reallocation for prepayment orders; blocked edition for open prepaymen...

[fa-stable.git] / purchasing / includes / db / invoice_db.inc

diff --git a/purchasing/includes/db/invoice_db.inc b/purchasing/includes/db/invoice_db.inc
index eadf5724a8a5ee1c2d9209d3ce2c470430606a87..8fdfda7fec8f2ca5529a0eaac7f6bd5c883e4b1b 100644 (file)
--- a/purchasing/includes/db/invoice_db.inc
+++ b/purchasing/includes/db/invoice_db.inc
@@ -135,7 +135,7 @@ function add_supp_invoice(&$supp_trans)
        $tax_total = 0;
     $taxes = $supp_trans->get_taxes($supp_trans->tax_group_id);
        if ($trans_no) {
-               $allocs = get_payments_for($trans_no, $trans_type); // save allocations
+               $allocs = get_payments_for($trans_no, $trans_type, $supp_trans->supplier_id); // save allocations
                void_transaction($trans_type, $trans_no, Today(), _("Document reentered."));
                $Refs->restore_last($trans_type, $trans_no);
        } else
@@ -393,11 +393,7 @@ function add_supp_invoice(&$supp_trans)
                }
        }
 
-//_vd($allocs);
-       reallocate_payments($invoice_id, ST_SUPPINVOICE, $date_, $to_allocate, $allocs);
-//_vd(get_payments_for($sales_order, ST_PURCHORDER));
-//_vd(get_payments_for($invoice_id, ST_SUPPINVOICE));
-//exit;
+       reallocate_payments($invoice_id, ST_SUPPINVOICE, $date_, $net_total+$tax_total, $allocs, $supp_trans->supplier_id);
        $supp_trans->trans_no = $invoice_id;
        hook_db_postwrite($supp_trans, $supp_trans->trans_type);
     commit_transaction();