summaryrefslogtreecommitdiff
path: root/FS/FS
diff options
context:
space:
mode:
authorivan <ivan>2008-06-04 18:51:43 +0000
committerivan <ivan>2008-06-04 18:51:43 +0000
commit187479662c5391f3d535c00c5f399862a47547fa (patch)
treef473014582088199f64a055d53ac8aa952e18211 /FS/FS
parente342397f8a0380982bc05673d5a22f5da2cb47f7 (diff)
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
Diffstat (limited to 'FS/FS')
-rw-r--r--FS/FS/cust_bill.pm10
1 files changed, 7 insertions, 3 deletions
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 : '';