From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 9 Nov 2013 20:03:52 +0000 (-0800)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/freeside
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=0c04fc78f66d17a5736686757cd8f838715c8380;hp=-c

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

0c04fc78f66d17a5736686757cd8f838715c8380
diff --combined FS/FS/Conf.pm
index 81669dc65,b368c8fbc..6b9aab213
--- a/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.',