Fix 'can't change uid' error when the account *has* a uid but svc_acct-edit_uid isn...

diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 167fcee..a9cdfb3 100644 (file)
--- a/FS/FS/svc_acct.pm
+++ b/FS/FS/svc_acct.pm
@@ -472,7 +472,8 @@ sub replace {
 
       return "Can't change $xid!"
         if ! $conf->exists("svc_acct-edit_$xid")
-           && $old->$xid() != $new->$xid();
+           && $old->$xid() != $new->$xid()
+           && $new->cust_svc->part_svc->part_svc_column($xid)->columnflag ne 'F'
     }
 
   }

diff --git a/httemplate/edit/svc_acct.cgi b/httemplate/edit/svc_acct.cgi
index bc5d96a..e74d84d 100755 (executable)
--- a/httemplate/edit/svc_acct.cgi
+++ b/httemplate/edit/svc_acct.cgi
@@ -288,12 +288,10 @@ if ( $part_svc->part_svc_column('popnum')->columnflag eq 'F' ) {
         </TD>
       </TR>
   
-    <% } else { %>
-  
-      <INPUT TYPE="hidden" NAME="<%= $xid %>" VALUE="<%= $svc_acct->$xid() %>">
-  
     <% } %>
   
+    <INPUT TYPE="hidden" NAME="<%= $xid %>" VALUE="<%= $svc_acct->$xid() %>">
+  
   <% } else { %>
   
     <TR>