projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5e9fa0e
)
this should fix the random "HylaFax support has not been configured" error, caused...
author
ivan
<ivan>
Wed, 4 Jun 2008 18:50:25 +0000
(18:50 +0000)
committer
ivan
<ivan>
Wed, 4 Jun 2008 18:50:25 +0000
(18:50 +0000)
FS/FS/cust_bill.pm
patch
|
blob
|
history
httemplate/misc/fax-invoice.cgi
patch
|
blob
|
history
diff --git
a/FS/FS/cust_bill.pm
b/FS/FS/cust_bill.pm
index
1426f55
..
a209209
100644
(file)
--- a/
FS/FS/cust_bill.pm
+++ b/
FS/FS/cust_bill.pm
@@
-838,13
+838,15
@@
sub send {
my @invoicing_list = $self->cust_main->invoicing_list;
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->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->print($template)
if grep { $_ eq 'POST' } @invoicing_list; #postal
- $self->fax($template)
+ $self->fax
_invoice
($template)
if grep { $_ eq 'FAX' } @invoicing_list; #fax
'';
if grep { $_ eq 'FAX' } @invoicing_list; #fax
'';
@@
-876,6
+878,7
@@
sub queueable_email {
}
}
+#sub email_invoice {
sub email {
my $self = shift;
my $template = scalar(@_) ? shift : '';
sub email {
my $self = shift;
my $template = scalar(@_) ? shift : '';
@@
-925,6
+928,7
@@
TEMPLATENAME, if specified, is the name of a suffix for alternate invoices.
=cut
=cut
+#sub print_invoice {
sub print {
my $self = shift;
my $template = scalar(@_) ? shift : '';
sub print {
my $self = shift;
my $template = scalar(@_) ? shift : '';
@@
-932,7
+936,7
@@
sub print {
do_print $self->lpr_data($template);
}
do_print $self->lpr_data($template);
}
-=item fax [ TEMPLATENAME ]
+=item fax
_invoice
[ TEMPLATENAME ]
Faxes this invoice.
Faxes this invoice.
@@
-940,7
+944,7
@@
TEMPLATENAME, if specified, is the name of a suffix for alternate invoices.
=cut
=cut
-sub fax {
+sub fax
_invoice
{
my $self = shift;
my $template = scalar(@_) ? shift : '';
my $self = shift;
my $template = scalar(@_) ? shift : '';
diff --git
a/httemplate/misc/fax-invoice.cgi
b/httemplate/misc/fax-invoice.cgi
index
e2e6db0
..
2591fce
100755
(executable)
--- 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;
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');
my $custnum = $cust_bill->getfield('custnum');