From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Tue, 13 Mar 2012 08:18:41 +0000 (+0100)
Subject: Bug. WHERE clause version=1 in rep304.php should be skipped.
X-Git-Tag: 2.3-final~473
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=ecc75c8addbdcfa6683da0ce19661c3b115e3552;p=fa-stable.git

Bug. WHERE clause version=1 in rep304.php should be skipped.
---

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);