Bug in document right-margin when more than 1 page.

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

diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index 16e97f9a1b542345d6f9bfa70b5b1ef9ddac8995..9ee5b8136533adfcb9df7d9c911c5729518685ed 100644 (file)
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -135,12 +135,21 @@
                }
                else
                {
-                       if ($doctype == 8)
-                               $this->Text($ccol, $myrow['supp_name'], $icol);
-                       else
-                               $this->Text($ccol, $myrow['DebtorName'], $icol);
+                       if ($doctype == 8) {
+                               $name = $myrow['supp_name'];
+                               $addr = $myrow['address'];
+                       } else {
+                               if (trim($branch['br_address']) != '') {
+                                       $name = $branch['br_name'];
+                                       $addr = $branch['br_address'];
+                               } else {
+                                       $name = $myrow['DebtorName'];
+                                       $addr = $myrow['address'];
+                               }
+                       }
+                       $this->Text($ccol, $name, $icol);
                        $this->NewLine();
-                       $this->TextWrapLines($ccol, $icol - $ccol, $myrow['address']);
+                       $this->TextWrapLines($ccol, $icol - $ccol, $addr);
                }
                if ($sales_order != NULL)
                {
@@ -167,7 +176,7 @@
                $this->TextWrap($col, $this->row, $width, $doc_Due_Date, 'C');
                $this->row = $iline3 - $this->lineHeight - 1;
                $col = $this->leftMargin;
-               if ($sales_order != NULL)
+               if (isset($sales_order["customer_ref"]))
                        $this->TextWrap($col, $this->row, $width, $sales_order["customer_ref"], 'C');
                $col += $width; 
                if ($branch != null)
@@ -193,16 +202,13 @@
                $col += $width; 
                if ($doctype == 9)
                        $this->TextWrap($col, $this->row, $width, sql2date($myrow['delivery_date']), 'C');
-               else if ($doctype != 8 && isset($myrow['due_date']))
+               else if ($doctype != 8 && $doctype != 11 && isset($myrow['due_date']))
                        $this->TextWrap($col, $this->row, $width, sql2date($myrow['due_date']), 'C');
                
                $this->row = $iline5 - $this->lineHeight - 1;
                $this->Font('bold');
                $count = count($this->headers);
-               if (user_pagesize() == "Letter")
-                       $this->cols[$count] += 40;
-               else    
-                       $this->cols[$count] += 5;
+               $this->cols[$count] = $right - 3;
                for ($i = 0; $i < $count; $i++)
                        $this->TextCol($i, $i + 1, $this->headers[$i], -2);
                $this->Font();