[freeside-commits] freeside/conf invoice_html, 1.6.2.6, 1.6.2.7 invoice_latex, 1.11.4.9, 1.11.4.10

[Jeff Finucane,420,,]

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

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	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.11.4.9
retrieving revision 1.11.4.10
diff -u -d -r1.11.4.9 -r1.11.4.10
--- invoice_latex	17 Jun 2008 19:30:07 -0000	1.11.4.9
+++ invoice_latex	23 Jun 2008 15:36:25 -0000	1.11.4.10
@@ -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}

Index: invoice_html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_html,v
retrieving revision 1.6.2.6
retrieving revision 1.6.2.7
diff -u -d -r1.6.2.6 -r1.6.2.7
--- invoice_html	5 Jun 2008 19:07:21 -0000	1.6.2.6
+++ invoice_html	23 Jun 2008 15:36:24 -0000	1.6.2.7
@@ -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 %>