Merged latest changes from stable branch.

[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 80169267ac9aa1a675adc14c84f1a6c5098fb5d7..18939822d8676a704d579c3c1b4c9674573a25bd 100644 (file)
--- a/purchasing/includes/db/invoice_db.inc
+++ b/purchasing/includes/db/invoice_db.inc
@@ -301,9 +301,9 @@ function add_supp_invoice(&$supp_trans) // do not receive as ref because we chan
                                $currency = get_supplier_currency($supp_trans->supplier_id);
 
                                $total += add_gl_trans_supplier($trans_type, $invoice_id, $date_, $iv_act,
-                                       $dim1, $dim2, $entered_grn->this_quantity_inv * $old_price, $supp_trans->supplier_id, "", $ex_rate);
-                               $diff = get_diff_in_home_currency($supp_trans->supplier_id, $old_date, $date_, $old_price, 
-                                       $line_taxfree); 
+                                       $dim, $dim2, $entered_grn->this_quantity_inv * $old_price, $supp_trans->supplier_id, "", $ex_rate);
+                               $diff = get_diff_in_home_currency($supp_trans->supplier_id, $old_date, $date_, $old_value, 
+                                       $taxfree_line);
 
                                $mat_cost = update_average_material_cost(null, $entered_grn->item_code,
                                        $diff/$entered_grn->this_quantity_inv, $entered_grn->this_quantity_inv, null, true);