From: ivan <ivan>
Date: Fri, 10 Apr 2009 19:33:29 +0000 (+0000)
Subject: better description for enable_taxproducts and a warning about tax-pkg_address with it
X-Git-Tag: root_of_svc_elec_features~1287
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=8a58ae3af817dd6f6d326fd934ce9feb90d6f800

better description for enable_taxproducts and a warning about tax-pkg_address with it
---

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 0c9dd6577..9d8c3f20e 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1506,7 +1506,7 @@ worry that config_items is freeside-specific and icky.
   {
     'key'         => 'enable_taxproducts',
     'section'     => 'billing',
-    'description' => 'Enable per-package mapping to new style tax classes',
+    'description' => 'Enable per-package mapping to vendor tax data from CCH or elsewhere.',
     'type'        => 'checkbox',
   },
 
@@ -2071,7 +2071,7 @@ worry that config_items is freeside-specific and icky.
   {
     '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',
   },