projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't enable 'Void invoices' by default, being overused in lieu of more accounting...
[freeside.git]
/
FS
/
FS
/
bill_batch.pm
diff --git
a/FS/FS/bill_batch.pm
b/FS/FS/bill_batch.pm
index
ec5c194
..
fb41e0e
100644
(file)
--- a/
FS/FS/bill_batch.pm
+++ b/
FS/FS/bill_batch.pm
@@
-1,16
+1,13
@@
package FS::bill_batch;
package FS::bill_batch;
+use base qw(FS::Record);
use strict;
use strict;
-use vars qw(
@ISA
$me $DEBUG );
+use vars qw( $me $DEBUG );
use CAM::PDF;
use FS::Conf;
use CAM::PDF;
use FS::Conf;
-use FS::Record qw( qsearch qsearchs dbh );
-use FS::agent;
-use FS::cust_bill_batch;
-@ISA = qw( FS::Record );
$me = '[ FS::bill_batch ]';
$me = '[ FS::bill_batch ]';
-$DEBUG
=
0;
+$DEBUG
=
0;
sub table { 'bill_batch' }
sub table { 'bill_batch' }
@@
-61,8
+58,7
@@
sub print_pdf {
my $self = shift;
my $job = shift;
$job->update_statustext(0) if $job;
my $self = shift;
my $job = shift;
$job->update_statustext(0) if $job;
- my @invoices = sort { $a->invnum <=> $b->invnum }
- qsearch('cust_bill_batch', { batchnum => $self->batchnum });
+ my @invoices = sort { $a->invnum <=> $b->invnum } $self->cust_bill_batch;
return "No invoices in batch ".$self->batchnum.'.' if !@invoices;
my $pdf_out;
return "No invoices in batch ".$self->batchnum.'.' if !@invoices;
my $pdf_out;
@@
-84,6
+80,7
@@
sub print_pdf {
die $error if $error;
}
}
die $error if $error;
}
}
+ $job->update_statustext(100, 'Combining invoices') if $job;
return $pdf_out->toPDF;
}
return $pdf_out->toPDF;
}
@@
-117,13
+114,6
@@
sub check {
Returns the agent (see L<FS::agent>) for this invoice batch.
Returns the agent (see L<FS::agent>) for this invoice batch.
-=cut
-
-sub agent {
- my $self = shift;
- qsearchs( 'agent', { 'agentnum' => $self->agentnum } );
-}
-
=back
=head1 SUBROUTINES
=back
=head1 SUBROUTINES
@@
-144,6
+134,11
@@
sub process_print_pdf {
my $batch = FS::bill_batch->by_key($param->{batchnum});
die "batch '$param->{batchnum}' not found!\n" if !$batch;
my $batch = FS::bill_batch->by_key($param->{batchnum});
die "batch '$param->{batchnum}' not found!\n" if !$batch;
+ if ( $param->{'close'} ) {
+ my $error = $batch->close;
+ die $error if $error;
+ }
+
my $pdf = $batch->print_pdf($job);
$batch->pdf($pdf);
my $error = $batch->replace;
my $pdf = $batch->print_pdf($job);
$batch->pdf($pdf);
my $error = $batch->replace;