X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fincludes%2Fdb%2Fitems_trans_db.inc;h=923d18c4f79f5dc65690186196360203e78f1f16;hb=90b3d069d96b99671af51726e2953352738abb75;hp=3d364a446407afcf16c71afabbf2e2b41ef89455;hpb=d69e655cbe282e2dbb261e207fcfacc5c3b8b246;p=fa-stable.git diff --git a/inventory/includes/db/items_trans_db.inc b/inventory/includes/db/items_trans_db.inc index 3d364a44..923d18c4 100644 --- a/inventory/includes/db/items_trans_db.inc +++ b/inventory/includes/db/items_trans_db.inc @@ -16,20 +16,20 @@ function stock_cost_update($stock_id, $material_cost, $labour_cost, $overhead_co { $mb_flag = get_mb_flag($stock_id); - $update_no = -1; - + $update_no = -1; + if (is_service($mb_flag)) { - //display_db_error("Cannot do cost update for Service item : $stock_id", ""); - - //Chaitanya - $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=".db_escape($material_cost)." - WHERE stock_id=".db_escape($stock_id); - - db_query($sql,"The cost details for the inventory item could not be updated"); - - return $update_no; - + //display_db_error("Cannot do cost update for Service item : $stock_id", ""); + + //Chaitanya + $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=".db_escape($material_cost)." + WHERE stock_id=".db_escape($stock_id); + + db_query($sql,"The cost details for the inventory item could not be updated"); + + return $update_no; + } begin_transaction(); @@ -44,26 +44,32 @@ function stock_cost_update($stock_id, $material_cost, $labour_cost, $overhead_co $qoh = get_qoh_on_date($_POST['stock_id']); $date_ = Today(); - if (!is_date_in_fiscalyear($date_)) - $date_ = end_fiscalyear(); - + if (!is_date_in_fiscalyear($date_)) + $date_ = end_fiscalyear(); + if ($qoh > 0) { $new_cost = $material_cost + $labour_cost + $overhead_cost; + $value_of_change = $qoh * ($new_cost - $last_cost); + + $memo_ = "Cost was " . $last_cost . " changed to " . $new_cost . " x quantity on hand of $qoh"; + add_gl_trans_std_cost(ST_COSTUPDATE, $update_no, $date_, $stock_gl_code["adjustment_account"], + $stock_gl_code["dimension_id"], $stock_gl_code["dimension2_id"], $memo_, (-$value_of_change)); + $value_of_change = round2($qoh * ($new_cost - $last_cost), user_price_dec()); - + if ($value_of_change != 0) - { - $stock_gl_code = get_stock_gl_code($stock_id); - $update_no = get_next_trans_no(ST_COSTUPDATE); + { + $stock_gl_code = get_stock_gl_code($stock_id); + $update_no = get_next_trans_no(ST_COSTUPDATE); $memo_ = "Cost was " . $last_cost . " changed to " . $new_cost . " x quantity on hand of $qoh"; add_gl_trans_std_cost(ST_COSTUPDATE, $update_no, $date_, $stock_gl_code["adjustment_account"], $stock_gl_code["dimension_id"], $stock_gl_code["dimension2_id"], $memo_, (-$value_of_change)); add_gl_trans_std_cost(ST_COSTUPDATE, $update_no, $date_, $stock_gl_code["inventory_account"], 0, 0, $memo_, $value_of_change); - } + } } add_audit_trail(ST_COSTUPDATE, $update_no, $date_);