rerun of bug 5232 fix.

[fa-stable.git] / reporting / rep451.php

diff --git a/reporting/rep451.php b/reporting/rep451.php
index 2a9d3cb05e3787d620a6f4063274c4491d96842d..ece0519b7af61ec3df4d7ea896b504483368736e 100644 (file)
--- 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();
@@ -84,13 +94,16 @@ function print_fixed_assets_valuation_report()
     $rep->NewPage();
 
        //$res = getTransactions($category, $location, $date);
-       $sql = get_sql_for_fixed_assets(true);
+       $sql = get_sql_for_fixed_assets(false);
        $res = db_query($sql,"No transactions were returned");
        
        $total = $grandtotal = 0.0;
        $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))
@@ -121,13 +134,13 @@ function print_fixed_assets_valuation_report()
                                $rep->NewLine();
                }
                $UnitCost = $trans['purchase_cost'];
-               $Depreciation = $trans['purchase_cost'] - $trans['material_cost'];;
+               $Depreciation = $trans['purchase_cost'] - $trans['material_cost'];
                $Balance = $trans['material_cost'];
                if ($detail)
                {
                        $rep->NewLine();
                        $rep->TextCol(0, 1, $trans['stock_id']);
-                       $rep->TextCol(1, 2, $trans['name'].($trans['inactive']==1 ? " ("._("Inactive").")" : ""), -1);
+                       $rep->TextCol(1, 2, $trans['name']);
                        $rep->TextCol(2, 3, $trans['units']);
                        $rep->AmountCol(3, 4, $UnitCost, $dec);
                        $rep->AmountCol(4, 5, $Depreciation, $dec);