projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rate CDRs immediately, RT#15839
[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
19a9869
..
fef295e
100644
(file)
--- a/
httemplate/search/cust_credit_bill_pkg.html
+++ b/
httemplate/search/cust_credit_bill_pkg.html
@@
-27,7
+27,7
@@
sub { sprintf($money_char.'%.2f', shift->amount ) },
sub { time2str('%b %d %Y', shift->get('cust_credit_date') ) },
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 { shift->cust_credit_bill->cust_credit->reason },
sub { $_[0]->pkgnum > 0
@@
-38,8
+38,16
@@
sub { time2str('%b %d %Y', shift->_date ) },
\&FS::UI::Web::cust_fields,
],
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' => [
'',
'',
'links' => [
'',
'',
@@
-256,7
+264,10
@@
if ( $cgi->param('out') ) {
#warn "neither nottax nor istax parameters specified";
}
#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 %hash = ( 'country' => scalar($cgi->param('country')) );
foreach (qw( state county )) {