Optimized editkey graphics by using JS callEditor instead.

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

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index 9e405431746e1fe1c2860bd1fd2a7ff7d75c39b1..ee79d43e2e4173304deb5f008c6e0774dbef46ec 100644 (file)
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -255,10 +255,10 @@ class FrontReport extends Cpdf
        {
                global $app_title, $version, $power_by, $power_url;
 
-               $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', $app_title . ' ' . $version);
+               $this->addInfo('Creator',$power_by . ' - ' . $power_url);
                $year = get_current_fiscalyear();
                if ($year['closed'] == 0)
                        $how = _("Active");
@@ -945,7 +945,7 @@ class FrontReport extends Cpdf
                        $this->{$this->headerTmpl}();
        }
 
-       function End($email=0)
+       function End($email=0, $subject='')
        {
                global $pdf_debug, $path_to_root;
 
@@ -980,7 +980,9 @@ class FrontReport extends Cpdf
                                        display_error(_("You have no email contact defined for this type of document"));
                                } else {
                                        $sent = $try = 0;
-                                       $subject = $this->formData['document_name'] . ' '. $this->formData['document_number'];
+                                       $emails = "";
+                                       if(!$subject)
+                                               $subject = $this->formData['document_name'] . ' '. $this->formData['document_number'];
                                        foreach($this->contactData as $contact) {
                                                if (!isset($contact['email'])) 
                                                        continue;
@@ -1017,6 +1019,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);
@@ -1024,10 +1027,11 @@ class FrontReport extends Cpdf
                                        if (!$try) {
                                                display_error(_("There is no contact email set for this document type."));
                                        } elseif (!$sent)
-                                               display_error(_("Sending document by email failed"));
+                                               display_error($this->title . " " . $this->formData['document_number'] . ". "
+                                                       . _("Sending document by email failed") . ". " . _("Email:") . $emails);
                                        else
                                                display_notification($this->title . " " . $this->formData['document_number'] . " " 
-                                                       . _("has been sent by email to destination."));
+                                                       . _("has been sent by email to destination.") . " " . _("Email:") . $emails);
                                }
                        }
                        else