From 8aaf510698dfc006b813782870f221d3d107b75f Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Mon, 28 Feb 2011 16:44:00 +0100 Subject: [PATCH] When voiding Inventory Adjustment transaction, the costs are not getting adjusted. [0000587] Converted currencies are not rounded when using Funds transfers --- CHANGELOG.txt | 4 ++++ gl/includes/db/gl_db_bank_trans.inc | 2 +- inventory/includes/db/items_adjust_db.inc | 8 ++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 7bcae749..32d8e4be 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -22,6 +22,10 @@ $ -> Affected files 28-Feb-2011 Joe Hunt # [0000583] Unique Reference check fails when running manual Revaluation of Currency $ /includes/references.inc +# When voiding Inventory Adjustment transaction, the costs are not getting adjusted. +$ /inventory/includes/db/items_adjust_db.inc +# [0000587] Converted currencies are not rounded when using Funds transfers +$ /gl/includes/db/gl_db_bank_trans.inc 21-Feb-2011 Janusz Dobrowolski ! Hiden warning in open_basedir/save_mode on rate retrieval. diff --git a/gl/includes/db/gl_db_bank_trans.inc b/gl/includes/db/gl_db_bank_trans.inc index 90dc8c4a..a0aab62e 100644 --- a/gl/includes/db/gl_db_bank_trans.inc +++ b/gl/includes/db/gl_db_bank_trans.inc @@ -32,7 +32,7 @@ function add_bank_trans($type, $trans_no, $bank_act, $ref, $date_, } else $amount_bank = $amount; - + $amount_bank = round2($amount_bank, user_price_dec()); // Also store the rate to the home //$BankToHomeCurrencyRate = get_exchange_rate_to_home_currency($bank_account_currency, $date_); diff --git a/inventory/includes/db/items_adjust_db.inc b/inventory/includes/db/items_adjust_db.inc index 5274584d..f3c8c9d2 100644 --- a/inventory/includes/db/items_adjust_db.inc +++ b/inventory/includes/db/items_adjust_db.inc @@ -51,6 +51,14 @@ function add_stock_adjustment($items, $location, $date_, $type, $increase, $refe function void_stock_adjustment($type_no) { hook_db_prevoid(ST_INVADJUST, $type_no); + + //Average the cost while voiding + $adjustment_items = get_stock_adjustment_items($type_no); + while ($adjustment = db_fetch($adjustment_items)) + { + update_average_material_cost(0, $adjustment['stock_id'], + $adjustment['standard_cost'], -$adjustment['qty'], sql2date($adjustment['tran_date'])); + } void_gl_trans(ST_INVADJUST, $type_no); void_stock_move(ST_INVADJUST, $type_no); } -- 2.30.2