function money_format is deprecated in aove PHP 7.4. Replaced with price_format.

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

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index 31dcdb367bc1eb584df1d8369e53eceabcb5c5a8..0d699731e75fbbdeaf80ac54f3a215b4e2031b1a 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
@@ -316,8 +317,10 @@ class FrontReport extends Cpdf
                $logo = company_path() . "/images/" . $this->company['coy_logo'];
                if (!empty($SysPrefs->prefs['company_logo_report']) && $this->company['coy_logo'] != '' && file_exists($logo))
                {
-                       $this->row -= ($this->lineHeight + 3);
-                       $this->AddImage($logo, $companyCol, $this->row, 0, 30);
+                       $size = getimagesize($logo);
+                       $height = $size[0] > 150 ? $size[1] * 150 / $size[0] : 30; 
+                       $this->row -= ($height / 2);
+                       $this->AddImage($logo, $companyCol, $this->row, 0, $height);
                        $this->row -= 6;
                }
                else
@@ -339,7 +342,7 @@ class FrontReport extends Cpdf
                $str = $this->fiscal_year;
                $this->Text($titleCol, $str, $companyCol);
                $this->Text($companyCol, $this->user);
-               for ($i = 1; $i < count($this->params); $i++)
+               for ($i = 1; $i < count_array($this->params); $i++)
                {
                        if ($this->params[$i]['from'] != '')
                        {
@@ -369,12 +372,12 @@ class FrontReport extends Cpdf
                $this->Font('italic');
                if ($this->headers2 != null)
                {
-                       $count = count($this->headers2);
+                       $count = count_array($this->headers2);
                        for ($i = 0; $i < $count; $i++)
                                $this->TextCol2($i, $i + 1,     $this->headers2[$i]);
                        $this->NewLine();
                }
-               $count = count($this->headers);
+               $count = count_array($this->headers);
                for ($i = 0; $i < $count; $i++)
                        $this->TextCol($i, $i + 1, $this->headers[$i]);
                $this->Font();
@@ -387,7 +390,7 @@ class FrontReport extends Cpdf
        */
        function SetCommonData($myrow, $branch, $sales_order, $bankaccount, $doctype, $contacts)
        {
-
+               $this->pageNumber = 0;
                $this->formData = array();
                $datnames = array( 
                'myrow' => array('ord_date', 'date_', 'tran_date', 
@@ -770,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;    
@@ -950,6 +953,9 @@ class FrontReport extends Cpdf
        {
                global $SysPrefs, $path_to_root;
 
+               if (!empty($SysPrefs->prefs['print_dialog_direct']))            
+                       $this->includeJS("print();"); // force to open print dialog
+
                if ($SysPrefs->pdf_debug == 1)
                {
                        $pdfcode = $this->Output('','S');