diff options
| -rw-r--r-- | FS/FS/UI/Web.pm | 5 | ||||
| -rw-r--r-- | httemplate/search/elements/cust_main_dayranges.html | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/FS/FS/UI/Web.pm b/FS/FS/UI/Web.pm index 5fcd522..6161706 100644 --- a/FS/FS/UI/Web.pm +++ b/FS/FS/UI/Web.pm @@ -324,7 +324,7 @@ sub cust_header { } sub cust_sort_fields { - cust_header(@_); + cust_header(@_) if( @_ or !@cust_fields ); #inefficientish, but tiny lists and only run once per page map { $_ eq 'custnum' ? 'custnum' : '' } @cust_fields; @@ -346,7 +346,7 @@ sub cust_sql_fields { my @fields = qw( last first company ); # push @fields, map "ship_$_", @fields; - cust_header(@_); + cust_header(@_) if( @_ or !@cust_fields ); #inefficientish, but tiny lists and only run once per page my @location_fields; @@ -486,6 +486,7 @@ element. sub cust_fields_subs { my $unlinked_warn = 0; + return map { my $f = $_; if ( $unlinked_warn++ ) { diff --git a/httemplate/search/elements/cust_main_dayranges.html b/httemplate/search/elements/cust_main_dayranges.html index ddde23a..5dbece8 100644 --- a/httemplate/search/elements/cust_main_dayranges.html +++ b/httemplate/search/elements/cust_main_dayranges.html @@ -187,7 +187,7 @@ my $sql_query = { 'cust_main.custnum', $range_cols, $packages_cols, - FS::UI::Web::cust_sql_fields($cgi->param('cust_fields')), + FS::UI::Web::cust_sql_fields(), 'payby', ), 'extra_sql' => $where, |