X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fpdf_report.inc;h=c8bd32550b1204d028fdf0305cf1ff34b2af6c35;hb=17b390efcf904072b02ec866b2a427490471a260;hp=e3aedbf61d3f712e7a8435ea83b1ce593ab9fc51;hpb=963566e192ba7c5fd7a1937cbaeeea546f43c732;p=fa-stable.git
diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index e3aedbf6..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('Title', $this->title);
+ $this->addInfo('Subject', $this->title);
+ $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");
@@ -386,10 +387,10 @@ 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')
+ 'bankaccount' => array('bank_name', 'bank_account_number', 'payment_service')
);
foreach($datnames as $var => $fields) {
@@ -402,6 +403,7 @@ class FrontReport extends Cpdf
}
}
$this->formData['doctype'] = $doctype;
+ $this->formData['document_amount'] = @$this->formData['ov_amount']+@$this->formData['ov_freight']+@$this->formData['ov_gst'];
if (count($contacts)) {
if (!is_array($contacts[0]))
$contacts = array($contacts); // change to array when single contact passed
@@ -422,13 +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;
-
- $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
@@ -518,15 +522,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);
}
@@ -944,21 +947,20 @@ class FrontReport extends Cpdf
$this->{$this->headerTmpl}();
}
- function End($email=0, $subject=null, $myrow=null, $doctype = 0)
+ 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 '';
}
else
{
-
$dir = company_path(). '/pdf_files';
//save the file
if (!file_exists($dir))
@@ -975,17 +977,25 @@ class FrontReport extends Cpdf
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;
- foreach($this->contactData as $contact) {
+ $emails = "";
+ if(!$subject)
+ $subject = $this->formData['document_name'] . ' '. $this->formData['document_number'];
+ foreach($contactData as $contact) {
if (!isset($contact['email']))
continue;
$emailtype = true;
$this->SetLang($contact['lang']);
- include("includes/doctext.inc");
require_once($path_to_root . "/reporting/includes/class.mail.inc");
$mail = new email(str_replace(",", "", $this->company['coy_name']),
@@ -994,37 +1004,42 @@ class FrontReport extends Cpdf
$to = str_replace(",", "", $contact['name'].' '.$contact['name2'])
." <" . $contact['email'] . ">";
- $msg = $doc_Dear_Sirs . " " . $contact['name2'] . ",\n\n"
- . $doc_AttachedFile . " " . $subject ."\n\n";
- if (isset($myrow['dimension_id']) && $myrow['dimension_id'] > 0 && $doctype == ST_SALESINVOICE) // helper for payment links
+ $msg = _("Dear") . " " . $contact['name2'] . ",\n\n"
+ . _("Attached you will find ") . " " . $subject ."\n\n";
+
+ if (isset($this->formData['payment_service']))
{
- if ($myrow['dimension_id'] == 1)
- {
- $amt = number_format($myrow["ov_freight"] + $myrow["ov_gst"] + $myrow["ov_amount"], user_price_dec());
- $txt = $doc_Payment_Link . " PayPal: ";
- $nn = urlencode($this->title . " " . $myrow['reference']);
- $url = "https://www.paypal.com/xclick/business=" . $this->company['email'] . "&item_name=" .
- $nn . "&amount=" . $amt . "¤cy_code=" . $myrow['curr_code'];
- $msg .= $txt . $url . "\n\n";
- }
+ $amt = number_format($this->formData['document_amount'], user_price_dec());
+ $service = $this->formData['payment_service'];
+ $url = payment_link($service, array(
+ 'company_email' => $this->company['email'],
+ 'amount' => $amt,
+ 'currency' => $this->formData['curr_code'],
+ 'comment' => $this->title . " " . $this->formData['document_number']
+ ));
+ if ($url)
+ $msg.= _("You can pay through"). " $service: $url\n\n";
}
- $msg .= $doc_Kindest_regards . "\n\n";
+
+ $msg .= _("Kindest regards") . "\n\n";
$sender = $this->user . "\n" . $this->company['coy_name'] . "\n" . $this->company['postal_address'] . "\n" . $this->company['email'] . "\n" . $this->company['phone'];
$mail->to($to); $try++;
$mail->subject($subject);
$mail->text($msg . $sender);
$mail->attachment($fname);
+ $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(_("Sending document by email failed"));
+ display_warning($this->title . " " . $this->formData['document_number'] . ". "
+ . _("Sending document by email failed") . ". " . _("Email:") . $emails);
else
- display_notification($this->title . " " . $myrow['reference'] . " "
- . _("has been sent by email to destination."));
+ display_notification($this->title . " " . $this->formData['document_number'] . " "
+ . _("has been sent by email to destination.") . " " . _("Email:") . $emails);
}
}
else
@@ -1075,4 +1090,3 @@ class FrontReport extends Cpdf
}
}
-?>
\ No newline at end of file