Merged changes form stabel branch up to the current state (2.3.22+).

[fa-stable.git] / inventory / includes / db / items_trans_db.inc

diff --git a/inventory/includes/db/items_trans_db.inc b/inventory/includes/db/items_trans_db.inc
index 923d18c4f79f5dc65690186196360203e78f1f16..cf72ee342f727b48b2b87f7f74a8a6c8f8b9457f 100644 (file)
--- a/inventory/includes/db/items_trans_db.inc
+++ b/inventory/includes/db/items_trans_db.inc
@@ -41,7 +41,7 @@ function stock_cost_update($stock_id, $material_cost, $labour_cost, $overhead_co
                WHERE stock_id=".db_escape($stock_id);
        db_query($sql,"The cost details for the inventory item could not be updated");
 
-       $qoh = get_qoh_on_date($_POST['stock_id']);
+       $qoh = get_qoh_on_date($stock_id);
        
        $date_ = Today();
        if (!is_date_in_fiscalyear($date_))
@@ -63,16 +63,20 @@ function stock_cost_update($stock_id, $material_cost, $labour_cost, $overhead_co
                {
                        $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";
+                       $memo_ = sprintf(_("Cost was %s changed to %s x quantity on hand for item '%s'"),
+                               number_format2($last_cost, 2), number_format2($new_cost, 2), $stock_id);
                        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);
+
+                       change_stock_moves_std_cost($stock_id, $date_, $new_cost - $last_cost); 
                }
        }
 
-       add_audit_trail(ST_COSTUPDATE, $update_no, $date_);
+       if ($update_no != -1)
+               add_audit_trail(ST_COSTUPDATE, $update_no, $date_);
        commit_transaction();
 
        return $update_no;
@@ -80,4 +84,11 @@ function stock_cost_update($stock_id, $material_cost, $labour_cost, $overhead_co
 
 //-------------------------------------------------------------------------------------------------------------
 
+function change_stock_moves_std_cost($stock_id, $date, $diff_cost)
+{
+       $date = date2sql($date);
+       $sql = "UPDATE ".TB_PREF."stock_moves SET standard_cost = standard_cost + ".db_escape($diff_cost). " WHERE stock_id = "
+       .       db_escape($stock_id)." AND tran_date <= '$date' AND qty <> 0 AND standard_cost > 0.001 AND type <> ".ST_LOCTRANSFER;
+       db_query($sql,"The stock moves cost details for the inventory item could not be updated");
+}
 ?>
\ No newline at end of file