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

diff --combined FS/FS/Schema.pm
index d47046f,0ada39f..59a18c5
--- 1/FS/FS/Schema.pm
--- 2/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@@ -2736,7 -2736,6 +2736,7 @@@ sub tables_hashref 
          'country',          'char',     '',       2, '', '', 
          'payby',            'char',     '',       4, '', '',
          'payinfo',       'varchar', 'NULL',     512, '', '', 
 +        #'paymask',       'varchar', 'NULL', $char_d, '', '',
          #'exp',          @date_type,                  '', '',
          'exp',           'varchar', 'NULL',      11, '', '', 
          'payname',       'varchar', 'NULL', $char_d, '', '', 
@@@ -4891,6 -4890,9 +4891,9 @@@
          'suid',                    'int', 'NULL',        '', '', '',
          'shared_svcnum',           'int', 'NULL',        '', '', '',
          'serviceid',           'varchar', 'NULL',        64, '', '',#srvexport/reportfields
+         'speed_test_up',           'int', 'NULL',        '', '', '',
+         'speed_test_down',         'int', 'NULL',        '', '', '',
+         'speed_test_latency',      'int', 'NULL',        '', '', '',
        ],
        'primary_key'  => 'svcnum',
        'unique'       => [ [ 'ip_addr' ], [ 'mac_addr' ] ],

diff --combined httemplate/misc/cust_pkg-import.html
index 6272d28,9bee7a0..da242a2
--- 1/httemplate/misc/cust_pkg-import.html
--- 2/httemplate/misc/cust_pkg-import.html
+++ b/httemplate/misc/cust_pkg-import.html
@@@ -36,6 -36,7 +36,7 @@@ Import a file containing customer packa
          <OPTION VALUE="svc_acct">Account service
          <OPTION VALUE="svc_acct-agent_custid">Account service with agent_custid
          <OPTION VALUE="svc_acct-locationnum">Account service with existing location
+         <OPTION VALUE="svc_broadband">Broadband service
          <OPTION VALUE="svc_phone">Phone service
          <OPTION VALUE="svc_phone-agent_custid">Phone service with agent_custid
          <OPTION VALUE="svc_phone-locationnum">Phone service with existing location
@@@ -105,6 -106,9 +106,9 @@@ Uploaded files can be CSV (comma-separa
  <b>Account service with existing location</b> format has the following field order: <i>custnum<%$req%>, locationnum, pkgpart<%$req%>, discountnum, start_date, setup, bill, last_bill, susp, adjourn, cancel, expire, username, _password, domsvc</i>
  <BR><BR>
  
+ <b>Broadband service</b> format has the following field order: <i>custnum<%$req%>, pkgpart<%$req%>, discountnum, start_date, setup, bill, last_bill, susp, adjourn, cancel, expire, ip_addr<%$req%>, description, routernum, blocknum, sectornum, speed_up, speed_down</i>
+ <BR><BR>
+ 
  <b>Phone service</b> format has the following field order: <i>custnum<%$req%>, pkgpart<%$req%>, discountnum, start_date, setup, bill, last_bill, susp, adjourn, cancel, expire, countrycode, phonenum, sip_password, pin</i>
  <BR><BR>
  
@@@ -215,9 -219,9 +219,9 @@@ Field information
  
    <li><i>quantity</i>
  
 -  <li><i>setup_fee</i>: Including this fee implements per-customer custom pricing for this package, overriding package definition pricing
 +  <li><i>setup_fee</i>: Including this implements per-customer custom pricing for this package, overriding package definition pricing
  
 -  <li><i>recur_fee</i>: Including this fee implements per-customer custom pricing for this package, overriding package definition pricing
 +  <li><i>recur_fee</i>: Including this implements per-customer custom pricing for this package, overriding package definition pricing
  
    <li><i>invoice_details</i>: Package invoice details (optionally, can include multiple lines of details separated by a vertical bar)