X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fheader2.inc;h=95b3a7e249157abcb31d081588a4ea0403e8dd5e;hb=9738f7d64641df18b688f0d03a3b62c93f40e0c7;hp=c783c915f44545e397ee514dfd578412727eadd9;hpb=fbf51ab0febfd0885620abcab8738339d156ff45;p=fa-stable.git diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc index c783c915..95b3a7e2 100644 --- 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); @@ -141,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); @@ -160,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; @@ -213,4 +213,3 @@ $this->Font(); $temp = $iline6 - $this->lineHeight - 2; -?>