[freeside-commits] freeside/conf invoice_html, 1.20, 1.21 invoice_latex, 1.24, 1.25

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/conf
In directory wavetail.420.am:/tmp/cvs-serv22646/conf

Modified Files:
	invoice_html invoice_latex 
Log Message:
invoice service address modifications

Index: invoice_latex
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_latex,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- invoice_latex	17 Jun 2008 19:29:51 -0000	1.24
+++ invoice_latex	23 Jun 2008 15:37:15 -0000	1.25
@@ -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}

Index: invoice_html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_html,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- invoice_html	23 Jun 2008 02:50:22 -0000	1.20
+++ invoice_html	23 Jun 2008 15:37:15 -0000	1.21
@@ -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 %>