From 7a03a26720d0bbe802f1fa063b496f999d59a876 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Sun, 23 Jun 2019 22:49:00 +0200 Subject: [PATCH] Fixed inventory cost calculation for fiscal year deletion. --- admin/db/fiscalyears_db.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/admin/db/fiscalyears_db.inc b/admin/db/fiscalyears_db.inc index 958338ef..6281268b 100644 --- a/admin/db/fiscalyears_db.inc +++ b/admin/db/fiscalyears_db.inc @@ -322,8 +322,9 @@ function delete_this_fiscalyear($selected_id) db_query($sql, "Could not delete workorders"); delete_attachments_and_comments(ST_WORKORDER, $row['id']); } - $sql = "SELECT loc_code, stock_id, SUM(qty) AS qty, SUM(qty*standard_cost) AS std_cost FROM ".TB_PREF."stock_moves WHERE tran_date <= '$to' GROUP by - loc_code, stock_id"; + $sql = "SELECT loc_code, stock_id, SUM(qty) AS qty," + ." SUM(-qty*IF(type=".ST_SUPPRECEIVE." OR type=".ST_SUPPCREDIT.", price, standard_cost)) AS std_cost" + ." FROM ".TB_PREF."stock_moves WHERE tran_date <= '$to' GROUP by loc_code, stock_id"; $result = db_query($sql, "Could not retrieve stock moves"); while ($row = db_fetch($result)) { -- 2.30.2