summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorivan <ivan>2005-10-13 21:17:18 +0000
committerivan <ivan>2005-10-13 21:17:18 +0000
commit591613cf1c861505335646fff3ffb4a705e011bf (patch)
tree0e55497ddeb107fcc16b755627c1d82f063a6a62
parent48b79e72df30f70a168b9b318bc7785129c79262 (diff)
Fix 'can't change uid' error when the account *has* a uid but svc_acct-edit_uid isn't turned on
-rw-r--r--FS/FS/svc_acct.pm3
-rwxr-xr-xhttemplate/edit/svc_acct.cgi6
2 files changed, 4 insertions, 5 deletions
diff --git a/FS/FS/svc_acct.pm b/FS/FS/svc_acct.pm
index 167fcee88..a9cdfb3df 100644
--- 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 bc5d96aab..e74d84d53 100755
--- 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>