X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=25d4727421ee25e180546e8731c4223c84a910bb;hb=fed12e8214a8a951377961ccbe7a09171b1e38c2;hp=c9f30fe6ecd6ebded03982b0c73b4443d563bcd4;hpb=eccc8de2366e2e004a37761b8da2b447ec861ecb;p=freeside.git diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index c9f30fe6e..25d472742 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%%%'; @@ -749,6 +748,15 @@ sub reason_type_options { 'type' => 'text', }, + { + 'key' => 'event_log_level', + 'section' => 'notification', + 'description' => 'Store events in the internal log if they are at least this severe. "info" is the default, "debug" is very detailed and noisy.', + 'type' => 'select', + 'select_enum' => [ '', 'debug', 'info', 'notice', 'warning', 'error', ], + # don't bother with higher levels + }, + { 'key' => 'log_sent_mail', 'section' => 'notification', @@ -976,6 +984,14 @@ sub reason_type_options { 'select_enum' => [ '', qw( USD AUD CAD DKK EUR GBP ILS JPY NZD ) ], }, + { + 'key' => 'currency', + 'section' => 'billing', + 'description' => 'Currency', + 'type' => 'select', + 'select_enum' => [ '', qw( USD AUD CAD DKK EUR GBP ILS JPY NZD XAF ) ], + }, + { 'key' => 'business-batchpayment-test_transaction', 'section' => 'billing', @@ -1135,6 +1151,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' => '', @@ -1472,7 +1495,7 @@ and customer address. Include units.', 'section' => 'invoicing', 'description' => 'Optional default invoice term, used to calculate a due date printed on invoices.', 'type' => 'select', - 'select_enum' => [ '', 'Payable upon receipt', 'Net 0', 'Net 3', 'Net 9', 'Net 10', 'Net 15', 'Net 20', 'Net 21', 'Net 30', 'Net 45', 'Net 60', 'Net 90' ], + 'select_enum' => [ '', 'Payable upon receipt', 'Net 0', 'Net 3', 'Net 9', 'Net 10', 'Net 15', 'Net 18', 'Net 20', 'Net 21', 'Net 30', 'Net 45', 'Net 60', 'Net 90' ], }, { @@ -1593,6 +1616,7 @@ and customer address. Include units.', 'section' => 'required', 'description' => 'Print command for paper invoices, for example `lpr -h\'', 'type' => 'text', + 'per_agent' => 1, }, { @@ -3510,7 +3534,7 @@ and customer address. Include units.', 'section' => 'billing', 'description' => 'Default format for batches.', 'type' => 'select', - 'select_enum' => [ 'csv-td_canada_trust-merchant_pc_batch', + 'select_enum' => [ 'NACHA', 'csv-td_canada_trust-merchant_pc_batch', 'csv-chase_canada-E-xactBatch', 'BoM', 'PAP', 'paymentech', 'ach-spiritone', 'RBC' ] @@ -3572,9 +3596,9 @@ and customer address. Include units.', 'section' => 'billing', 'description' => 'Fixed (unchangeable) format for electronic check batches.', 'type' => 'select', - 'select_enum' => [ 'csv-td_canada_trust-merchant_pc_batch', 'BoM', 'PAP', - 'paymentech', 'ach-spiritone', 'RBC', 'td_eft1464', - 'eft_canada' + 'select_enum' => [ 'NACHA', 'csv-td_canada_trust-merchant_pc_batch', 'BoM', + 'PAP', 'paymentech', 'ach-spiritone', 'RBC', + 'td_eft1464', 'eft_canada' ] }, @@ -3627,13 +3651,6 @@ and customer address. Include units.', 'type' => 'textarea', }, - { - 'key' => 'batch-manual_approval', - 'section' => 'billing', - 'description' => 'Allow manual batch closure, which will approve all payments that do not yet have a status. This is not advised, but is needed for payment processors that provide a report of rejected rather than approved payments.', - 'type' => 'checkbox', - }, - { 'key' => 'batchconfig-eft_canada', 'section' => 'billing', @@ -3642,6 +3659,34 @@ and customer address. Include units.', 'per_agent' => 1, }, + { + 'key' => 'batchconfig-nacha-destination', + 'section' => 'billing', + 'description' => 'Configuration for NACHA batching, Destination (9 digit transit routing number).', + 'type' => 'text', + }, + + { + 'key' => 'batchconfig-nacha-destination_name', + 'section' => 'billing', + 'description' => 'Configuration for NACHA batching, Destination (Bank Name, up to 23 characters).', + 'type' => 'text', + }, + + { + 'key' => 'batchconfig-nacha-origin', + 'section' => 'billing', + 'description' => 'Configuration for NACHA batching, Origin (your 10-digit company number, IRS tax ID recommended).', + 'type' => 'text', + }, + + { + 'key' => 'batch-manual_approval', + 'section' => 'billing', + 'description' => 'Allow manual batch closure, which will approve all payments that do not yet have a status. This is not advised unless needed for specific payment processors that provide a report of rejected rather than approved payments.', + 'type' => 'checkbox', + }, + { 'key' => 'batch-spoolagent', 'section' => 'billing', @@ -3900,6 +3945,19 @@ and customer address. Include units.', 'per_agent' => 1, }, + { + 'key' => 'cust_bill-line_item-date_style-non_monthly', + 'section' => 'billing', + 'description' => 'If set, override cust_bill-line_item-date_style for non-monthly charges.', + 'type' => 'select', + 'select_hash' => [ '' => 'Default', + 'start_end' => 'STARTDATE-ENDDATE', + 'month_of' => 'Month of MONTHNAME', + 'X_month' => 'DATE_DESC MONTHNAME', + ], + 'per_agent' => 1, + }, + { 'key' => 'cust_bill-line_item-date_description', 'section' => 'billing', @@ -4057,6 +4115,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', @@ -4071,6 +4140,20 @@ and customer address. Include units.', 'type' => 'text', }, + { + 'key' => 'ezlocate-userid', + 'section' => 'UI', + 'description' => 'User ID for EZ-Locate service. See the TomTom website 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', @@ -4098,7 +4181,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', + ], }, { @@ -4667,6 +4755,13 @@ and customer address. Include units.', 'type' => 'checkbox', }, + { + 'key' => 'cdr-gsm_tap3-sender', + 'section' => 'telephony', + 'description' => 'GSM TAP3 Sender network (5 letter code)', + 'type' => 'text', + }, + { 'key' => 'cust_pkg-show_autosuspend', 'section' => 'UI', @@ -5101,6 +5196,13 @@ and customer address. Include units.', 'type' => 'checkbox', }, + { + 'key' => 'username-exclamation', + 'section' => 'username', + 'description' => 'Allow the exclamation character (!) in usernames.', + 'type' => 'checkbox', + }, + { 'key' => 'ie-compatibility_mode', 'section' => 'UI',