X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fpdf_report.inc;h=c8bd32550b1204d028fdf0305cf1ff34b2af6c35;hb=33dfc21a26f08e9ac19048bbcf80cce2351a6cfe;hp=55c9f9634e377c371a8934133698bf6566be5557;hpb=fd15091b0a8ef77fdfd13376f31ec35a7bf8861c;p=fa-stable.git diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc index 55c9f963..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"); @@ -386,7 +387,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', 'requisition_no', 'contact'), + '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,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 @@ -947,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 ''; @@ -1088,4 +1090,3 @@ class FrontReport extends Cpdf } } -?> \ No newline at end of file