Bug 5194: The company name is not displayed on invoices if the logo is set. Fixed.

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

diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index d1ac120b0cb09304c4523221bf64fa201409ceed..d97f50e65d0d2775e6c639ae4ad4da06e140a75c 100644 (file)
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -58,27 +58,27 @@
                for ($i = 0; $i < 5; $i++)
                {
                        $this->LineTo($col += $width, $iline2,$col, $iline4);
-               }       
-               $this->LineTo($right, $iline2 ,$right, $iline4);
+               }
                $this->LineTo($this->leftMargin, $iline5 ,$this->leftMargin, $iline7);
-               $this->LineTo($this->cols[$cols - 2] + 4, $iline5 ,$this->cols[$cols - 2] + 4, $iline7);
+               if ($this->l['a_meta_dir'] == 'rtl') // avoid line overwrite in rtl language
+                       $this->LineTo($this->cols[$cols - 2], $iline5 ,$this->cols[$cols - 2], $iline7);
+               else    
+                       $this->LineTo($this->cols[$cols - 2] + 4, $iline5 ,$this->cols[$cols - 2] + 4, $iline7);
                $this->LineTo($right, $iline5 ,$right, $iline7);
 
                // Company Logo
-               $this->NewLine();
-               if ($this->company['coy_logo'] != '')
+               $logo = company_path() . "/images/" . $this->company['coy_logo'];
+               if ($this->company['coy_logo'] != '' && file_exists($logo))
                {
-                       $logo = company_path() . "/images/" . $this->company['coy_logo'];
+                       $this->NewLine();
                        $this->AddImage($logo, $ccol, $this->row, 0, 40);
                }
-               else
-               {
-                       $this->fontSize += 4;
-                       $this->Font('bold');
-                       $this->Text($ccol, $this->company['coy_name'], $icol);
-                       $this->Font();
-                       $this->fontSize -= 4;
-               }
+               $this->NewLine();
+               $this->fontSize += 4;
+               $this->Font('bold');
+               $this->Text($ccol, $this->company['coy_name'], $icol);
+               $this->Font();
+               $this->fontSize -= 4;
                // Document title
                $this->SetTextColor(190, 190, 190);
                $this->fontSize += 10;
@@ -93,19 +93,19 @@
                // Company data
                $this->TextWrapLines($ccol, $icol, $this->company['postal_address']);
                $this->Font('italic');
-               if ($this->company['phone'] != "")
+               if (@$this->company['phone'])
                {
                        $this->Text($ccol, _("Phone"), $c2col);
                        $this->Text($c2col, $this->company['phone'], $mcol);
                        $this->NewLine();
-               }       
-               if ($this->company['fax'] != "")
+               }
+               if (@$this->company['fax'])
                {
                        $this->Text($ccol, _("Fax"), $c2col);
                        $this->Text($c2col, $this->company['fax'], $mcol);
                        $this->NewLine();
-               }       
-               if ($this->company['email'] != "")
+               }
+               if (@$this->company['email'])
                {
                        $this->Text($ccol, _("Email"), $c2col);
 
@@ -117,13 +117,13 @@
 
                        $this->NewLine();
                }
-               if ($this->company['gst_no'] != "")
+               if (@$this->company['gst_no'])
                {
                        $this->Text($ccol, _("Our VAT No."), $c2col);
                        $this->Text($c2col, $this->company['gst_no'], $mcol);
                        $this->NewLine();
                }
-               if ($this->formData['domicile'] != "")
+               if (@$this->formData['domicile'])
                {
                        $this->Text($ccol, _("Domicile"), $c2col);
                        $this->Text($c2col, $this->company['domicile'], $mcol);
@@ -138,9 +138,10 @@
                $this->NewLine();
                $this->Text($mcol + 100, $this->formData['document_name']);
                $this->Text($mcol + 180, $this->formData['document_number']);
-
-               if ($this->pageNumber > 1 && !strstr($this->filename, "Bulk"))
-                       $this->Text($this->endLine - 35, _("Page") . ' ' . $this->pageNumber);
+               $this->NewLine(2);
+       
+               if ($this->pageNumber > 1)
+                       $this->Text($mcol + 180, _("Page") . ' ' . $this->pageNumber);
                $this->row = $iline1 - $this->lineHeight;
                $this->fontSize -= 4;
                $this->Text($ccol, $Addr1['title'], $icol);
@@ -157,7 +158,7 @@
                $this->row = $temp;
                $this->Text($mcol, $Addr2['name']);
                $this->NewLine();
-               $this->TextWrapLines($mcol, $this->rightMargin - $mcol, $Addr2['address']);
+               $this->TextWrapLines($mcol, $this->rightMargin - $mcol, $Addr2['address'], 'left', 0, 0, NULL, 1);
 
                // Auxiliary document information
                $col = $this->leftMargin;
@@ -210,4 +211,3 @@
 
                $this->Font();
                $temp = $iline6 - $this->lineHeight - 2;
-?>
\ No newline at end of file