X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fheader2.inc;h=c783c915f44545e397ee514dfd578412727eadd9;hb=3b06c6c4718610a408cae2e9b76c3134ca30b84c;hp=19f31d46c14542bfff0b3a5a2e13a7b3bc4f6607;hpb=b2839f4a7567a863e4e205be65c1befbdd44b08b;p=fa-stable.git

diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index 19f31d46..c783c915 100644
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -61,14 +61,17 @@
 		}
 		$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->AddImage($logo, $ccol, $this->row, 0, 40);
 		}
 		else
@@ -139,7 +142,7 @@
 		$this->Text($mcol + 100, $this->formData['document_name']);
 		$this->Text($mcol + 180, $this->formData['document_number']);
 
-		if ($this->pageNumber > 1 && !strstr($this->filename, "Bulk"))
+		if ($this->pageNumber > 1)
 			$this->Text($this->endLine - 35, _("Page") . ' ' . $this->pageNumber);
 		$this->row = $iline1 - $this->lineHeight;
 		$this->fontSize -= 4;