X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=415b90a7801a912a0a1b08985e5152175157ddd0;hb=4e082c20bcb6754f6f832cfc95d45198a2b920f5;hp=80022e4312530556453aeb191f0817485da24ba8;hpb=dbc37c25095f050ac6284d399e25b2668fa00609;p=freeside.git

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 80022e431..415b90a78 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1061,6 +1061,7 @@ sub reason_type_options {
                        '%d/%m/%Y' => 'DD/MM/YYYY',
 		       '%Y/%m/%d' => 'YYYY/MM/DD',
                      ],
+    'per_locale'  => 1,
   },
 
   {
@@ -1075,6 +1076,7 @@ sub reason_type_options {
                        '%d/%m/%Y'  => 'DD/MM/YYYY',
 		       '%Y/%m/%d'  => 'YYYY/MM/DD',
                      ],
+    'per_locale'  => 1,
   },
 
   {
@@ -1733,7 +1735,7 @@ and customer address. Include units.',
   {
     'key'         => 'sip_passwordmax',
     'section'     => 'telephony',
-    'description' => 'Maximum SIP password length (default 8) (don\'t set this over 12 if you need to import or export crypt() passwords)',
+    'description' => 'Maximum SIP password length (default 80)',
     'type'        => 'text',
   },
 
@@ -5213,7 +5215,7 @@ and customer address. Include units.',
   {
     'key'         => 'cust_main-custom_link',
     'section'     => 'UI',
-    'description' => 'URL to use as source for the "Custom" tab in the View Customer page.  The customer number will be appended, or you can insert "$custnum" to have it inserted elsewhere.  "$agentnum" will be replaced with the agent number, and "$usernum" will be replaced with the employee number.',
+    'description' => 'URL to use as source for the "Custom" tab in the View Customer page.  The customer number will be appended, or you can insert "$custnum" to have it inserted elsewhere.  "$agentnum" will be replaced with the agent number, "$agent_custid" with be replaced with the agent customer ID (if any), and "$usernum" will be replaced with the employee number.',
     'type'        => 'textarea',
   },
 
@@ -5434,7 +5436,6 @@ and customer address. Include units.',
     'multiple'    => 1,
     'options_sub' => sub { 
       map { $_ => FS::Locales->description($_) }
-      grep { $_ ne 'en_US' } 
       FS::Locales->locales;
     },
     'option_sub'  => sub { FS::Locales->description(shift) },