Merge branch 'github/pr/55_reprise'

diff --cc FS/FS/Conf.pm
index d4d9d2b,90bb3b1..9f1a707
--- 1/FS/FS/Conf.pm
--- 2/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@@ -955,25 -968,18 +955,25 @@@ my $validate_email = sub { $_[0] =
  
    {
      'key'         => 'business-onlinepayment-currency',
 -    'section'     => 'billing',
 +    'section'     => 'credit_cards',
      'description' => 'Currency parameter for Business::OnlinePayment transactions.',
      'type'        => 'select',
-     'select_enum' => [ '', qw( USD AUD CAD DKK EUR GBP ILS JPY NZD ) ],
+     'select_enum' => [ '', qw( USD AUD CAD DKK EUR GBP ILS JPY NZD ARS ) ],
    },
  
    {
 +    'key'         => 'business-onlinepayment-verification',
 +    'section'     => 'credit_cards',
 +    'description' => 'Run a $1 authorization (followed by a void) to verify new credit card information.',
 +    'type'        => 'checkbox',
 +  },
 +
 +  {
      'key'         => 'currency',
 -    'section'     => 'billing',
 +    'section'     => 'localization',
      'description' => 'Main accounting currency',
      'type'        => 'select',
-     'select_enum' => [ '', qw( USD AUD CAD DKK EUR GBP ILS JPY NZD XAF ) ],
+     'select_enum' => [ '', qw( USD AUD CAD DKK EUR GBP ILS JPY NZD XAF ARS ) ],
    },
  
    {

diff --cc httemplate/pref/pref.html
Simple merge