track taxes created by Washington sales tax lookup so they can be updated in place...

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

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 0f94f8f..689c68a 100644 (file)
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -3169,7 +3169,7 @@ and customer address. Include units.',
   {
     'key'         => 'ticket_system-appointment-queueid',
     'section'     => 'ticketing',
-    'description' => 'Custom field from the ticketing system to use as an appointment classification.',
+    'description' => 'Ticketing queue to use for appointments.',
     #false laziness w/above
     'type'        => 'select-sub',
     'options_sub' => sub {
@@ -3197,7 +3197,7 @@ and customer address. Include units.',
   {
     'key'         => 'ticket_system-appointment-custom_field',
     'section'     => 'ticketing',
-    'description' => 'Custom field from the ticketing system to use as an appointment classification.',
+    'description' => 'Ticketing custom field to use as an appointment classification.',
     'type'        => 'text',
   },
 
@@ -3549,18 +3549,29 @@ and customer address. Include units.',
   {
     'key'         => 'voip-cdr_email',
     'section'     => 'telephony',
-    'description' => 'Include the call details on emailed invoices (and HTML invoices viewed in the backend), even if the customer is configured for not printing them on the invoices.',
+    'description' => 'Include the call details inline on emailed invoices (and HTML invoices viewed in the backend), even if the customer is configured for not printing them on the invoices.  Useful for including these details in electronic delivery but omitting them when printing.',
     'type'        => 'checkbox',
   },
 
   {
     'key'         => 'voip-cust_email_csv_cdr',
-    'section'     => 'telephony',
-    'description' => 'Enable the per-customer option for including CDR information as a CSV attachment on emailed invoices.',
+    'section'     => 'deprecated',
+    'description' => 'Deprecated, see voip-cdr_email_attach instead.  Used to enable the per-customer option for including CDR information as a CSV attachment on emailed invoices.',
     'type'        => 'checkbox',
   },
 
   {
+    'key'         => 'voip-cdr_email_attach',
+    'section'     => 'telephony',
+    'description' => 'Enable the per-customer option for including CDR information as an attachment on emailed invoices.',
+    'type'        => 'select',
+    'select_hash' => [ ''    => 'Disabled',
+                       'csv' => 'Text (CSV) attachment',
+                       'zip' => 'Zip attachment',
+                     ],
+  },
+
+  {
     'key'         => 'cgp_rule-domain_templates',
     'section'     => '',
     'description' => 'Communigate Pro rule templates for domains, one per line, "svcnum Name"',
@@ -5165,6 +5176,13 @@ and customer address. Include units.',
   },
 
   {
+    'key'         => 'tax-round_per_line_item',
+    'section'     => 'billing',
+    'description' => 'Calculate tax and round to the nearest cent for each line item, rather than for the whole invoice.',
+    'type'        => 'checkbox',
+  },
+
+  {
     'key'         => 'cust_main-default_view',
     'section'     => 'UI',
     'description' => 'Default customer view, for users who have not selected a default view in their preferences.',