add a config value for disabling the ACLs... this should be good for a demo in 1...

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

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 9f607ed..eb0574d 100644 (file)
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -175,11 +175,12 @@ sub config_orbase {
 =item key_orbase KEY SUFFIX
 
 If the config value KEY_SUFFIX exists, returns KEY_SUFFIX, otherwise returns
 =item key_orbase KEY SUFFIX
 
 If the config value KEY_SUFFIX exists, returns KEY_SUFFIX, otherwise returns

-KEY.  Useful for which exact configuration option is returned by config_orbase.
+KEY.  Useful for determining which exact configuration option is returned by
+config_orbase.

 
 =cut
 
 
 =cut
 

-sub configkey_orbase {
+sub key_orbase {

   my $self = shift;
   #no compat for this...return $self->_usecompat('config_orbase', @_) if use_confcompat;
 
   my $self = shift;
   #no compat for this...return $self->_usecompat('config_orbase', @_) if use_confcompat;
 


@@ -868,7 +869,7 @@ worry that config_items is freeside-specific and icky.
   { 
     'key'         => 'invoice_sections',
     'section'     => 'billing',
   { 
     'key'         => 'invoice_sections',
     'section'     => 'billing',

-    'description' => 'Split invoice into sections and label according to package type when enabled.',
+    'description' => 'Split invoice into sections and label according to package class when enabled.',

     'type'        => 'checkbox',
   },
 
     'type'        => 'checkbox',
   },
 


@@ -1404,6 +1405,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'checkbox',
   },
 
     'type'        => 'checkbox',
   },
 

+  {
+    'key'         => 'enable_taxproducts',
+    'section'     => 'billing',
+    'description' => 'Enable per-package mapping to new style tax classes',
+    'type'        => 'checkbox',
+  },
+

   {
     'key'         => 'welcome_email',
     'section'     => '',
   {
     'key'         => 'welcome_email',
     'section'     => '',


@@ -2228,6 +2236,41 @@ worry that config_items is freeside-specific and icky.
                      ],
   },
 
                      ],
   },
 

+  {
+    'key'         => 'disable_previous_balance',
+    'section'     => 'billing',
+    'description' => 'Disable inclusion of previous balancem payment, and credit lines on invoices',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'usps_webtools-userid',
+    'section'     => 'UI',
+    'description' => 'Production UserID for USPS web tools.   Enables USPS address standardization.  See the <a href="http://www.usps.com/webtools/">USPS website</a>, register and agree not to use the tools for batch purposes.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'usps_webtools-password',
+    'section'     => 'UI',
+    'description' => 'Production password for USPS web tools.   Enables USPS address standardization.  See <a href="http://www.usps.com/webtools/">USPS website</a>, register and agree not to use the tools for batch purposes.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'cust_main-auto_standardize_address',
+    'section'     => 'UI',
+    'description' => 'When using USPS web tools, automatically standardize the address without asking.',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'disable_acl_changes',
+    'section'     => '',
+    'description' => 'Disable all ACL changes, for demos.',
+    'type'        => 'checkbox',
+  },
+

 );
 
 1;
 );
 
 1;