X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fpdf_report.inc;h=a0a78be95b0784c49531c477a4603374c4164fb9;hb=e685a94465fe8f26c8ff3789242b43c1c20054cf;hp=20b96bd4dc117553f39c593fd8e85c50521b2d9a;hpb=0489317205141deaecefe3a7243d11a3e38a51d0;p=fa-stable.git
diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index 20b96bd4..a0a78be9 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");
@@ -69,7 +70,7 @@ class FrontReport extends Cpdf
var $dest; // destination: email or printer
- function FrontReport($title, $filename, $size = 'A4', $fontsize = 9, $orientation = 'P', $margins = NULL, $excelColWidthFactor = NULL)
+ function __construct($title, $filename, $size = 'A4', $fontsize = 9, $orientation = 'P', $margins = NULL, $excelColWidthFactor = NULL)
{
global $page_security;
@@ -221,7 +222,7 @@ class FrontReport extends Cpdf
$this->scaleLogoWidth = false; // if Logo, scale on width (else height).
$this->SetHeaderType('Header'); // default
- $this->Cpdf($size, $_SESSION['language']->code, $orientation);
+ parent::__construct($size, $_SESSION['language']->code, $orientation);
}
/*
@@ -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");
@@ -295,6 +296,8 @@ class FrontReport extends Cpdf
//
function Header()
{
+ global $SysPrefs;
+
$companyCol = $this->endLine - 150;
$titleCol = $this->leftMargin + 100;
@@ -310,9 +313,20 @@ 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->prefs['company_logo_report']) && $this->company['coy_logo'] != '' && file_exists($logo))
+ {
+ $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
+ {
+ $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();
@@ -327,7 +341,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'] != '')
{
@@ -357,12 +371,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();
@@ -375,9 +389,7 @@ 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->pageNumber = 0;
$this->formData = array();
$datnames = array(
'myrow' => array('ord_date', 'date_', 'tran_date',
@@ -423,14 +435,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
@@ -469,16 +482,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
@@ -520,15 +523,14 @@ 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)
- $this->AddImage($logo, $companyCol, $this->row, COMPANY_WIDTH, 0);
+ $this->AddImage($logo, $companyCol, $this->row + 15, COMPANY_WIDTH, 0);
else
$this->AddImage($logo, $companyCol, $this->row - (LOGO_HEIGHT * LOGO_Y_POS_ADJ_FACTOR), 0, LOGO_HEIGHT);
}
@@ -946,21 +948,17 @@ class FrontReport extends Cpdf
$this->{$this->headerTmpl}();
}
- function recalculate_cols(&$cols)
- {
- $factor = (user_pagesize() == "A4" ? 1.4 : 1.3);
- foreach($cols as $key => $col)
- $cols[$key] = intval($col * $factor);
- }
-
function End($email=0, $subject='')
{
- global $pdf_debug, $path_to_root;
+ global $SysPrefs, $path_to_root;
+
+ if (!empty($SysPrefs->prefs['print_dialog_direct']))
+ $this->includeJS("print();"); // force to open print dialog
- 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 '';
@@ -975,23 +973,26 @@ 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)
{
- if(!count($this->contactData)) {
+ $contactData = array();
+ if ($this->contactData)
+ foreach($this->contactData as $contact)
+ if (!empty($contact['email']))
+ $contactData[] = $contact;
+
+ if(!count($contactData)) {
$this->SetLang(user_language());
- display_error(_("You have no email contact defined for this type of document"));
+ display_warning(sprintf(_("You have no email contact defined for this type of document for '%s'."), $this->formData['recipient_name']));
} else {
$sent = $try = 0;
$emails = "";
if(!$subject)
$subject = $this->formData['document_name'] . ' '. $this->formData['document_number'];
- foreach($this->contactData as $contact) {
+ foreach($contactData as $contact) {
if (!isset($contact['email']))
continue;
$emailtype = true;
@@ -1026,16 +1027,16 @@ 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
unlink($fname);
$this->SetLang(user_language());
if (!$try) {
- display_error(_("There is no contact email set for this document type."));
+ display_warning(sprintf(_("You have no email contact defined for this type of document for '%s'."), $this->formData['recipient_name']));
} elseif (!$sent)
- display_error($this->title . " " . $this->formData['document_number'] . ". "
+ display_warning($this->title . " " . $this->formData['document_number'] . ". "
. _("Sending document by email failed") . ". " . _("Email:") . $emails);
else
display_notification($this->title . " " . $this->formData['document_number'] . " "
@@ -1059,7 +1060,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
@@ -1090,4 +1090,3 @@ class FrontReport extends Cpdf
}
}
-?>
\ No newline at end of file