diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/invoice_html | 16 | ||||
| -rw-r--r-- | conf/invoice_latex | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/conf/invoice_html b/conf/invoice_html index be03d1635..331a0b978 100644 --- a/conf/invoice_html +++ b/conf/invoice_html @@ -60,6 +60,22 @@ ) %> </td> + <%= $ship_enable ? ('<td align="left">'. + join('<BR>',grep length($_), '<b>Service Address</b>', + $ship_company, + $ship_address1, + $ship_address2, + "$ship_city, $ship_state $ship_zip", + $ship_country, + ' ', + ' ', + ). + ($agent_custid ? "<b>ID:</b> $agent_custid<BR>" : ''). + ($ship_fax ? "<b>Fax:</b> $ship_fax<BR>" : ''). + '</td><tr><td></td><td></td>' + ) + : '' + %> <td align="right"> Terms: <%= $terms %><BR> <%= $po_line %> diff --git a/conf/invoice_latex b/conf/invoice_latex index ef92cf3fd..0f83a5fe6 100644 --- a/conf/invoice_latex +++ b/conf/invoice_latex @@ -202,7 +202,6 @@ \hfill
\makebox{
\begin{minipage}[t]{6.4cm}
-\begin{flushright}
[@--
if ($ship_enable) {
$OUT .= '\textbf{Service Address}\\\\';
@@ -219,6 +218,7 @@ $OUT .= '';
}
--@]
+\begin{flushright}
Terms: [@-- $terms --@]\\
[@-- $po_line --@]\\
\end{flushright}
|