X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fpdf_report.inc;h=c8bd32550b1204d028fdf0305cf1ff34b2af6c35;hb=17b390efcf904072b02ec866b2a427490471a260;hp=2bda1d078572c052dc4888469ff2e9cf6b24bd11;hpb=1571869d54be48452fdbe08f25130972ff0a7b5a;p=fa-stable.git diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc index 2bda1d07..c8bd3255 100644 --- a/reporting/includes/pdf_report.inc +++ b/reporting/includes/pdf_report.inc @@ -20,6 +20,7 @@ */ include_once(dirname(__FILE__)."/class.pdf.inc"); include_once(dirname(__FILE__)."/printer_class.inc"); +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"); @@ -253,12 +254,12 @@ class FrontReport extends Cpdf $cols2 = null, $headers2 = null, $aligns2 = null, $companylogoenable = false, $footerenable = false, $footertext = '') { - global $app_title, $version, $power_by, $power_url; + global $SysPrefs, $version; $this->addInfo('Title', $this->title); $this->addInfo('Subject', $this->title); - $this->addInfo('Author', $app_title . ' ' . $version); - $this->addInfo('Creator',$power_by . ' - ' . $power_url); + $this->addInfo('Author', $SysPrefs->app_title . ' ' . $version); + $this->addInfo('Creator',$SysPrefs->power_by . ' - ' . $SysPrefs->power_url); $year = get_current_fiscalyear(); if ($year['closed'] == 0) $how = _("Active"); @@ -423,14 +424,15 @@ class FrontReport extends Cpdf */ function Header2() { - global $path_to_root, $print_as_quote, - $print_invoice_no, $packing_slip, $dflt_lang; // FIXME should be passed as params + global $dflt_lang; // FIXME should be passed as params + $this->SetLang(@$this->formData['rep_lang'] ? $this->formData['rep_lang'] : $dflt_lang); $doctype = $this->formData['doctype']; $header2type = true; + $lang = user_language(); $this->SetLang(@$this->formData['rep_lang'] ? $this->formData['rep_lang'] - : ($_SESSION["wa_current_user"]->prefs->language ? $_SESSION["wa_current_user"]->prefs->language : $dflt_lang)); + : ( $lang ? $lang : $dflt_lang)); // leave layout files names without path to enable including // modified versions from company/x/reporting directory @@ -520,11 +522,10 @@ class FrontReport extends Cpdf $this->fontSize = HEADER1_FONT_SIZE; // Print company logo if present and requested, or else just print company name - if ($this->companyLogoEnable && ($this->company['coy_logo'] != '')) + // Build a string specifying the location of the company logo file + $logo = company_path() . "/images/" . $this->company['coy_logo']; + if ($this->companyLogoEnable && ($this->company['coy_logo'] != '') && file_exists($logo)) { - // Build a string specifying the location of the company logo file - $logo = company_path() . "/images/" . $this->company['coy_logo']; - // Width being zero means that the image will be scaled to the specified height // keeping its aspect ratio intact. if ($this->scaleLogoWidth) @@ -948,12 +949,12 @@ class FrontReport extends Cpdf function End($email=0, $subject='') { - global $pdf_debug, $path_to_root; + global $SysPrefs, $path_to_root; - if ($pdf_debug == 1) + if ($SysPrefs->pdf_debug == 1) { $pdfcode = $this->Output('','S'); - $pdfcode = str_replace("\n", "\n
", htmlspecialchars($pdfcode)); + $pdfcode = str_replace("\n", "\n
", html_specials_encode($pdfcode)); echo ''; echo trim($pdfcode); echo ''; @@ -1089,4 +1090,3 @@ class FrontReport extends Cpdf } } -?> \ No newline at end of file