X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_bill.pm;h=2c25c6ff2de1fde9d23387517ea1f0d0a4ea6542;hb=d4242fa379b1c84733b6f0e6ef7021d132eb0c38;hp=f62f112684fe557c9824f8b685362e8fd3f25b0f;hpb=3081639bd119c6d281ef23139649b2e73ba62754;p=freeside.git

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index f62f11268..2c25c6ff2 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -23,7 +23,7 @@ use FS::cust_bill_event;
 
 @ISA = qw( FS::Record );
 
-$DEBUG = 1;
+$DEBUG = 0;
 
 #ask FS::UID to run this stuff for us later
 FS::UID->install_callback( sub { 
@@ -1308,14 +1308,14 @@ sub print_latex {
     $invoice_data{'country'} = _latex_escape(code2country($cust_main->country));
   }
 
+  $invoice_data{'notes'} =
+    join("\n",
 #  #do variable substitutions in notes
-#  $invoice_data{'notes'} =
-#    join("\n",
 #      map { my $b=$_; $b =~ s/\$(\w+)/$invoice_data{$1}/eg; $b }
-#        $conf->config_orbase('invoice_latexnotes', $template)
-#    );
-#  warn "invoice notes: ". $invoice_data{'notes'}. "\n"
-#    if $DEBUG;
+        $conf->config_orbase('invoice_latexnotes', $template)
+    );
+  warn "invoice notes: ". $invoice_data{'notes'}. "\n"
+    if $DEBUG;
 
   $invoice_data{'footer'} =~ s/\n+$//;
   $invoice_data{'smallfooter'} =~ s/\n+$//;
@@ -1699,7 +1699,12 @@ sub print_html {
 
   $invoice_data{'returnaddress'} = $conf->exists('invoice_htmlreturnaddress')
     ? join("\n", $conf->config('invoice_htmlreturnaddress') )
-    : join("\n", map { s/~/&nbsp;/g; s/\\\\\*?\s*$/<BR>/; $_; }
+    : join("\n", map { 
+                       s/~/&nbsp;/g;
+                       s/\\\\\*?\s*$/<BR>/;
+                       s/\\hyphenation\{[\w\s\-]+\}//;
+                       $_;
+                     }
                      $conf->config('invoice_latexreturnaddress')
           );