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

diff --combined FS/FS/Conf.pm
index 9ba3f09,2b959e6..a1faecf
--- 1/FS/FS/Conf.pm
--- 2/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@@ -2996,7 -2996,7 +2996,7 @@@ and customer address. Include units.'
      'type'        => 'select',
      'select_hash' => [ '' => 'Password reset disabled',
                         'email' => 'Click on a link in email',
-                        'paymask,amount,zip' => 'Click on a link in email, and also verify with credit card (or bank account) last 4 digits, payment amount and zip code',
+                        'paymask,amount,zip' => 'Click on a link in email, and also verify with credit card (or bank account) last 4 digits, payment amount and zip code.  Note: Do not use if you have multi-customer contacts, as they will be unable to reset their passwords.',
                       ],
    },
  
@@@ -3352,14 -3352,6 +3352,14 @@@
    },
  
    {
 +    'key'         => 'city_not_required',
 +    'section'     => 'required',
 +    'description' => 'Turn off requirement for a City to be entered for billing & shipping addresses',
 +    'type'        => 'checkbox',
 +    'per_agent'   => 1,
 +  },
 +
 +  {
      'key'         => 'echeck-void',
      'section'     => 'deprecated',
      'description' => '<B>DEPRECATED</B>, now controlled by ACLs.  Used to enable local-only voiding of echeck payments in addition to refunds against the payment gateway',