From: ivan <ivan>
Date: Fri, 4 Jan 2008 02:36:07 +0000 (+0000)
Subject: new tax rate editor
X-Git-Tag: TRIXBOX_2_6~132
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=3b720b3194fb140737a87830b32b2e8d616215f4

new tax rate editor
---

diff --git a/httemplate/browse/elements/browse.html b/httemplate/browse/elements/browse.html
index 2cc5a9660..513c2c4e9 100644
--- a/httemplate/browse/elements/browse.html
+++ b/httemplate/browse/elements/browse.html
@@ -1,6 +1,6 @@
 <% include( '/search/elements/search.html',
-               @_,
                'disable_download'  => 1,
                'disable_nonefound' => 1,
+               @_,
            )
 %>
diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi
deleted file mode 100755
index 7d1354d3e..000000000
--- a/httemplate/edit/cust_main_county.cgi
+++ /dev/null
@@ -1,99 +0,0 @@
-<!-- mason kludge -->
-%
-%
-%print header("Edit tax rates", menubar(
-%  'Main Menu' => popurl(2),
-%));
-%
-%print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-%      "</FONT>"
-%  if $cgi->param('error');
-%
-%print qq!<FORM ACTION="!, popurl(1),
-%    qq!process/cust_main_county.cgi" METHOD=POST>!, &table(), <<END;
-%      <TR>
-%        <TH><FONT SIZE=-1>Country</FONT></TH>
-%        <TH><FONT SIZE=-1>State</FONT></TH>
-%        <TH><FONT SIZE=-1>County</FONT></TH>
-%        <TH><FONT SIZE=-1>Taxclass</FONT><BR><FONT SIZE=-2>(per-package classification)</FONT></TH>
-%END
-%
-%if ( dbdef->table('cust_main_county')->column('taxname') ) {
-%  print '<TH><FONT SIZE=-1>Tax name</FONT><BR><FONT SIZE=-2>(printed on invoices)</FONT></TH>';
-%}
-%
-%print <<END;
-%        <TH><FONT SIZE=-1>Tax</FONT></TH>
-%        <TH><FONT SIZE=-1>Exempt<BR>per<BR>month</TH>
-%END
-%
-%if ( dbdef->table('cust_main_county')->column('setuptax') ) {
-%  print '<TH><FONT SIZE=-1>Setup<BR>fee<BR>exempt</TH>';
-%}
-%if ( dbdef->table('cust_main_county')->column('recurtax') ) {
-%  print '<TH><FONT SIZE=-1>Recurring<BR>fee<BR>exempt</TH>';
-%}
-%
-%print '</TR>';
-%
-%foreach my $cust_main_county ( sort {    $a->country cmp $b->country
-%                                      or $a->state   cmp $b->state
-%                                      or $a->county  cmp $b->county
-%                                    } qsearch('cust_main_county',{}) ) {
-%  my($hashref)=$cust_main_county->hashref;
-%  print <<END;
-%      <TR>
-%        <TD BGCOLOR="#ffffff">$hashref->{country}</TD>
-%END
-%
-%  print "<TD", $hashref->{state}
-%      ? ' BGCOLOR="#ffffff">'.$hashref->{state}
-%      : ' BGCOLOR="#cccccc">(ALL)'
-%    , "</TD>";
-%
-%  print "<TD", $hashref->{county}
-%      ? ' BGCOLOR="#ffffff">'. $hashref->{county}
-%      : ' BGCOLOR="#cccccc">(ALL)'
-%    , "</TD>";
-%
-%  print "<TD", $hashref->{taxclass}
-%      ? ' BGCOLOR="#ffffff">'. $hashref->{taxclass}
-%      : ' BGCOLOR="#cccccc">(ALL)'
-%    , "</TD>";
-%
-%  print qq!<TD><INPUT TYPE="text" NAME="taxname!, $hashref->{taxnum},
-%        qq!" VALUE="!, $hashref->{taxname}, qq!"></TD>!
-%    if dbdef->table('cust_main_county')->column('taxname');
-%
-%  print qq!<TD><TABLE><TR><TD><INPUT TYPE="text" NAME="tax!, $hashref->{taxnum},
-%        qq!" VALUE="!, $hashref->{tax}, qq!" SIZE=6 MAXLENGTH=6></TD><TD>%</TD></TR></TABLE></TD>!;
-%  print qq!<TD><TABLE><TR><TD>\$</TD><TD><INPUT TYPE="text" NAME="exempt_amount!, $hashref->{taxnum},
-%        qq!" VALUE="!, $hashref->{exempt_amount}||0, qq!" SIZE=6></TD></TR></TABLE></TD>!;
-%
-%  print qq!<TD><INPUT TYPE="checkbox" NAME="setuptax!. $hashref->{taxnum}.
-%        '" VALUE="Y"'.
-%        ( $hashref->{setuptax} =~ /^Y$/i ? ' CHECKED' : '' ).
-%        '></TD>'
-%    if dbdef->table('cust_main_county')->column('setuptax');
-%
-%  print qq!<TD><INPUT TYPE="checkbox" NAME="recurtax!. $hashref->{taxnum}.
-%        '" VALUE="Y"'.
-%        ( $hashref->{recurtax} =~ /^Y$/i ? ' CHECKED' : '' ).
-%        '></TD>'
-%    if dbdef->table('cust_main_county')->column('recurtax');
-%
-%  print '</TR>';
-%
-%}
-%
-%print <<END;
-%    </TABLE>
-%    <INPUT TYPE="submit" VALUE="Apply changes">
-%    </FORM>
-%    </CENTER>
-%  </BODY>
-%</HTML>
-%END
-%
-%
-
diff --git a/httemplate/edit/process/cust_main_county.cgi b/httemplate/edit/process/cust_main_county.cgi
deleted file mode 100755
index 2c3ebe866..000000000
--- a/httemplate/edit/process/cust_main_county.cgi
+++ /dev/null
@@ -1,31 +0,0 @@
-%
-%
-%foreach ( grep { /^tax\d+$/ } $cgi->param ) {
-%  /^tax(\d+)$/ or die "Illegal form $_!";
-%  my $taxnum = $1;
-%  my $old = qsearchs('cust_main_county', { 'taxnum' => $taxnum })
-%    or die "Couldn't find taxnum $taxnum!";
-%  next unless    $old->tax           != $cgi->param("tax$taxnum")
-%              || $old->exempt_amount != $cgi->param("exempt_amount$taxnum")
-%              || $old->taxname       ne $cgi->param("taxname$taxnum")
-%              || $old->setuptax      ne $cgi->param("setuptax$taxnum")
-%              || $old->recurtax      ne $cgi->param("recurtax$taxnum");
-%  my %hash = $old->hash;
-%  $hash{tax} = $cgi->param("tax$taxnum");
-%  $hash{exempt_amount} = $cgi->param("exempt_amount$taxnum");
-%  $hash{taxname} = $cgi->param("taxname$taxnum");
-%  $hash{setuptax} = $cgi->param("setuptax$taxnum");
-%  $hash{recurtax} = $cgi->param("recurtax$taxnum");
-%  my $new = new FS::cust_main_county \%hash;
-%  my $error = $new->replace($old);
-%  if ( $error ) {
-%    $cgi->param('error', $error);
-%    print $cgi->redirect(popurl(2). "cust_main_county.cgi?". $cgi->query_string );
-%    myexit();
-%  }
-%}
-%
-%print $cgi->redirect(popurl(3). "browse/cust_main_county.cgi");
-%
-%
-