From cfca164f37b2510f5eee4ba862324c3080a4fb46 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 11 Nov 2008 08:45:24 +0000
Subject: [PATCH] agent_custid and ship_fax don't belong with the ship address,
 that was an unrelated tampabay/pbx-change request, RT#3290

---
 conf/invoice_html  | 2 --
 conf/invoice_latex | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/conf/invoice_html b/conf/invoice_html
index 58d495633..a43cc92b7 100644
--- a/conf/invoice_html
+++ b/conf/invoice_html
@@ -71,8 +71,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 13698331c..e6735b6ec 100644
--- a/conf/invoice_latex
+++ b/conf/invoice_latex
@@ -228,9 +228,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 .= '';
   }
-- 
2.11.0