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 538d152473c8f1493ba386f14deaf4768b4be605..d97f50e65d0d2775e6c639ae4ad4da06e140a75c 100644 (file)
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -59,7 +59,6 @@
                {
                        $this->LineTo($col += $width, $iline2,$col, $iline4);
                }
-               $this->LineTo($right, $iline2 ,$right, $iline4);
                $this->LineTo($this->leftMargin, $iline5 ,$this->leftMargin, $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);
@@ -68,20 +67,18 @@
                $this->LineTo($right, $iline5 ,$right, $iline7);
 
                // Company Logo
-               $this->NewLine();
                $logo = company_path() . "/images/" . $this->company['coy_logo'];
                if ($this->company['coy_logo'] != '' && file_exists($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;
@@ -141,9 +138,10 @@
                $this->NewLine();
                $this->Text($mcol + 100, $this->formData['document_name']);
                $this->Text($mcol + 180, $this->formData['document_number']);
-
+               $this->NewLine(2);
+       
                if ($this->pageNumber > 1)
-                       $this->Text($this->endLine - 35, _("Page") . ' ' . $this->pageNumber);
+                       $this->Text($mcol + 180, _("Page") . ' ' . $this->pageNumber);
                $this->row = $iline1 - $this->lineHeight;
                $this->fontSize -= 4;
                $this->Text($ccol, $Addr1['title'], $icol);