From: jeff <jeff>
Date: Wed, 28 Feb 2007 19:14:42 +0000 (+0000)
Subject: restore (none) choice to first package select
X-Git-Tag: TRIXBOX_2_6~618
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=b7edb246e8b697f12c2b586c5bffef6a2df7ba64;p=freeside.git

restore (none) choice to first package select
---

diff --git a/httemplate/edit/cust_main/select-domain.html b/httemplate/edit/cust_main/select-domain.html
index 3d42eb8b1..bec1e834c 100644
--- a/httemplate/edit/cust_main/select-domain.html
+++ b/httemplate/edit/cust_main/select-domain.html
@@ -42,6 +42,7 @@
 </SCRIPT>
 
 <SELECT NAME="<% $opt{'prefix'} %>pkgpart_svcpart" onchange="<% $opt{'prefix'} %>pkgpart_svcpart_changed(this,0);" >
+  <OPTION VALUE="">(none)
 
 % foreach my $part_pkg ( @part_pkg ) {
 
diff --git a/httemplate/misc/svc_acct-domains.cgi b/httemplate/misc/svc_acct-domains.cgi
index 3f9599e30..a49a02305 100644
--- a/httemplate/misc/svc_acct-domains.cgi
+++ b/httemplate/misc/svc_acct-domains.cgi
@@ -3,9 +3,10 @@
 %  my $pkgpart_svcpart = $cgi->param('arg');
 %  $pkgpart_svcpart =~ /^\d+_(\d+)$/;
 %  my $part_svc = qsearchs('part_svc', { 'svcpart' => $1 }) if $1;
-%  my $part_svc_column = $part_svc->part_svc_column('domsvc');
+%  my $part_svc_column = $part_svc->part_svc_column('domsvc') if $part_svc;
 %
-%  my @output = split /,/, $part_svc_column->columnvalue;
+%  my @output = split /,/, $part_svc_column->columnvalue if $part_svc_column;
+%  my $columnflag = $part_svc_column->columnflag if $part_svc_column;
 %  my @svc_domain = ();
 %  my %seen = ();
 %  
@@ -17,8 +18,7 @@
 %    $seen{$_}++;
 %  }
 %  if ($conf->exists('svc_acct-alldomains')
-%       && ( $part_svc_column->columnflag eq 'D'
-%         || $part_svc_column->columnflag eq '' )
+%       && ( $columnflag eq 'D' || $columnflag eq '' )
 %     ) {
 %    foreach (grep { $_->svcnum ne $output[0] } qsearch('svc_domain', {}) ){
 %      push @svc_domain, [ $_->svcnum => $_->domain ];