Missing freight tax in Customer Balances Report
authorJoe Hunt <joe.hunt.consulting@gmail.com>
Wed, 16 Sep 2009 01:15:19 +0000 (01:15 +0000)
committerJoe Hunt <joe.hunt.consulting@gmail.com>
Wed, 16 Sep 2009 01:15:19 +0000 (01:15 +0000)
CHANGELOG.txt
reporting/rep101.php

index c6cd42fffbeec576382fbe1fd2275d26397d4558..b926f6ee89107d65d6c193cd1ed4c660514e679a 100644 (file)
@@ -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
index 1745d93d6986a38a5948d8249f58175018fa9ffb..59bb026b74c26edee523539c96fc21ab8ae4d99d 100644 (file)
@@ -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