fix error linking legacy services, RT#81818

[freeside.git] / httemplate / browse / cust_main_county.cgi

diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
index dfbe119..5523278 100755 (executable)
--- a/httemplate/browse/cust_main_county.cgi
+++ b/httemplate/browse/cust_main_county.cgi
@@ -10,7 +10,9 @@
                            'table'    => 'cust_main_county',
                            'hashref'  => $hashref,
                            'order_by' =>
-                  'ORDER BY country, state, county, city, district, taxclass',
+                              'ORDER BY country, state, county, city, '.
+                              'district, taxclass, '.
+                              "COALESCE(taxname, '')",
                          },
      'count_query'    => $count_query,
      'header'         => \@header,
@@ -409,7 +411,8 @@ my $html_foot = <<END;
 <A HREF="javascript:void(0);" onClick="bulkPopup('add');">Add new tax to selected</A>
 |
 <A HREF="javascript:void(0);" onClick="bulkPopup('edit');">Bulk edit selected</A>
-
+|
+<A HREF="${p}misc/tax_edit_excel.html",">bulk edit with excel file</A>
 END
 
 my $hashref = {};
@@ -454,7 +457,7 @@ my %seen_county = ();
 my @fields = (
   sub { my $country = shift->country;
         return '' if $seen_country{$country}++;
-        code2country($country). "&nbsp;($country)";
+        FS::geocode_Mixin->code2country($country). "&nbsp;($country)";
       },
 
   #state
@@ -465,13 +468,13 @@ my @fields = (
                              ? '&nbsp;'. add_link(
                                  desc => 'Add more counties',
                                  col  => 'state',
-                                 label=> 'add&nbsp;more&nbsp;counties',
+                                 label=> 'add more counties',
                                  row  => $_[0],
                                  cgi  => $cgi,
                                ).
                                ' '. collapse_link(
                                  col  => 'state',
-                                 label=> 'remove&nbsp;all&nbsp;counties',
+                                 label=> 'remove all counties',
                                  row  => $_[0],
                                  cgi  => $cgi,
                                )
@@ -482,7 +485,7 @@ my @fields = (
               ? ''
               : '&nbsp;'. expand_link( desc  => 'Add States',
                                        row   => $_[0],
-                                       label => 'add&nbsp;states',
+                                       label => 'add states',
                                        cgi  => $cgi,
                                      )
           );
@@ -501,18 +504,18 @@ my @fields = (
                        ? '&nbsp;'. add_link(
                            desc => 'Add more cities',
                            col  => 'county',
-                           label=> 'add&nbsp;more&nbsp;cities',
+                           label=> 'add more cities',
                            row  => $_[0],
                            cgi  => $cgi,
                          ).
                          ' '. collapse_link(
                            col  => 'county',
-                           label=> 'remove&nbsp;all&nbsp;cities',
+                           label=> 'remove all cities',
                            row  => $_[0],
                            cgi  => $cgi,
                          )
                        : '&nbsp;'. remove_link( col  => 'county',
-                                                label=> 'remove&nbsp;county',
+                                                label=> 'remove county',
                                                 row  => $_[0],
                                                 cgi  => $cgi,
                                               );
@@ -523,7 +526,7 @@ my @fields = (
           : '(all)&nbsp;'.
               expand_link(   desc  => 'Add Counties',
                              row   => $_[0],
-                             label => 'add&nbsp;counties',
+                             label => 'add counties',
                              cgi  => $cgi,
                          );
       },
@@ -539,7 +542,7 @@ my @fields = (
           } else {
             $r->city. '&nbsp;'.
               remove_link( col  => 'city',
-                           label=> 'remove&nbsp;city',
+                           label=> 'remove city',
                            row  => $r,
                            cgi  => $cgi,
                          );
@@ -548,7 +551,7 @@ my @fields = (
           '(all)&nbsp;'.
             expand_link(   desc  => 'Add Cities',
                            row   => $r,
-                           label => 'add&nbsp;cities',
+                           label => 'add cities',
                            cgi  => $cgi,
                        );
         }
@@ -560,7 +563,7 @@ my @fields = (
         if ( $r->district ) {
           $r->district . '&nbsp;'.
             remove_link( col  => 'district',
-                         label=> 'remove&nbsp;district',
+                         label=> 'remove district',
                          row  => $r,
                          cgi  => $cgi,
                        );