invoice service address modifications

2 files changed, 17 insertions, 1 deletions

diff --git a/conf/invoice_html b/conf/invoice_html
index e2f16640d..0e7021e3b 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,&nbsp;$ship_state&nbsp;$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 693d66e85..6bfc41d5a 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -204,7 +204,6 @@
 \hfill

 \makebox{

 \begin{minipage}[t]{6.4cm}

-\begin{flushright}

 [@--

   if ($ship_enable) {

     $OUT .= '\textbf{Service Address}\\\\';

@@ -221,6 +220,7 @@
     $OUT .= '';

   }

 --@]

+\begin{flushright}

 Terms: [@-- $terms --@]\\

 [@-- $po_line --@]\\

 \end{flushright}