X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep304.php;h=a525f33c505d15d241f628217bafae83a6042b8f;hb=c5dc92bf60148463852a81f74284117ce3fd1e92;hp=624dabeaece0d8c437827b31532f7d95ddcfc14f;hpb=b37623cf1de2cfce6825744557d76475f002321f;p=fa-stable.git diff --git a/reporting/rep304.php b/reporting/rep304.php index 624dabea..a525f33c 100644 --- 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, @@ -161,20 +161,20 @@ function print_inventory_sales() $trans['amt'] *= $rate; $cb = $trans['amt'] - $trans['cost']; $rep->NewLine(); - $rep->fontsize -= 2; + $rep->fontSize -= 2; $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); $rep->AmountCol(6, 7, $cb, $dec); - $rep->fontsize += 2; + $rep->fontSize += 2; $total += $trans['amt']; $total1 += $trans['cost']; $total2 += $cb;