Rerun

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

diff --git a/reporting/rep203.php b/reporting/rep203.php
index 3ad684adc96085c7afd7b27bdb3a8c530d900437..6fe008d410bceeeb8f3493c0d32d97baea34fb46 100644 (file)
--- a/reporting/rep203.php
+++ b/reporting/rep203.php
@@ -30,6 +30,7 @@ print_payment_report();
 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,
@@ -41,7 +42,8 @@ function getTransactions($supplier, $date)
                        (ABS(".TB_PREF."supp_trans.ov_amount) + ABS(".TB_PREF."supp_trans.ov_gst) ) AS TranTotal
                FROM ".TB_PREF."supp_trans
                WHERE ".TB_PREF."supp_trans.supplier_id = '" . $supplier . "'
-               AND ABS(".TB_PREF."supp_trans.ov_amount) + ABS(".TB_PREF."supp_trans.ov_gst) - ".TB_PREF."supp_trans.alloc != 0
+               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";
@@ -53,7 +55,7 @@ function getTransactions($supplier, $date)
 
 function print_payment_report()
 {
-    global $path_to_root;
+    global $path_to_root, $systypes_array;
 
     $to = $_POST['PARAM_0'];
     $fromsupp = $_POST['PARAM_1'];
@@ -65,14 +67,14 @@ function print_payment_report()
        else
                include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
-       if ($fromsupp == reserved_words::get_all_numeric())
+       if ($fromsupp == ALL_NUMERIC)
                $from = _('All');
        else
                $from = get_supplier_name($fromsupp);
 
     $dec = user_price_dec();
 
-       if ($currency == reserved_words::get_all())
+       if ($currency == ALL_TEXT)
        {
                $convert = true;
                $currency = _('Balances in Home Currency');
@@ -96,15 +98,15 @@ function print_payment_report()
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
-    $rep->Header();
+    $rep->NewPage();
 
        $total = array();
        $grandtotal = array(0,0);
 
        $sql = "SELECT supplier_id, supp_name AS name, curr_code, ".TB_PREF."payment_terms.terms FROM ".TB_PREF."suppliers, ".TB_PREF."payment_terms
                WHERE ";
-       if ($fromsupp != reserved_words::get_all_numeric())
-               $sql .= "supplier_id=$fromsupp AND ";
+       if ($fromsupp != ALL_NUMERIC)
+               $sql .= "supplier_id=".db_escape($fromsupp)." AND ";
        $sql .= "".TB_PREF."suppliers.payment_terms = ".TB_PREF."payment_terms.terms_indicator
                ORDER BY supp_name";
        $result = db_query($sql, "The customers could not be retrieved");
@@ -131,13 +133,13 @@ function print_payment_report()
                        else
                                $rate = 1.0;
                        $rep->NewLine(1, 2);
-                       $rep->TextCol(0, 1,     systypes::name($trans['type']));
+                       $rep->TextCol(0, 1, $systypes_array[$trans['type']]);
                        $rep->TextCol(1, 2,     $trans['supp_reference']);
-                       if ($trans['type'] == 20)
+                       if ($trans['type'] == ST_SUPPINVOICE)
                                $rep->DateCol(2, 3,     $trans['due_date'], true);
                        else    
                                $rep->DateCol(2, 3,     $trans['tran_date'], true);
-                       if ($trans['type'] != 20)
+                       if ($trans['type'] != ST_SUPPINVOICE)
                        {
                                $trans['TranTotal'] = -$trans['TranTotal'];
                                $trans['Balance'] = -$trans['Balance'];