X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fcust_main%2Fbasics.html;h=a30d7f88cbadf674ca2aa9d6a95c89f8ce09d80e;hb=64aec88c35418b8c630811cdf5afb19b2a1c4299;hp=e16aafafc768cfbb7899e2727e6b48005f42693a;hpb=c6ab4d567c978cbe616c8cb5201c61bde212b3a0;p=freeside.git diff --git a/httemplate/edit/cust_main/basics.html b/httemplate/edit/cust_main/basics.html index e16aafafc..a30d7f88c 100644 --- a/httemplate/edit/cust_main/basics.html +++ b/httemplate/edit/cust_main/basics.html @@ -31,6 +31,8 @@ $('#spouse_label').slideUp(); $('#spouse_last_input').slideUp(); $('#spouse_first_input').slideUp(); + $('#invoice_email_label').slideUp(); + $('#invoice_email_input').slideUp(); } else { if ( document.getElementById('company').value.length == 0 ) { $('#company_label').slideUp(); @@ -40,13 +42,15 @@ $('#spouse_label').slideDown(); $('#spouse_last_input').slideDown(); $('#spouse_first_input').slideDown(); + $('#invoice_email_label').slideDown(); + $('#invoice_email_input').slideDown(); } } var ship_locked_agents = <% encode_json(\%ship_locked_agents) %>; var ship_fields = [ - 'locationname', 'address1', 'city', 'state', 'zip', 'country', + 'locationname', 'address1',<% $conf->exists('cust_main-no_city_in_address') ? '' : q( 'city',) %> 'state', 'zip', 'country', 'latitude', 'longitude', 'district' ]; @@ -119,6 +123,7 @@ %# tags <& /elements/tr-select-cust_tag.html, 'custnum' => $custnum, + 'default' => { map { $_=>1 } FS::part_tag->default_tags }, 'cgi' => $cgi, &> @@ -307,7 +312,10 @@ foreach (qsearch('agent',{})) { my $agent_ship_location = $cust_main->ship_location; $ship_locked_agents{$agentnum} = +{ map { $_ => $agent_ship_location->$_ } - qw(locationname address1 city state zip country latitude longitude district) + ( + qw(locationname address1 state zip country latitude longitude district), + ($conf->exists('cust_main-no_city_in_address') ? () : 'city') + ) }; }