projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix big in RADIUS session viewing when using an ignored-accounting export
[freeside.git]
/
FS
/
FS
/
cust_bill.pm
diff --git
a/FS/FS/cust_bill.pm
b/FS/FS/cust_bill.pm
index
bb12de0
..
2755be0
100644
(file)
--- a/
FS/FS/cust_bill.pm
+++ b/
FS/FS/cust_bill.pm
@@
-683,7
+683,7
@@
sub _agent_invoice_from {
sub _agent_plandata {
my( $self, $option ) = @_;
sub _agent_plandata {
my( $self, $option ) = @_;
- my $
cus
t_bill_event = qsearchs( 'part_bill_event',
+ my $
par
t_bill_event = qsearchs( 'part_bill_event',
{
'payby' => $self->cust_main->payby,
'plan' => 'send_agent',
{
'payby' => $self->cust_main->payby,
'plan' => 'send_agent',
@@
-697,12
+697,13
@@
sub _agent_plandata {
'ORDER BY seconds LIMIT 1'
);
'ORDER BY seconds LIMIT 1'
);
- return '' unless $
cus
t_bill_event;
+ return '' unless $
par
t_bill_event;
- if ( $
cus
t_bill_event->plandata =~ /^$option (.*)$/m ) {
+ if ( $
par
t_bill_event->plandata =~ /^$option (.*)$/m ) {
return $1;
} else {
return $1;
} else {
- warn "can't parse plandata for $1";
+ warn "can't parse part_bill_event eventpart#". $part_bill_event->eventpart.
+ " plandata for $option";
return '';
}
return '';
}
@@
-719,14
+720,16
@@
L<Time::Local> and L<Date::Parse> for conversion functions.
=cut
=cut
+#still some false laziness w/print_text
sub print_text {
my( $self, $today, $template ) = @_;
$today ||= time;
sub print_text {
my( $self, $today, $template ) = @_;
$today ||= time;
+
# my $invnum = $self->invnum;
# my $invnum = $self->invnum;
- my $cust_main =
qsearchs('cust_main', { 'custnum', $self->custnum } )
;
+ my $cust_main =
$self->cust_main
;
$cust_main->payname( $cust_main->first. ' '. $cust_main->getfield('last') )
$cust_main->payname( $cust_main->first. ' '. $cust_main->getfield('last') )
- unless $cust_main->payname && $cust_main->payby
ne 'CHEK'
;
+ unless $cust_main->payname && $cust_main->payby
!~ /^(CHEK|DCHK)$/
;
my( $pr_total, @pr_cust_bill ) = $self->previous; #previous balance
# my( $cr_total, @cr_cust_credit ) = $self->cust_credit; #credits
my( $pr_total, @pr_cust_bill ) = $self->previous; #previous balance
# my( $cr_total, @cr_cust_credit ) = $self->cust_credit; #credits
@@
-966,7
+969,7
@@
sub print_latex {
# my $invnum = $self->invnum;
my $cust_main = $self->cust_main;
$cust_main->payname( $cust_main->first. ' '. $cust_main->getfield('last') )
# my $invnum = $self->invnum;
my $cust_main = $self->cust_main;
$cust_main->payname( $cust_main->first. ' '. $cust_main->getfield('last') )
- unless $cust_main->payname && $cust_main->payby
ne 'CHEK'
;
+ unless $cust_main->payname && $cust_main->payby
!~ /^(CHEK|DCHK)$/
;
my( $pr_total, @pr_cust_bill ) = $self->previous; #previous balance
# my( $cr_total, @cr_cust_credit ) = $self->cust_credit; #credits
my( $pr_total, @pr_cust_bill ) = $self->previous; #previous balance
# my( $cr_total, @cr_cust_credit ) = $self->cust_credit; #credits
@@
-1162,9
+1165,11
@@
sub print_ps {
my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
chdir($dir);
my $dir = $FS::UID::conf_dir. "cache.". $FS::UID::datasrc;
chdir($dir);
- system("pslatex $file.tex >/dev/null 2>&1") == 0
+ my $sfile = shell_quote $file;
+
+ system("pslatex $sfile.tex >/dev/null 2>&1") == 0
or die "pslatex $file.tex failed: $!";
or die "pslatex $file.tex failed: $!";
- system("pslatex $file.tex >/dev/null 2>&1") == 0
+ system("pslatex $
s
file.tex >/dev/null 2>&1") == 0
or die "pslatex $file.tex failed: $!";
system('dvips', '-q', '-t', 'letter', "$file.dvi", '-o', "$file.ps" ) == 0
or die "pslatex $file.tex failed: $!";
system('dvips', '-q', '-t', 'letter', "$file.dvi", '-o', "$file.ps" ) == 0
@@
-1209,13
+1214,14
@@
sub print_pdf {
#system('pdflatex', "$file.tex");
#! LaTeX Error: Unknown graphics extension: .eps.
#system('pdflatex', "$file.tex");
#! LaTeX Error: Unknown graphics extension: .eps.
- system("pslatex $file.tex >/dev/null 2>&1") == 0
+ my $sfile = shell_quote $file;
+
+ system("pslatex $sfile.tex >/dev/null 2>&1") == 0
or die "pslatex $file.tex failed: $!";
or die "pslatex $file.tex failed: $!";
- system("pslatex $file.tex >/dev/null 2>&1") == 0
+ system("pslatex $
s
file.tex >/dev/null 2>&1") == 0
or die "pslatex $file.tex failed: $!";
#system('dvipdf', "$file.dvi", "$file.pdf" );
or die "pslatex $file.tex failed: $!";
#system('dvipdf', "$file.dvi", "$file.pdf" );
- my $sfile = shell_quote $file;
system(
"dvips -q -t letter -f $sfile.dvi ".
"| gs -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=$sfile.pdf ".
system(
"dvips -q -t letter -f $sfile.dvi ".
"| gs -q -dNOPAUSE -dBATCH -sDEVICE=pdfwrite -sOutputFile=$sfile.pdf ".