Merged changes from main CVS up to 2.1.5

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

diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index a857da9b957af4d5ff59538d9c01e5fa6ced39c1..64f391de30daf9e1f6501871aa551601d2d208d0 100644 (file)
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -58,7 +58,7 @@
                if ($this->company['coy_logo'] != '')
                {
                        $logo = $comp_path .'/'. user_company() . "/images/" . $this->company['coy_logo'];
-                       $this->AddImage($logo, $ccol, $this->row - 10, 0, 40);
+                       $this->AddImage($logo, $ccol, $this->row, 0, 40);
                }
                else
                {
@@ -312,7 +312,7 @@
                if (($doctype == 10 || $doctype == 12) && $this->company['legal_text'] != "") 
                {
                        $this->TextWrap($ccol, $this->row, $right - $ccol, $this->company['legal_text'], 'C');
-                       $this->NewLine();
+//                     $this->NewLine();
                }
                $this->Font();
                $temp = $iline6 - $this->lineHeight - 2;