X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Ffiscalyears_db.inc;h=6281268ba897d0be203511edd2b801f00836badf;hb=7a03a26720d0bbe802f1fa063b496f999d59a876;hp=958338ef9ef0a97a81bb1fdfb96223077d0e14ab;hpb=d94a924a5ad03d723ef50047204c9f543acab4dd;p=fa-stable.git 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)) {