This commit was manufactured by cvs2svn to create tag 'freeside_2_1_1'.

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

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 980bd62..b3e5477 100644 (file)
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -395,7 +395,6 @@ sub verify_config_item {
 
   } else {
 
-    no warnings 'uninitialized';
     $error .= "$key fails binary comparison; "
       unless scalar($self->config_binary($key)) eq scalar($compat->config_binary($key));
 
@@ -2718,7 +2717,7 @@ and customer address. Include units.',
   {
     'key'         => 'tax-pkg_address',
     'section'     => 'billing',
-    'description' => 'By default, tax calculations are done based on the billing address.  Enable this switch to calculate tax based on the package address instead (when present).',
+    'description' => 'By default, tax calculations are done based on the billing address.  Enable this switch to calculate tax based on the package address instead (when present).  Note that this option is currently incompatible with vendor data taxation enabled by enable_taxproducts.',
     'type'        => 'checkbox',
   },
 
@@ -3992,13 +3991,6 @@ and customer address. Include units.',
     'type'        => 'text',
   },
 
-  {
-    'key'         => 'part_pkg-default_suspend_bill',
-    'section'     => 'billing',
-    'description' => 'Default the "Continue recurring billing while suspended" flag to on for new package definitions.',
-    'type'        => 'checkbox',
-  },
-
   { key => "apacheroot", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachine", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },