X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=5f2c3b3556bede48b92c611ba8938c00ae2399ed;hb=4b4b3ca9cb0b7336293b759549b78fc903a7d8c8;hp=237ab1e58e850c7fc7873d686f8f43a3eb8a51e0;hpb=a5bbbed61e09dffffc5d7022cddb3f9ff62a955a;p=freeside.git

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 237ab1e58..5f2c3b355 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1258,6 +1258,13 @@ httemplate/docs/config.html
   },
 
   {
+    'key'         => 'require_taxclasses',
+    'section'     => 'billing',
+    'description' => 'Require a taxclass to be entered for every package',
+    'type'        => 'checkbox',
+  },
+
+  {
     'key'         => 'welcome_email',
     'section'     => '',
     'description' => 'Template file for welcome email.  Welcome emails are sent to the customer email invoice destination(s) each time a svc_acct record is created.  See the <a href="http://search.cpan.org/~mjd/Text-Template/lib/Text/Template.pm">Text::Template</a> documentation for details on the template substitution language.  The following variables are available<ul><li><code>$username</code> <li><code>$password</code> <li><code>$first</code> <li><code>$last</code> <li><code>$pkg</code></ul>',
@@ -1465,8 +1472,16 @@ httemplate/docs/config.html
   {
     'key'         => 'ticket_system-default_queueid',
     'section'     => '',
-    'description' => 'Default queue number used when creating new customer tickets.',
-    'type'        => 'text',
+    'description' => 'Default queue used when creating new customer tickets.',
+    'type'        => 'select-sub',
+    'options_sub' => sub { eval "use FS::TicketSystem;";
+                           die $@ if $@;
+                           FS::TicketSystem->queues();
+                         },
+    'option_sub'  => sub { eval "use FS::TicketSystem;";
+                           die $@ if $@;
+                           FS::TicketSystem->queue(shift);
+                         },
   },
 
   {
@@ -1505,6 +1520,13 @@ httemplate/docs/config.html
   },
 
   {
+    'key'         => 'cc-void',
+    'section'     => 'billing',
+    'description' => 'Enable local-only voiding of credit card payments in addition to refunds against the payment gateway',
+    'type'        => 'checkbox',
+  },
+
+  {
     'key'         => 'address2-search',
     'section'     => 'UI',
     'description' => 'Enable a "Unit" search box which searches the second address field',