Merge branch 'master' of git.freeside.biz:/home/git/freeside

diff --combined FS/FS/Conf.pm
index d5384e1,50df3dd..b750ba5
--- 1/FS/FS/Conf.pm
--- 2/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@@ -2449,11 -2449,18 +2449,18 @@@ and customer address. Include units.'
    {
      'key'         => 'billsoft-company_code',
      'section'     => 'taxation',
-     'description' => 'Billsoft tax service company code (3 letters)',
+     'description' => 'Billsoft (AvaTax for Communications) tax service company code (3 letters)',
      'type'        => 'text',
    },
  
    {
+     'key'         => 'billsoft-taxconfig',
+     'section'     => 'taxation',
+     'description' => 'Billsoft tax configuration flags. Four lines: Facilities, Franchise, Regulated, Business Class. See the Avalara documentation for instructions on setting these flags.',
+     'type'        => 'textarea',
+   },
+ 
+   {
      'key'         => 'avalara-taxconfig',
      'section'     => 'taxation',
      'description' => 'Avalara tax service configuration. Four lines: company code, account number, license key, test mode (1 to enable).',
@@@ -2886,13 -2893,6 +2893,13 @@@
    },
  
    {
 +    'key'         => 'selfservice-password_reset_hours',
 +    'section'     => 'self-service',
 +    'description' => 'Numbers of hours an email password reset is valid.  Defaults to 24.',
 +    'type'        => 'text',
 +  },
 +
 +  {
      'key'         => 'selfservice-password_reset_msgnum',
      'section'     => 'self-service',
      'description' => 'Template to use for password reset emails.',