X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep304.php;h=054a12d613b19c1d90c10d32bf6599151b8d1699;hb=fff65dd000727b3403f641cb265c7b327b4fe22d;hp=7a91a4a1ee9226bcf6ac38bf34d5628f409e64ec;hpb=7aa9feb544ca1dfc86982533b7a14c843dde21f3;p=fa-stable.git diff --git a/reporting/rep304.php b/reporting/rep304.php index 7a91a4a1..054a12d6 100644 --- a/reporting/rep304.php +++ b/reporting/rep304.php @@ -56,7 +56,7 @@ 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);