Added cancel edition hotkey

[fa-stable.git] / reporting / includes / pdf_report.inc

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index c849f98fea60c9253257280a9d499d659cf1bbe6..8c5d5727d42d1d6e11b41f327451c2369c39f1de 100644 (file)
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-       Released under the terms of the GNU Affero General Public License,
-       AGPL, as published by the Free Software Foundation, either version 
-       3 of the License, or (at your option) any later version.
+       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/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 /* $Revision$ */
 $page_security = 8;
@@ -124,7 +124,7 @@ class FrontReport extends Cpdf
                }
                $this->size = array(0, 0, $this->pageWidth, $this->pageHeight);
                $this->title = $title;
-               $this->filename = $filename;
+               $this->filename = $filename.".pdf";
                $this->pageNumber = 0;
                $this->endLine = $this->pageWidth - $this->rightMargin;
                $this->companyCol = $this->endLine - 150;
@@ -319,6 +319,18 @@ class FrontReport extends Cpdf
        {
                return $this->TextWrap($this->cols[$c], $this->row - $r, $this->cols[$n] - $this->cols[$c] + $corr, $txt, $this->aligns[$c]);
        }
+       
+       function AmountCol($c, $n, $txt, $dec=0, $corr=0, $r=0)
+       {
+               return $this->TextCol($c, $n, number_format2($txt, $dec), $corr, $r);
+       }
+
+       function DateCol($c, $n, $txt, $conv=false, $corr=0, $r=0)
+       {
+               if ($conv)
+                       $txt = sql2date($txt);
+               return $this->TextCol($c, $n, $txt, $corr, $r);
+       }
 
        function TextCol2($c, $n, $txt, $corr=0, $r=0)
        {