'table' => 'cust_bill_pay_pkg',
'addl_from' => ' LEFT JOIN cust_bill_pay USING ( billpaynum ) '.
' LEFT JOIN cust_bill_pkg USING ( billpkgnum ) ',
- 'hashref' => { 'invnum' => $self->invnum,
- 'pkgnum' => $pkgnum,
- },
+ 'extra_sql' => ' WHERE cust_bill_pkg.invnum = '. $self->invnum.
+ " AND cust_bill_pkg.pkgnum = $pkgnum",
});
}
'table' => 'cust_credit_bill_pkg',
'addl_from' => ' LEFT JOIN cust_credit_bill USING ( creditbillnum ) '.
' LEFT JOIN cust_bill_pkg USING ( billpkgnum ) ',
- 'hashref' => { 'invnum' => $self->invnum,
- 'pkgnum' => $pkgnum,
- },
+ 'extra_sql' => ' WHERE cust_bill_pkg.invnum = '. $self->invnum.
+ " AND cust_bill_pkg.pkgnum = $pkgnum",
});
}
#invoice from info
'company_name' => scalar( $conf->config('company_name', $agentnum) ),
'company_address' => join("\n", $conf->config('company_address', $agentnum) ). "\n",
+ 'company_phonenum'=> scalar( $conf->config('company_phonenum', $agentnum) ),
'returnaddress' => $returnaddress,
'agent' => &$escape_function($cust_main->agent->agent),
}
}
-
+
if ( @pr_cust_bill && !$conf->exists('disable_previous_balance') ) {
push @buf, ['','-----------'];
push @buf, [ 'Total Previous Balance',
if $DEBUG > 1;
my ($didsummary,$minutes) = $self->_did_summary;
- my $didsummary_desc = 'DID Activity Summary (Past 30 days)';
+ my $didsummary_desc = 'DID Activity Summary (since last invoice)';
push @detail_items,
{ 'description' => $didsummary_desc,
'ext_description' => [ $didsummary, $minutes ],
my ($file, $logofile, $barcodefile) = $self->print_latex(@_);
my $ps = generate_ps($file);
unlink($logofile);
- unlink($barcodefile);
+ unlink($barcodefile) if $barcodefile;
$ps;
}
my ($file, $logofile, $barcodefile) = $self->print_latex(@_);
my $pdf = generate_pdf($file);
unlink($logofile);
- unlink($barcodefile);
+ unlink($barcodefile) if $barcodefile;
$pdf;
}
}
} @sections;
push @early, @$extra_sections if $extra_sections;
-
+
sort { $a->{sort_weight} <=> $b->{sort_weight} } @early;
}
sub _did_summary {
my $self = shift;
my $end = $self->_date;
- my $start = $end - 2592000; # 30 days
+ my @cust_bill = sort { $a->_date <=> $b->_date }
+ grep { $_->_date < $self->_date }
+ qsearch( 'cust_bill', { 'custnum' => $self->custnum } );
+ my $start = $cust_bill[-1]->_date+1; # since last invoice
my $cust_main = $self->cust_main;
my @pkgs = $cust_main->all_pkgs;
my($num_activated,$num_deactivated,$num_portedin,$num_portedout,$minutes)