diff options
| author | ivan <ivan> | 2011-04-15 22:12:56 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2011-04-15 22:12:56 +0000 |
| commit | 26b237b61bb5340e92edb033f48371c8e8d2de55 (patch) | |
| tree | 083d21b994e36ddd97e9d446867efed9a78e731b /httemplate | |
| parent | 386e5631dd76e01faaad23a15d5977e13587b135 (diff) | |
link new tax report to cust_credit_bill_pkg for credits, RT#12332
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/search/cust_credit_bill_pkg.html | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/httemplate/search/cust_credit_bill_pkg.html b/httemplate/search/cust_credit_bill_pkg.html index c6995470d..19a9869dd 100644 --- a/httemplate/search/cust_credit_bill_pkg.html +++ b/httemplate/search/cust_credit_bill_pkg.html @@ -345,16 +345,7 @@ my $join_cust = my $join_pkg; -my $join_cust_bill_pkg = 'LEFT JOIN cust_bill_pkg USING ( billpkgnum'; -if ( $cgi->param('iscredit') eq 'rate' ) { - $join_cust_bill_pkg .= ', billpkgtaxratelocationnum )'; -} elsif ( $conf->exists('tax-pkg_address') ) { - $join_cust_bill_pkg .= ', billpkgtaxlocationnum )'; - push @where, "billpkgtaxratelocationnum IS NULL"; -} else { - $join_cust_bill_pkg .= ' )'; - push @where, "billpkgtaxratelocationnum IS NULL"; -} +my $join_cust_bill_pkg = 'LEFT JOIN cust_bill_pkg USING ( billpkgnum )'; if ( $cgi->param('nottax') ) { @@ -372,8 +363,18 @@ if ( $cgi->param('nottax') ) { $cgi->param('iscredit') eq 'rate') { $join_pkg .= - ' LEFT JOIN cust_bill_pkg_tax_rate_location USING ( billpkgnum ) '. - ' LEFT JOIN tax_rate_location USING ( taxratelocationnum ) '; + ' LEFT JOIN cust_bill_pkg_tax_rate_location 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"; + } + + $join_pkg .= ' LEFT JOIN tax_rate_location USING ( taxratelocationnum ) '; } elsif ( $conf->exists('tax-pkg_address') ) { |