From c2b751f91d79c69bb802b1bff13a3c4bdecb87b0 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Mon, 17 Jun 2019 08:25:43 +0200 Subject: [PATCH] Anomaly created by Cost Update in Inventory Sales Report (rep304). Updated bugfix. @boxygen. --- inventory/includes/db/items_adjust_db.inc | 74 ++++++++++------------- reporting/rep301.php | 30 +++++---- reporting/rep308.php | 32 ++++++---- 3 files changed, 69 insertions(+), 67 deletions(-) diff --git a/inventory/includes/db/items_adjust_db.inc b/inventory/includes/db/items_adjust_db.inc index 605206cb..807a404a 100644 --- a/inventory/includes/db/items_adjust_db.inc +++ b/inventory/includes/db/items_adjust_db.inc @@ -83,50 +83,40 @@ function get_stock_adjustment_items($trans_no) //-------------------------------------------------------------------------------------------------- function add_stock_adjustment_item($adj_id, $stock_id, $location, $date_, $reference, - $quantity, $standard_cost, $memo_) + $quantity, $price, $memo_) { - $mb_flag = get_mb_flag($stock_id); - + $mb_flag = get_mb_flag($stock_id); if (is_service($mb_flag)) { - display_db_error("Cannot do inventory adjustment for Service item : $stock_id", ""); + display_db_error("Cannot do inventory adjustment for Service item : $stock_id", ""); + } + update_average_material_cost(null, $stock_id, $price, $quantity, $date_); + if (is_fixed_asset($mb_flag)) { + $sql = "UPDATE ".TB_PREF."stock_master SET inactive=1 + WHERE stock_id=".db_escape($stock_id); + db_query($sql,"The inactive flag for the fixed asset could not be updated"); + } + $standard_cost = get_unit_cost($stock_id); //added by faisal + add_stock_move(ST_INVADJUST, $stock_id, $adj_id, $location, + $date_, $reference, $quantity, $standard_cost, $price); + $inv_value = $price * $quantity; + $adj_value = $price * -($quantity); + if (is_fixed_asset($mb_flag)) { + // get the initial value of the fixed assset. + $row = get_fixed_asset_move($stock_id, ST_SUPPRECEIVE); + $inv_value = $row['price'] * $quantity; + $adj_value = (-($row['price']) + $price) * $quantity; + } + if ($price > 0 || is_fixed_asset($mb_flag)) + { + $stock_gl_codes = get_stock_gl_code($stock_id); + add_gl_trans_std_cost(ST_INVADJUST, $adj_id, $date_, + $stock_gl_codes['adjustment_account'], $stock_gl_codes['dimension_id'], $stock_gl_codes['dimension2_id'], $memo_, $adj_value ); + add_gl_trans_std_cost(ST_INVADJUST, $adj_id, $date_, $stock_gl_codes['inventory_account'], 0, 0, $memo_, $inv_value); + } + if (is_fixed_asset($mb_flag)) { + // Additional gl entry for fixed asset. + $grn_act = get_company_pref('default_loss_on_asset_disposal_act'); + add_gl_trans_std_cost(ST_INVADJUST, $adj_id, $date_, $grn_act, 0, 0, $memo_, ($price * -($quantity))); } - - update_average_material_cost(null, $stock_id, $standard_cost, $quantity, $date_); - - if (is_fixed_asset($mb_flag)) { - $sql = "UPDATE ".TB_PREF."stock_master SET inactive=1 - WHERE stock_id=".db_escape($stock_id); - db_query($sql,"The inactive flag for the fixed asset could not be updated"); - } - - add_stock_move(ST_INVADJUST, $stock_id, $adj_id, $location, - $date_, $reference, $quantity, $standard_cost); - - $inv_value = $standard_cost * $quantity; - $adj_value = $standard_cost * -($quantity); - - if (is_fixed_asset($mb_flag)) { - // get the initial value of the fixed assset. - $row = get_fixed_asset_move($stock_id, ST_SUPPRECEIVE); - $inv_value = $row['price'] * $quantity; - $adj_value = (-($row['price']) + $standard_cost) * $quantity; - } - - if ($standard_cost > 0 || is_fixed_asset($mb_flag)) - { - - $stock_gl_codes = get_stock_gl_code($stock_id); - - add_gl_trans_std_cost(ST_INVADJUST, $adj_id, $date_, - $stock_gl_codes['adjustment_account'], $stock_gl_codes['dimension_id'], $stock_gl_codes['dimension2_id'], $memo_, $adj_value ); - - add_gl_trans_std_cost(ST_INVADJUST, $adj_id, $date_, $stock_gl_codes['inventory_account'], 0, 0, $memo_, $inv_value); - } - - if (is_fixed_asset($mb_flag)) { - // Additional gl entry for fixed asset. - $grn_act = get_company_pref('default_loss_on_asset_disposal_act'); - add_gl_trans_std_cost(ST_INVADJUST, $adj_id, $date_, $grn_act, 0, 0, $memo_, ($standard_cost * -($quantity))); - } } diff --git a/reporting/rep301.php b/reporting/rep301.php index 168b6e22..e40b4128 100644 --- a/reporting/rep301.php +++ b/reporting/rep301.php @@ -30,17 +30,23 @@ print_inventory_valuation_report(); function get_domestic_price($myrow, $stock_id) { - $price = $myrow['price']; - if ($myrow['person_id'] > 0) - { - // Do we have foreign currency? - $supp = get_supplier($myrow['person_id']); - $currency = $supp['curr_code']; - $ex_rate = get_exchange_rate_to_home_currency($currency, sql2date($myrow['tran_date'])); - $price /= $ex_rate; - } - return $price; -} + if ($myrow['type'] == ST_SUPPRECEIVE || $myrow['type'] == ST_SUPPCREDIT || $myrow['type'] == ST_INVADJUST) + { + $price = $myrow['price']; + if ($myrow['person_id'] > 0) + { + // Do we have foreign currency? + $supp = get_supplier($myrow['person_id']); + $currency = $supp['curr_code']; + $ex_rate = $myrow['ex_rate']; + $price *= $ex_rate; + } + } + else + $price = $myrow['standard_cost']; //pick standard_cost for sales deliveries + + return $price; +} function getAverageCost($stock_id, $location, $to_date) { @@ -49,7 +55,7 @@ function getAverageCost($stock_id, $location, $to_date) $to_date = date2sql($to_date); - $sql = "SELECT move.*, IF(ISNULL(supplier.supplier_id), debtor.debtor_no, supplier.supplier_id) person_id + $sql = "SELECT move.*, supplier.supplier_id person_id, IF(ISNULL(grn.rate), credit.rate, grn.rate) ex_rate FROM ".TB_PREF."stock_moves move LEFT JOIN ".TB_PREF."supp_trans credit ON credit.trans_no=move.trans_no AND credit.type=move.type LEFT JOIN ".TB_PREF."grn_batch grn ON grn.id=move.trans_no AND 25=move.type diff --git a/reporting/rep308.php b/reporting/rep308.php index 84f43a79..a738e3d1 100644 --- a/reporting/rep308.php +++ b/reporting/rep308.php @@ -32,17 +32,23 @@ inventory_movements(); function get_domestic_price($myrow, $stock_id) { - $price = $myrow['price']; - if ($myrow['person_id'] > 0) - { - // Do we have foreign currency? - $supp = get_supplier($myrow['person_id']); - $currency = $supp['curr_code']; - $ex_rate = get_exchange_rate_to_home_currency($currency, sql2date($myrow['tran_date'])); - $price /= $ex_rate; - } - return $price; -} + if ($myrow['type'] == ST_SUPPRECEIVE || $myrow['type'] == ST_SUPPCREDIT || $myrow['type'] == ST_INVADJUST) + { + $price = $myrow['price']; + if ($myrow['person_id'] > 0) + { + // Do we have foreign currency? + $supp = get_supplier($myrow['person_id']); + $currency = $supp['curr_code']; + $ex_rate = $myrow['ex_rate']; + $price *= $ex_rate; + } + } + else + $price = $myrow['standard_cost']; //pick standard_cost for sales deliveries + + return $price; +} function fetch_items($category=0) { @@ -98,7 +104,7 @@ function avg_unit_cost($stock_id, $location=null, $to_date) $to_date = date2sql($to_date); - $sql = "SELECT move.*, IF(ISNULL(supplier.supplier_id), debtor.debtor_no, supplier.supplier_id) person_id + $sql = "SELECT move.*, supplier.supplier_id person_id, IF(ISNULL(grn.rate), credit.rate, grn.rate) ex_rate FROM ".TB_PREF."stock_moves move LEFT JOIN ".TB_PREF."supp_trans credit ON credit.trans_no=move.trans_no AND credit.type=move.type LEFT JOIN ".TB_PREF."grn_batch grn ON grn.id=move.trans_no AND 25=move.type @@ -145,7 +151,7 @@ function trans_qty_unit_cost($stock_id, $location=null, $from_date, $to_date, $i $to_date = date2sql($to_date); - $sql = "SELECT move.*, IF(ISNULL(supplier.supplier_id), debtor.debtor_no, supplier.supplier_id) person_id + $sql = "SELECT move.*, supplier.supplier_id person_id, IF(ISNULL(grn.rate), credit.rate, grn.rate) ex_rate FROM ".TB_PREF."stock_moves move LEFT JOIN ".TB_PREF."supp_trans credit ON credit.trans_no=move.trans_no AND credit.type=move.type LEFT JOIN ".TB_PREF."grn_batch grn ON grn.id=move.trans_no AND 25=move.type -- 2.30.2