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

diff --combined FS/FS/Conf.pm
index 809333c,71b7ddf..2931f35
--- 1/FS/FS/Conf.pm
--- 2/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@@ -717,6 -717,18 +717,18 @@@ my %batch_gateway_options = 
    },
  );
  
+ my @cdr_formats = (
+   '' => '',
+   'default' => 'Default',
+   'source_default' => 'Default with source',
+   'accountcode_default' => 'Default plus accountcode',
+   'description_default' => 'Default with description field as destination',
+   'basic' => 'Basic',
+   'simple' => 'Simple',
+   'simple2' => 'Simple with source',
+   'accountcode_simple' => 'Simple with accountcode',
+ );
+ 
  # takes the reason class (C, R, S) as an argument
  sub reason_type_options {
    my $reason_class = shift;
@@@ -2062,7 -2074,7 +2074,7 @@@ and customer address. Include units.'
      'key'         => 'locale',
      'section'     => 'UI',
      'description' => 'Default locale',
 -    'type'        => 'select',
 +    'type'        => 'select-sub',
      'options_sub' => sub {
        map { $_ => FS::Locales->description($_) } FS::Locales->locales;
      },
@@@ -4760,6 -4772,13 +4772,13 @@@
    },
  
    {
+     'key'         => 'cdr-taqua-callerid_rewrite',
+     'section'     => 'telephony',
+     'description' => 'For the Taqua CDR format, pull Caller ID blocking information from secondary CDRs.',
+     'type'        => 'checkbox',
+   },
+ 
+   {
      'key'         => 'cdr-asterisk_australia_rewrite',
      'section'     => 'telephony',
      'description' => 'For Asterisk CDRs, assign CDR type numbers based on Australian conventions.',
@@@ -5351,6 -5370,22 +5370,22 @@@
    },
  
    {
+     'key'         => 'selfservice-default_cdr_format',
+     'section'     => 'self-service',
+     'description' => 'Format for showing outbound CDRs in self-service.  The per-package option overrides this.',
+     'type'        => 'select',
+     'select_hash' => \@cdr_formats,
+   },
+ 
+   {
+     'key'         => 'selfservice-default_inbound_cdr_format',
+     'section'     => 'self-service',
+     'description' => 'Format for showing inbound CDRs in self-service.  The per-package option overrides this.  Leave blank to avoid showing these CDRs.',
+     'type'        => 'select',
+     'select_hash' => \@cdr_formats,
+   },
+ 
+   {
      'key'         => 'logout-timeout',
      'section'     => 'UI',
      'description' => 'If set, automatically log users out of the backoffice after this many minutes.',