my $unsquelched = $params{unsquelch_cdr} || $cust_main->squelch_cdr ne 'Y';
my $multisection = $conf->exists('invoice_sections', $cust_main->agentnum);
my $late_sections = [];
- my $extra_sections = ();
+ my $extra_sections = [];
my $extra_lines = ();
if ( $multisection ) {
($extra_sections, $extra_lines) =
die "no invoice_lines() functions in template?"
if ( $format eq 'template' && !$wasfunc );
- use Data::Dumper;
- warn Dumper(\@sections);
if ($format eq 'template') {
if ( $invoice_lines ) {
my %sectionmap = ();
my $simple = new FS::usage_class { format => 'simple' }; #bleh
- my $minimal = new FS::usage_class { format => 'minimal' }; #bleh
+ my $usage_simple = new FS::usage_class { format => 'usage_simple' }; #bleh
foreach ( keys %sections ) {
my $summary = $sections{$_}{sort_weight} < 0 ? 1 : 0;
- my $usage_class = $summary ? $simple : $minimal;
+ my $usage_class = $summary ? $simple : $usage_simple;
my $ending = $summary ? ' usage charges' : '';
$sectionmap{$_} = { 'description' => &{$escape}($_. $ending),
'amount' => $sections{$_}{amount}, #subtotal
foreach my $cust_bill_pkg ( @$cust_bill_pkg )
{
- foreach ( $s, $r, ($opt{skip_usage} ? $u : () ) ) {
+ foreach ( $s, $r, ($opt{skip_usage} ? () : $u ) ) {
if ( $_ && !$cust_bill_pkg->hidden ) {
$_->{amount} = sprintf( "%.2f", $_->{amount} ),
$_->{amount} =~ s/^\-0\.00$/0.00/;
}
- foreach ( $s, $r, ($opt{skip_usage} ? $u : () ) ) {
+ foreach ( $s, $r, ($opt{skip_usage} ? () : $u ) ) {
if ( $_ ) {
$_->{amount} = sprintf( "%.2f", $_->{amount} ),
$_->{amount} =~ s/^\-0\.00$/0.00/;
my $distinct = '';
my $orderby = 'ORDER BY cust_bill._date';
- my $extra_sql = ' WHERE '. FS::cust_bill->search_sql(\%param);
+ my $extra_sql = ' WHERE '. FS::cust_bill->search_sql_where(\%param);
my $addl_from = 'LEFT JOIN cust_main USING ( custnum )';
WHERE cust_bill.invnum = cust_credit_bill.invnum )";
}
-=item search_sql HASHREF
+=item search_sql_where HASHREF
Class method which returns an SQL WHERE fragment to search for parameters
specified in HASHREF. Valid parameters are
=cut
-sub search_sql {
+sub search_sql_where {
my($class, $param) = @_;
if ( $DEBUG ) {
- warn "$me search_sql called with params: \n".
+ warn "$me search_sql_where called with params: \n".
join("\n", map { " $_: ". $param->{$_} } keys %$param ). "\n";
}