Minor bug in currency

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

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index fde0b441cdd8957286bfef2d9ad59c9dfdd30e81..af7ba6cc6f51dafae4c98be5d0a317e34a2a36e7 100644 (file)
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -9,8 +9,6 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-/* $Revision$ */
-$page_security = 8;
 //include_once($path_to_root . "reporting/includes/class.pdf.inc");
 include_once(dirname(__FILE__)."/class.pdf.inc");
 include_once(dirname(__FILE__)."/printer_class.inc");
@@ -52,9 +50,16 @@ class FrontReport extends Cpdf
 
        function FrontReport($title, $filename, $size = 'A4', $fontsize = 9)
        {
+               global $page_security;
+               if (!$_SESSION["wa_current_user"]->can_access_page($page_security))
+               {
+                       display_error(_("The security settings on your account do not permit you to print this report"));
+                       end_page();
+                       exit;
+               }
                switch ($size)
                {
-
+                       default:
                  case 'A4':
                  case 'a4':
                          $this->pageWidth=595;
@@ -124,7 +129,7 @@ class FrontReport extends Cpdf
                }
                $this->size = array(0, 0, $this->pageWidth, $this->pageHeight);
                $this->title = $title;
-               $this->filename = $filename;
+               $this->filename = $filename.".pdf";
                $this->pageNumber = 0;
                $this->endLine = $this->pageWidth - $this->rightMargin;
                $this->companyCol = $this->endLine - 150;
@@ -204,6 +209,8 @@ class FrontReport extends Cpdf
                $str = _("Print Out Date") . ':';
                $this->Text($this->leftMargin, $str, $this->titleCol);
                $str = Today() . '   ' . Now();
+               if ($this->company['time_zone'])
+                       $str .= ' ' . date('O') . ' GMT';
                $this->Text($this->titleCol, $str, $this->companyCol);
                $this->Text($this->companyCol, $this->host);
 
@@ -265,7 +272,7 @@ class FrontReport extends Cpdf
                if ($this->pageNumber > 1)
                        $this->newPage();
                $header2type = true;
-               if ($this->currency != $myrow['curr_code'])
+               if (isset($myrow['curr_code']) && $this->currency != $myrow['curr_code'])
                {
                        include($path_to_root . "/reporting/includes/doctext2.inc");
                }
@@ -319,6 +326,18 @@ class FrontReport extends Cpdf
        {
                return $this->TextWrap($this->cols[$c], $this->row - $r, $this->cols[$n] - $this->cols[$c] + $corr, $txt, $this->aligns[$c]);
        }
+       
+       function AmountCol($c, $n, $txt, $dec=0, $corr=0, $r=0)
+       {
+               return $this->TextCol($c, $n, number_format2($txt, $dec), $corr, $r);
+       }
+
+       function DateCol($c, $n, $txt, $conv=false, $corr=0, $r=0)
+       {
+               if ($conv)
+                       $txt = sql2date($txt);
+               return $this->TextCol($c, $n, $txt, $corr, $r);
+       }
 
        function TextCol2($c, $n, $txt, $corr=0, $r=0)
        {
@@ -394,7 +413,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)
                        {
@@ -407,13 +429,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)
                                        {
@@ -426,33 +449,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
                        {
@@ -481,6 +489,7 @@ class FrontReport extends Cpdf
                        header('Expires: 0');
                    header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
                        header('Pragma: public');
+
                        $this->Stream();
                                        }
                                } else { // send report to network printer