[freeside-commits] freeside/conf invoice_latex, 1.11.4.12, 1.11.4.13 invoice_html, 1.6.2.8, 1.6.2.9

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	invoice_latex invoice_html 
Log Message:
agent_custid and ship_fax don't belong with the ship address, that was an unrelated tampabay/pbx-change request, RT#3290

Index: invoice_latex
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_latex,v
retrieving revision 1.11.4.12
retrieving revision 1.11.4.13
diff -u -d -r1.11.4.12 -r1.11.4.13
--- invoice_latex	12 Oct 2008 23:57:06 -0000	1.11.4.12
+++ invoice_latex	11 Nov 2008 08:45:26 -0000	1.11.4.13
@@ -226,9 +226,6 @@
     $OUT .= "\\addressline{$ship_city, $ship_state~~$ship_zip}";
     $OUT .= "\\addressline{$ship_country}";
     $OUT .= '~\\\\';
-    $OUT .= "\\textbf{ID:}~~$agent_custid\\\\" if $agent_custid;
-    $OUT .= "\\textbf{Fax:}~~$ship_fax\\\\" if $ship_fax;
-    $OUT .= '~\\\\' if ($ship_fax or $agent_custid);
   }else{
     $OUT .= '';
   }

Index: invoice_html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/conf/invoice_html,v
retrieving revision 1.6.2.8
retrieving revision 1.6.2.9
diff -u -d -r1.6.2.8 -r1.6.2.9
--- invoice_html	11 Nov 2008 07:51:14 -0000	1.6.2.8
+++ invoice_html	11 Nov 2008 08:45:26 -0000	1.6.2.9
@@ -70,8 +70,6 @@
                                                        ' ',
                                                        ' ',
                               ).
-                           ($agent_custid ? "<b>ID:</b> $agent_custid<BR>" : '').
-                           ($ship_fax ? "<b>Fax:</b> $ship_fax<BR>" : '').
                            '</td><tr><td></td><td></td>'
                          )
                        : ''