X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=7f3fcaa383d4af6875d121c600e0f26c28600b8d;hb=e7a9ba25d437b6a145a6260594c27f9dc0ac0495;hp=b72cf031310ce05913dab7d429cf093a55df1b02;hpb=2b10c0594ff2ab9ce37d9f8af9c154d3bedde731;p=freeside.git

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index b72cf0313..7f3fcaa38 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -14,7 +14,6 @@ use FS::conf;
 use FS::Record qw(qsearch qsearchs);
 use FS::UID qw(dbh datasrc use_confcompat);
 use FS::Misc::Invoicing qw( spool_formats );
-use FS::Misc::Geo;
 
 $base_dir = '%%%FREESIDE_CONF%%%';
 
@@ -1135,6 +1134,13 @@ sub reason_type_options {
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'svc_acct-ip_addr',
+    'section'     => '',
+    'description' => 'Enable IP address management on login services like for broadband services.',
+    'type'        => 'checkbox',
+  },
+
   {
     'key'         => 'exclude_ip_addr',
     'section'     => '',
@@ -3219,6 +3225,14 @@ and customer address. Include units.',
     'per_agent'   => 1,
   },
 
+  {
+    'key'         => 'ics-confirm_template',
+    'section'     => '',
+    'description' => 'Confirmation email template for uploading to ICS invoice printing.  Text::Template format, with variables "%count" and "%sum".',
+    'type'        => 'textarea',
+    'per_agent'   => 1,
+  },
+
   {
     'key'         => 'svc_acct-usage_suspend',
     'section'     => 'billing',
@@ -3469,7 +3483,7 @@ and customer address. Include units.',
   {
     'key'         => 'postal_invoice-recurring_only',
     'section'     => 'billing',
-    'description' => 'The postal invoice fee is omitted on invoices without reucrring charges when this is set.',
+    'description' => 'The postal invoice fee is omitted on invoices without recurring charges when this is set.',
     'type'        => 'checkbox',
   },
 
@@ -3601,7 +3615,7 @@ and customer address. Include units.',
   {
     'key'         => 'batchconfig-paymentech',
     'section'     => 'billing',
-    'description' => 'Configuration for Chase Paymentech batching, five lines: 1. BIN, 2. Terminal ID, 3. Merchant ID, 4. Username, 5. Password (for batch uploads)',
+    'description' => 'Configuration for Chase Paymentech batching, six lines: 1. BIN, 2. Terminal ID, 3. Merchant ID, 4. Username, 5. Password (for batch uploads), 6. Flag to send recurring indicator.',
     'type'        => 'textarea',
   },
 
@@ -4049,6 +4063,17 @@ and customer address. Include units.',
     'type'        => 'checkbox',
   },
 
+  {
+    'key'         => 'address_standardize_method',
+    'section'     => 'UI', #???
+    'description' => 'Method for standardizing customer addresses.',
+    'type'        => 'select',
+    'select_hash' => [ '' => '', 
+                       'usps' => 'U.S. Postal Service',
+                       'ezlocate' => 'EZLocate',
+                     ],
+  },
+
   {
     'key'         => 'usps_webtools-userid',
     'section'     => 'UI',
@@ -4063,6 +4088,20 @@ and customer address. Include units.',
     'type'        => 'text',
   },
 
+  {
+    'key'         => 'ezlocate-userid',
+    'section'     => 'UI',
+    'description' => 'User ID for EZ-Locate service.  See <a href="http://www.geocode.com/">the TomTom website</a> for access and pricing information.',
+    'type'        => 'text',
+  },
+
+  {
+    'key'         => 'ezlocate-password',
+    'section'     => 'UI',
+    'description' => 'Password for EZ-Locate service.',
+    'type'        => 'text'
+  },
+
   {
     'key'         => 'cust_main-auto_standardize_address',
     'section'     => 'UI',
@@ -4090,7 +4129,12 @@ and customer address. Include units.',
     'section'     => 'UI',
     'description' => 'The method to use to look up tax district codes.',
     'type'        => 'select',
-    'select_hash' => [ FS::Misc::Geo::get_district_methods() ],
+    #'select_hash' => [ FS::Misc::Geo::get_district_methods() ],
+    #after RT#13763, using FS::Misc::Geo here now causes a dependancy loop :/
+    'select_hash' => [
+                       ''         => '',
+                       'wa_sales' => 'Washington sales tax',
+                     ],
   },
 
   {