Removed redundant form_types functions and the file /reporting/includes/form_types...

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

diff --git a/reporting/rep201.php b/reporting/rep201.php
index 3b6e64f571649206a46b9b25a703f3806352ce00..834ca6ce0c6b30e7e41fb8ec03fe209956d27970 100644 (file)
--- a/reporting/rep201.php
+++ b/reporting/rep201.php
@@ -22,8 +22,8 @@ print_supplier_balances();
 function getTransactions($supplier_id, $date)
 {
        $date = date2sql($date);
-       
-    $sql = "SELECT ".TB_PREF."supp_trans.*, ".TB_PREF."sys_types.type_name, 
+
+    $sql = "SELECT ".TB_PREF."supp_trans.*, ".TB_PREF."sys_types.type_name,
                                (".TB_PREF."supp_trans.ov_amount + ".TB_PREF."supp_trans.ov_gst + ".TB_PREF."supp_trans.ov_discount)
                                AS TotalAmount, ".TB_PREF."supp_trans.alloc AS Allocated,
                                ((".TB_PREF."supp_trans.type = 20)
@@ -48,14 +48,13 @@ function print_supplier_balances()
 
     $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())
@@ -75,8 +74,7 @@ function print_supplier_balances()
 
     $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(_('Supplier Balances'), "SupplierBalances.pdf", user_pagesize());
@@ -88,61 +86,63 @@ function print_supplier_balances()
        $total = array();
        $grandtotal = array();
 
-       $sql = "SELECT supplier_id, supp_name AS name, curr_code FROM ".TB_PREF."suppliers
-               WHERE supplier_id>=$fromsupp AND supplier_id<=$tosupp ORDER BY supp_name";
+       $sql = "SELECT supplier_id, supp_name AS name, curr_code FROM ".TB_PREF."suppliers ";
+       if ($fromsupp != reserved_words::get_all_numeric())
+               $sql .= "WHERE supplier_id=$fromsupp ";
+       $sql .= "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;
                $rep->fontSize += 2;
                $rep->TextCol(0, 3, $myrow['name']);
                if ($convert)
-               {
-                       $rate = get_exchange_rate_from_home_currency($myrow['curr_code'], $to);
                        $rep->TextCol(3, 4,     $myrow['curr_code']);
-               }
-               else
-                       $rate = 1.0;
                $rep->fontSize -= 2;
                $rep->NewLine(1, 2);
                $res = getTransactions($myrow['supplier_id'], $to);
                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] = $total[2] = $total[3] = 0.0;
                while ($trans=db_fetch($res))
                {
                        $rep->NewLine(1, 2);
                        $rep->TextCol(0, 1,     $trans['type_name']);
                        $rep->TextCol(1, 2,     $trans['reference']);
-                       $rep->TextCol(2, 3,     sql2date($trans['tran_date']));
-                       if ($trans['type'] == 20)       
+                       $date = sql2date($trans['tran_date']);
+                       $rep->TextCol(2, 3,     $date);
+                       if ($trans['type'] == 20)
                                $rep->TextCol(3, 4,     sql2date($trans['due_date']));
-                       $item[0] = $item[1] = 0.0;              
-                       if ($trans['TotalAmount'] > 0.0)        
+                       $item[0] = $item[1] = 0.0;
+                       if ($convert)
+                               $rate = get_exchange_rate_from_home_currency($myrow['curr_code'], $date);
+                       else
+                               $rate = 1.0;
+                       if ($trans['TotalAmount'] > 0.0)
                        {
-                               $item[0] = Abs($trans['TotalAmount']) * $rate;          
+                               $item[0] = Abs($trans['TotalAmount']) * $rate;
                                $rep->TextCol(4, 5,     number_format2($item[0], $dec));
-                       }               
-                       else    
+                       }
+                       else
                        {
-                               $item[1] = Abs($trans['TotalAmount']) * $rate;          
+                               $item[1] = Abs($trans['TotalAmount']) * $rate;
                                $rep->TextCol(5, 6,     number_format2($item[1], $dec));
-                       }               
+                       }
                        $item[2] = $trans['Allocated'] * $rate;
                        $rep->TextCol(6, 7,     number_format2($item[2], $dec));
                        if ($trans['type'] == 20)
-                               $item[3] = ($trans['TotalAmount'] - $trans['Allocated']) * $rate;               
-                       else    
-                               $item[3] = ($trans['TotalAmount'] + $trans['Allocated']) * $rate;               
+                               $item[3] = ($trans['TotalAmount'] - $trans['Allocated']) * $rate;
+                       else
+                               $item[3] = ($trans['TotalAmount'] + $trans['Allocated']) * $rate;
                        $rep->TextCol(7, 8,     number_format2($item[3], $dec));
                        for ($i = 0; $i < 4; $i++)
                        {
                                $total[$i] += $item[$i];
                                $grandtotal[$i] += $item[$i];
-                       }       
+                       }
                }
                $rep->Line($rep->row - 8);
                $rep->NewLine(2);
@@ -151,7 +151,7 @@ function print_supplier_balances()
                {
                        $rep->TextCol($i + 4, $i + 5, number_format2($total[$i], $dec));
                        $total[$i] = 0.0;
-               }       
+               }
        $rep->Line($rep->row  - 4);
        $rep->NewLine(2);
        }