If setting the delivered items in PO Receive Items to 0 the value is not updated

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

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index 8c5d5727d42d1d6e11b41f327451c2369c39f1de..8d9bef0f86f1df55091a67660d9a99e06e75b27a 100644 (file)
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -54,7 +54,7 @@ class FrontReport extends Cpdf
        {
                switch ($size)
                {
-
+                       default:
                  case 'A4':
                  case 'a4':
                          $this->pageWidth=595;
@@ -406,7 +406,10 @@ class FrontReport extends Cpdf
                        }
                        // do not use standard filenames or your sensitive company data 
                        // are world readable
-                       $fname = $dir.'/'.uniqid('').'.pdf';
+                       if ($email == 1)
+                               $fname = $dir.'/'.$this->filename;
+                       else    
+                               $fname = $dir.'/'.uniqid('').'.pdf';
                        $this->Output($fname, 'F');
                        if ($email == 1)
                        {
@@ -419,13 +422,14 @@ class FrontReport extends Cpdf
                                {
                                        include("doctext.inc");
                                }
-                               require_once($path_to_root . "reporting/includes/class.mail.inc");
+                               require_once($path_to_root . "/reporting/includes/class.mail.inc");
                        $mail = new email($this->company['coy_name'], $this->company['email']);
-                       $from = $this->company['coy_name'] . " <" . $this->company['email'] . ">";
+                               if (!isset($myrow['email']) || $myrow['email'] == '') 
+                                       $myrow['email'] = $myrow['contact_email'];
                        $to = $myrow['DebtorName'] . " <" . $myrow['email'] . ">";
-                       $msg = $doc_Dear_Sirs . ",\n\n" . $doc_AttachedFile . " " . $subject .
+                       $msg = $doc_Dear_Sirs . " " . $myrow['DebtorName'] . ",\n\n" . $doc_AttachedFile . " " . $subject .
                                "\n\n";
-                               if ($myrow['dimension_id'] > 0 && $doctype == 10) // helper for payment links
+                               if (isset($myrow['dimension_id']) && $myrow['dimension_id'] > 0 && $doctype == 10) // helper for payment links
                                {
                                        if ($myrow['dimension_id'] == 1)
                                        {
@@ -438,33 +442,18 @@ class FrontReport extends Cpdf
                                        }
                                }
                        $msg .= $doc_Kindest_regards . "\n\n";
-                       $sender = $this->user . "\n" . $this->company['coy_name'];
+                       $sender = $this->user . "\n" . $this->company['coy_name'] . "\n" . $this->company['postal_address'] . "\n" . $this->company['email'] . "\n" . $this->company['phone'];
                        $mail->to($to);
                        $mail->subject($subject);
                        $mail->text($msg . $sender);
                        $mail->attachment($fname);
                        $ret = $mail->send();
-                       if (1 == 1) // just for fun and for debugging purposes!!
-                       {
-                               $from = str_replace("<", "(", $from);
-                               $from = str_replace(">", ")", $from);
-                               $to = str_replace("<", "(", $to);
-                               $to = str_replace(">", ")", $to);
-                               $msg2 = "<br>From: " . $from;
-                               $msg2 .= "<br>To: " . $to;
-                               $msg2 .= "<br>Subject: " . $subject;
-                               $msg2 .= "<br>Msg: " . nl2br($msg);
-                               $msg2 .= nl2br($sender) . "<br>";
-                               $msg2 .= "<br>Filepath: " . $fname . "<br>Filename: " . $this->filename . "<br>";
-                       }
-                       if ($ret)
-                               $str = "<br>" . $this->title . " " . $myrow['reference'] . " " . _("sent to") . " ";
-                       else
-                               $str = "<br>" . $this->title . " " . $myrow['reference'] . " " . _("NOT sent to") . " ";
-                       $msg2 .= $str . $myrow['DebtorName'] . " - " . $myrow['email'];
-                       echo "<html><body>";
-                       echo $msg2;
-                       echo "</body></html>";
+                               if (!$ret)
+                                       display_error(_("Sending document by email failed"));
+                               else
+                                       display_notification($this->title . " " . $myrow['reference'] . " " 
+                                               . _("has been sent by email."));
+                               unlink($fname);         
                        }
                        else
                        {