projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT#28246: Add more details to Change History for Discounts [actually fixed the bug]
[freeside.git]
/
httemplate
/
search
/
cust_credit_bill_pkg.html
diff --git
a/httemplate/search/cust_credit_bill_pkg.html
b/httemplate/search/cust_credit_bill_pkg.html
index
8b21f37
..
63d70c2
100644
(file)
--- a/
httemplate/search/cust_credit_bill_pkg.html
+++ b/
httemplate/search/cust_credit_bill_pkg.html
@@
-1,4
+1,4
@@
-<
% include( 'elements/search.html'
,
+<
& elements/search.html
,
'title' => 'Credit application detail', #to line item
'name_singular' => 'credit application',
'query' => $query,
'title' => 'Credit application detail', #to line item
'name_singular' => 'credit application',
'query' => $query,
@@
-96,8
+96,8
@@
'',
FS::UI::Web::cust_styles(),
],
'',
FS::UI::Web::cust_styles(),
],
- )
-
%
>
+
+
&
>
<%init>
#LOTS of false laziness below w/cust_bill_pkg.cgi
<%init>
#LOTS of false laziness below w/cust_bill_pkg.cgi
@@
-383,8
+383,8
@@
my $count_query = "SELECT COUNT(DISTINCT creditbillpkgnum),
SUM(cust_credit_bill_pkg.amount)";
my $join_cust =
SUM(cust_credit_bill_pkg.amount)";
my $join_cust =
- ' JOIN cust_bill ON ( cust_bill_pkg.invnum = cust_bill.invnum )
-
LEFT JOIN cust_main ON ( cust_bill.custnum = cust_main.custnum ) '
;
+ ' JOIN cust_bill ON ( cust_bill_pkg.invnum = cust_bill.invnum )
'.
+
FS::UI::Web::join_cust_main('cust_bill', 'cust_pkg')
;
my $join_pkg;
my $join_pkg;
@@
-429,7
+429,7
@@
if ( $cgi->param('nottax') ) {
s/cust_pkg\.locationnum/cust_bill_pkg_tax_location.locationnum/g for @where;
}
s/cust_pkg\.locationnum/cust_bill_pkg_tax_location.locationnum/g for @where;
}
-} else {
+} else {
#warn "neither nottax nor istax parameters specified";
#same as before?
#warn "neither nottax nor istax parameters specified";
#same as before?
@@
-464,7
+464,7
@@
my @post_desc_header = ();
my @post_desc = ();
my @post_desc_null = ();
my $post_desc_align = '';
my @post_desc = ();
my @post_desc_null = ();
my $post_desc_align = '';
-if ( $conf->exists('enable_taxclasses') ) {
+if ( $conf->exists('enable_taxclasses')
&& ! $cgi->param('istax')
) {
push @post_desc_header, 'Tax class';
push @post_desc, 'taxclass';
push @post_desc_null, '';
push @post_desc_header, 'Tax class';
push @post_desc, 'taxclass';
push @post_desc_null, '';