Merging version 2.1 RC to main trunk.

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

diff --git a/reporting/rep203.php b/reporting/rep203.php
index d69bf519dcb8024f66ae1bf9d4b8017ab03d864c..c276188f8a6d0befbcb2cab9f91cb57c31c0fb85 100644 (file)
--- a/reporting/rep203.php
+++ b/reporting/rep203.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 $page_security = 2;
 // ----------------------------------------------------------------
 // $ Revision: 2.0 $
@@ -7,16 +16,15 @@ $page_security = 2;
 // date_:      2005-05-19
 // Title:      Payment Report
 // ----------------------------------------------------------------
-$path_to_root="../";
+$path_to_root="..";
 
-include_once($path_to_root . "includes/session.inc");
-include_once($path_to_root . "includes/date_functions.inc");
-include_once($path_to_root . "includes/data_checks.inc");
-include_once($path_to_root . "gl/includes/gl_db.inc");
+include_once($path_to_root . "/includes/session.inc");
+include_once($path_to_root . "/includes/date_functions.inc");
+include_once($path_to_root . "/includes/data_checks.inc");
+include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
-// trial_inquiry_controls();
 print_payment_report();
 
 function getTransactions($supplier, $date)
@@ -50,12 +58,15 @@ function print_payment_report()
 {
     global $path_to_root;
 
-    include_once($path_to_root . "reporting/includes/pdf_report.inc");
-
     $to = $_POST['PARAM_0'];
     $fromsupp = $_POST['PARAM_1'];
     $currency = $_POST['PARAM_2'];
     $comments = $_POST['PARAM_3'];
+       $destination = $_POST['PARAM_4'];
+       if ($destination)
+               include_once($path_to_root . "/reporting/includes/excel_report.inc");
+       else
+               include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
        if ($fromsupp == reserved_words::get_all_numeric())
                $from = _('All');
@@ -84,7 +95,7 @@ function print_payment_report()
                                    2 => array('text' => _('Supplier'), 'from' => $from, 'to' => ''),
                                    3 => array(  'text' => _('Currency'),'from' => $currency, 'to' => ''));
 
-    $rep = new FrontReport(_('Payment Report'), "PaymentReport.pdf", user_pagesize());
+    $rep = new FrontReport(_('Payment Report'), "PaymentReport", user_pagesize());
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
@@ -126,18 +137,18 @@ function print_payment_report()
                        $rep->TextCol(0, 1,     $trans['type_name']);
                        $rep->TextCol(1, 2,     $trans['supp_reference']);
                        if ($trans['type'] == 20)
-                               $rep->TextCol(2, 3,     sql2date($trans['due_date']));
+                               $rep->DateCol(2, 3,     $trans['due_date'], true);
                        else    
-                               $rep->TextCol(2, 3,     sql2date($trans['tran_date']));
+                               $rep->DateCol(2, 3,     $trans['tran_date'], true);
                        if ($trans['type'] != 20)
                        {
                                $trans['TranTotal'] = -$trans['TranTotal'];
                                $trans['Balance'] = -$trans['Balance'];
                        }
                        $item[0] = $trans['TranTotal'] * $rate;
-                       $rep->TextCol(6, 7,     number_format2($item[0], $dec));
+                       $rep->AmountCol(6, 7, $item[0], $dec);
                        $item[1] = $trans['Balance'] * $rate;
-                       $rep->TextCol(7, 8,     number_format2($item[1], $dec));
+                       $rep->AmountCol(7, 8, $item[1], $dec);
                        for ($i = 0; $i < 2; $i++)
                        {
                                $total[$i] += $item[$i];
@@ -149,7 +160,7 @@ function print_payment_report()
                $rep->TextCol(0, 3,     _('Total'));
                for ($i = 0; $i < 2; $i++)
                {
-                       $rep->TextCol($i + 6, $i + 7, number_format2($total[$i], $dec));
+                       $rep->AmountCol($i + 6, $i + 7, $total[$i], $dec);
                        $total[$i] = 0.0;
                }
        $rep->Line($rep->row  - 4);
@@ -159,8 +170,9 @@ function print_payment_report()
        $rep->TextCol(0, 3,     _('Grand Total'));
        $rep->fontSize -= 2;
        for ($i = 0; $i < 2; $i++)
-               $rep->TextCol($i + 6, $i + 7,number_format2($grandtotal[$i], $dec));
+               $rep->AmountCol($i + 6, $i + 7,$grandtotal[$i], $dec);
        $rep->Line($rep->row  - 4);
+       $rep->NewLine();
     $rep->End();
 }