X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fbrowse%2Fcust_main_county.cgi;h=c6484cacd589fb0aaa752c9b26d29c0ff91b6bd7;hb=12f4cc4b100b849de3584d5d1a2376cebcd8729f;hp=2a21da1505aacbcafb9a14c65350c98e292a7ab9;hpb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c;p=freeside.git

diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
index 2a21da150..c6484cacd 100755
--- a/httemplate/browse/cust_main_county.cgi
+++ b/httemplate/browse/cust_main_county.cgi
@@ -456,6 +456,7 @@ my @fields = (
         code2country($country). " ($country)";
       },
 
+  #state
   sub { my $label = $seen_state{$_[0]->country}->{$_[0]->state}++
                       ? '' : state_label($_[0]->state, $_[0]->country);
 
@@ -488,6 +489,7 @@ my @fields = (
         $label.$countylinks.$addlink;
       },
 
+  #county
   sub { my $label =
           $seen_county{$_[0]->country}->{$_[0]->state}->{$_[0]->county}++ 
             ? '' : $_[0]->county;
@@ -525,19 +527,29 @@ my @fields = (
                          );
       },
 
-  sub { $_[0]->city
-          ? $_[0]->city. ' '.
+  #city
+  sub {
+        my $r = shift;
+        if ( $r->city ) {
+
+          if ( $r->taxclass ) { #but if it has a taxclass, can't remove
+            $r->city;
+          } else {
+            $r->city. ' '.
               remove_link( col  => 'city',
                            label=> 'remove city',
-                           row  => $_[0],
+                           row  => $r,
                            cgi  => $cgi,
-                         )
-          : '(all) '.
-              expand_link(   desc  => 'Add Cities',
-                             row   => $_[0],
-                             label => 'add cities',
-                             cgi  => $cgi,
                          );
+          }
+        } else {
+          '(all) '.
+            expand_link(   desc  => 'Add Cities',
+                           row   => $r,
+                           label => 'add cities',
+                           cgi  => $cgi,
+                       );
+        }
       },
 );
 
@@ -551,10 +563,24 @@ my @color = (
 if ( $conf->exists('enable_taxclasses') ) {
   push @header, qq!Tax class (<A HREF="${p}edit/part_pkg_taxclass.html">add new</A>)!;
   push @header2, '(per-package classification)';
-  push @fields, sub { $_[0]->taxclass || '(all)&nbsp;'.
-                       separate_taxclasses_link($_[0], 'Separate Taxclasses').
-                       'separate&nbsp;taxclasses</A></FONT>'
-                    };
+  push @fields, sub {
+    my $r = shift;
+    if ( $r->taxclass ) {
+      $r->taxclass;
+    } else {
+      my $sql = 'SELECT COUNT(*) FROM cust_main_county
+                   WHERE country = ? AND state = ? AND county = ?
+                     AND city = ? AND taxclass IS NOT NULL';
+      if ( FS::Record->scalar_sql($sql, map $r->$_,
+                                            qw( country state county city) ) ) {
+        '(none)';
+      } else {
+        '(all)&nbsp;'.
+          separate_taxclasses_link($r, 'Separate Taxclasses').
+          'separate&nbsp;taxclasses</A></FONT>';
+      }
+    }
+  };
   push @color, sub { shift->taxclass ? '000000' : '999999' };
   push @links, '';
   push @link_onclicks, '';