***********************************************************************/
// New version (without vertical lines)
+ global $wo_types_array;
+
$this->row = $this->pageHeight - $this->topMargin;
$upper = $this->row - 2 * $this->lineHeight;
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
{
$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_']));
$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']);
$this->row = $this->row - $this->lineHeight - 5;
$temp = $this->row;
- if ($doctype == 9)
+ if ($doctype == 7 || $doctype == 9)
{
$this->Text($ccol, $myrow['name'], $icol);
}
$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');
$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'";
$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');
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;