X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fpdf_report.inc;h=dd0ae91826016175edd6b3d048f93bc2f1c5bbcc;hb=95ff74b5722826544743a01daf527aa3c9efe11a;hp=ee79d43e2e4173304deb5f008c6e0774dbef46ec;hpb=7729c70dcdc39b2d776f27cd12bd4631c93251b7;p=fa-stable.git
diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index ee79d43e..dd0ae918 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");
@@ -375,8 +376,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(
@@ -386,7 +385,7 @@ class FrontReport extends Cpdf
'DebtorName', 'supp_account_no', 'wo_ref', 'debtor_ref','type', 'trans_no',
'StockItemName', 'tax_id', 'order_', 'delivery_date', 'units_issued',
'due_date', 'required_by', 'payment_terms', 'curr_code',
- 'ov_freight', 'ov_gst', 'ov_amount'),
+ 'ov_freight', 'ov_gst', 'ov_amount', 'prepaid', 'requisition_no', 'contact'),
'branch' => array('br_address', 'br_name', 'salesman', 'disable_branch'),
'sales_order' => array('deliver_to', 'delivery_address', 'customer_ref'),
'bankaccount' => array('bank_name', 'bank_account_number', 'payment_service')
@@ -423,13 +422,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;
- $this->SetLang(@$this->formData['rep_lang'] ? $this->formData['rep_lang'] : $dflt_lang);
+ $lang = user_language();
+ $this->SetLang(@$this->formData['rep_lang'] ? $this->formData['rep_lang']
+ : ( $lang ? $lang : $dflt_lang));
// leave layout files names without path to enable including
// modified versions from company/x/reporting directory
@@ -468,16 +469,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
@@ -519,15 +510,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);
}
@@ -947,12 +937,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 '';
@@ -967,23 +957,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;
@@ -1018,16 +1011,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'] . " "
@@ -1051,7 +1044,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
@@ -1082,4 +1074,3 @@ class FrontReport extends Cpdf
}
}
-?>
\ No newline at end of file