-<% include( 'elements/search.html',
- 'title' => 'Line items',
- 'name' => 'line items',
+<& elements/search.html,
+ 'title' => emt('Line items'),
+ 'name' => emt('line items'),
'query' => $query,
'count_query' => $count_query,
'count_addl' => [ $money_char. '%.2f total', ],
'header' => [
- '#',
- 'Description',
- 'Setup charge',
+ emt('Description'),
+ emt('Setup charge'),
( $use_usage eq 'usage'
- ? 'Usage charge'
- : 'Recurring charge'
+ ? emt('Usage charge')
+ : emt('Recurring charge')
),
- 'Invoice',
- 'Date',
+ emt('Invoice'),
+ emt('Date'),
FS::UI::Web::cust_header(),
],
'fields' => [
- 'billpkgnum',
sub { $_[0]->pkgnum > 0
? $_[0]->get('pkg') # possibly use override.pkg
: $_[0]->get('itemdesc') # but i think this correct
},
#strikethrough or "N/A ($amount)" or something these when
# they're not applicable to pkg_tax search
- sub { sprintf($money_char.'%.2f', shift->setup ) },
+ sub { my $cust_bill_pkg = shift;
+ sprintf($money_char.'%.2f', $cust_bill_pkg->setup );
+ },
sub { my $row = shift;
my $value = 0;
if ( $use_usage eq 'recurring' ) {
sub { time2str('%b %d %Y', shift->_date ) },
\&FS::UI::Web::cust_fields,
],
- 'links' => [
+ 'sort_fields' => [
'',
+ 'setup',
+ ( $use_usage eq 'recurring'
+ ? 'recur - usage' :
+ $use_usage eq 'usage'
+ ? 'usage'
+ : 'recur'
+ ),
+ 'invnum',
+ '_date',
+ ],
+ 'links' => [
+ #'',
'',
'',
'',
FS::UI::Web::cust_header()
),
],
- 'align' => 'rlrrrc'.FS::UI::Web::cust_aligns(),
+ #'align' => 'rlrrrc'.FS::UI::Web::cust_aligns(),
+ 'align' => 'lr'.
+ 'r'.
+ 'rc'.
+ FS::UI::Web::cust_aligns(),
'color' => [
- '',
+ #'',
'',
'',
'',
FS::UI::Web::cust_colors(),
],
'style' => [
- '',
+ #'',
'',
'',
'',
'',
FS::UI::Web::cust_styles(),
],
- )
-%>
+&>
<%init>
+#LOTS of false laziness below w/cust_credit_bill_pkg.cgi
+
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('Financial reports');
my $conf = new FS::Conf;
+my @select = ( 'cust_bill_pkg.*', 'cust_bill._date' );
+my ($join_cust, $join_pkg ) = ('', '');
+
#here is the agent virtualization
my $agentnums_sql =
$FS::CurrentUser::CurrentUser->agentnums_sql( 'table' => 'cust_main' );
my @where = ( $agentnums_sql );
my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
-push @where, "_date >= $beginning",
- "_date <= $ending";
-push @where , " payby != 'COMP' "
- unless $cgi->param('include_comp_cust');
+if ( $cgi->param('status') =~ /^([a-z]+)$/ ) {
+ push @where, FS::cust_main->cust_status_sql . " = '$1'";
+}
+
+if ( $cgi->param('distribute') == 1 ) {
+ push @where, "sdate <= $ending",
+ "edate > $beginning",
+ ;
+}
+else {
+ push @where, "cust_bill._date >= $beginning",
+ "cust_bill._date <= $ending";
+}
if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
push @where, "cust_main.agentnum = $1";
}
+if ( $cgi->param('refnum') =~ /^(\d+)$/ ) {
+ push @where, "cust_main.refnum = $1";
+}
+
#classnum
# not specified: all classes
# 0: empty class
}
}
-my $use_usage = $cgi->param('use_usage');
+if ( $cgi->param('taxclass')
+ && ! $cgi->param('istax') #no part_pkg.taxclass in this case
+ #(should we save a taxclass or a link to taxnum
+ # in cust_bill_pkg or something like
+ # cust_bill_pkg_tax_location?)
+ )
+{
-push @where, ' ( '. join(' OR ',
- map ' taxclass = '.dbh->quote($_), $cgi->param('taxclass')
- ).
- ' ) '
- if $cgi->param('taxclass')
- && ! $cgi->param('istax'); #no part_pkg.taxclass in this case
- #(should we save a taxclass or a link to taxnum
- # in cust_bill_pkg or something like
- # cust_bill_pkg_tax_location?)
-
-#sub _where {
-# my $table = shift;
-# my $prefix = @_ ? shift : '';
-# "
-# ( cust_main_county.county = $table.${prefix}.county
-# OR ( cust_main_county.county IS NULL AND $table.${prefix}.county = '' )
-# OR ( cust_main_county.county = '' AND $table.${prefix}.county IS NULL)
-# OR ( cust_main_county.county IS NULL AND $table.${prefix}.county IS NULL)
-# )
-# AND ( cust_main_county.state = $table.${prefix}.state
-# OR ( cust_main_county.state IS NULL AND $table.${prefix}.state = '' )
-# OR ( cust_main_county.state = '' AND $table.${prefix}.state IS NULL )
-# OR ( cust_main_county.state IS NULL AND $table.${prefix}.state IS NULL )
-# )
-# AND cust_main_county.country = $table.${prefix}.country
-# ";
-#
-#}
+ #override taxclass when use_override is specified? probably
-if ( $cgi->param('out') ) {
+ push @where, ' part_pkg.taxclass IN ( '.
+ join(', ', map dbh->quote($_), $cgi->param('taxclass') ).
+ ' ) ';
- my ( $loc_sql, @param ) = FS::cust_pkg->location_sql( 'ornull' => 1 );
- while ( $loc_sql =~ /\?/ ) { #easier to do our own substitution
- $loc_sql =~ s/\?/'cust_main_county.'.shift(@param)/e;
- }
+}
- $loc_sql =~ s/cust_pkg\.locationnum/cust_bill_pkg_tax_location.locationnum/g
- if $cgi->param('istax');
+my @loc_param = qw( district city county state country );
+
+if ( $cgi->param('out') ) {
+
+ my ( $loc_sql, @param ) = FS::cust_location->in_county_sql( 'ornull' => 1 );
+# while ( $loc_sql =~ /\?/ ) { #easier to do our own substitution
+# $loc_sql =~ s/\?/'cust_main_county.'.shift(@param)/e;
+# }
push @where, "
0 = (
";
#not linked to by anything, but useful for debugging "out of taxable region"
- if ( grep $cgi->param($_), qw( county state country ) ) {
+ if ( grep $cgi->param($_), @loc_param ) {
- my %ph = map { $_ => dbh->quote( $cgi->param($_) ) }
- qw( county state country );
+ my %ph = map { $_ => dbh->quote( scalar($cgi->param($_)) ) } @loc_param;
- my ( $loc_sql, @param ) = FS::cust_pkg->location_sql;
+ my ( $loc_sql, @param ) = FS::cust_location->in_county_sql(param => 1);
while ( $loc_sql =~ /\?/ ) { #easier to do our own substitution
$loc_sql =~ s/\?/$ph{shift(@param)}/e;
}
}
-} elsif ( $cgi->param('country') ) {
+} elsif ( $cgi->param('country') ) { # and not $cgi->param('out')
my @counties = $cgi->param('county');
my %ph = ( 'county' => dbh->quote($_),
map { $_ => dbh->quote( $cgi->param($_) ) }
- qw( state country )
+ qw( district city state country )
);
- my ( $loc_sql, @param ) = FS::cust_pkg->location_sql;
+ my ( $loc_sql, @param ) = FS::cust_location->in_county_sql(param => 1);
while ( $loc_sql =~ /\?/ ) { #easier to do our own substitution
$loc_sql =~ s/\?/$ph{shift(@param)}/e;
}
push @where, $locs_sql;
- } else {
+ } else { #scalar(@counties) <= 1
- my %ph = map { $_ => dbh->quote( $cgi->param($_) ) }
- qw( county state country );
+ my %ph = map { $_ => dbh->quote( scalar($cgi->param($_)) ) } @loc_param;
- my ( $loc_sql, @param ) = FS::cust_pkg->location_sql;
+
+ my ( $loc_sql, @param ) = FS::cust_location->in_county_sql(param => 1);
while ( $loc_sql =~ /\?/ ) { #easier to do our own substitution
$loc_sql =~ s/\?/$ph{shift(@param)}/e;
}
#warn "neither nottax nor istax parameters specified";
}
- if ( $cgi->param('taxclassNULL') ) {
-
+ if ( $cgi->param('taxclassNULL')
+ && ! $cgi->param('istax') #no part_pkg.taxclass in this case
+ #(see comment above?)
+ )
+ {
my %hash = ( 'country' => scalar($cgi->param('country')) );
foreach (qw( state county )) {
$hash{$_} = scalar($cgi->param($_)) if $cgi->param($_);
die "unknown base region for empty taxclass" unless $cust_main_county;
my $same_sql = $cust_main_county->sql_taxclass_sameregion;
+ $same_sql =~ s/taxclass/part_pkg.taxclass/g;
push @where, $same_sql if $same_sql;
}
} elsif ( scalar( grep( /locationtaxid/, $cgi->param ) ) ) {
+# and not $cgi->param('out' or 'country')
- # this should really be shoved out to FS::cust_pkg->location_sql or something
- # along with the code in report_newtax.cgi
-
- my %pn = (
- 'county' => 'tax_rate_location.county',
- 'state' => 'tax_rate_location.state',
- 'city' => 'tax_rate_location.city',
- 'locationtaxid' => 'cust_bill_pkg_tax_rate_location.locationtaxid',
- );
-
- my %ph = map { ( $pn{$_} => dbh->quote( $cgi->param($_) || '' ) ) }
- qw( county state city locationtaxid );
-
- push @where,
- join( ' AND ', map { "( $_ = $ph{$_} OR $ph{$_} = '' AND $_ IS NULL)" }
- keys %ph
- );
+ push @where, FS::tax_rate_location->location_sql(
+ map { $_ => (scalar($cgi->param($_)) || '') }
+ qw( district city county state locationtaxid )
+ );
}
push @where, $cust_exempt;
}
+my $use_usage = $cgi->param('use_usage');
+
my $count_query;
if ( $cgi->param('pkg_tax') ) {
AND cust_bill_pkg.recur > 0 )
)",
#not a tax_exempt customer
- "( tax != 'Y' OR tax IS NULL )";
+ "( tax != 'Y' OR tax IS NULL )", # assume this was intended?
#not covered in full by a monthly tax exemption (texas tax)
- "0 < ( $setup_taxable + $recur_taxable - $exempt )",
+ "0 < ( $setup_taxable + $recur_taxable - $exempt )";
} else {
- $count_query = "SELECT COUNT(*), ";
+ if ( $use_usage ) {
+ $count_query = "SELECT COUNT(*), ";
+ } else {
+ $count_query = "SELECT COUNT(DISTINCT billpkgnum), ";
+ }
if ( $use_usage eq 'recurring' ) {
- $count_query .= "SUM(setup + recur - usage)";
+ $count_query .= "SUM(cust_bill_pkg.setup + cust_bill_pkg.recur - usage)";
} elsif ( $use_usage eq 'usage' ) {
$count_query .= "SUM(usage)";
+ } elsif ( scalar( grep( /locationtaxid/, $cgi->param ) ) ) {
+ $count_query .= "SUM( COALESCE(cust_bill_pkg_tax_rate_location.amount, cust_bill_pkg.setup + cust_bill_pkg.recur))";
+ } elsif ( $cgi->param('iscredit') eq 'rate') {
+ $count_query .= "SUM( cust_credit_bill_pkg.amount )";
} else {
$count_query .= "SUM(cust_bill_pkg.setup + cust_bill_pkg.recur)";
}
}
-my $where = ' WHERE '. join(' AND ', @where);
-
-my $join_cust = ' JOIN cust_bill USING ( invnum )
- LEFT JOIN cust_main USING ( custnum ) ';
-
+$join_cust = ' JOIN cust_bill USING ( invnum )
+ LEFT JOIN cust_main USING ( custnum ) ';
-my $join_pkg;
if ( $cgi->param('nottax') ) {
- $join_pkg = ' LEFT JOIN cust_pkg USING ( pkgnum )
- LEFT JOIN part_pkg USING ( pkgpart )
- LEFT JOIN part_pkg AS override
- ON pkgpart_override = override.pkgpart ';
- $join_pkg .= ' LEFT JOIN cust_location USING ( locationnum ) '
- if $conf->exists('tax-pkg_address');
+ $join_pkg .= ' LEFT JOIN cust_pkg USING ( pkgnum )
+ LEFT JOIN part_pkg USING ( pkgpart )
+ LEFT JOIN part_pkg AS override
+ ON pkgpart_override = override.pkgpart
+ LEFT JOIN cust_location
+ ON cust_location.locationnum = '.
+ FS::cust_pkg->tax_locationnum_sql;
} elsif ( $cgi->param('istax') ) {
#false laziness w/report_tax.cgi $taxfromwhere
- if ( $conf->exists('tax-pkg_address') ) {
- $join_pkg .= ' LEFT JOIN cust_bill_pkg_tax_location USING ( billpkgnum )
- LEFT JOIN cust_location USING ( locationnum ) ';
+ if ( scalar( grep( /locationtaxid/, $cgi->param ) ) ||
+ $cgi->param('iscredit') eq 'rate') {
- #quelle kludge, false laziness w/report_tax.cgi
- $where =~ s/cust_pkg\.locationnum/cust_bill_pkg_tax_location.locationnum/g;
- } elsif ( scalar( grep( /locationtaxid/, $cgi->param ) ) ) {
+ # using tax_rate_location and friends
$join_pkg .=
' LEFT JOIN cust_bill_pkg_tax_rate_location USING ( billpkgnum ) '.
' LEFT JOIN tax_rate_location USING ( taxratelocationnum ) ';
+
+ #} elsif ( $conf->exists('tax-pkg_address') ) {
+ } else {
+
+ # using cust_bill_pkg_tax_location to relate tax items to locations
+ # ...but for consolidated taxes we don't want to duplicate this
+ my $tax_item_location = '(SELECT DISTINCT billpkgnum, locationnum
+ FROM cust_bill_pkg_tax_location) AS tax_item_location';
+
+ $join_pkg .= " LEFT JOIN $tax_item_location USING ( billpkgnum )
+ LEFT JOIN cust_location
+ ON tax_item_location.locationnum =
+ cust_location.locationnum ";
+
+ #quelle kludge, somewhat false laziness w/report_tax.cgi
+ s/cust_pkg\.locationnum/tax_item_location.locationnum/g for @where;
+ }
+
+ if ( $cgi->param('iscredit') ) {
+ $join_pkg .= ' JOIN cust_credit_bill_pkg USING ( billpkgnum';
+ if ( $cgi->param('iscredit') eq 'rate' ) {
+ $join_pkg .= ', billpkgtaxratelocationnum )';
+ } elsif ( $conf->exists('tax-pkg_address') ) {
+ $join_pkg .= ', billpkgtaxlocationnum )';
+ push @where, "billpkgtaxratelocationnum IS NULL";
+ } else {
+ $join_pkg .= ' )';
+ push @where, "billpkgtaxratelocationnum IS NULL";
+ }
}
} else {
#die?
- warn "neiether nottax nor istax parameters specified";
+ warn "neither nottax nor istax parameters specified";
#same as before?
$join_pkg = ' LEFT JOIN cust_pkg USING ( pkgnum )
LEFT JOIN part_pkg USING ( pkgpart ) ';
}
+my $where = ' WHERE '. join(' AND ', @where);
+
if ($use_usage) {
$count_query .=
" FROM (SELECT cust_bill_pkg.setup, cust_bill_pkg.recur,
} else {
$count_query .= " FROM cust_bill_pkg $join_cust $join_pkg $where";
}
-warn "count_query is $count_query\n";
-my @select = (
- 'cust_bill_pkg.*',
- 'cust_bill._date',
- );
-push @select, 'part_pkg.pkg' unless $cgi->param('istax');
+push @select, 'part_pkg.pkg',
+ 'part_pkg.freq',
+ unless $cgi->param('istax');
+
push @select, 'cust_main.custnum',
FS::UI::Web::cust_sql_fields();
'table' => 'cust_bill_pkg',
'addl_from' => "$join_cust $join_pkg",
'hashref' => {},
- 'select' => join(', ', @select ),
+ 'select' => join(",\n", @select ),
'extra_sql' => $where,
- 'order_by' => 'ORDER BY _date, billpkgnum',
+ 'order_by' => 'ORDER BY cust_bill._date, billpkgnum',
};
my $ilink = [ "${p}view/cust_bill.cgi?", 'invnum' ];
my $conf = new FS::Conf;
my $money_char = $conf->config('money_char') || '$';
+my $owed_sub = sub {
+ $money_char . shift->get('owed') # owed_recur is not correct here
+};
+my $payment_date_sub = sub {
+ #my $cust_bill_pkg = shift;
+ my @cust_pay = sort { $a->_date <=> $b->_date }
+ map $_->cust_bill_pay->cust_pay,
+ shift->cust_bill_pay_pkg('recur') #recur :/
+ or return '';
+ time2str('%b %d %Y', $cust_pay[-1]->_date );
+};
+warn $count_query;
</%init>