sales tax districts, #15089

4 files changed, 48 insertions, 8 deletions

diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi
index c6484cacd..dfbe11917 100755
--- a/httemplate/browse/cust_main_county.cgi
+++ b/httemplate/browse/cust_main_county.cgi
@@ -10,7 +10,7 @@
                            'table'    => 'cust_main_county',
                            'hashref'  => $hashref,
                            'order_by' =>
-                             'ORDER BY country, state, county, city, taxclass',
+                  'ORDER BY country, state, county, city, district, taxclass',
                          },
      'count_query'    => $count_query,
      'header'         => \@header,
@@ -440,11 +440,12 @@ if ( $taxclass ) {
 
 $cell_style = '';
 
-my @header        = ( 'Country', 'State/Province', 'County', 'City' );
-my @header2       = ( '', '', '', '', );
-my @links         = ( '', '', '', '', );
-my @link_onclicks = ( '', '', '', '', );
-my $align = 'llll';
+my @header        = ( 'Country', 'State/Province', 'County', 'City', '' );
+# last column is 'district', but usually unused
+my @header2       = ( '', '', '', '', '' );
+my @links         = ( '', '', '', '', '' );
+my @link_onclicks = ( '', '', '', '', '' );
+my $align = 'lllll';
 
 my %seen_country = ();
 my %seen_state = ();
@@ -532,7 +533,8 @@ my @fields = (
         my $r = shift;
         if ( $r->city ) {
 
-          if ( $r->taxclass ) { #but if it has a taxclass, can't remove
+          if ( $r->taxclass #but if it has a taxclass, can't remove
+              or $r->district ) { # or a district
             $r->city;
           } else {
             $r->city. ' '.
@@ -551,6 +553,21 @@ my @fields = (
                        );
         }
       },
+
+  #district
+  sub {
+        my $r = shift;
+        if ( $r->district ) {
+          $r->district . ' '.
+            remove_link( col  => 'district',
+                         label=> 'remove district',
+                         row  => $r,
+                         cgi  => $cgi,
+                       );
+        }
+        # manually editing districts is not exactly intended
+      },
+
 );
 
 my @color = (
@@ -607,7 +624,8 @@ my $cb_sub = sub {
   my $cust_main_county = shift;
 
   if ( $cb_oldrow ) {
-    if (    $cb_oldrow->city     ne $cust_main_county->city 
+    if (    $cb_oldrow->district ne $cust_main_county->district
+         || $cb_oldrow->city     ne $cust_main_county->city 
          || $cb_oldrow->county   ne $cust_main_county->county  
          || $cb_oldrow->state    ne $cust_main_county->state  
          || $cb_oldrow->country  ne $cust_main_county->country 
diff --git a/httemplate/edit/cust_main_county.html b/httemplate/edit/cust_main_county.html
index 11b8e43cd..9d21cc8a0 100644
--- a/httemplate/edit/cust_main_county.html
+++ b/httemplate/edit/cust_main_county.html
@@ -7,6 +7,7 @@
                    'state'    => 'State',
                    'county'   => 'County',
                    'city'     => 'City',
+                   'district' => 'District',
                    'taxclass' => 'Tax class',
                    'taxname'  => 'Tax name',
                    'tax'      => 'Tax rate',
@@ -48,6 +49,9 @@ my @fields = (
   { field=>'city',     type=>'fixed', },
 );
 
+push @fields, { field=>'district', type=>'fixed', }
+  if $cust_main_county->district;
+
 push @fields, { field=>'taxclass', type=>'fixed', }
   if $conf->exists('enable_taxclasses');
 
diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index c5509c1a9..13797fe61 100644
--- a/httemplate/elements/location.html
+++ b/httemplate/elements/location.html
@@ -209,6 +209,14 @@ Example:
 %   } else {
       <INPUT TYPE="hidden" NAME="censustract" VALUE="<% $opt{censustract} %>">
 %   } 
+%   if ( $conf->config('tax_district_method') or $object->get('district') ) {
+    <TR>
+      <<%$th%> ALIGN="right">Tax district<BR>(automatic)</<%$th%>>
+      <TD>
+        <INPUT TYPE="text" NAME="district" VALUE="<%$object->get('district')%>">
+      </TD>
+    </TR>
+%   }
 % } 
 
 <%init>
diff --git a/httemplate/view/cust_main/misc.html b/httemplate/view/cust_main/misc.html
index f664ae203..28414ef2d 100644
--- a/httemplate/view/cust_main/misc.html
+++ b/httemplate/view/cust_main/misc.html
@@ -127,6 +127,16 @@
 
 % }
 
+% if ( $cust_main->district ) {
+
+  <TR>
+    <TD ALIGN="right"><% mt('Tax district') |h %></TD>
+    <TD BGCOLOR="#ffffff"><% $cust_main->district %></TD>
+  </TR>
+
+% }
+
+
 % if ( $conf->exists('ticket_system-selfservice_edit_subject') ) {
 
   <TR>