projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some smaller fixes (see CHANGELOG)
[fa-stable.git]
/
reporting
/
includes
/
header2.inc
diff --git
a/reporting/includes/header2.inc
b/reporting/includes/header2.inc
index 5fdf36f2910d33a076fd6d25e52aaa1386d34c6a..31b0ad2336b0c7c6abb3737a95cb8a08ed64a07c 100644
(file)
--- a/
reporting/includes/header2.inc
+++ b/
reporting/includes/header2.inc
@@
-47,7
+47,7
@@
if ($this->company['coy_logo'] != '')
{
$logo = $comp_path .'/'. user_company() . "/images/" . $this->company['coy_logo'];
if ($this->company['coy_logo'] != '')
{
$logo = $comp_path .'/'. user_company() . "/images/" . $this->company['coy_logo'];
- $this->AddImage($logo, $ccol, $iline1 + 5,
25
0, 40);
+ $this->AddImage($logo, $ccol, $iline1 + 5, 0, 40);
}
else
{
}
else
{
@@
-57,10
+57,8
@@
$this->Font();
$this->fontSize -= 4;
}
$this->Font();
$this->fontSize -= 4;
}
- if ($doctype == 8
) // P
O
+ if ($doctype == 8
|| $doctype == 9) // PO or S
O
$this->Text($mcol, $myrow['order_no'], $mcol + 90);
$this->Text($mcol, $myrow['order_no'], $mcol + 90);
- else if ($doctype == 9) // SO
- $this->Text($mcol, $myrow['order_no'] ." ".$myrow['customer_ref'], $mcol + 90);
else if (isset($myrow['trans_no']) && isset($myrow['reference'])) // INV/CRE/STA
{
if ($print_invoice_no == 1)
else if (isset($myrow['trans_no']) && isset($myrow['reference'])) // INV/CRE/STA
{
if ($print_invoice_no == 1)
@@
-156,7
+154,11
@@
$this->Text($mcol, $doc_Our_Order_No . ":", $mcol2);
if (isset($myrow['order_']))
$this->Text($mcol2, $myrow['order_']);
$this->Text($mcol, $doc_Our_Order_No . ":", $mcol2);
if (isset($myrow['order_']))
$this->Text($mcol2, $myrow['order_']);
-
+ // 2008-06-16. Added customer's reference
+ $this->NewLine();
+ $this->Text($ccol, $doc_Customers_Ref, $ccol2);
+ if ($sales_order != NULL)
+ $this->Text($ccol2, $sales_order["customer_ref"], $mcol);
$locale = $path_to_root . "lang/" . $_SESSION['language']->code . "/locale.inc";
if (file_exists($locale))
{
$locale = $path_to_root . "lang/" . $_SESSION['language']->code . "/locale.inc";
if (file_exists($locale))
{