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 3958536fe9440c5f8526b793a16d778b7a65f532..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,
@@ -59,11 +59,11 @@ function getTransactions($category, $location, $fromcust, $from, $to)
                AND ((".TB_PREF."debtor_trans.type=".ST_CUSTDELIVERY." AND ".TB_PREF."debtor_trans.version=1) OR ".TB_PREF."stock_moves.type=".ST_CUSTCREDIT.")
                AND (".TB_PREF."stock_master.mb_flag='B' OR ".TB_PREF."stock_master.mb_flag='M')";
                if ($category != 0)
-                       $sql .= " AND ".TB_PREF."stock_master.category_id = '$category'";
+                       $sql .= " AND ".TB_PREF."stock_master.category_id = ".db_escape($category);
                if ($location != 'all')
-                       $sql .= " AND ".TB_PREF."stock_moves.loc_code = '$location'";
+                       $sql .= " AND ".TB_PREF."stock_moves.loc_code = ".db_escape($location);
                if ($fromcust != -1)
-                       $sql .= " AND ".TB_PREF."debtors_master.debtor_no = $fromcust";
+                       $sql .= " AND ".TB_PREF."debtors_master.debtor_no = ".db_escape($fromcust);
                $sql .= " GROUP BY ".TB_PREF."stock_master.stock_id, ".TB_PREF."debtors_master.name ORDER BY ".TB_PREF."stock_master.category_id,
                        ".TB_PREF."stock_master.stock_id, ".TB_PREF."debtors_master.name";
     return db_query($sql,"No transactions were returned");
@@ -127,7 +127,7 @@ function print_inventory_sales()
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
-    $rep->Header();
+    $rep->NewPage();
 
        $res = getTransactions($category, $location, $fromcust, $from, $to);
        $total = $grandtotal = 0.0;
@@ -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;