rerun of bug 5232 fix.

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

diff --git a/reporting/rep451.php b/reporting/rep451.php
index 5d73ff79d287032ee5834ae6917ffd130301f3b5..ece0519b7af61ec3df4d7ea896b504483368736e 100644 (file)
--- a/reporting/rep451.php
+++ b/reporting/rep451.php
@@ -94,7 +94,7 @@ 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;
@@ -134,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);