[freeside-commits] freeside/FS/FS cust_main.pm, 1.464.2.50, 1.464.2.51

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv30153

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	cust_main.pm 
Log Message:
fix "Inactive" status showing instead of "Suspended" or "Canceled" when there were one-time charges, RT#9971

Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.464.2.50
retrieving revision 1.464.2.51
diff -u -w -d -r1.464.2.50 -r1.464.2.51
--- cust_main.pm	13 Oct 2010 20:21:03 -0000	1.464.2.50
+++ cust_main.pm	18 Oct 2010 03:36:30 -0000	1.464.2.51
@@ -8114,7 +8114,7 @@
 
 sub cust_status {
   my $self = shift;
-  for my $status (qw( prospect active inactive suspended cancelled )) {
+  for my $status ( FS::cust_main->statuses() ) {
     my $method = $status.'_sql';
     my $numnum = ( my $sql = $self->$method() ) =~ s/cust_main\.custnum/?/g;
     my $sth = dbh->prepare("SELECT $sql") or die dbh->errstr;
@@ -8149,9 +8149,9 @@
 tie %statuscolor, 'Tie::IxHash',
   'prospect'  => '7e0079', #'000000', #black?  naw, purple
   'active'    => '00CC00', #green
-  'inactive'  => '0000CC', #blue
   'suspended' => 'FF9900', #yellow
   'cancelled' => 'FF0000', #red
+  'inactive'  => '0000CC', #blue
 ;
 
 sub statuscolor { shift->cust_statuscolor(@_); }
@@ -8321,8 +8321,8 @@
     AND 0 = ( $select_count_pkgs AND $recurring_sql
                   AND ( cust_pkg.cancel IS NULL OR cust_pkg.cancel = 0 )
             )
-    AND 0 = (  $select_count_pkgs AND ". FS::cust_pkg->inactive_sql. " )
   ";
+#    AND 0 = (  $select_count_pkgs AND ". FS::cust_pkg->inactive_sql. " )
 
 }