From ee4363925d5fcefa44c99565d940f88a601d8046 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Wed, 16 Sep 2009 01:15:19 +0000 Subject: [PATCH] Missing freight tax in Customer Balances Report --- CHANGELOG.txt | 4 ++++ reporting/rep101.php | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index c6cd42ff..b926f6ee 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,10 @@ Legend: ! -> Note $ -> Affected files +16-Sep-2009 Joe Hunt +# Missing freight tax in Customer Balances Report +$ /reporting/rep101.php + 14-Sep-2009 Joe Hunt # A couple of minor bugs in tax report when displaying supplier credit notes $ /purchasing/includes/db/invoice_db.inc diff --git a/reporting/rep101.php b/reporting/rep101.php index 1745d93d..59bb026b 100644 --- a/reporting/rep101.php +++ b/reporting/rep101.php @@ -34,8 +34,8 @@ function get_transactions($debtorno, $date) $date = date2sql($date); $sql = "SELECT ".TB_PREF."debtor_trans.*, ".TB_PREF."sys_types.type_name, - (".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + ".TB_PREF."debtor_trans.ov_discount) - AS TotalAmount, ".TB_PREF."debtor_trans.alloc AS Allocated, + (".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) AS TotalAmount, ".TB_PREF."debtor_trans.alloc AS Allocated, ((".TB_PREF."debtor_trans.type = 10) AND ".TB_PREF."debtor_trans.due_date < '$date') AS OverDue FROM ".TB_PREF."debtor_trans, ".TB_PREF."sys_types -- 2.30.2