X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fpdf_report.inc;h=c475a29be608bdeafbcc8807db72efac9d40190f;hb=41fc5025878df6a2950e4356e4b6883a5efcac1a;hp=e64b7f5a5a13a4688bfa28c4dc0c8adf1e2dba8d;hpb=5e63c6ace55729bbb5ee3b060035a25a4426eb0a;p=fa-stable.git
diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index e64b7f5a..c475a29b 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");
@@ -295,6 +296,8 @@ class FrontReport extends Cpdf
//
function Header()
{
+ global $SysPrefs;
+
$companyCol = $this->endLine - 150;
$titleCol = $this->leftMargin + 100;
@@ -310,9 +313,18 @@ class FrontReport extends Cpdf
$this->Text($this->leftMargin, $this->title, $companyCol);
$this->Font();
$this->fontSize -= 4;
- $this->Text($companyCol, $this->company['coy_name']);
- $this->row -= ($this->lineHeight + 4);
-
+ $logo = company_path() . "/images/" . $this->company['coy_logo'];
+ if (!empty($SysPrefs->show_company_logo_report) && $this->company['coy_logo'] != '' && file_exists($logo))
+ {
+ $this->row -= ($this->lineHeight + 3);
+ $this->AddImage($logo, $companyCol, $this->row, 0, 30);
+ $this->row -= 6;
+ }
+ else
+ {
+ $this->Text($companyCol, $this->company['coy_name']);
+ $this->row -= ($this->lineHeight + 4);
+ }
$str = _("Print Out Date") . ':';
$this->Text($this->leftMargin, $str, $titleCol);
$str = Today() . ' ' . Now();
@@ -375,8 +387,6 @@ class FrontReport extends Cpdf
*/
function SetCommonData($myrow, $branch, $sales_order, $bankaccount, $doctype, $contacts)
{
-// $this->formData = array_merge($myrow, $branch, $sales_order,
-// $bank_account, array('doctype' => $doctype));
$this->formData = array();
$datnames = array(
@@ -425,11 +435,13 @@ class FrontReport extends Cpdf
{
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
@@ -468,16 +480,6 @@ class FrontReport extends Cpdf
$footerCol = $this->leftMargin + PAGE_NUM_WIDTH;
$footerRow = $this->bottomMargin - FOOTER_MARGIN;
- // Calling this function generates a new PDF page after the first instance
-// {
-// // TODO: experimenting with line drawing to highlight current period
-// $this->SetLineWidth(1);
-// $this->LineTo($this->cols[3], 33, $this->cols[3], 534);
-// $this->LineTo($this->cols[4], 33, $this->cols[4], 534);
-// $this->SetLineWidth(0.1);
-
-// $this->newPage();
-// }
$this->row = $this->pageHeight - $this->topMargin;
// Set the color of dividing lines we'll draw
@@ -951,7 +953,7 @@ class FrontReport extends Cpdf
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 '';
@@ -966,10 +968,7 @@ class FrontReport extends Cpdf
}
// do not use standard filenames or your sensitive company data
// are world readable
- if ($email == 1)
- $fname = $dir.'/'.$this->filename;
- else
- $fname = $dir.'/'.uniqid('').'.pdf';
+ $fname = $dir.'/'.random_id().'.pdf';
$this->Output($fname, 'F');
if ($email == 1)
@@ -1023,7 +1022,7 @@ class FrontReport extends Cpdf
$mail->to($to); $try++;
$mail->subject($subject);
$mail->text($msg . $sender);
- $mail->attachment($fname);
+ $mail->attachment($fname, $this->filename);
$emails .= " " . $contact['email'];
if ($mail->send()) $sent++;
} // foreach contact
@@ -1056,7 +1055,6 @@ class FrontReport extends Cpdf
header('Expires: 0');
header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
header('Pragma: public');
-// $this->Stream(basename($fname));
$this->Stream($this->filename);
}
} else { // send report to network printer