Changed so Print Statements don't list voided items.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 76576493a9f2ac4462f1a13932271c5a1b35af8b..8cb8f903a582c7d896c37a79b5537b4ccd4b93d6 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,10 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+10-May-2010 Joe Hunt/Alvin
+! Changed so Print Statements don't list voided items.
+$ /reporting/rep108.php
+
 04-May-2010 Janusz Dobrowolski/Robert Laussegger
 # Fixed amibiguites and typos in report titles.
 $ /reporting/includes/doctext.inc

diff --git a/reporting/rep108.php b/reporting/rep108.php
index b896b73b46ca72123ca4a1b874dfb7687bca47a5..f4a8aa3294b0a28372135cace435ad13abc74e0e 100644 (file)
--- a/reporting/rep108.php
+++ b/reporting/rep108.php
@@ -40,6 +40,8 @@ function getTransactions($debtorno, $date)
                        FROM ".TB_PREF."debtor_trans
                        WHERE ".TB_PREF."debtor_trans.tran_date <= '$date' AND ".TB_PREF."debtor_trans.debtor_no = ".db_escape($debtorno)."
                                AND ".TB_PREF."debtor_trans.type <> ".ST_CUSTDELIVERY."
+                               AND (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + 
+                               ".TB_PREF."debtor_trans.ov_freight_tax + ".TB_PREF."debtor_trans.ov_discount) != 0
                                ORDER BY ".TB_PREF."debtor_trans.tran_date";
 
     return db_query($sql,"No transactions were returned");