projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed so company domicile is printed on invoices and statements if filled out
[fa-stable.git]
/
reporting
/
includes
/
header2.inc
diff --git
a/reporting/includes/header2.inc
b/reporting/includes/header2.inc
index 2f23a36ac719b2a5d0ccb1a06dfc3b7315269334..6298149b2317940814228707438a2ffe1228440b 100644
(file)
--- a/
reporting/includes/header2.inc
+++ b/
reporting/includes/header2.inc
@@
-14,7
+14,7
@@
$upper = $this->row - 2 * $this->lineHeight;
$lower = $this->bottomMargin + 6 * $this->lineHeight;
$upper = $this->row - 2 * $this->lineHeight;
$lower = $this->bottomMargin + 6 * $this->lineHeight;
- $iline1 = $upper - 7 * $this->lineHeight;
+ $iline1 = $upper - 7
.5
* $this->lineHeight;
$iline2 = $iline1 - 8 * $this->lineHeight;
$iline3 = $iline2 - 1.5 * $this->lineHeight;
$iline4 = $iline3 - 1.5 * $this->lineHeight;
$iline2 = $iline1 - 8 * $this->lineHeight;
$iline3 = $iline2 - 1.5 * $this->lineHeight;
$iline4 = $iline3 - 1.5 * $this->lineHeight;
@@
-107,7
+107,13
@@
$this->Text($ccol, $doc_Our_VAT_no, $c2col);
$this->Text($c2col, $this->company['gst_no'], $mcol);
$this->NewLine();
$this->Text($ccol, $doc_Our_VAT_no, $c2col);
$this->Text($c2col, $this->company['gst_no'], $mcol);
$this->NewLine();
- }
+ }
+ if (($doctype == 10 || $doctype == 12) && $this->company['domicile'] != "")
+ {
+ $this->Text($ccol, $doc_Domicile, $c2col);
+ $this->Text($c2col, $this->company['domicile'], $mcol);
+ $this->NewLine();
+ }
$this->Font();
$this->row = $adrline;
$this->NewLine(3);
$this->Font();
$this->row = $adrline;
$this->NewLine(3);
@@
-276,10
+282,9
@@
$this->TextWrap($ccol, $this->row, $right - $ccol, $this->params['comments'], 'C');
$this->NewLine();
}
$this->TextWrap($ccol, $this->row, $right - $ccol, $this->params['comments'], 'C');
$this->NewLine();
}
- $legal = get_company_pref('legal_text');
- if (($doctype == 10 || $doctype == 12) && $legal != "")
+ if (($doctype == 10 || $doctype == 12) && $this->company['legal_text'] != "")
{
{
- $this->TextWrap($ccol, $this->row, $right - $ccol, $
legal
, 'C');
+ $this->TextWrap($ccol, $this->row, $right - $ccol, $
this->company['legal_text']
, 'C');
$this->NewLine();
}
$this->Font();
$this->NewLine();
}
$this->Font();