Merge branch 'master' of git.freeside.biz:/home/git/freeside

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

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 38a6894..111bafa 100644 (file)
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -693,6 +693,13 @@ sub reason_type_options {
     %msg_template_options,
   },
 
     %msg_template_options,
   },
 

+  {
+    'key'         => 'part_pkg-lineage',
+    'section'     => '',
+    'description' => 'When editing a package definition, if setup or recur fees are changed, create a new package rather than changing the existing package.',
+    'type'        => 'checkbox',
+  },
+

   {
     'key'         => 'apacheip',
     #not actually deprecated yet
   {
     'key'         => 'apacheip',
     #not actually deprecated yet


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

+  {
+    'key'         => 'disable_maxselect',
+    'section'     => 'UI',
+    'description' => 'Prevent changing the number of records per page.',
+    'type'        => 'checkbox',
+  },
+

   {
     'key'         => 'session-start',
     'section'     => 'session',
   {
     'key'         => 'session-start',
     'section'     => 'session',


@@ -2283,6 +2297,13 @@ and customer address. Include units.',
     'select_enum' => [ '', qw(CARD DCRD CHEK DCHK LECB BILL CASH WEST MCRD COMP HIDE) ],
   },
 
     'select_enum' => [ '', qw(CARD DCRD CHEK DCHK LECB BILL CASH WEST MCRD COMP HIDE) ],
   },
 

+  {
+    'key'         => 'require_cash_deposit_info',
+    'section'     => 'billing',
+    'description' => 'When recording cash payments, display bank deposit information fields.',
+    'type'        => 'checkbox',
+  },
+

   {
     'key'         => 'paymentforcedtobatch',
     'section'     => 'deprecated',
   {
     'key'         => 'paymentforcedtobatch',
     'section'     => 'deprecated',


@@ -2898,6 +2919,7 @@ and customer address. Include units.',
     'section'     => '',
     'description' => "Use the agent's master service address as the service address (only ship_address2 can be entered, if blank on the master address).  Useful for multi-tenant applications.",
     'type'        => 'checkbox',
     'section'     => '',
     'description' => "Use the agent's master service address as the service address (only ship_address2 can be entered, if blank on the master address).  Useful for multi-tenant applications.",
     'type'        => 'checkbox',

+    'per_agent'   => 1,

   },
 
   { 'key'         => 'referral_credit',
   },
 
   { 'key'         => 'referral_credit',


@@ -2925,7 +2947,7 @@ and customer address. Include units.',
     'section'     => 'invoicing',
     'description' => 'Enable FTP of raw invoice data - format.',
     'type'        => 'select',
     'section'     => 'invoicing',
     'description' => 'Enable FTP of raw invoice data - format.',
     'type'        => 'select',

-    'select_enum' => [ '', 'default', 'billco', ],
+    'select_enum' => [ '', 'default', 'oneline', 'billco', ],

   },
 
   {
   },
 
   {


@@ -2961,7 +2983,7 @@ and customer address. Include units.',
     'section'     => 'invoicing',
     'description' => 'Enable spooling of raw invoice data - format.',
     'type'        => 'select',
     'section'     => 'invoicing',
     'description' => 'Enable spooling of raw invoice data - format.',
     'type'        => 'select',

-    'select_enum' => [ '', 'default', 'billco', ],
+    'select_enum' => [ '', 'default', 'oneline', 'billco', ],

   },
 
   {
   },
 
   {


@@ -3601,6 +3623,17 @@ and customer address. Include units.',
     'per_agent'   => 1,
   },
 
     'per_agent'   => 1,
   },
 

+  {
+    'key'         => 'cust_main-check_unique',
+    'section'     => '',
+    'description' => 'Warn before creating a customer record where these fields duplicate another customer.',
+    'type'        => 'select',
+    'multiple'    => 1,
+    'select_hash' => [ 
+      'address1' => 'Billing address',
+    ],
+  },
+

   {
     'key'         => 'svc_acct-display_paid_time_remaining',
     'section'     => '',
   {
     'key'         => 'svc_acct-display_paid_time_remaining',
     'section'     => '',


@@ -3836,11 +3869,18 @@ and customer address. Include units.',
   {
     'key'         => 'cust_main-custnum-display_prefix',
     'section'     => 'UI',
   {
     'key'         => 'cust_main-custnum-display_prefix',
     'section'     => 'UI',

-    'description' => 'Prefix the customer number with this number for display purposes (and zero fill to 8 digits).',
+    'description' => 'Prefix the customer number with this string for display purposes.',

     'type'        => 'text',
     #and then probably agent-virt this to merge these instances
   },
 
     'type'        => 'text',
     #and then probably agent-virt this to merge these instances
   },
 

+  {
+    'key'         => 'cust_main-custnum-display_length',
+    'section'     => 'UI',
+    'description' => 'Zero fill the customer number to this many digits for display purposes.',
+    'type'        => 'text',
+  },
+

   {
     'key'         => 'cust_main-default_areacode',
     'section'     => 'UI',
   {
     'key'         => 'cust_main-default_areacode',
     'section'     => 'UI',


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

+  {
+    'key'         => 'svc_hardware-check_mac_addr',
+    'section'     => '', #?
+    'description' => 'Require the "hardware address" field in hardware services to be a valid MAC address.',
+    'type'        => 'checkbox',
+  },
+

   {
     'key'         => 'tax-report_groups',
     'section'     => '',
   {
     'key'         => 'tax-report_groups',
     'section'     => '',