X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_broadband.cgi;h=b11fec7a7c18804512acf1c53727c8c5835e3a8b;hb=2ab068f449eb97a10e18d20e9dab5ab9faa017e7;hp=01e58cdc4fbc9a49beababaf6ffe9689c852f9d6;hpb=d3784b40552e9f00c9d803ac0833e09828c73d96;p=freeside.git

diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi
index 01e58cdc4..b11fec7a7 100644
--- a/httemplate/edit/svc_broadband.cgi
+++ b/httemplate/edit/svc_broadband.cgi
@@ -2,7 +2,7 @@
      'post_url'             => popurl(1). 'process/svc_broadband.cgi',
      'name'                 => 'broadband service',
      'table'                => 'svc_broadband',
-     'labels'               => { 'svcnum'       => 'Service #',
+     'labels'               => { 'svcnum'       => 'Service',
                                  'description'  => 'Description',
                                  'ip_addr'      => 'IP address',
                                  'speed_down'   => 'Download speed',
@@ -63,12 +63,12 @@ my $callback = sub {
       if $fieldref->{field} eq 'blocknum';
       
     $fieldref->{value} = $object->addr_block->label
-      if $fieldref->{field} eq 'block_label';
+      if $fieldref->{field} eq 'block_label' && $object->addr_block;
 
   } else { 
 
     if ($fieldref->{field} eq 'block_label') {
-      if ($fixedblock) {
+      if ($fixedblock && $object->addr_block) {
         $object->blocknum($fixedblock);
         $fieldref->{value} = $object->addr_block->label;
       }else{
@@ -93,7 +93,8 @@ my $callback = sub {
                && $FS::CurrentUser::CurrentUser->agentnum($_->agentnum)
              }
         map { $_->addr_block } $object->allowed_routers;
-      my @options = map { $_->blocknum } @addr_block;
+      my @options = map { $_->blocknum } 
+                    sort { $a->label cmp $b->label } @addr_block;
       my %option_labels = map { ( $_->blocknum => $_->label ) } @addr_block;
       $fieldref->{type}    = 'select';
       $fieldref->{options} = \@options;