From: ivan <ivan>
Date: Wed, 4 Jun 2008 18:51:43 +0000 (+0000)
Subject: this should fix the random "HylaFax support has not been configured" error, caused... 
X-Git-Tag: freeside_1_7_4rc1~314
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=187479662c5391f3d535c00c5f399862a47547fa;p=freeside.git

this should fix the random "HylaFax support has not been configured" error, caused by cust_bill->fax getting called instead of cust_main->fax field
---

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 8e4d3f24a..b84b310bb 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -790,13 +790,15 @@ sub send {
 
   my @invoicing_list = $self->cust_main->invoicing_list;
 
+  #$self->email_invoice($template, $invoice_from)
   $self->email($template, $invoice_from)
     if grep { $_ !~ /^(POST|FAX)$/ } @invoicing_list or !@invoicing_list;
 
+  #$self->print_invoice($template)
   $self->print($template)
     if grep { $_ eq 'POST' } @invoicing_list; #postal
 
-  $self->fax($template)
+  $self->fax_invoice($template)
     if grep { $_ eq 'FAX' } @invoicing_list; #fax
 
   '';
@@ -828,6 +830,7 @@ sub queueable_email {
 
 }
 
+#sub email_invoice {
 sub email {
   my $self = shift;
   my $template = scalar(@_) ? shift : '';
@@ -877,6 +880,7 @@ TEMPLATENAME, if specified, is the name of a suffix for alternate invoices.
 
 =cut
 
+#sub print_invoice {
 sub print {
   my $self = shift;
   my $template = scalar(@_) ? shift : '';
@@ -884,7 +888,7 @@ sub print {
   do_print $self->lpr_data($template);
 }
 
-=item fax [ TEMPLATENAME ] 
+=item fax_invoice [ TEMPLATENAME ] 
 
 Faxes this invoice.
 
@@ -892,7 +896,7 @@ TEMPLATENAME, if specified, is the name of a suffix for alternate invoices.
 
 =cut
 
-sub fax {
+sub fax_invoice {
   my $self = shift;
   my $template = scalar(@_) ? shift : '';
 
diff --git a/httemplate/misc/fax-invoice.cgi b/httemplate/misc/fax-invoice.cgi
index e2e6db095..2591fceb8 100755
--- a/httemplate/misc/fax-invoice.cgi
+++ b/httemplate/misc/fax-invoice.cgi
@@ -12,7 +12,7 @@ my $invnum = $3;
 my $cust_bill = qsearchs('cust_bill',{'invnum'=>$invnum});
 die "Can't find invoice!\n" unless $cust_bill;
 
-$cust_bill->fax($template);
+$cust_bill->fax_invoice($template);
 
 my $custnum = $cust_bill->getfield('custnum');