Dimensions not utilized in Direct Invoice/Delivery

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

diff --git a/reporting/rep304.php b/reporting/rep304.php
index a84e53d2babddb8b92da6e10d8816fbbf4756834..054a12d613b19c1d90c10d32bf6599151b8d1699 100644 (file)
--- a/reporting/rep304.php
+++ b/reporting/rep304.php
@@ -56,13 +56,13 @@ function getTransactions($category, $location, $fromcust, $from, $to)
                AND ".TB_PREF."stock_moves.trans_no=".TB_PREF."debtor_trans.trans_no
                AND ".TB_PREF."stock_moves.tran_date>='$from'
                AND ".TB_PREF."stock_moves.tran_date<='$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."debtor_trans.type=".ST_CUSTDELIVERY." 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 = ".db_escape($category);
-               if ($location != 'all')
+               if ($location != '')
                        $sql .= " AND ".TB_PREF."stock_moves.loc_code = ".db_escape($location);
-               if ($fromcust != -1)
+               if ($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";
@@ -97,14 +97,12 @@ function print_inventory_sales()
        else
                $cat = get_category_name($category);
 
-       if ($location == ALL_TEXT)
-               $location = 'all';
-       if ($location == 'all')
+       if ($location == '')
                $loc = _('All');
        else
                $loc = get_location_name($location);
 
-       if ($fromcust == ALL_TEXT)
+       if ($fromcust == '')
                $fromc = _('All');
        else
                $fromc = get_customer_name($fromcust);
@@ -112,8 +110,8 @@ function print_inventory_sales()
        $cols = array(0, 75, 175, 250, 300, 375, 450,   515);
 
        $headers = array(_('Category'), _('Description'), _('Customer'), _('Qty'), _('Sales'), _('Cost'), _('Contribution'));
-       if ($fromcust != ALL_TEXT)
-               $headers[2] = '';       
+       if ($fromcust != '')
+               $headers[2] = '';
 
        $aligns = array('left', 'left', 'left', 'right', 'right', 'right', 'right');