merge NG auth, RT#21563

[freeside.git] / httemplate / edit / process / cust_location.cgi

diff --git a/httemplate/edit/process/cust_location.cgi b/httemplate/edit/process/cust_location.cgi
index 790fc8e..fd1b874 100644 (file)
--- a/httemplate/edit/process/cust_location.cgi
+++ b/httemplate/edit/process/cust_location.cgi
@@ -28,11 +28,12 @@ my $cust_location = qsearchs({
 });
 die "unknown locationnum $locationnum" unless $cust_location;
 
-my $new = {
-  map { $_ => scalar($cgi->param($_)) }
-    qw( address1 address2 city county state zip country )
-};
-
-my $error = $cust_location->move_to($new);
+my $new = FS::cust_location->new({
+  custnum     => $cust_location->custnum,
+  prospectnum => $cust_location->prospectnum,
+  map { $_ => scalar($cgi->param($_)) } FS::cust_main->location_fields
+});
+my $error = $new->find_or_insert;
+$error  ||= $cust_location->move_to($new);
 
 </%init>