Merged changes form main trunk (2.2.8, 2.2.9)

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

diff --git a/reporting/rep305.php b/reporting/rep305.php
index 5f180025e7241f78e33556690de010f84d66fdc7..6711d9b7f4257bb7f1a8e42b9432a671760a478f 100644 (file)
--- a/reporting/rep305.php
+++ b/reporting/rep305.php
@@ -36,7 +36,7 @@ function getTransactions($from, $to)
        
        $sql = "SELECT DISTINCT ".TB_PREF."grn_batch.supplier_id, 
             ".TB_PREF."purch_order_details.*,
-            ".TB_PREF."stock_master.description
+            ".TB_PREF."stock_master.description, ".TB_PREF."stock_master.inactive
         FROM ".TB_PREF."stock_master,
             ".TB_PREF."purch_order_details,
             ".TB_PREF."grn_batch
@@ -108,7 +108,7 @@ function print_grn_valuation()
 
                $rep->NewLine();
                $rep->TextCol(0, 1, $trans['item_code']);
-               $rep->TextCol(1, 2, $trans['description']);
+               $rep->TextCol(1, 2, $trans['description'].($trans['inactive']==1 ? " ("._("Inactive").")" : ""), -1);
                $rep->TextCol(2, 3, $trans['order_no']);
                $qdec = get_qty_dec($trans['item_code']);
                $rep->AmountCol(3, 4, $trans['quantity_received'], $qdec);