Merging changes form main trunk 2.2.5-2.2.6

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

diff --git a/reporting/rep203.php b/reporting/rep203.php
index 122c6826ebec021f4652e4947a8534f2bdcbdbc6..27eef02b5dd538a10c2975d8f47bdf98dbe7b6e0 100644 (file)
--- a/reporting/rep203.php
+++ b/reporting/rep203.php
@@ -9,7 +9,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 2;
+$page_security = 'SA_SUPPPAYMREP';
 // ----------------------------------------------------------------
 // $ Revision: 2.0 $
 // Creator:    Joe Hunt
@@ -53,7 +53,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 +65,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');
@@ -103,8 +103,8 @@ function print_payment_report()
 
        $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 +131,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'];