Merged changes form main trunk (2.2.8, 2.2.9)

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

diff --git a/reporting/rep304.php b/reporting/rep304.php
index f40d8e56c5c7f5fc71ff53c0d750de43f079ad7f..a525f33c505d15d241f628217bafae83a6042b8f 100644 (file)
--- a/reporting/rep304.php
+++ b/reporting/rep304.php
@@ -36,7 +36,7 @@ function getTransactions($category, $location, $fromcust, $from, $to)
        $sql = "SELECT ".TB_PREF."stock_master.category_id,
                        ".TB_PREF."stock_category.description AS cat_description,
                        ".TB_PREF."stock_master.stock_id,
-                       ".TB_PREF."stock_master.description,
+                       ".TB_PREF."stock_master.description, ".TB_PREF."stock_master.inactive,
                        ".TB_PREF."stock_moves.loc_code,
                        ".TB_PREF."debtor_trans.debtor_no,
                        ".TB_PREF."debtors_master.name AS debtor_name,
@@ -165,11 +165,11 @@ function print_inventory_sales()
                $rep->TextCol(0, 1, $trans['stock_id']);
                if ($fromcust == ALL_NUMERIC)
                {
-                       $rep->TextCol(1, 2, $trans['description']);
+                       $rep->TextCol(1, 2, $trans['description'].($trans['inactive']==1 ? " ("._("Inactive").")" : ""), -1);
                        $rep->TextCol(2, 3, $trans['debtor_name']);
                }
                else
-                       $rep->TextCol(1, 3, $trans['description']);
+                       $rep->TextCol(1, 3, $trans['description'].($trans['inactive']==1 ? " ("._("Inactive").")" : ""), -1);
                $rep->AmountCol(3, 4, $trans['qty'], get_qty_dec($trans['stock_id']));
                $rep->AmountCol(4, 5, $trans['amt'], $dec);
                $rep->AmountCol(5, 6, $trans['cost'], $dec);