[freeside-commits] freeside/FS/FS cust_bill.pm, 1.163.2.31, 1.163.2.32

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv27874/FS/FS

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	cust_bill.pm 
Log Message:
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

Index: cust_bill.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_bill.pm,v
retrieving revision 1.163.2.31
retrieving revision 1.163.2.32
diff -u -d -r1.163.2.31 -r1.163.2.32
--- cust_bill.pm	4 Jun 2008 18:05:02 -0000	1.163.2.31
+++ cust_bill.pm	4 Jun 2008 18:51:43 -0000	1.163.2.32
@@ -790,13 +790,15 @@
 
   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 email_invoice {
 sub email {
   my $self = shift;
   my $template = scalar(@_) ? shift : '';
@@ -877,6 +880,7 @@
 
 =cut
 
+#sub print_invoice {
 sub print {
   my $self = shift;
   my $template = scalar(@_) ? shift : '';
@@ -884,7 +888,7 @@
   do_print $self->lpr_data($template);
 }
 
-=item fax [ TEMPLATENAME ] 
+=item fax_invoice [ TEMPLATENAME ] 
 
 Faxes this invoice.
 
@@ -892,7 +896,7 @@
 
 =cut
 
-sub fax {
+sub fax_invoice {
   my $self = shift;
   my $template = scalar(@_) ? shift : '';