RT#37165: Print document when account is created

[freeside.git] / FS / FS / Conf.pm

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index c4e5af4..90b5d29 100644 (file)
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1,7 +1,9 @@
 package FS::Conf;
 
 package FS::Conf;
 

-use vars qw($base_dir @config_items @base_items @card_types $DEBUG);

 use strict;
 use strict;

+use vars qw( $base_dir @config_items @base_items @card_types $DEBUG
+             $conf_cache $conf_cache_enabled
+           );

 use Carp;
 use IO::File;
 use File::Basename;
 use Carp;
 use IO::File;
 use File::Basename;


@@ -9,18 +11,19 @@ use MIME::Base64;
 use Locale::Currency;
 use FS::ConfItem;
 use FS::ConfDefaults;
 use Locale::Currency;
 use FS::ConfItem;
 use FS::ConfDefaults;

-use FS::Conf_compat17;

 use FS::Locales;
 use FS::payby;
 use FS::conf;
 use FS::Record qw(qsearch qsearchs);
 use FS::Locales;
 use FS::payby;
 use FS::conf;
 use FS::Record qw(qsearch qsearchs);

-use FS::UID qw(dbh datasrc use_confcompat);
+use FS::UID qw(dbh datasrc);

 use FS::Misc::Invoicing qw( spool_formats );
 
 $base_dir = '%%%FREESIDE_CONF%%%';
 
 $DEBUG = 0;
 
 use FS::Misc::Invoicing qw( spool_formats );
 
 $base_dir = '%%%FREESIDE_CONF%%%';
 
 $DEBUG = 0;
 

+$conf_cache_enabled = 0;
+

 =head1 NAME
 
 FS::Conf - Freeside configuration values
 =head1 NAME
 
 FS::Conf - Freeside configuration values


@@ -109,18 +112,12 @@ specific value(s) is returned.
 
 =cut
 
 
 =cut
 

-sub _usecompat {
-  my ($self, $method) = (shift, shift);
-  carp "NO CONFIGURATION RECORDS FOUND -- USING COMPATIBILITY MODE"
-    if use_confcompat;
-  my $compat = new FS::Conf_compat17 ("$base_dir/conf." . datasrc);
-  $compat->$method(@_);
-}
-

 sub _config {
   my($self,$name,$agentnum,$agentonly)=@_;
   my $hashref = { 'name' => $name };
   local $FS::Record::conf = undef;  # XXX evil hack prevents recursion
 sub _config {
   my($self,$name,$agentnum,$agentonly)=@_;
   my $hashref = { 'name' => $name };
   local $FS::Record::conf = undef;  # XXX evil hack prevents recursion

+  $conf_cache = undef unless $conf_cache_enabled; # use cache only when it is
+                                                  # safe to do so

   my $cv;
   my @a = (
     ($agentnum || ()),
   my $cv;
   my @a = (
     ($agentnum || ()),


@@ -134,9 +131,14 @@ sub _config {
   foreach my $a (@a) {
     $hashref->{agentnum} = $a;
     foreach my $l (@l) {
   foreach my $a (@a) {
     $hashref->{agentnum} = $a;
     foreach my $l (@l) {

-      $hashref->{locale} = $l;
-      $cv = FS::Record::qsearchs('conf', $hashref);
-      return $cv if $cv;
+      my $key = join(':',$name, $a, $l);
+      if (! exists $conf_cache->{$key}){
+        $hashref->{locale} = $l;
+        # $conf_cache is reset in FS::UID during myconnect, so the cache is
+        # reset per connection
+        $conf_cache->{$key} = FS::Record::qsearchs('conf', $hashref);
+      }
+      return $conf_cache->{$key} if $conf_cache->{$key};

     }
   }
   return undef;
     }
   }
   return undef;


@@ -144,7 +146,6 @@ sub _config {
 
 sub config {
   my $self = shift;
 
 sub config {
   my $self = shift;

-  return $self->_usecompat('config', @_) if use_confcompat;

 
   carp "FS::Conf->config(". join(', ', @_). ") called"
     if $DEBUG > 1;
 
   carp "FS::Conf->config(". join(', ', @_). ") called"
     if $DEBUG > 1;


@@ -168,7 +169,6 @@ Returns the exact scalar value for key.
 
 sub config_binary {
   my $self = shift;
 
 sub config_binary {
   my $self = shift;

-  return $self->_usecompat('config_binary', @_) if use_confcompat;

 
   my $cv = $self->_config(@_) or return;
   length($cv->value) ? decode_base64($cv->value) : '';
 
   my $cv = $self->_config(@_) or return;
   length($cv->value) ? decode_base64($cv->value) : '';


@@ -183,7 +183,6 @@ is undefined.
 
 sub exists {
   my $self = shift;
 
 sub exists {
   my $self = shift;

-  return $self->_usecompat('exists', @_) if use_confcompat;

 
   #my($name, $agentnum)=@_;
 
 
   #my($name, $agentnum)=@_;
 


@@ -198,7 +197,6 @@ sub exists {
 
 sub config_bool {
   my $self = shift;
 
 sub config_bool {
   my $self = shift;

-  return $self->_usecompat('exists', @_) if use_confcompat;

 
   my($name,$agentnum,$agentonly) = @_;
 
 
   my($name,$agentnum,$agentonly) = @_;
 


@@ -253,7 +251,6 @@ KEY_SUFFIX, if it exists, otherwise for KEY
 # these to fall back to standard values
 sub config_orbase {
   my $self = shift;
 # these to fall back to standard values
 sub config_orbase {
   my $self = shift;

-  return $self->_usecompat('config_orbase', @_) if use_confcompat;

 
   my( $name, $suffix ) = @_;
   if ( $self->exists("${name}_$suffix") ) {
 
   my( $name, $suffix ) = @_;
   if ( $self->exists("${name}_$suffix") ) {


@@ -273,7 +270,6 @@ config_orbase.
 
 sub key_orbase {
   my $self = shift;
 
 sub key_orbase {
   my $self = shift;

-  #no compat for this...return $self->_usecompat('config_orbase', @_) if use_confcompat;

 
   my( $name, $suffix ) = @_;
   if ( $self->exists("${name}_$suffix") ) {
 
   my( $name, $suffix ) = @_;
   if ( $self->exists("${name}_$suffix") ) {


@@ -316,7 +312,6 @@ Creates the specified configuration key if it does not exist.
 
 sub touch {
   my $self = shift;
 
 sub touch {
   my $self = shift;

-  return $self->_usecompat('touch', @_) if use_confcompat;

 
   my($name, $agentnum) = @_;
   #unless ( $self->exists($name, $agentnum) ) {
 
   my($name, $agentnum) = @_;
   #unless ( $self->exists($name, $agentnum) ) {


@@ -337,7 +332,6 @@ Sets the specified configuration key to the given value.
 
 sub set {
   my $self = shift;
 
 sub set {
   my $self = shift;

-  return $self->_usecompat('set', @_) if use_confcompat;

 
   my($name, $value, $agentnum) = @_;
   $value =~ /^(.*)$/s;
 
   my($name, $value, $agentnum) = @_;
   $value =~ /^(.*)$/s;


@@ -362,6 +356,12 @@ sub set {
     $error = $new->insert;
   }
 
     $error = $new->insert;
   }
 

+  if (! $error) {
+    # clean the object cache
+    my $key = join(':',$name, $agentnum, $self->{locale});
+    $conf_cache->{ $key } = $new;
+  }
+

   die "error setting configuration value: $error \n"
     if $error;
 
   die "error setting configuration value: $error \n"
     if $error;
 


@@ -376,7 +376,6 @@ can be retrieved with config_binary.
 
 sub set_binary {
   my $self  = shift;
 
 sub set_binary {
   my $self  = shift;

-  return if use_confcompat;

 
   my($name, $value, $agentnum)=@_;
   $self->set($name, encode_base64($value), $agentnum);
 
   my($name, $value, $agentnum)=@_;
   $self->set($name, encode_base64($value), $agentnum);


@@ -390,7 +389,6 @@ Deletes the specified configuration key.
 
 sub delete {
   my $self = shift;
 
 sub delete {
   my $self = shift;

-  return $self->_usecompat('delete', @_) if use_confcompat;

 
   my($name, $agentnum) = @_;
   if ( my $cv = FS::Record::qsearchs('conf', {name => $name, agentnum => $agentnum, locale => $self->{locale}}) ) {
 
   my($name, $agentnum) = @_;
   if ( my $cv = FS::Record::qsearchs('conf', {name => $name, agentnum => $agentnum, locale => $self->{locale}}) ) {


@@ -417,7 +415,6 @@ sub delete {
 
 sub delete_bool {
   my $self = shift;
 
 sub delete_bool {
   my $self = shift;

-  return $self->_usecompat('delete', @_) if use_confcompat;

 
   my($name, $agentnum) = @_;
 
 
   my($name, $agentnum) = @_;
 


@@ -448,7 +445,7 @@ in the directory DIR.
 sub import_config_item { 
   my ($self,$item,$dir) = @_;
   my $key = $item->key;
 sub import_config_item { 
   my ($self,$item,$dir) = @_;
   my $key = $item->key;

-  if ( -e "$dir/$key" && ! use_confcompat ) {
+  if ( -e "$dir/$key" ) {

     warn "Inserting $key\n" if $DEBUG;
     local $/;
     my $value = readline(new IO::File "$dir/$key");
     warn "Inserting $key\n" if $DEBUG;
     local $/;
     my $value = readline(new IO::File "$dir/$key");


@@ -457,68 +454,9 @@ sub import_config_item {
     }else{
       $self->set($key, $value);
     }
     }else{
       $self->set($key, $value);
     }

-  }else {
-    warn "Not inserting $key\n" if $DEBUG;
-  }
-}
-
-=item verify_config_item CONFITEM DIR 
-
-  Compares the item specified by the CONFITEM (see L<FS::ConfItem>) in
-the database to the legacy file value in DIR.
-
-=cut
-
-sub verify_config_item { 
-  return '' if use_confcompat;
-  my ($self,$item,$dir) = @_;
-  my $key = $item->key;
-  my $type = $item->type;
-
-  my $compat = new FS::Conf_compat17 $dir;
-  my $error = '';
-  
-  $error .= "$key fails existential comparison; "
-    if $self->exists($key) xor $compat->exists($key);
-
-  if ( $type !~ /^(binary|image)$/ ) {
-
-    {
-      no warnings;
-      $error .= "$key fails scalar comparison; "
-        unless scalar($self->config($key)) eq scalar($compat->config($key));
-    }
-
-    my (@new) = $self->config($key);
-    my (@old) = $compat->config($key);
-    unless ( scalar(@new) == scalar(@old)) { 
-      $error .= "$key fails list comparison; ";
-    }else{
-      my $r=1;
-      foreach (@old) { $r=0 if ($_ cmp shift(@new)); }
-      $error .= "$key fails list comparison; "
-        unless $r;
-    }
-

   } else {
   } else {

-
-    no warnings 'uninitialized';
-    $error .= "$key fails binary comparison; "
-      unless scalar($self->config_binary($key)) eq scalar($compat->config_binary($key));
-
+    warn "Not inserting $key\n" if $DEBUG;

   }
   }

-
-#remove deprecated config on our own terms, not freeside-upgrade's
-#  if ($error =~ /existential comparison/ && $item->section eq 'deprecated') {
-#    my $proto;
-#    for ( @config_items ) { $proto = $_; last if $proto->key eq $key;  }
-#    unless ($proto->key eq $key) { 
-#      warn "removed config item $error\n" if $DEBUG;
-#      $error = '';
-#    }
-#  }
-
-  $error;

 }
 
 #item _orbase_items OPTIONS
 }
 
 #item _orbase_items OPTIONS


@@ -589,7 +527,6 @@ FS::ConfItem objects.  See L<FS::ConfItem>.
 
 sub config_items {
   my $self = shift; 
 
 sub config_items {
   my $self = shift; 

-  return $self->_usecompat('config_items', @_) if use_confcompat;

 
   ( @config_items, $self->_orbase_items(@_) );
 }
 
   ( @config_items, $self->_orbase_items(@_) );
 }


@@ -625,23 +562,11 @@ to conf records in the database.
 sub init_config {
   my $dir = shift;
 
 sub init_config {
   my $dir = shift;
 

-  {
-    local $FS::UID::use_confcompat = 0;
-    my $conf = new FS::Conf;
-    foreach my $item ( $conf->config_items(dir => $dir) ) {
-      $conf->import_config_item($item, $dir);
-      my $error = $conf->verify_config_item($item, $dir);
-      return $error if $error;
-    }
-  
-    my $compat = new FS::Conf_compat17 $dir;
-    foreach my $item ( $compat->config_items ) {
-      my $error = $conf->verify_config_item($item, $dir);
-      return $error if $error;
-    }
+  my $conf = new FS::Conf;
+  foreach my $item ( $conf->config_items(dir => $dir) ) {
+    $conf->import_config_item($item, $dir);

   }
 
   }
 

-  $FS::UID::use_confcompat = 0;

   '';  #success
 }
 
   '';  #success
 }
 


@@ -680,10 +605,12 @@ invoice_latexfooter
 invoice_latexsmallfooter
 invoice_latexnotes
 invoice_latexcoupon
 invoice_latexsmallfooter
 invoice_latexnotes
 invoice_latexcoupon

+invoice_latexwatermark

 invoice_html
 invoice_htmlreturnaddress
 invoice_htmlfooter
 invoice_htmlnotes
 invoice_html
 invoice_htmlreturnaddress
 invoice_htmlfooter
 invoice_htmlnotes

+invoice_htmlwatermark

 logo.png
 logo.eps
 );
 logo.png
 logo.eps
 );


@@ -778,6 +705,11 @@ sub reason_type_options {
   }
 }
 
   }
 }
 

+my $validate_email = sub { $_[0] =~
+                             /^[^@]+\@[[:alnum:]-]+(\.[[:alnum:]-]+)+$/
+                             ? '' : 'Invalid email address';
+                         };
+

 #Billing (81 items)
 #Invoicing (50 items)
 #UI (69 items)
 #Billing (81 items)
 #Invoicing (50 items)
 #UI (69 items)


@@ -1269,10 +1201,7 @@ sub reason_type_options {
     'description' => 'Return address on email invoices (address only, see invoice_from_name)',
     'type'        => 'text',
     'per_agent'   => 1,
     'description' => 'Return address on email invoices (address only, see invoice_from_name)',
     'type'        => 'text',
     'per_agent'   => 1,

-    'validate'    => sub { $_[0] =~
-                             /^[^@]+\@[[:alnum:]-]+(\.[[:alnum:]-]+)+$/
-                             ? '' : 'Invalid email address';
-                         }
+    'validate'    => $validate_email,

   },
 
   {
   },
 
   {


@@ -1378,6 +1307,15 @@ sub reason_type_options {
     'per_locale'  => 1,
   },
 
     'per_locale'  => 1,
   },
 

+  {
+    'key'         => 'invoice_htmlwatermark',
+    'section'     => 'invoicing',
+    'description' => 'Watermark for HTML invoices. Appears in a semitransparent positioned DIV overlaid on the main invoice container.',
+    'type'        => 'textarea',
+    'per_agent'   => 1,
+    'per_locale'  => 1,
+  },
+

   {
     'key'         => 'invoice_latex',
     'section'     => 'invoicing',
   {
     'key'         => 'invoice_latex',
     'section'     => 'invoicing',


@@ -1565,6 +1503,15 @@ and customer address. Include units.',
     'per_locale'  => 1,
   },
 
     'per_locale'  => 1,
   },
 

+  {
+    'key'         => 'invoice_latexwatermark',
+    'section'     => 'invoicing',
+    'description' => 'Watermark for LaTeX invoices. See "texdoc background" for information on what this can contain. The content itself should be enclosed in braces, optionally followed by a comma and any formatting options.',
+    'type'        => 'textarea',
+    'per_agent'   => 1,
+    'per_locale'  => 1,
+  },
+

   {
     'key'         => 'invoice_email_pdf',
     'section'     => 'invoicing',
   {
     'key'         => 'invoice_email_pdf',
     'section'     => 'invoicing',


@@ -2370,6 +2317,7 @@ and customer address. Include units.',
                        'svc_acct'  => 'Account (svc_acct)',
                        'svc_phone' => 'Phone number (svc_phone)',
                        'svc_pbx'   => 'PBX (svc_pbx)',
                        'svc_acct'  => 'Account (svc_acct)',
                        'svc_phone' => 'Phone number (svc_phone)',
                        'svc_pbx'   => 'PBX (svc_pbx)',

+                       'none'      => 'None - package only',

                      ],
   },
   
                      ],
   },
   


@@ -2526,65 +2474,107 @@ and customer address. Include units.',
 
   {
     'key'         => 'enable_taxclasses',
 
   {
     'key'         => 'enable_taxclasses',

-    'section'     => 'billing',
+    'section'     => 'taxation',

     'description' => 'Enable per-package tax classes',
     'type'        => 'checkbox',
   },
 
   {
     'key'         => 'require_taxclasses',
     'description' => 'Enable per-package tax classes',
     'type'        => 'checkbox',
   },
 
   {
     'key'         => 'require_taxclasses',

-    'section'     => 'billing',
+    'section'     => 'taxation',

     'description' => 'Require a taxclass to be entered for every package',
     'type'        => 'checkbox',
   },
 
   {
     'description' => 'Require a taxclass to be entered for every package',
     'type'        => 'checkbox',
   },
 
   {

-    'key'         => 'enable_taxproducts',
-    'section'     => 'billing',
+    'key'         => 'tax_data_vendor',
+    'section'     => 'taxation',

     'description' => 'Tax data vendor you are using.',
     'type'        => 'select',
     'description' => 'Tax data vendor you are using.',
     'type'        => 'select',

-    'select_enum' => [ 'cch', 'billsoft', 'avalara' ],
+    'select_enum' => [ '', 'cch', 'billsoft', 'avalara', 'suretax' ],

   },
 
   {
     'key'         => 'taxdatadirectdownload',
   },
 
   {
     'key'         => 'taxdatadirectdownload',

-    'section'     => 'billing',  #well
-    'description' => 'Enable downloading tax data directly from the vendor site. at least three lines: URL, username, and password.j',
+    'section'     => 'taxation',
+    'description' => 'Enable downloading tax data directly from CCH. at least three lines: URL, username, and password.j',

     'type'        => 'textarea',
   },
 
   {
     'key'         => 'ignore_incalculable_taxes',
     'type'        => 'textarea',
   },
 
   {
     'key'         => 'ignore_incalculable_taxes',

-    'section'     => 'billing',
+    'section'     => 'taxation',

     'description' => 'Prefer to invoice without tax over not billing at all',
     'type'        => 'checkbox',
   },
 
   {
     'key'         => 'billsoft-company_code',
     'description' => 'Prefer to invoice without tax over not billing at all',
     'type'        => 'checkbox',
   },
 
   {
     'key'         => 'billsoft-company_code',

-    'section'     => 'billing',
+    'section'     => 'taxation',

     'description' => 'Billsoft tax service company code (3 letters)',
     'type'        => 'text',
   },
 
   {
     'key'         => 'avalara-taxconfig',
     'description' => 'Billsoft tax service company code (3 letters)',
     'type'        => 'text',
   },
 
   {
     'key'         => 'avalara-taxconfig',

-    'section'     => 'billing',
+    'section'     => 'taxation',

     'description' => 'Avalara tax service configuration. Four lines: company code, account number, license key, test mode (1 to enable).',
     'type'        => 'textarea',
   },
 
     'description' => 'Avalara tax service configuration. Four lines: company code, account number, license key, test mode (1 to enable).',
     'type'        => 'textarea',
   },
 

+  {
+    'key'         => 'suretax-hostname',
+    'section'     => 'taxation',
+    'description' => 'SureTax server name; defaults to the test server.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'suretax-client_number',
+    'section'     => 'taxation',
+    'description' => 'SureTax tax service client ID.',
+    'type'        => 'text',
+  },
+  {
+    'key'         => 'suretax-validation_key',
+    'section'     => 'taxation',
+    'description' => 'SureTax validation key (UUID).',
+    'type'        => 'text',
+  },
+  {
+    'key'         => 'suretax-business_unit',
+    'section'     => 'taxation',
+    'description' => 'SureTax client business unit name; optional.',
+    'type'        => 'text',
+    'per_agent'   => 1,
+  },
+  {
+    'key'         => 'suretax-regulatory_code',
+    'section'     => 'taxation',
+    'description' => 'SureTax client regulatory status.',
+    'type'        => 'select',
+    'select_enum' => [ '', 'ILEC', 'IXC', 'CLEC', 'VOIP', 'ISP', 'Wireless' ],
+    'per_agent'   => 1,
+  },
+
+

   {
     'key'         => 'welcome_msgnum',
     'section'     => 'notification',
     'description' => 'Template to use for welcome messages when a svc_acct record is created.',
     %msg_template_options,
   },
   {
     'key'         => 'welcome_msgnum',
     'section'     => 'notification',
     'description' => 'Template to use for welcome messages when a svc_acct record is created.',
     %msg_template_options,
   },

-  
+
+  { 'key'         => 'svc_acct_welcome_letter',
+    'section'     => 'notification',
+    'description' => 'Optional LaTex template for a printed welcome letter when a svc_acct record is created.  Fields from the customer and svc_acct records are available for substitution.',
+    'type'        => 'textarea',
+  },
+

   {
     'key'         => 'svc_acct_welcome_exclude',
     'section'     => 'notification',
   {
     'key'         => 'svc_acct_welcome_exclude',
     'section'     => 'notification',

-    'description' => 'A list of svc_acct services for which no welcome email is to be sent.',
+    'description' => 'A list of svc_acct services for which no welcome email or letter is to be sent.',

     'type'        => 'select-part_svc',
     'multiple'    => 1,
   },
     'type'        => 'select-part_svc',
     'multiple'    => 1,
   },


@@ -2680,6 +2670,13 @@ and customer address. Include units.',
     'select_enum' => [ qw(CARD DCRD CHEK DCHK CASH WEST MCRD MCHK PPAL) ],
   },
 
     'select_enum' => [ qw(CARD DCRD CHEK DCHK CASH WEST MCRD MCHK PPAL) ],
   },
 

+  {
+    'key'         => 'banned_pay-pad',
+    'section'     => 'billing',
+    'description' => 'Padding for encrypted storage of banned credit card hashes.  If you already have new-style SHA512 entries in the banned_pay table, do not change as this will invalidate the old entries.',
+    'type'        => 'text',
+  },
+

   {
     'key'         => 'payby-default',
     'section'     => 'deprecated',
   {
     'key'         => 'payby-default',
     'section'     => 'deprecated',


@@ -2768,6 +2765,14 @@ and customer address. Include units.',
     'type'        => 'text',
   },
 
     'type'        => 'text',
   },
 

+  {
+    'key'         => 'dump-email_to',
+    'section'     => '',
+    'description' => "Optional email address to send success/failure message for database dumps.",
+    'type'        => 'text',
+    'validate'    => $validate_email,
+  },
+

   {
     'key'         => 'users-allow_comp',
     'section'     => 'deprecated',
   {
     'key'         => 'users-allow_comp',
     'section'     => 'deprecated',


@@ -2829,6 +2834,13 @@ and customer address. Include units.',
     'type'        => 'checkbox',
   },
 
     'type'        => 'checkbox',
   },
 

+  {
+    'key'         => 'manual_process-single_invoice_amount',
+    'section'     => 'billing',
+    'description' => 'When entering manual credit card and ACH payments, amount will not autofill if the customer has more than one open invoice',
+    'type'        => 'checkbox',
+  },
+

   {
     'key'         => 'manual_process-pkgpart',
     'section'     => 'billing',
   {
     'key'         => 'manual_process-pkgpart',
     'section'     => 'billing',


@@ -3376,14 +3388,6 @@ and customer address. Include units.',
     'per_agent'   => 1,
   },
 
     'per_agent'   => 1,
   },
 

-  {
-    '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',
   {
     'key'         => 'echeck-void',
     'section'     => 'deprecated',


@@ -3739,14 +3743,14 @@ and customer address. Include units.',
 
   {
     'key'         => 'tax-ship_address',
 
   {
     'key'         => 'tax-ship_address',

-    'section'     => 'billing',
+    'section'     => 'taxation',

     'description' => 'By default, tax calculations are done based on the billing address.  Enable this switch to calculate tax based on the shipping address instead.',
     'type'        => 'checkbox',
   }
 ,
   {
     'key'         => 'tax-pkg_address',
     'description' => 'By default, tax calculations are done based on the billing address.  Enable this switch to calculate tax based on the shipping address instead.',
     'type'        => 'checkbox',
   }
 ,
   {
     'key'         => 'tax-pkg_address',

-    'section'     => 'billing',
+    'section'     => 'taxation',

     'description' => 'By default, tax calculations are done based on the billing address.  Enable this switch to calculate tax based on the package address instead (when present).',
     'type'        => 'checkbox',
   },
     'description' => 'By default, tax calculations are done based on the billing address.  Enable this switch to calculate tax based on the package address instead (when present).',
     'type'        => 'checkbox',
   },


@@ -3936,7 +3940,7 @@ and customer address. Include units.',
   {
     'key'         => 'batchconfig-RBC',
     'section'     => 'billing',
   {
     'key'         => 'batchconfig-RBC',
     'section'     => 'billing',

-    'description' => 'Configuration for Royal Bank of Canada PDS batching, four lines: 1. Client number, 2. Short name, 3. Long name, 4. Transaction code.',
+    'description' => 'Configuration for Royal Bank of Canada PDS batching, five lines: 1. Client number, 2. Short name, 3. Long name, 4. Transaction code 5. (optional) set to TEST to turn on test mode.',

     'type'        => 'textarea',
   },
 
     'type'        => 'textarea',
   },
 


@@ -3976,6 +3980,13 @@ and customer address. Include units.',
     'type'        => 'text',
   },
 
     'type'        => 'text',
   },
 

+  {
+    'key'         => 'batchconfig-nacha-origin_name',
+    'section'     => 'billing',
+    'description' => 'Configuration for NACHA batching, Origin name (defaults to company name, but sometimes bank name is needed instead.)',
+    'type'        => 'text',
+  },
+

   {
     'key'         => 'batch-manual_approval',
     'section'     => 'billing',
   {
     'key'         => 'batch-manual_approval',
     'section'     => 'billing',


@@ -4379,8 +4390,22 @@ and customer address. Include units.',
   {
     'key'         => 'previous_balance-exclude_from_total',
     'section'     => 'invoicing',
   {
     'key'         => 'previous_balance-exclude_from_total',
     'section'     => 'invoicing',

-    'description' => 'Do not include previous balance in the \'Total\' line.  Only meaningful when invoice_sections is false.  Optionally provide text to override the Total New Charges description',
-    'type'        => [ qw(checkbox text) ],
+    'description' => 'Show separate totals for previous invoice balance and new charges. Only meaningful when invoice_sections is false.',
+    'type'        => 'checkbox',
+  },
+
+  {
+    'key'         => 'previous_balance-text',
+    'section'     => 'invoicing',
+    'description' => 'Text for the label of the total previous balance, when it is shown separately. Defaults to "Previous Balance".',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'previous_balance-text-total_new_charges',
+    'section'     => 'invoicing',
+    'description' => 'Text for the label of the total of new charges, when it is shown separately. If invoice_show_prior_due_date is enabled, the due date of current charges will be appended. Defaults to "Total New Charges".',
+    'type'        => 'text',

   },
 
   {
   },
 
   {


@@ -4416,6 +4441,7 @@ and customer address. Include units.',
     'section'     => 'invoicing',
     'description' => 'Instead of showing payments (and credits) applied to the invoice, show those received since the previous invoice date.',
     'type'        => 'checkbox',
     'section'     => 'invoicing',
     'description' => 'Instead of showing payments (and credits) applied to the invoice, show those received since the previous invoice date.',
     'type'        => 'checkbox',

+                       'uscensus' => 'U.S. Census Bureau',

   },
 
   {
   },
 
   {


@@ -4503,6 +4529,13 @@ and customer address. Include units.',
     'type'        => 'checkbox',
   },
 
     'type'        => 'checkbox',
   },
 

+  {
+    'key'         => 'cust_main-no_city_in_address',
+    'section'     => 'UI',
+    'description' => 'Turn off City for billing & shipping addresses',
+    'type'        => 'checkbox',
+  },
+

   {
     'key'         => 'census_year',
     'section'     => 'UI',
   {
     'key'         => 'census_year',
     'section'     => 'UI',


@@ -4513,7 +4546,7 @@ and customer address. Include units.',
 
   {
     'key'         => 'tax_district_method',
 
   {
     'key'         => 'tax_district_method',

-    'section'     => 'UI',
+    'section'     => 'taxation',

     'description' => 'The method to use to look up tax district codes.',
     'type'        => 'select',
     #'select_hash' => [ FS::Misc::Geo::get_district_methods() ],
     'description' => 'The method to use to look up tax district codes.',
     'type'        => 'select',
     #'select_hash' => [ FS::Misc::Geo::get_district_methods() ],


@@ -5274,7 +5307,7 @@ and customer address. Include units.',
 
   {
     'key'         => 'tax-cust_exempt-groups',
 
   {
     'key'         => 'tax-cust_exempt-groups',

-    'section'     => 'billing',
+    'section'     => 'taxation',

     'description' => 'List of grouping possibilities for tax names, for per-customer exemption purposes, one tax name per line.  For example, "GST" would indicate the ability to exempt customers individually from taxes named "GST" (but not other taxes).',
     'type'        => 'textarea',
   },
     'description' => 'List of grouping possibilities for tax names, for per-customer exemption purposes, one tax name per line.  For example, "GST" would indicate the ability to exempt customers individually from taxes named "GST" (but not other taxes).',
     'type'        => 'textarea',
   },


@@ -5288,7 +5321,7 @@ and customer address. Include units.',
 
   {
     'key'         => 'tax-cust_exempt-groups-num_req',
 
   {
     'key'         => 'tax-cust_exempt-groups-num_req',

-    'section'     => 'billing',
+    'section'     => 'taxation',

     'description' => 'When using tax-cust_exempt-groups, control whether individual tax exemption numbers are required for exemption from different taxes.',
     'type'        => 'select',
     'select_hash' => [ ''            => 'Not required',
     'description' => 'When using tax-cust_exempt-groups, control whether individual tax exemption numbers are required for exemption from different taxes.',
     'type'        => 'select',
     'select_hash' => [ ''            => 'Not required',


@@ -5316,7 +5349,7 @@ and customer address. Include units.',
 
   {
     'key'         => 'enable_tax_adjustments',
 
   {
     'key'         => 'enable_tax_adjustments',

-    'section'     => 'billing',
+    'section'     => 'taxation',

     'description' => 'Enable the ability to add manual tax adjustments.',
     'type'        => 'checkbox',
   },
     'description' => 'Enable the ability to add manual tax adjustments.',
     'type'        => 'checkbox',
   },


@@ -5769,7 +5802,7 @@ and customer address. Include units.',
 
   {
     'key'         => 'cust_class-tax_exempt',
 
   {
     'key'         => 'cust_class-tax_exempt',

-    'section'     => 'billing',
+    'section'     => 'taxation',

     'description' => 'Control the tax exemption flag per customer class rather than per indivual customer.',
     'type'        => 'checkbox',
   },
     'description' => 'Control the tax exemption flag per customer class rather than per indivual customer.',
     'type'        => 'checkbox',
   },


@@ -5804,6 +5837,13 @@ and customer address. Include units.',
     'type'        => 'checkbox',
   },
 
     'type'        => 'checkbox',
   },
 

+  {
+    'key'         => 'selfservice-enable_payment_without_balance',
+    'section'     => 'self-service',
+    'description' => 'Allow selfservice customers to make payments even if balance is zero or below (resulting in an unapplied payment and negative balance.)',
+    'type'        => 'checkbox',
+  },
+

   {
     'key'         => 'logout-timeout',
     'section'     => 'UI',
   {
     'key'         => 'logout-timeout',
     'section'     => 'UI',


@@ -5957,6 +5997,13 @@ and customer address. Include units.',
     'type'        => 'checkbox',
   },
 
     'type'        => 'checkbox',
   },
 

+  {
+    'key'         => 'default_appointment_length',
+    'section'     => 'UI',
+    'description' => 'Default appointment length, in minutes (30 minute granularity).',
+    'type'        => 'text',
+  },
+

   { key => "apacheroot", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachine", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apacheroot", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachine", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },
   { key => "apachemachines", section => "deprecated", description => "<b>DEPRECATED</b>", type => "text" },