From: Janusz Dobrowolski Date: Sat, 22 Jun 2019 21:00:06 +0000 (+0200) Subject: Additional dev related exclusions in gitignore, small cleanups in old upgrade classes. X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=7647c792901573c9a46a976e548cc367022a7d57 Additional dev related exclusions in gitignore, small cleanups in old upgrade classes. --- diff --git a/.gitignore b/.gitignore index 12a5b6dd..2330f0ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,13 @@ +_devel +_tests /company/*/attachments /company/*/backup/*.sql /company/*/backup/*.sql.gz /company/*/pdf_files/*.pdf -/company/*/js_cache/*.js +/company/*/js_cache/*/*.js /company/*/reporting /company/*/images +/company/*/ /tmp /lang /modules diff --git a/includes/db/inventory_db.inc b/includes/db/inventory_db.inc index 52c01674..e46dd6de 100644 --- a/includes/db/inventory_db.inc +++ b/includes/db/inventory_db.inc @@ -229,14 +229,14 @@ function get_deliveries_from_trans($stock_id, $move_id) WHERE stock_id=".db_escape($stock_id)." AND qty < 0 AND trans_id>='$move_id' GROUP BY stock_id"; $result = db_query($sql, "The deliveries could not be updated"); - $row = db_fetch_row($result); + $row = db_fetch_row($result); // fetch quantity and cost of all deliveries including move_id $sql = "SELECT IF(type=".ST_SUPPRECEIVE." OR type=".ST_SUPPCREDIT.", price, standard_cost) FROM ".TB_PREF."stock_moves WHERE stock_id=".db_escape($stock_id) ." AND trans_id ='$move_id'"; $result = db_query($sql, "The deliveries could not be updated"); - $cost = db_fetch_row($result); + $cost = db_fetch_row($result); // fetch unit cost at move_id // Adjusting QOH valuation $sql = "SELECT SUM(qty) @@ -244,9 +244,10 @@ function get_deliveries_from_trans($stock_id, $move_id) WHERE stock_id=".db_escape($stock_id)." AND trans_id<'$move_id' GROUP BY stock_id"; $result = db_query($sql, "The deliveries could not be updated"); - $qoh = db_fetch_row($result); + $qoh = db_fetch_row($result); // find qoh before inventory went negative - $qty = $row[0] - $qoh[0]; //QOH prior to -ve stock is subtracted + // adjust cost and quantity for part of move_id transaction on positive inventory + $qty = $row[0] - $qoh[0]; // QOH prior to -ve stock is subtracted $final_cost = $row[1] - $qoh[0]*$cost[0]; return array($qty,$final_cost); @@ -340,6 +341,7 @@ function get_stock_gl_code($stock_id) function get_purchase_value($stock_id) { + $sql = "SELECT purchase_cost FROM ".TB_PREF."stock_master WHERE stock_id = ".db_escape($stock_id); diff --git a/manufacturing/includes/db/work_order_costing_db.inc b/manufacturing/includes/db/work_order_costing_db.inc index 5d39a8a9..99cd1a5c 100644 --- a/manufacturing/includes/db/work_order_costing_db.inc +++ b/manufacturing/includes/db/work_order_costing_db.inc @@ -104,7 +104,7 @@ function update_material_cost($stock_id, $qty, $unit_cost, $date) } if ($qty > 0 && ($qoh != -$qty)) - $avg_cost = ($avg_cost*($qoh+$qty_delayed)+$unit_cost*$qty_new)/($qoh+$qty); + $avg_cost = ($avg_cost*($qoh+$qty_delayed)+$unit_cost*$qty_new)/($qoh+$qty); $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=".db_escape($avg_cost)." WHERE stock_id=".db_escape($stock_id); diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc index d3cee339..62f29ed8 100644 --- a/purchasing/includes/db/grn_db.inc +++ b/purchasing/includes/db/grn_db.inc @@ -9,7 +9,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -//------------------- update average material cost ---------------------------------------------- +/* + Update average inventory item cost. +*/ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date, $adj_only=false) { // probably this function should be optimized @@ -40,20 +42,18 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date, // Skip negative inventory adjustment for case of adjust_only if (is_inventory_item($stock_id) && !$adj_only) handle_negative_inventory($stock_id, $qty, $price_in_home_currency, $date); - - $sql = "SELECT mb_flag, material_cost FROM ".TB_PREF."stock_master WHERE stock_id=".db_escape($stock_id); - $result = db_query($sql); - $myrow = db_fetch($result); - $material_cost = $myrow['material_cost']; - - $cost_adjust = false; + + $item = get_item($stock_id); + $avg_cost = $item['material_cost']; $qoh = get_qoh_on_date($stock_id); + $cost_adjust = false; + if ($adj_only) { if ($qoh > 0) - $material_cost = ($qoh * $material_cost + $qty * $price_in_home_currency) / $qoh; + $avg_cost = ($qoh * $avg_cost + $qty * $price_in_home_currency) / $qoh; } else { @@ -64,16 +64,17 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date, $qoh = 0; } if ($qoh + $qty > 0) - $material_cost = ($qoh * $material_cost + $qty * $price_in_home_currency) / ($qoh + $qty); + $avg_cost = ($qoh * $avg_cost + $qty * $price_in_home_currency) / ($qoh + $qty); } if ($cost_adjust) // Material_cost replaced with price adjust_deliveries($stock_id, $price_in_home_currency_, $date); - $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=".db_escape($material_cost)." + + $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=".db_escape($avg_cost)." WHERE stock_id=".db_escape($stock_id); db_query($sql,"The cost details for the inventory item could not be updated"); - return $material_cost; + return $avg_cost; } //------------------------------------------------------------------------------------------------------------- diff --git a/sql/alter2.4.php b/sql/alter2.4.php index bd364e2e..6b2d0aa7 100644 --- a/sql/alter2.4.php +++ b/sql/alter2.4.php @@ -15,7 +15,6 @@ class fa2_4 extends fa_patch { var $version = '2.4.1'; // version installed var $description; var $sql = 'alter2.4.sql'; - var $preconf = true; var $max_upgrade_time = 900; // table recoding is really long process function __construct() { diff --git a/sql/alter2.4rc1.php b/sql/alter2.4rc1.php index 66a029fb..1cba63b3 100644 --- a/sql/alter2.4rc1.php +++ b/sql/alter2.4rc1.php @@ -15,7 +15,6 @@ class fa2_4rc1 extends fa_patch { var $version = '2.4.1'; // version installed var $description; var $sql = ''; // 'alter2.4rc1.sql'; - var $preconf = true; var $max_upgrade_time = 900; // table recoding is really long process function __construct() {