projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT##29285: State field not needed for New Zealand
[freeside.git]
/
httemplate
/
edit
/
cust_main
/
top_misc.html
diff --git
a/httemplate/edit/cust_main/top_misc.html
b/httemplate/edit/cust_main/top_misc.html
index
8f8a96a
..
c19f347
100644
(file)
--- a/
httemplate/edit/cust_main/top_misc.html
+++ b/
httemplate/edit/cust_main/top_misc.html
@@
-40,7
+40,7
@@
var ship_locked_agents = <% encode_json(\%ship_locked_agents) %>;
var ship_fields = [
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'
];
'latitude', 'longitude', 'district'
];
@@
-276,7
+276,10
@@
foreach (qsearch('agent',{})) {
my $agent_ship_location = $cust_main->ship_location;
$ship_locked_agents{$agentnum} = +{
map { $_ => $agent_ship_location->$_ }
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')
+ )
};
}
};
}