Eliminated non-static method calls and other bulk fixes to fix php5 warnings

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

diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index 64f391de30daf9e1f6501871aa551601d2d208d0..5755b627e984e118903b552788c061cc9314c537 100644 (file)
--- a/reporting/includes/header2.inc
+++ b/reporting/includes/header2.inc
@@ -11,6 +11,8 @@
 ***********************************************************************/
                // New version (without vertical lines)
 
+       global $wo_types_array;
+       
                $this->row = $this->pageHeight - $this->topMargin;
 
                $upper = $this->row - 2 * $this->lineHeight;
@@ -119,7 +121,7 @@
                $this->row = $adrline;
                $this->NewLine(3);
                $this->Text($mcol + 100, $doc_Date.":");
-               if ($doctype == 8 || $doctype == 9)
+               if ($doctype == 7 || $doctype == 8 || $doctype == 9)
                        $this->Text($mcol + 180, sql2date($myrow['ord_date']));
                elseif ($doctype == 26) 
                        $this->Text($mcol + 180, sql2date($myrow['date_']));
@@ -127,7 +129,7 @@
                        $this->Text($mcol + 180, sql2date($myrow['tran_date']));
                $this->NewLine();
                $this->Text($mcol + 100, $doc_Invoice_no);
-               if ($doctype == 8 || $doctype == 9) // PO or SO
+               if ($doctype == 7 || $doctype == 8 || $doctype == 9) // QUOTE, PO or SO
                        $this->Text($mcol + 180, $myrow['order_no']);
                elseif ($doctype == 26) 
                        $this->Text($mcol + 180, $myrow['id']);
@@ -150,7 +152,7 @@
                $this->row = $this->row - $this->lineHeight - 5;
 
                $temp = $this->row;
-               if ($doctype == 9)
+               if ($doctype == 7 || $doctype == 9)
                {
                        $this->Text($ccol, $myrow['name'], $icol);
                }
@@ -222,7 +224,7 @@
                        $this->TextWrap($col, $this->row, $width, $row['salesman_name'], 'C');
                }               
                elseif ($doctype == 26)
-                       $this->TextWrap($col, $this->row, $width, wo_types::name($myrow["type"]), 'C');
+                       $this->TextWrap($col, $this->row, $width, $wo_types_array[$myrow["type"]], 'C');
                $col += $width; 
                if ($doctype == 26)
                        $this->TextWrap($col, $this->row, $width, $myrow["StockItemName"], 'C');
@@ -258,7 +260,7 @@
                        $this->TextWrap($col, $this->row, $width, $row["terms"], 'C');
                }       
                $col += $width; 
-               if ($doctype == 9)
+               if ($doctype == 9 || $doctype == 7)
                        $this->TextWrap($col, $this->row, $width, sql2date($myrow['delivery_date']), 'C');
                elseif ($doctype == 26) 
                        $this->TextWrap($col, $this->row, $width, $myrow["units_issued"], 'C');