X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fsvc_domain.pm;h=4d85060d3e5d0d6f19d513463290edfa63a09caf;hb=8090f8d2c058e033abf7d6e770a5c37f8cee6341;hp=8215380bbeffe0103f390355eb8961ad7df7b708;hpb=f9b6d766508334004d62be88a08d38dd3dec29e4;p=freeside.git

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index 8215380bb..4d85060d3 100644
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -159,7 +159,8 @@ sub table_info {
                           },
       'acct_def_cgp_emptytrash' => { 
                             label => 'Acct. default Communigate on logout remove trash',
-                            type  => 'text',
+                            type        => 'select',
+                            select_list => __PACKAGE__->cgp_emptytrash_values,
                             disable_inventory => 1,
                             disable_select    => 1,
                           },
@@ -220,9 +221,9 @@ sub table_info {
                             disable_select    => 1,
                         },
       'acct_def_cgp_timezone' => {
-                            label             => 'Acct. default time zone',
-                            type              => 'select',
-                            select_list       => __PACKAGE__->cgp_timezone,
+                            label       => 'Acct. default time zone',
+                            type        => 'select',
+                            select_list => __PACKAGE__->cgp_timezone_values,
                             disable_inventory => 1,
                             disable_select    => 1,
                         },
@@ -492,7 +493,8 @@ sub check {
               #XXX archive messages
               #preferences
               || $self->ut_alphasn('acct_def_cgp_deletemode')
-              || $self->ut_alphan('acct_def_cgp_emptytrash')
+              || $self->ut_enum('acct_def_cgp_emptytrash',
+                                   $self->cgp_emptytrash_values )
               || $self->ut_alphan('acct_def_cgp_language')
               || $self->ut_textn('acct_def_cgp_timezone')
               || $self->ut_textn('acct_def_cgp_skinname')