X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fcontacts.html;h=252ca10b36ccc1294713c8278a3dba5346c5fcfd;hb=24389dff37b486ed4f0281bd50a3ff1ee77ae74d;hp=8fe3a9ebbe868a321af1809558a561ad8e31d3d4;hpb=c6af9fc65bb5e974453a355a62506b54b2abcdca;p=freeside.git diff --git a/httemplate/view/cust_main/contacts.html b/httemplate/view/cust_main/contacts.html index 8fe3a9ebb..252ca10b3 100644 --- a/httemplate/view/cust_main/contacts.html +++ b/httemplate/view/cust_main/contacts.html @@ -10,9 +10,16 @@ % if ( $this eq 'ship' and % $cust_main->bill_locationnum == $cust_main->ship_locationnum ) % { - (<% mt('same as billing') %>) + (<% emt('same as billing') %>) % } +% if ( +% ($this eq 'ship') +% && $cust_main->invoice_ship_address +% && !$conf->exists('invoice-ship_address') #it's always on, so hide per-cust config +% ) { +(<% emt('included on invoices') %>) +% }
<% mt('Spouse') |h %> | ++ <% join(', ', grep $_, + $cust_main->spouse_last, $cust_main->spouse_first) %> + | +|||||||||
<% mt('Email address(es)') |h %> | @@ -41,8 +58,23 @@<% $cust_main->company |h %> | |||||||||
<% mt('Company') |h %> | +<% $cust_main->ship_company |h %> | +|||||||||
<% mt('Location ID') |h %> | +<% $location->locationname |h %> | +|||||||||
<% mt('Address') |h %> | <% $location->address1 |h %> | @@ -61,8 +93,12 @@ % }|||||||||
<% mt('City') |h %> | <% $location->city |h %> | +% } else { ++% } % if ( $location->county ) { | <% mt('County') |h %> | <% $location->county |h %> | @@ -70,11 +106,11 @@<% mt('State') |h %> | <% state_label( $location->state, $location->country ) |h %> | <% mt('Zip') |h %> | -<% $location->zip %> | +<% $location->zip |h %> | |
<% mt('Country') |h %> | -<% code2country( $location->country ) %> | +<% $location->country_full |h %> |