Marged fixes from ain trunk up to 2.2.11

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

diff --git a/reporting/rep203.php b/reporting/rep203.php
index 6fe008d410bceeeb8f3493c0d32d97baea34fb46..e6f00ce8c5b46ec372be7e9ac2797e75a21593d0 100644 (file)
--- a/reporting/rep203.php
+++ b/reporting/rep203.php
@@ -55,13 +55,14 @@ function getTransactions($supplier, $date)
 
 function print_payment_report()
 {
-    global $path_to_root, $systypes_array;
-
-    $to = $_POST['PARAM_0'];
-    $fromsupp = $_POST['PARAM_1'];
-    $currency = $_POST['PARAM_2'];
-    $comments = $_POST['PARAM_3'];
-       $destination = $_POST['PARAM_4'];
+       global $path_to_root, $systypes_array;
+
+       $to = $_POST['PARAM_0'];
+       $fromsupp = $_POST['PARAM_1'];
+       $currency = $_POST['PARAM_2'];
+       $no_zeros = $_POST['PARAM_3'];
+       $comments = $_POST['PARAM_4'];
+       $destination = $_POST['PARAM_5'];
        if ($destination)
                include_once($path_to_root . "/reporting/includes/excel_report.inc");
        else
@@ -72,7 +73,7 @@ function print_payment_report()
        else
                $from = get_supplier_name($fromsupp);
 
-    $dec = user_price_dec();
+       $dec = user_price_dec();
 
        if ($currency == ALL_TEXT)
        {
@@ -82,6 +83,9 @@ function print_payment_report()
        else
                $convert = false;
 
+       if ($no_zeros) $nozeros = _('Yes');
+       else $nozeros = _('No');
+
        $cols = array(0, 100, 130, 190, 250, 320, 385, 450,     515);
 
        $headers = array(_('Trans Type'), _('#'), _('Due Date'), '', '',
@@ -90,9 +94,10 @@ function print_payment_report()
        $aligns = array('left', 'left', 'left', 'left', 'right', 'right', 'right', 'right');
 
     $params =   array(         0 => $comments,
-                                   1 => array('text' => _('End Date'), 'from' => $to, 'to' => ''),
-                                   2 => array('text' => _('Supplier'), 'from' => $from, 'to' => ''),
-                                   3 => array(  'text' => _('Currency'),'from' => $currency, 'to' => ''));
+                       1 => array('text' => _('End Date'), 'from' => $to, 'to' => ''),
+                       2 => array('text' => _('Supplier'), 'from' => $from, 'to' => ''),
+                       3 => array(  'text' => _('Currency'),'from' => $currency, 'to' => ''),
+                       4 => array('text' => _('Suppress Zeros'), 'from' => $nozeros, 'to' => ''));
 
     $rep = new FrontReport(_('Payment Report'), "PaymentReport", user_pagesize());
 
@@ -113,25 +118,28 @@ function print_payment_report()
 
        while ($myrow=db_fetch($result))
        {
-               if (!$convert && $currency != $myrow['curr_code'])
-                       continue;
+               if (!$convert && $currency != $myrow['curr_code']) continue;
+
+               $res = getTransactions($myrow['supplier_id'], $to);
+               if ($no_zeros && db_num_rows($res)==0) continue;
+
                $rep->fontSize += 2;
                $rep->TextCol(0, 6, $myrow['name'] . " - " . $myrow['terms']);
                if ($convert)
                        $rep->TextCol(6, 7,     $myrow['curr_code']);
                $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] = 0.0;
                while ($trans=db_fetch($res))
                {
-                       if ($convert)
-                               $rate = $trans['rate'];
-                       else
-                               $rate = 1.0;
+                       if ($no_zeros && $trans['TranTotal'] == 0 && $trans['Balance'] == 0) continue;
+
+                       if ($convert) $rate = $trans['rate'];
+                       else $rate = 1.0;
+
                        $rep->NewLine(1, 2);
                        $rep->TextCol(0, 1, $systypes_array[$trans['type']]);
                        $rep->TextCol(1, 2,     $trans['supp_reference']);
@@ -175,4 +183,4 @@ function print_payment_report()
     $rep->End();
 }
 
-?>
\ No newline at end of file
+?>