Optimized the textwraplines in pdf_report.inc and header2.inc

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

diff --git a/reporting/rep203.php b/reporting/rep203.php
index 8c4b2aed14a76d8c196a82edef2754e23fcce45f..625e3ce15bf85576f5038930d5d10e1376d4beeb 100644 (file)
--- a/reporting/rep203.php
+++ b/reporting/rep203.php
@@ -22,7 +22,7 @@ print_payment_report();
 function getTransactions($supplier, $date)
 {
        $date = date2sql($date);
-       
+
        $sql = "SELECT ".TB_PREF."sys_types.type_name,
                        ".TB_PREF."supp_trans.supp_reference,
                        ".TB_PREF."supp_trans.due_date,
@@ -52,15 +52,14 @@ function print_payment_report()
 
     $to = $_POST['PARAM_0'];
     $fromsupp = $_POST['PARAM_1'];
-    $tosupp = $_POST['PARAM_2'];
-    $currency = $_POST['PARAM_3'];
-    $comments = $_POST['PARAM_4'];
-
-       if ($fromsupp == null)
-               $fromsupp = 0;
-       if ($tosupp == null)
-               $tosupp = 0;
-           
+    $currency = $_POST['PARAM_2'];
+    $comments = $_POST['PARAM_3'];
+
+       if ($fromsupp == reserved_words::get_all_numeric())
+               $from = _('All');
+       else
+               $from = get_supplier_name($fromsupp);
+
     $dec = user_price_dec();
 
        if ($currency == reserved_words::get_all())
@@ -80,8 +79,7 @@ function print_payment_report()
 
     $params =   array(         0 => $comments,
                                    1 => array('text' => _('End Date'), 'from' => $to, 'to' => ''),
-                                   2 => array('text' => _('Supplier'), 'from' => get_supplier_name($fromsupp),
-                            'to' => get_supplier_name($tosupp)),
+                                   2 => array('text' => _('Supplier'), 'from' => $from, 'to' => ''),
                                    3 => array(  'text' => _('Currency'),'from' => $currency, 'to' => ''));
 
     $rep = new FrontReport(_('Payment Report'), "PaymentReport.pdf", user_pagesize());
@@ -91,14 +89,17 @@ function print_payment_report()
     $rep->Header();
 
        $total = array();
-       $grandtotal = 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 supplier_id>=$fromsupp AND supplier_id<=$tosupp AND ".TB_PREF."suppliers.payment_terms = ".TB_PREF."payment_terms.terms_indicator 
+               WHERE ";
+       if ($fromsupp != reserved_words::get_all_numeric())
+               $sql .= "supplier_id=$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");
-       
-       while ($myrow=db_fetch($result)) 
+
+       while ($myrow=db_fetch($result))
        {
                if (!$convert && $currency != $myrow['curr_code'])
                        continue;
@@ -117,14 +118,14 @@ function print_payment_report()
                if (db_num_rows($res)==0)
                        continue;
                $rep->Line($rep->row + 4);
-               $total[0] = $total[1] = $total[2] = $total[3] = 0.0; 
+               $total[0] = $total[1] = 0.0;
                while ($trans=db_fetch($res))
                {
                        $rep->NewLine(1, 2);
                        $rep->TextCol(0, 1,     $trans['type_name']);
                        $rep->TextCol(1, 2,     $trans['supp_reference']);
                        $rep->TextCol(2, 3,     sql2date($trans['due_date']));
-                       $item[0] = Abs($trans['TranTotal']) * $rate;            
+                       $item[0] = Abs($trans['TranTotal']) * $rate;
                        $rep->TextCol(6, 7,     number_format2($item[0], $dec));
                        $item[1] = $trans['Balance'] * $rate;
                        $rep->TextCol(7, 8,     number_format2($item[1], $dec));
@@ -132,7 +133,7 @@ function print_payment_report()
                        {
                                $total[$i] += $item[$i];
                                $grandtotal[$i] += $item[$i];
-                       }       
+                       }
                }
                $rep->Line($rep->row - 8);
                $rep->NewLine(2);
@@ -141,7 +142,7 @@ function print_payment_report()
                {
                        $rep->TextCol($i + 6, $i + 7, number_format2($total[$i], $dec));
                        $total[$i] = 0.0;
-               }       
+               }
        $rep->Line($rep->row  - 4);
        $rep->NewLine(2);
        }