X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fcust_main_county.html;h=b0823098f0f579ab9c2bddc78c313eb38f1b1474;hp=510839d71f4127eda6b8c68d36f9b580a06f153c;hb=c49cfd25a8f92c7a2f44b51d72506a21f6b8d09f;hpb=1f0e0fb65fdd32d57a3134c018d5a1dc0f09e249

diff --git a/httemplate/edit/cust_main_county.html b/httemplate/edit/cust_main_county.html
index 510839d71..b0823098f 100644
--- a/httemplate/edit/cust_main_county.html
+++ b/httemplate/edit/cust_main_county.html
@@ -6,12 +6,15 @@
                    'country'  => 'Country',
                    'state'    => 'State',
                    'county'   => 'County',
+                   'city'     => 'City',
+                   'district' => 'District',
                    'taxclass' => 'Tax class',
                    'taxname'  => 'Tax name',
                    'tax'      => 'Tax rate',
                    'setuptax' => 'This tax not applicable to setup fees',
                    'recurtax' => 'This tax not applicable to recurring fees',
                    'exempt_amount' => 'Monthly exemption per customer ($25 "Texas tax")',
+                   'charge_prediscount' => 'Charge this tax prior to any discounts',
                  },
      'fields' => \@fields,
    )
@@ -21,7 +24,6 @@
 my $conf = new FS::Conf;
 
 </%once>
-
 <%init>
 
 die "access denied"
@@ -29,7 +31,8 @@ die "access denied"
 
 my $taxnum;
 if ( $cgi->param('error') ) {
-  $cgi->param('taxnum') =~ /^(\d+)$/ or die 'error, but no taxnum';
+  $cgi->param('taxnum') =~ /^(\d+)$/
+    or die "no taxnum, but error: ". $cgi->param('error');
   $taxnum = $1;
 } else {
   my($query) = $cgi->keywords;
@@ -44,8 +47,13 @@ my @fields = (
   { field=>'country',  type=>'fixed-country', },
   { field=>'state',    type=>'fixed-state', },
   { field=>'county',   type=>'fixed', },
+  { field=>'city',     type=>'fixed', },
+  { field=>'source',   type=>'hidden', },
 );
 
+push @fields, { field=>'district', type=>'fixed', }
+  if $cust_main_county->district;
+
 push @fields, { field=>'taxclass', type=>'fixed', }
   if $conf->exists('enable_taxclasses');
 
@@ -53,6 +61,9 @@ push @fields,
   'taxname',
   { field=>'tax',      type=>'percentage', },
 
+  { type=>'tablebreak-tr-title', value=>'Charging options' },
+  { field=>'charge_prediscount', type=>'checkbox', value=>'Y', },
+
   { type=>'tablebreak-tr-title', value=>'Exemptions' },
   { field=>'setuptax', type=>'checkbox', value=>'Y', },
   { field=>'recurtax', type=>'checkbox', value=>'Y', },