CHANGELOG.txt

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

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index a0a78be95b0784c49531c477a4603374c4164fb9..ecb31b0e46a5c3620bf1d3b2b08a9600f75d6f68 100644 (file)
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -24,6 +24,7 @@ include_once($path_to_root . "/reporting/includes/reporting.inc");
 include_once($path_to_root . "/admin/db/company_db.inc");
 include_once($path_to_root . "/admin/db/fiscalyears_db.inc");
 include_once($path_to_root . "/admin/db/printers_db.inc");
+include_once($path_to_root . "/includes/ui/ui_globals.inc");
 include_once($path_to_root . "/config.php");
 
 class FrontReport extends Cpdf
@@ -742,7 +743,7 @@ class FrontReport extends Cpdf
 
        function TextWrap($xpos, $ypos, $len, $str, $align = 'left', $border = 0, $fill = 0, $link = NULL, $stretch = 1, $spacebreak=false)
        {
-               $str = strtr($str, array("\r"=>''));
+               $str = ($str != NULL ? strtr($str, array("\r"=>'')) : "");
 
                if ($this->fontSize != $this->oldFontSize)
                {
@@ -772,7 +773,7 @@ class FrontReport extends Cpdf
                setlocale(LC_MONETARY, $amount_locale);
                if ($color_red && $txt < 0)
                        $this->SetTextColor(255, 0, 0);
-               $ret = $this->TextCol($c, $n, money_format($amount_format, $txt), $corr, $r, $border, $fill, $link, $stretch);
+               $ret = $this->TextCol($c, $n, price_format($txt), $corr, $r, $border, $fill, $link, $stretch);
                if ($color_red && $txt < 0)
                        $this->SetTextColor(0, 0, 0);
                return $ret;    
@@ -798,7 +799,7 @@ class FrontReport extends Cpdf
 
        function TextWrapLines($c, $width, $txt, $align='left', $border=0, $fill=0, $link=NULL, $stretch=0, $spacebreak=true)
        {
-               $str = explode("\n", $txt);
+               $str = ($txt != NULL ? explode("\n", $txt) : array());
 
                for ($i = 0; $i < count($str); $i++)
                {