Typo fixed.

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

diff --git a/reporting/rep202.php b/reporting/rep202.php
index 57ef0e8baaa4cd1d9620479150b0a01381d664f3..2eb27559689efe240c53f395c0a60089ea79f773 100644 (file)
--- a/reporting/rep202.php
+++ b/reporting/rep202.php
@@ -1,12 +1,12 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
 <?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 
+       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
        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.  
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $page_security = 'SA_SUPPLIERANALYTIC';
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 $page_security = 'SA_SUPPLIERANALYTIC';


@@ -131,15 +131,9 @@ function print_aged_supplier_analysis()
                $headers[2] = _('currency');
        $rep = new FrontReport(_('Aged Supplier Analysis'), "AgedSupplierAnalysis", user_pagesize());
 
                $headers[2] = _('currency');
        $rep = new FrontReport(_('Aged Supplier Analysis'), "AgedSupplierAnalysis", user_pagesize());
 

-<<<<<<< rep202.php

     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
     $rep->NewPage();
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
     $rep->NewPage();

-=======
-       $rep->Font();
-       $rep->Info($params, $cols, $headers, $aligns);
-       $rep->Header();
->>>>>>> 1.7

 
        $total = array();
        $total[0] = $total[1] = $total[2] = $total[3] = $total[4] = 0.0;
 
        $total = array();
        $total[0] = $total[1] = $total[2] = $total[3] = $total[4] = 0.0;


@@ -242,9 +236,8 @@ function print_aged_supplier_analysis()
                $pg->type      = $graphics;
                $pg->skin      = $graph_skin;
                $pg->built_in  = false;
                $pg->type      = $graphics;
                $pg->skin      = $graph_skin;
                $pg->built_in  = false;

-               $pg->fontfile  = $path_to_root . "/reporting/fonts/Vera.ttf";

                $pg->latin_notation = ($decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()] != ".");
                $pg->latin_notation = ($decseps[$_SESSION["wa_current_user"]->prefs->dec_sep()] != ".");

-               $filename = company_path(). "/pdf_files/test.png";
+               $filename = company_path(). "/pdf_files/". uniqid("").".png";

                $pg->display($filename, true);
                $w = $pg->width / 1.5;
                $h = $pg->height / 1.5;
                $pg->display($filename, true);
                $w = $pg->width / 1.5;
                $h = $pg->height / 1.5;