projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT# 30783 Clean up json code for free_addrs
[freeside.git]
/
FS
/
FS
/
cust_main
/
Status.pm
diff --git
a/FS/FS/cust_main/Status.pm
b/FS/FS/cust_main/Status.pm
index
46a87ff
..
66ba33f
100644
(file)
--- a/
FS/FS/cust_main/Status.pm
+++ b/
FS/FS/cust_main/Status.pm
@@
-1,7
+1,7
@@
package FS::cust_main::Status;
use strict;
package FS::cust_main::Status;
use strict;
-use vars qw( $conf
); #
$module ); #$DEBUG $me );
+use vars qw( $conf $module ); #$DEBUG $me );
use Tie::IxHash;
use FS::UID;
use FS::cust_pkg;
use Tie::IxHash;
use FS::UID;
use FS::cust_pkg;
@@
-11,7
+11,7
@@
use FS::cust_pkg;
install_callback FS::UID sub {
$conf = new FS::Conf;
install_callback FS::UID sub {
$conf = new FS::Conf;
-
#
$module = $conf->config('cust_main-status_module') || 'Classic';
+ $module = $conf->config('cust_main-status_module') || 'Classic';
};
=head1 NAME
};
=head1 NAME
@@
-40,8
+40,6
@@
sub statuscolors {
my %statuscolors;
my %statuscolors;
- my $module = $conf->config('cust_main-status_module') || 'Classic';
-
if ( $module eq 'Classic' ) {
tie %statuscolors, 'Tie::IxHash',
'prospect' => 'FF00F5', #'000000', #black? naw, purple
if ( $module eq 'Classic' ) {
tie %statuscolors, 'Tie::IxHash',
'prospect' => 'FF00F5', #'000000', #black? naw, purple
@@
-102,8
+100,6
@@
sub cancelled_sql {
AND 0 < ( $select_count_pkgs AND $cancelled_sql )
";
AND 0 < ( $select_count_pkgs AND $cancelled_sql )
";
- my $module = $conf->config('cust_main-status_module') || 'Classic';
-
if ( $module eq 'Classic' ) {
$sql .=
" AND 0 = ( $select_count_pkgs AND ". FS::cust_pkg->inactive_sql. " ) ";
if ( $module eq 'Classic' ) {
$sql .=
" AND 0 = ( $select_count_pkgs AND ". FS::cust_pkg->inactive_sql. " ) ";