Access to system settings moved from global scope to SysPrefs.

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

diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index 3ecc468e34f964fe315fb2dee4ad6702cc6c4bb0..70e41ee4d219ed4e67082476a04f7c4210ed031f 100644 (file)
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -61,7 +61,10 @@
                }
                $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
@@ -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;
@@ -210,4 +213,3 @@
 
                $this->Font();
                $temp = $iline6 - $this->lineHeight - 2;
-?>