X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FUI%2FWeb.pm;h=9b1c16f97bb774176a72a4418a6cb7cb6900e571;hb=772656864b377bbd2ef2febd40891ef1206b5be0;hp=04aeda103ad9820fe087cdb073cec8172385c01e;hpb=1aecd5bf33146bf3f374341a3814960ae1d419e8;p=freeside.git diff --git a/FS/FS/UI/Web.pm b/FS/FS/UI/Web.pm index 04aeda103..9b1c16f97 100644 --- a/FS/FS/UI/Web.pm +++ b/FS/FS/UI/Web.pm @@ -300,7 +300,7 @@ sub cust_header { my %header2method = ( 'Customer' => 'name', 'Cust. Status' => 'cust_status_label', - 'Cust#' => 'custnum', + 'Cust#' => 'display_custnum', 'Name' => 'contact', 'Company' => 'company', @@ -343,10 +343,15 @@ sub cust_header { '(service) Latitude' => 'ship_latitude', '(service) Longitude' => 'ship_longitude', 'Invoicing email(s)' => 'invoicing_list_emailonly_scalar', + 'Contact email(s)' => 'contact_list_emailonly', + 'Invoices' => 'contact_list_cust_invoice_only', + 'Messages' => 'contact_list_cust_message_only', # FS::Upgrade::upgrade_config removes this from existing cust-fields settings # 'Payment Type' => 'cust_payby', 'Current Balance' => 'current_balance', 'Agent Cust#' => 'agent_custid', + 'Agent' => 'agent_name', + 'Agent Cust# or Cust#' => 'display_custnum', 'Advertising Source' => 'referral', ); $header2method{'Cust#'} = 'display_custnum' @@ -450,6 +455,8 @@ sub cust_sql_fields { } push @fields, 'agent_custid'; + push @fields, 'agentnum' if grep { $_ eq 'agent_name' } @cust_fields; + my @extra_fields = (); if (grep { $_ eq 'current_balance' } @cust_fields) { push @extra_fields, FS::cust_main->balance_sql . " AS current_balance"; @@ -464,9 +471,9 @@ sub cust_sql_fields { =item join_cust_main [ TABLE[.CUSTNUM] ] [ LOCATION_TABLE[.LOCATIONNUM] ] Returns an SQL join phrase for the FROM clause so that the fields listed -in L will be available. Currently joins to cust_main +in L will be available. Currently joins to cust_main itself, as well as cust_location (under the aliases 'bill_location' and -'ship_location') if address fields are needed. L should have +'ship_location') if address fields are needed. L should have been called already. All of these will be left joins; if you want to exclude rows with no linked @@ -739,6 +746,7 @@ use FS::CurrentUser; use FS::Record qw(qsearchs); use FS::queue; use FS::CGI qw(rooturl); +use FS::Report::Queued::FutureAutobill; $DEBUG = 0;