Merge branch 'FREESIDE_3_BRANCH_34237' into FREESIDE_3_BRANCH

diff --combined FS/FS/Conf.pm
index e9d0ee6,903b42e..41d6db6
--- 1/FS/FS/Conf.pm
--- 2/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@@ -3276,12 -3276,14 +3276,14 @@@ and customer address. Include units.'
                             }
                           },
    },
+ 
    {
      'key'         => 'ticket_system-force_default_queueid',
      'section'     => 'ticketing',
      'description' => 'Disallow queue selection when creating new tickets from customer view.',
      'type'        => 'checkbox',
    },
+ 
    {
      'key'         => 'ticket_system-selfservice_queueid',
      'section'     => 'ticketing',
@@@ -3358,6 -3360,41 +3360,41 @@@
      'description' => 'Allow customers to edit ticket subjects through selfservice.',
      'type'        => 'checkbox',
    },
+ 
+   {
+     'key'         => 'ticket_system-appointment-queueid',
+     'section'     => 'ticketing',
+     'description' => 'Custom field from the ticketing system to use as an appointment classification.',
+     #false laziness w/above
+     'type'        => 'select-sub',
+     'options_sub' => sub {
+                            my $conf = new FS::Conf;
+                            if ( $conf->config('ticket_system') ) {
+                              eval "use FS::TicketSystem;";
+                              die $@ if $@;
+                              FS::TicketSystem->queues();
+                            } else {
+                              ();
+                            }
+                          },
+     'option_sub'  => sub { 
+                            my $conf = new FS::Conf;
+                            if ( $conf->config('ticket_system') ) {
+                              eval "use FS::TicketSystem;";
+                              die $@ if $@;
+                              FS::TicketSystem->queue(shift);
+                            } else {
+                              '';
+                            }
+                          },
+   },
+ 
+   {
+     'key'         => 'ticket_system-appointment-custom_field',
+     'section'     => 'ticketing',
+     'description' => 'Custom field from the ticketing system to use as an appointment classification.',
+     'type'        => 'text',
+   },
  
    {
      'key'         => 'ticket_system-escalation',
@@@ -4270,14 -4307,6 +4307,14 @@@
    },
  
    {
 +    'key'         => 'password-insecure',
 +    'section'     => 'password',
 +    'description' => 'Disable all password security checks and allow entry of insecure passwords.  NOT RECOMMENDED.',
 +    'type'        => 'checkbox',
 +    'per_agent'   => 1,
 +  },
 +
 +  {
      'key'         => 'datavolume-forcemegabytes',
      'section'     => 'UI',
      'description' => 'All data volumes are expressed in megabytes',