sub { sprintf($money_char.'%.2f', shift->amount ) },
sub { time2str('%b %d %Y', shift->get('cust_credit_date') ) },
- 'otaker',
+ sub { shift->cust_credit_bill->cust_credit->otaker },
sub { shift->cust_credit_bill->cust_credit->reason },
sub { $_[0]->pkgnum > 0
sub { time2str('%b %d %Y', shift->_date ) },
\&FS::UI::Web::cust_fields,
],
- #'sort_fields' => [ #XXX add
- #],
+ 'sort_fields' => [
+ 'amount',
+ 'cust_credit_date',
+ '', #'otaker',
+ '', #reason
+ '', #line item description
+ 'invnum',
+ '_date',
+ #cust fields
+ ],
'links' => [
'',
'',
#warn "neither nottax nor istax parameters specified";
}
- if ( $cgi->param('taxclassNULL') ) {
+ if ( $cgi->param('taxclassNULL')
+ && ! $cgi->param('istax') #no taxclass in this case
+ )
+ {
my %hash = ( 'country' => scalar($cgi->param('country')) );
foreach (qw( state county )) {
my $join_pkg;
-my $join_cust_bill_pkg = 'LEFT JOIN cust_bill_pkg USING ( billpkgnum ';
+my $join_cust_bill_pkg = 'LEFT JOIN cust_bill_pkg USING ( billpkgnum )';
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 ) ';
-
- } elsif ( $conf->exists('tax-pkg_address') ) {
-
- $join_pkg .= ' LEFT JOIN cust_bill_pkg_tax_location USING ( billpkgnum )
- LEFT JOIN cust_location USING ( locationnum ) ';
-
- #quelle kludge, somewhat false laziness w/report_tax.cgi
- s/cust_pkg\.locationnum/cust_bill_pkg_tax_location.locationnum/g for @where;
- }
-
- #if ( $cgi->param('iscredit') ) {
- $join_pkg .= ' JOIN cust_credit_bill_pkg USING ( billpkgnum';
+ ' 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 .= ' )';
push @where, "billpkgtaxratelocationnum IS NULL";
}
- #}
+
+ $join_pkg .= ' LEFT JOIN tax_rate_location USING ( taxratelocationnum ) ';
+
+ } elsif ( $conf->exists('tax-pkg_address') ) {
+
+ $join_pkg .= ' LEFT JOIN cust_bill_pkg_tax_location USING ( billpkgnum )
+ LEFT JOIN cust_location USING ( locationnum ) ';
+
+ #quelle kludge, somewhat false laziness w/report_tax.cgi
+ s/cust_pkg\.locationnum/cust_bill_pkg_tax_location.locationnum/g for @where;
+ }
} else {