From: ivan <ivan>
Date: Tue, 11 Nov 2008 08:45:26 +0000 (+0000)
Subject: agent_custid and ship_fax don't belong with the ship address, that was an unrelated... 
X-Git-Tag: freeside_1_7_4rc1~143
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=c632b69b355494185a83b09905d5005aa7048c19;p=freeside.git

agent_custid and ship_fax don't belong with the ship address, that was an unrelated tampabay/pbx-change request, RT#3290
---

diff --git a/conf/invoice_html b/conf/invoice_html
index ed590192c..fb1d6f62f 100644
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -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>'
                          )
                        : ''
diff --git a/conf/invoice_latex b/conf/invoice_latex
index 0abdd6dbd..86fbe0ec5 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -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 .= '';
   }