diff options
| author | ivan <ivan> | 2010-10-18 03:36:39 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2010-10-18 03:36:39 +0000 |
| commit | 012d4123d496461ea2548769fab4eef94cd066f1 (patch) | |
| tree | 0f228cfc7a6a985608c1aba0795d8649593922c5 /FS | |
| parent | e2cff16135741b166473d18f828ad54f57037dae (diff) | |
fix "Inactive" status showing instead of "Suspended" or "Canceled" when there were one-time charges, RT#9971
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/cust_main.pm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm index 4e42f8de0..a33caf21f 100644 --- a/FS/FS/cust_main.pm +++ b/FS/FS/cust_main.pm @@ -3581,7 +3581,6 @@ sub status { shift->cust_status(@_); } sub cust_status { my $self = shift; - # prospect ordered 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; @@ -3618,9 +3617,9 @@ tie %statuscolor, 'Tie::IxHash', 'prospect' => '7e0079', #'000000', #black? naw, purple 'active' => '00CC00', #green 'ordered' => '009999', #teal? cyan? - 'inactive' => '0000CC', #blue 'suspended' => 'FF9900', #yellow 'cancelled' => 'FF0000', #red + 'inactive' => '0000CC', #blue ; sub statuscolor { shift->cust_statuscolor(@_); } @@ -3845,8 +3844,8 @@ sub cancel_sql { 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. " ) } |