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

diff --combined FS/FS/Conf.pm
index 81669dc,b368c8f..6b9aab2
--- 1/FS/FS/Conf.pm
--- 2/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@@ -1724,21 -1724,6 +1724,21 @@@ and customer address. Include units.'
    },
  
    {
 +    'key'         => 'sip_passwordmin',
 +    'section'     => 'telephony',
 +    'description' => 'Minimum SIP password length (default 6)',
 +    'type'        => 'text',
 +  },
 +
 +  {
 +    'key'         => 'sip_passwordmax',
 +    'section'     => 'telephony',
 +    'description' => 'Maximum SIP password length (default 8) (don\'t set this over 12 if you need to import or export crypt() passwords)',
 +    'type'        => 'text',
 +  },
 +
 +
 +  {
      'key'         => 'password-noampersand',
      'section'     => 'password',
      'description' => 'Disallow ampersands in passwords',
@@@ -2055,6 -2040,13 +2055,13 @@@
    },
  
    {
+     'key'         => 'show_ship_company',
+     'section'     => 'UI',
+     'description' => 'Turns on display/collection of a "service company name" field for customers.',
+     'type'        => 'checkbox',
+   },
+ 
+   {
      'key'         => 'show_ss',
      'section'     => 'UI',
      'description' => 'Turns on display/collection of social security numbers in the web interface.  Sometimes required by electronic check (ACH) processors.',