Implemented Selectable Print Orientation (Portrait, Landscape) for all reports in...

[fa-stable.git] / reporting / includes / pdf_report.inc

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index e4b4c3a66c58d398e630aeec436fb847ff90c37b..20b96bd4dc117553f39c593fd8e85c50521b2d9a 100644 (file)
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -386,7 +386,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')
@@ -429,7 +429,8 @@ class FrontReport extends Cpdf
                $doctype = $this->formData['doctype'];
                $header2type = true;
 
-               $this->SetLang(@$this->formData['rep_lang'] ? $this->formData['rep_lang'] : $dflt_lang);
+               $this->SetLang(@$this->formData['rep_lang'] ? $this->formData['rep_lang']
+                       : ($_SESSION["wa_current_user"]->prefs->language ? $_SESSION["wa_current_user"]->prefs->language : $dflt_lang));
 
                 // leave layout files names without path to enable including
                 // modified versions from company/x/reporting directory
@@ -945,6 +946,13 @@ 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;
@@ -980,6 +988,7 @@ class FrontReport extends Cpdf
                                        display_error(_("You have no email contact defined for this type of document"));
                                } else {
                                        $sent = $try = 0;
+                                       $emails = "";
                                        if(!$subject)
                                                $subject = $this->formData['document_name'] . ' '. $this->formData['document_number'];
                                        foreach($this->contactData as $contact) {
@@ -1018,6 +1027,7 @@ class FrontReport extends Cpdf
                                        $mail->subject($subject);
                                        $mail->text($msg . $sender);
                                        $mail->attachment($fname);
+                                       $emails .= " " . $contact['email'];
                                        if ($mail->send()) $sent++;
                                        } // foreach contact
                                        unlink($fname);
@@ -1026,10 +1036,10 @@ class FrontReport extends Cpdf
                                                display_error(_("There is no contact email set for this document type."));
                                        } elseif (!$sent)
                                                display_error($this->title . " " . $this->formData['document_number'] . ". "
-                                                       . _("Sending document by email failed") . ". " . _("Email:") . " " . $contact['email']);
+                                                       . _("Sending document by email failed") . ". " . _("Email:") . $emails);
                                        else
                                                display_notification($this->title . " " . $this->formData['document_number'] . " " 
-                                                       . _("has been sent by email to destination.") . " " . _("Email:") . " " . $contact['email']);
+                                                       . _("has been sent by email to destination.") . " " . _("Email:") . $emails);
                                }
                        }
                        else