Moving bugfixes from 2.3 to 2.4 and updated install languages for Denmark and Sweden.

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

diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc
index d3bed587e3c2bbdc65314ad1ca4bb6f8d1e5cfa1..90d84eb47818e56ab027bebaf94ff559b6c51889 100644 (file)
--- a/purchasing/includes/db/grn_db.inc
+++ b/purchasing/includes/db/grn_db.inc
@@ -123,9 +123,8 @@ function add_grn(&$po)
                                if ($clearing_act)
                                        $total += add_gl_trans_supplier(ST_SUPPRECEIVE, $grn, $date_, $stock_gl_code["inventory_account"],
                                                $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'],
-                                               $order_line->receive_qty * $order_line->taxfree_charge_price($po), $po->supplier_id, '', 0, 
-                                               $order_line->stock_id);
-                               update_average_material_cost($po->supplier_id, $order_line->stock_id, $order_line->price,
+                                           $order_line->taxfree_charge_value($po), $po->supplier_id, '', 0, $order_line->stock_id);
+                               update_average_material_cost($po->supplier_id, $order_line->stock_id, $order_line->price,
                                        $order_line->receive_qty, $date_);
                        }
                        //------------------------------------------------------------------------------------------------------
@@ -149,7 +148,8 @@ function add_grn(&$po)
                        $po->line_items[$line_no]->grn_item_id = $grn_item;
                        /* Update location stock records - NB  a po cannot be entered for a service/kit parts done automatically */
                        add_stock_move(ST_SUPPRECEIVE, $order_line->stock_id, $grn, $po->Location, $date_, "",
-                               $order_line->receive_qty, $order_line->standard_cost, $order_line->taxfree_charge_price($po));
+                               $order_line->receive_qty, $order_line->standard_cost,           
+                               $po->supplier_id, 1, $order_line->taxfree_charge_value($po)/$order_line->receive_qty);
 
                } /*quantity received is != 0 */
        } /*end of order_line loop */