From b4ac68e2ed3d797e44fce2a1082d890e35c3d368 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Wed, 23 Nov 2011 01:40:39 +0100 Subject: [PATCH] Fixed double calculation of tax free price for an item. --- purchasing/includes/db/grn_db.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc index df35e23d..a31bc2ec 100644 --- a/purchasing/includes/db/grn_db.inc +++ b/purchasing/includes/db/grn_db.inc @@ -117,8 +117,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); - update_average_material_cost($po->supplier_id, $order_line->stock_id, $order_line->taxfree_charge_price($po), + $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->receive_qty, $date_); } //---------------------------------------------------------------------------------------------------------------- @@ -143,7 +143,7 @@ function add_grn(&$po) /* 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, - $po->supplier_id, 1, $order_line->price); + $po->supplier_id, 1, $order_line->taxfree_charge_price($po)); } /*quantity received is != 0 */ } /*end of order_line loop */ -- 2.30.2