Changed so reference no in QUOTE/SO/INV/CRE/PO is printed instead of trans_no

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

diff --git a/reporting/includes/header2.inc b/reporting/includes/header2.inc
index a857da9b957af4d5ff59538d9c01e5fa6ced39c1..b77b0610609ae1ae6351296052885c8fab4f48f8 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;
@@ -58,7 +60,7 @@
                if ($this->company['coy_logo'] != '')
                {
                        $logo = $comp_path .'/'. user_company() . "/images/" . $this->company['coy_logo'];
-                       $this->AddImage($logo, $ccol, $this->row - 10, 0, 40);
+                       $this->AddImage($logo, $ccol, $this->row, 0, 40);
                }
                else
                {
@@ -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,8 +129,13 @@
                        $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
-                       $this->Text($mcol + 180, $myrow['order_no']);
+               if ($doctype == 7 || $doctype == 8 || $doctype == 9) // QUOTE, PO or SO
+               {
+                       if ($print_invoice_no == 1)
+                               $this->Text($mcol + 180, $myrow['order_no']);
+                       else    
+                               $this->Text($mcol + 180, $myrow['reference']);
+               }               
                elseif ($doctype == 26) 
                        $this->Text($mcol + 180, $myrow['id']);
                else if (isset($myrow['trans_no']) && isset($myrow['reference'])) // INV/CRE/STA
@@ -150,7 +157,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 +229,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');
@@ -249,7 +256,7 @@
                $col += $width;
                if ($doctype == 26)
                        $this->TextWrap($col, $this->row, $width, sql2date($myrow["required_by"]), 'C');
-               else
+               elseif (!isset($packing_slip) || $packing_slip == 0)
                {
                        $id = $myrow['payment_terms'];
                        $sql = "SELECT terms FROM ".TB_PREF."payment_terms WHERE terms_indicator='$id'";
@@ -258,7 +265,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');
@@ -312,7 +319,7 @@
                if (($doctype == 10 || $doctype == 12) && $this->company['legal_text'] != "") 
                {
                        $this->TextWrap($ccol, $this->row, $right - $ccol, $this->company['legal_text'], 'C');
-                       $this->NewLine();
+//                     $this->NewLine();
                }
                $this->Font();
                $temp = $iline6 - $this->lineHeight - 2;