X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Fcust_main_county-collapse.cgi;h=9608fc9190b811cc5856ef1549fae0242e53e8f3;hb=37591b61f8ad6fc5c5acb2fd8f520d2dbe4f1539;hp=8e67140a8488e80eba4982e6d6202445419bdadd;hpb=22a35047ecdffff80110e06cc08fc84f9ddba9b0;p=freeside.git

diff --git a/httemplate/edit/process/cust_main_county-collapse.cgi b/httemplate/edit/process/cust_main_county-collapse.cgi
index 8e67140a8..9608fc919 100755
--- a/httemplate/edit/process/cust_main_county-collapse.cgi
+++ b/httemplate/edit/process/cust_main_county-collapse.cgi
@@ -1,17 +1,26 @@
-<%
+<% $cgi->redirect(popurl(3). "browse/cust_main_county.cgi") %>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
 my($query) = $cgi->keywords;
 $query =~ /^(\d+)$/ or die "Illegal taxnum!";
 my $taxnum = $1;
-my $cust_main_county = qsearchs('cust_main_county',{'taxnum'=>$taxnum})
-  or die ("Unknown taxnum!");
+my $cust_main_county = qsearchs('cust_main_county', { 'taxnum' => $taxnum } )
+  or die "Unknown taxnum $taxnum";
 
 #really should do this in a .pm & start transaction
 
-foreach my $delete ( qsearch('cust_main_county', {
-                    'country' => $cust_main_county->country,
-                    'state' => $cust_main_county->state  
-                 } ) ) {
+my %search = (
+               'country' => $cust_main_county->country,
+               'state'   => $cust_main_county->state,
+             );
+
+$search{'county'} = $cust_main_county->county
+  if $cust_main_county->city;
+
+foreach my $delete ( qsearch('cust_main_county', \%search) ) {
 #  unless ( qsearch('cust_main',{
 #    'state'  => $cust_main_county->getfield('state'),
 #    'county' => $cust_main_county->getfield('county'),
@@ -26,10 +35,12 @@ foreach my $delete ( qsearch('cust_main_county', {
 }
 
 $cust_main_county->taxnum('');
-$cust_main_county->county('');
+if ( $cust_main_county->city ) {
+  $cust_main_county->city('');
+} else {
+  $cust_main_county->county('');
+}
 my $error = $cust_main_county->insert;
 die $error if $error;
 
-print $cgi->redirect(popurl(3). "browse/cust_main_county.cgi");
-
-%>
+</%init>