projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
include elements/search.html the right way to avoid problems with XLS download, ...
[freeside.git]
/
httemplate
/
search
/
unearned_detail.html
diff --git
a/httemplate/search/unearned_detail.html
b/httemplate/search/unearned_detail.html
index
02d514c
..
425aa5a
100644
(file)
--- a/
httemplate/search/unearned_detail.html
+++ b/
httemplate/search/unearned_detail.html
@@
-118,6
+118,12
@@
if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
push @where, "cust_main.agentnum = $1";
}
push @where, "cust_main.agentnum = $1";
}
+if ( $cgi->param('cust_classnum') ) {
+ my @classnums = grep /^\d+$/, $cgi->param('cust_classnum');
+ push @where, 'cust_main.classnum IN('.join(',',@classnums).')'
+ if @classnums;
+}
+
# no pkgclass, no taxclass, no tax location...
# unearned revenue mode
# no pkgclass, no taxclass, no tax location...
# unearned revenue mode
@@
-204,8
+210,8
@@
push @select, '(edate - 82799) AS before_edate';
#usage always excluded
# always 'nottax', not 'istax'
#usage always excluded
# always 'nottax', not 'istax'
-$join_cust = ' JOIN cust_bill USING ( invnum )
-
LEFT JOIN cust_main USING ( custnum ) '
;
+$join_cust = ' JOIN cust_bill USING ( invnum )
'.
+
FS::UI::Web::join_cust_main('cust_pkg', 'cust_pkg')
;
$join_pkg .= ' LEFT JOIN cust_pkg USING ( pkgnum )
LEFT JOIN part_pkg USING ( pkgpart )
$join_pkg .= ' LEFT JOIN cust_pkg USING ( pkgnum )
LEFT JOIN part_pkg USING ( pkgpart )
@@
-216,7
+222,7
@@
my $where = ' WHERE '. join(' AND ', @where);
my $count_query = "SELECT COUNT(DISTINCT billpkgnum),
SUM( $unearned_base ), SUM( $unearned_sql )
my $count_query = "SELECT COUNT(DISTINCT billpkgnum),
SUM( $unearned_base ), SUM( $unearned_sql )
- FROM cust_bill_pkg $join_
cust $join_pkg
$where";
+ FROM cust_bill_pkg $join_
pkg $join_cust
$where";
push @select, 'part_pkg.pkg',
'part_pkg.freq',
push @select, 'part_pkg.pkg',
'part_pkg.freq',
@@
-225,7
+231,7
@@
push @select, 'part_pkg.pkg',
my $query = {
'table' => 'cust_bill_pkg',
my $query = {
'table' => 'cust_bill_pkg',
- 'addl_from' => "$join_
cust $join_pkg
",
+ 'addl_from' => "$join_
pkg $join_cust
",
'hashref' => {},
'select' => join(",\n", @select ),
'extra_sql' => $where,
'hashref' => {},
'select' => join(",\n", @select ),
'extra_sql' => $where,
@@
-235,7
+241,8
@@
my $query = {
my $ilink = [ "${p}view/cust_bill.cgi?", 'invnum' ];
my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
my $ilink = [ "${p}view/cust_bill.cgi?", 'invnum' ];
my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
-my $money_char;
+my $conf = new FS::Conf;
+my $money_char = $conf->config('money_char') || '$';
sub money_sub {
$conf ||= new FS::Conf;
sub money_sub {
$conf ||= new FS::Conf;