so Search.tsf and Search.rdf work

[freeside.git] / FS / FS / cust_bill.pm

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 7317786..2c25c6f 100644 (file)
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -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+$//;
@@ -1702,7 +1702,7 @@ sub print_html {
     : join("\n", map { 
                        s/~/ /g;
                        s/\\\\\*?\s*$/<BR>/;
-                       s/\\hypenation\{[\w\s\-]+\}//;
+                       s/\\hyphenation\{[\w\s\-]+\}//;
                        $_;
                      }
                      $conf->config('invoice_latexreturnaddress')