fix address stickiness on errors, RT#76000

[freeside.git] / httemplate / elements / tr-select-cust_location.html

diff --git a/httemplate/elements/tr-select-cust_location.html b/httemplate/elements/tr-select-cust_location.html
index 3078f2c..34ed78d 100644 (file)
--- 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)
 };