communigate provisioning phase 2: Domain:Account Defaults:Settings: RulesAllowed...

[freeside.git] / FS / FS / svc_domain.pm

diff --git a/FS/FS/svc_domain.pm b/FS/FS/svc_domain.pm
index b928e26..f8c6615 100644 (file)
--- a/FS/FS/svc_domain.pm
+++ b/FS/FS/svc_domain.pm
@@ -144,9 +144,13 @@ sub table_info {
                            },
       'acct_def_password_selfchange' => { label => 'Acct. default Password modification',
                                  type  => 'checkbox',
+                            disable_inventory => 1,
+                            disable_select    => 1,
                                },
       'acct_def_password_recover'    => { label => 'Acct. default Password recovery',
                                  type  => 'checkbox',
+                            disable_inventory => 1,
+                            disable_select    => 1,
                                },
       'acct_def_cgp_deletemode' => { 
                             label => 'Acct. default Communigate message delete method',
@@ -415,6 +419,7 @@ sub check {
   my $error = $self->ut_numbern('svcnum')
               || $self->ut_numbern('catchall')
               || $self->ut_numbern('max_accounts')
+              || $self->ut_anything('trailer') #well
               || $self->ut_textn('cgp_aliases') #well
               || $self->ut_enum('acct_def_password_selfchange', [ '', 'Y' ])
               || $self->ut_enum('acct_def_password_recover',    [ '', 'Y' ])
@@ -425,6 +430,10 @@ sub check {
               || $self->ut_alphan('acct_def_maxsize')
               || $self->ut_alphasn('acct_def_cgp_deletemode')
               || $self->ut_alphan('acct_def_cgp_emptytrash')
+              || $self->ut_textn('acct_def_cgp_rulesallowed')
+              || $self->ut_enum('acct_def_cgp_rpopallowed', [ '', 'Y' ])
+              || $self->ut_enum('acct_def_cgp_mailtoall', [ '', 'Y' ])
+              || $self->ut_enum('acct_def_cgp_addmailtrailer', [ '', 'Y' ])
   ;
   return $error if $error;