X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fheader2.inc;h=95b3a7e249157abcb31d081588a4ea0403e8dd5e;hb=a31195793c023906ab5da62f06ab84aefed445c3;hp=5bda35c6c171c471aaffec419675abf38eada389;hpb=fa43a9c974d05b77517a0d8e3e510ef4a088632e;p=fa-stable.git

diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index 5bda35c6..95b3a7e2 100644
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -59,9 +59,11 @@
 		{
 			$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
@@ -138,9 +140,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);
@@ -157,7 +160,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 +213,3 @@
 
 		$this->Font();
 		$temp = $iline6 - $this->lineHeight - 2;
-?>