X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=ea9a536f9868ee8a4c30911e6a7f764e6c707d0d;hb=51fa32c6d1d22d4b78afd4bf12e307fbdacc6062;hp=d3cd994be66f4c3b46206528ab39b4a9d66040b6;hpb=0bebde603df97eb496150e80a58755b2f792f64a;p=freeside.git

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index d3cd994be..ea9a536f9 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -653,6 +653,13 @@ my %payment_gateway_options = (
     'description' => 'IP address to assign to new virtual hosts',
     'type'        => 'text',
   },
+  
+  {
+    'key'         => 'discount-show-always',
+    'section'     => 'billing',
+    'description' => 'Generate a line item on an invoice even when a package is discounted 100%',
+    'type'        => 'checkbox',
+  },
 
   {
     'key'         => 'encryption',
@@ -2551,6 +2558,13 @@ and customer address. Include units.',
     'type'        => 'text',
   },
 
+  {
+    'key'         => 'ticket_system-escalation',
+    'section'     => '',
+    'description' => 'Enable priority escalation of tickets as part of daily batch processing.',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'ticket_system-rt_external_datasrc',
     'section'     => '',