From 26c3aa914a802dab194638f7750e5b486beedb0f Mon Sep 17 00:00:00 2001 From: erling Date: Sun, 18 Jun 2017 07:48:35 +0200 Subject: [PATCH] 0003896: Fixed Assets valuation report, location parameter not working --- reporting/rep451.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/reporting/rep451.php b/reporting/rep451.php index 2a9d3cb0..5d73ff79 100644 --- a/reporting/rep451.php +++ b/reporting/rep451.php @@ -26,6 +26,16 @@ include_once($path_to_root . "/inventory/includes/db/items_category_db.inc"); include_once($path_to_root . "/fixed_assets/includes/fixed_assets_db.inc"); include_once($path_to_root . "/fixed_assets/includes/fa_classes_db.inc"); +function find_last_location($stock_id, $end_date) +{ + $end_date = date2sql($end_date); + $sql = "SELECT loc_code FROM ".TB_PREF."stock_moves WHERE stock_id = ".db_escape($stock_id)." AND + tran_date <= '$end_date' ORDER BY tran_date DESC LIMIT 1"; + $res = db_query($sql,"No stock moves were returned"); + $row = db_fetch_row($res); + return $row[0]; +} + //---------------------------------------------------------------------------------------------------- print_fixed_assets_valuation_report(); @@ -91,6 +101,9 @@ function print_fixed_assets_valuation_report() $catt = ''; while ($trans=db_fetch($res)) { + $loc = find_last_location($trans['stock_id'], $date); + if ($location != 'all' && $location != $loc) + continue; $purchase = get_fixed_asset_purchase($trans['stock_id']); $d = sql2date($purchase['tran_date']); if (date1_greater_date2($d, $date)) -- 2.30.2