X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Ftr-select-cust_location.html;h=34ed78dd400911e2ef10958a62ae99005ce57c24;hb=9a6e080912eb49a601b574591321cfc915359dc0;hp=3078f2cbebdf4780163ce59c03e78a5fc53e6c2b;hpb=d9f0a98539cd8dd957ea9a4b5d77fbb739d43d2e;p=freeside.git

diff --git a/httemplate/elements/tr-select-cust_location.html b/httemplate/elements/tr-select-cust_location.html
index 3078f2cbe..34ed78dd4 100644
--- a/httemplate/elements/tr-select-cust_location.html
+++ b/httemplate/elements/tr-select-cust_location.html
@@ -205,9 +205,13 @@ Example:
              'enable_censustract' => 1,
           )
 %>
-<SCRIPT TYPE="text/javascript">
-  locationnum_changed(document.getElementById('locationnum'));
-</SCRIPT>
+
+% unless ( $prospect_main ) {
+  <SCRIPT TYPE="text/javascript">
+    locationnum_changed(document.getElementById('locationnum'));
+  </SCRIPT>
+% }
+
 <%init>
 
 my $conf = new FS::Conf;
@@ -271,7 +275,9 @@ my $location_sort = sub {
   #enabled w/label_prefix _location #    $a->locationname cmp $b->locationname
                                     # or 
         $a->country   cmp $b->country
+  or lc($a->state)    cmp lc($b->state)
   or lc($a->city)     cmp lc($b->city)
+  or lc($a->county)   cmp lc($b->county)
   or lc($a->address1) cmp lc($b->address1)
   or lc($a->address2) cmp lc($b->address2)
 };