projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Access control system description.
[fa-stable.git]
/
reporting
/
includes
/
header2.inc
diff --git
a/reporting/includes/header2.inc
b/reporting/includes/header2.inc
index 90cf3b63f5636866a97a62695333bb7b782517e8..7fae9f64fa2a5dac79f9dff8629be2c7adf28a1e 100644
(file)
--- a/
reporting/includes/header2.inc
+++ b/
reporting/includes/header2.inc
@@
-11,6
+11,8
@@
***********************************************************************/
// New version (without vertical lines)
***********************************************************************/
// New version (without vertical lines)
+ global $wo_types_array;
+
$this->row = $this->pageHeight - $this->topMargin;
$upper = $this->row - 2 * $this->lineHeight;
$this->row = $this->pageHeight - $this->topMargin;
$upper = $this->row - 2 * $this->lineHeight;
@@
-222,7
+224,7
@@
$this->TextWrap($col, $this->row, $width, $row['salesman_name'], 'C');
}
elseif ($doctype == 26)
$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, $myrow["StockItemName"], 'C');
@@
-249,7
+251,7
@@
$col += $width;
if ($doctype == 26)
$this->TextWrap($col, $this->row, $width, sql2date($myrow["required_by"]), 'C');
$col += $width;
if ($doctype == 26)
$this->TextWrap($col, $this->row, $width, sql2date($myrow["required_by"]), 'C');
- else
+ else
if (!isset($packing_slip) || $packing_slip == 0)
{
$id = $myrow['payment_terms'];
$sql = "SELECT terms FROM ".TB_PREF."payment_terms WHERE terms_indicator='$id'";
{
$id = $myrow['payment_terms'];
$sql = "SELECT terms FROM ".TB_PREF."payment_terms WHERE terms_indicator='$id'";