Global fixes in SQL queries aimed to make them more readible and easier for maintence.

[fa-stable.git] / reporting / rep203.php

diff --git a/reporting/rep203.php b/reporting/rep203.php
index 95c3c0e664fe732ba3f2013a542b3981bd1edd85..1422ce256f7fc9d87f33331e1b75394a3c7edca9 100644 (file)
--- a/reporting/rep203.php
+++ b/reporting/rep203.php
@@ -32,21 +32,16 @@ function getTransactions($supplier, $date)
        $date = date2sql($date);
        $dec = user_price_dec();
 
-       $sql = "SELECT ".TB_PREF."supp_trans.supp_reference,
-                       ".TB_PREF."supp_trans.tran_date,
-                       ".TB_PREF."supp_trans.due_date,
-                       ".TB_PREF."supp_trans.trans_no,
-                       ".TB_PREF."supp_trans.type,
-                       ".TB_PREF."supp_trans.rate,
-                       (ABS(".TB_PREF."supp_trans.ov_amount) + ABS(".TB_PREF."supp_trans.ov_gst) - ".TB_PREF."supp_trans.alloc) AS Balance,
-                       (ABS(".TB_PREF."supp_trans.ov_amount) + ABS(".TB_PREF."supp_trans.ov_gst) ) AS TranTotal
+       $sql = "SELECT  supp_reference, tran_date, due_date, trans_no, type, rate,
+                       (ABS( ov_amount) + ABS( ov_gst) -  alloc) AS Balance,
+                       (ABS( ov_amount) + ABS( ov_gst) ) AS TranTotal
                FROM ".TB_PREF."supp_trans
-               WHERE ".TB_PREF."supp_trans.supplier_id = '" . $supplier . "'
-               AND ROUND(ABS(".TB_PREF."supp_trans.ov_amount),$dec) + ROUND(ABS(".TB_PREF."supp_trans.ov_gst),$dec) - 
-               ROUND(".TB_PREF."supp_trans.alloc,$dec) != 0
-               AND ".TB_PREF."supp_trans.tran_date <='" . $date . "'
-               ORDER BY ".TB_PREF."supp_trans.type,
-                       ".TB_PREF."supp_trans.trans_no";
+               WHERE  supplier_id = '$supplier'
+               AND ROUND(ABS( ov_amount),$dec) + ROUND(ABS( ov_gst),$dec) - 
+               ROUND( alloc,$dec) != 0
+               AND  tran_date <='$date'
+               ORDER BY  type,
+                        trans_no";
 
     return db_query($sql, "No transactions were returned");
 }
@@ -103,7 +98,7 @@ function print_payment_report()
 
     $rep = new FrontReport(_('Payment Report'), "PaymentReport", user_pagesize(), 9, $orientation);
     if ($orientation == 'L')
-       $rep->recalculate_cols($cols);
+       recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
@@ -187,4 +182,3 @@ function print_payment_report()
     $rep->End();
 }
 
-?>