From 9d9a80a6a4411f42f06a30284b1e6d02277ad992 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Sun, 14 May 2017 21:21:33 +0200 Subject: [PATCH] Optimized Inventory Valuation Reports, 301 and 308. --- reporting/rep301.php | 60 +++++++++++++++++---------------------- reporting/rep308.php | 67 ++++++++++++++++---------------------------- 2 files changed, 50 insertions(+), 77 deletions(-) diff --git a/reporting/rep301.php b/reporting/rep301.php index 30cc9ac9..ac669492 100644 --- a/reporting/rep301.php +++ b/reporting/rep301.php @@ -11,10 +11,10 @@ ***********************************************************************/ $page_security = 'SA_ITEMSVALREP'; // ---------------------------------------------------------------- -// $ Revision: 2.0 $ -// Creator: Joe Hunt -// date_: 2005-05-19 -// Title: Inventory Valuation +// $ Revision: 2.4 $ +// Creator: Joe Hunt, boxygen +// date_: 2014-05-13 +// Title: Inventory Valuation // ---------------------------------------------------------------- $path_to_root=".."; @@ -28,23 +28,11 @@ include_once($path_to_root . "/inventory/includes/db/items_category_db.inc"); print_inventory_valuation_report(); -function get_domestic_price($myrow, $stock_id, $qty, $old_std_cost, $old_qty) +function get_domestic_price($myrow, $stock_id) { if ($myrow['type'] == ST_SUPPRECEIVE || $myrow['type'] == ST_SUPPCREDIT) { $price = $myrow['price']; - if ($myrow['type'] == ST_SUPPRECEIVE) - { - // Has the supplier invoice increased the receival price? - $sql = "SELECT DISTINCT act_price - FROM ".TB_PREF."purch_order_details pod - INNER JOIN ".TB_PREF."grn_batch grn ON pod.order_no = - grn.purch_order_no WHERE grn.id = ".$myrow['trans_no']." AND pod.item_code = '$stock_id'"; - $result = db_query($sql, "Could not retrieve act_price from purch_order_details"); - $row = db_fetch_row($result); - if ($row[0] > 0 AND $row[0] <> $myrow['price']) - $price = $row[0]; - } if ($myrow['person_id'] > 0) { // Do we have foreign currency? @@ -54,44 +42,48 @@ function get_domestic_price($myrow, $stock_id, $qty, $old_std_cost, $old_qty) $price /= $ex_rate; } } - elseif ($myrow['type'] != ST_INVADJUST) // calcutale the price from avg. price - $price = ($myrow['standard_cost'] * $qty - $old_std_cost * $old_qty) / $myrow['qty']; else $price = $myrow['standard_cost']; // Item Adjustments just have the real cost return $price; } -function getAverageCost($stock_id, $to_date) +function getAverageCost($stock_id, $location, $to_date) { if ($to_date == null) $to_date = Today(); $to_date = date2sql($to_date); - $sql = "SELECT standard_cost, qty FROM ".TB_PREF."stock_moves - WHERE stock_id=".db_escape($stock_id)." - AND tran_date <= '$to_date' AND standard_cost > 0.001 AND qty <> 0 AND type <> ".ST_LOCTRANSFER; + $sql = "SELECT move.*, IF(ISNULL(supplier.supplier_id), debtor.debtor_no, supplier.supplier_id) person_id + 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 + LEFT JOIN ".TB_PREF."suppliers supplier ON IFNULL(grn.supplier_id, credit.supplier_id)=supplier.supplier_id + LEFT JOIN ".TB_PREF."debtor_trans cust_trans ON cust_trans.trans_no=move.trans_no AND cust_trans.type=move.type + LEFT JOIN ".TB_PREF."debtors_master debtor ON cust_trans.debtor_no=debtor.debtor_no + WHERE stock_id=".db_escape($stock_id)." + AND move.tran_date < '$to_date' AND standard_cost > 0.001 AND qty <> 0 AND move.type <> ".ST_LOCTRANSFER; + + if ($location != 'all') + $sql .= " AND move.loc_code = ".db_escape($location); $sql .= " ORDER BY tran_date"; $result = db_query($sql, "No standard cost transactions were returned"); + if ($result == false) return 0; - $qty = $old_qty = $count = $old_std_cost = $tot_cost = 0; + $qty = $tot_cost = 0; while ($row=db_fetch($result)) { $qty += $row['qty']; - - $price = get_domestic_price($row, $stock_id, $qty, $old_std_cost, $old_qty); - - $old_std_cost = $row['standard_cost']; - $tot_cost += $price; - $count++; - $old_qty = $qty; + $price = get_domestic_price($row, $stock_id); + $tran_cost = $row['qty'] * $price; + $tot_cost += $tran_cost; } - if ($count == 0) + if ($qty == 0) return 0; - return $tot_cost / $count; + return $tot_cost / $qty; } function getTransactions($category, $location, $date) @@ -216,7 +208,7 @@ function print_inventory_valuation_report() } if (isset($SysPrefs->use_costed_values) && $SysPrefs->use_costed_values==1) { - $UnitCost = getAverageCost($trans['stock_id'], $date); + $UnitCost = getAverageCost($trans['stock_id'], $location, $date); $ItemTotal = $trans['QtyOnHand'] * $UnitCost; } else diff --git a/reporting/rep308.php b/reporting/rep308.php index 08b8e898..21877177 100644 --- a/reporting/rep308.php +++ b/reporting/rep308.php @@ -11,10 +11,10 @@ ***********************************************************************/ $page_security = 'SA_ITEMSVALREP'; // ---------------------------------------------------------------- -// $ Revision: 2.0 $ -// Creator: Jujuk, Joe Hunt -// date_: 2011-05-24 -// Title: Stock Movements +// $ Revision: 2.4 $ +// Creator: boxygen, Joe Hunt +// date_: 2017-05-14 +// Title: Costed Inventory Movements // ---------------------------------------------------------------- $path_to_root=".."; @@ -30,21 +30,11 @@ include_once($path_to_root . "/inventory/includes/inventory_db.inc"); inventory_movements(); -function get_domestic_price($myrow, $stock_id, $qty, $old_std_cost, $old_qty) +function get_domestic_price($myrow, $stock_id) { if ($myrow['type'] == ST_SUPPRECEIVE || $myrow['type'] == ST_SUPPCREDIT) { $price = $myrow['price']; - if ($myrow['type'] == ST_SUPPRECEIVE) - { - // Has the supplier invoice increased the receival price? - $sql = "SELECT DISTINCT act_price FROM ".TB_PREF."purch_order_details pod INNER JOIN ".TB_PREF."grn_batch grn ON pod.order_no = - grn.purch_order_no WHERE grn.id = ".$myrow['trans_no']." AND pod.item_code = '$stock_id'"; - $result = db_query($sql, "Could not retrieve act_price from purch_order_details"); - $row = db_fetch_row($result); - if ($row[0] > 0 AND $row[0] <> $myrow['price']) - $price = $row[0]; - } if ($myrow['person_id'] > 0) { // Do we have foreign currency? @@ -54,8 +44,6 @@ function get_domestic_price($myrow, $stock_id, $qty, $old_std_cost, $old_qty) $price /= $ex_rate; } } - elseif ($myrow['type'] != ST_INVADJUST) // calcutale the price from avg. price - $price = ($myrow['standard_cost'] * $qty - $old_std_cost * $old_qty) / $myrow['qty']; else $price = $myrow['standard_cost']; // Item Adjustments just have the real cost return $price; @@ -127,26 +115,25 @@ function avg_unit_cost($stock_id, $location=null, $to_date) if ($location != '') $sql .= " AND move.loc_code = ".db_escape($location); + $sql .= " ORDER BY tran_date"; $result = db_query($sql, "No standard cost transactions were returned"); + if ($result == false) return 0; - $qty = $old_qty = $count = $old_std_cost = $tot_cost = 0; + + $qty = $tot_cost = 0; while ($row=db_fetch($result)) { $qty += $row['qty']; - - $price = get_domestic_price($row, $stock_id, $qty, $old_std_cost, $old_qty); - - $old_std_cost = $row['standard_cost']; - $tot_cost += $price; - $count++; - $old_qty = $qty; + $price = get_domestic_price($row, $stock_id); + $tran_cost = $price * $row['qty']; + $tot_cost += $tran_cost; } - if ($count == 0) + if ($qty == 0) return 0; - return $tot_cost / $count; + return $tot_cost / $qty; } //---------------------------------------------------------------------------------------------------- @@ -181,29 +168,23 @@ function trans_qty_unit_cost($stock_id, $location=null, $from_date, $to_date, $i else $sql .= " AND qty < 0 "; $sql .= " ORDER BY tran_date"; + $result = db_query($sql, "No standard cost transactions were returned"); + if ($result == false) return 0; - $qty = $count = $old_qty = $old_std_cost = $tot_cost = 0; + + $qty = $tot_cost = 0; while ($row=db_fetch($result)) { - $qty += $row['qty']; - - $price = get_domestic_price($row, $stock_id, $qty, $old_std_cost, $old_qty); - - if (strncmp($row['tran_date'], $from_date,10) >= 0) - { - $tot_cost += $price; - $count++; - } - - $old_std_cost = $row['standard_cost']; - $old_qty = $qty; + $qty += $row['qty']; + $price = get_domestic_price($row, $stock_id); + $tran_cost = $row['qty'] * $price; + $tot_cost += $tran_cost; } - if ($count == 0) + if ($qty == 0) return 0; - return $tot_cost / $count; - + return $tot_cost / $qty; } //---------------------------------------------------------------------------------------------------- -- 2.30.2