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

diff --combined FS/FS/Conf.pm
index 4497916,a1faecf..a4e26f7
--- 1/FS/FS/Conf.pm
--- 2/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@@ -2249,7 -2249,7 +2249,7 @@@ and customer address. Include units.'
      'section'     => 'self-service',
      'description' => 'Acceptable payment types for the signup server',
      'type'        => 'selectmultiple',
 -    'select_enum' => [ qw(CARD DCRD CHEK DCHK PREPAY PPAL BILL COMP) ],
 +    'select_enum' => [ qw(CARD DCRD CHEK DCHK PREPAY PPAL ) ], # BILL COMP) ],
    },
  
    {
@@@ -2652,13 -2652,13 +2652,13 @@@
      'section'     => 'billing',
      'description' => 'Available payment types.',
      'type'        => 'selectmultiple',
 -    'select_enum' => [ qw(CARD DCRD CHEK DCHK BILL CASH WEST MCRD MCHK PPAL COMP) ],
 +    'select_enum' => [ qw(CARD DCRD CHEK DCHK CASH WEST MCRD MCHK PPAL) ],
    },
  
    {
      'key'         => 'payby-default',
 -    'section'     => 'UI',
 -    'description' => 'Default payment type.  HIDE disables display of billing information and sets customers to BILL.',
 +    'section'     => 'deprecated',
 +    'description' => 'Deprecated; in 4.x there is no longer the concept of a single "payment type".  Used to indicate the default payment type.  HIDE disables display of billing information and sets customers to BILL.',
      'type'        => 'select',
      'select_enum' => [ '', qw(CARD DCRD CHEK DCHK BILL CASH WEST MCRD PPAL COMP HIDE) ],
    },
@@@ -3352,6 -3352,14 +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',