fix sorting of NULL companies differently than empty companies

[freeside.git] / httemplate / search / report_receivables.cgi

diff --git a/httemplate/search/report_receivables.cgi b/httemplate/search/report_receivables.cgi
index f42269f..0e95ad7 100755 (executable)
--- a/httemplate/search/report_receivables.cgi
+++ b/httemplate/search/report_receivables.cgi
@@ -93,7 +93,7 @@ where 0 <
            ,0
          )
 
-order by lower(company), lower(last)
+order by coalesce(lower(company), ''), lower(last)
 
 END
 
@@ -123,14 +123,14 @@ END
      if ( $row->{uncancelled_pkgs} ) {
        $status = 'Suspended';
        $statuscol = 'FF9900';
-       if ( $row->{active_pkgs} > $row->{uncancelled_pkgs} ) {
+       if ( $row->{active_pkgs} ) {
          $status = 'Active';
          $statuscol = '00CC00';
        }
      }
 %>
   <TR>
-    <TD><A HREF="<%= $p %>view/cust_main.cgi?<%= $row->{'custnum'} %>">
+    <TD><A HREF="<%= $p %>view/cust_main.cgi?<%= $row->{'custnum'} %>"><%= $row->{'custnum'} %>:
         <%= $row->{'company'} ? $row->{'company'}. ' (' : '' %><%= $row->{'last'}. ', '. $row->{'first'} %><%= $row->{'company'} ? ')' : '' %></A>
     </TD>
     <TD><B><FONT SIZE=-1 COLOR="#<%= $statuscol %>"><%= $status %></FONT></B></TD>