diff options
author | ivan <ivan> | 2002-09-21 11:17:39 +0000 |
---|---|---|
committer | ivan <ivan> | 2002-09-21 11:17:39 +0000 |
commit | 8965012fa53fd05d851d2f5abed4e056ab758797 (patch) | |
tree | 819fc50e7c8292a2aede31b5d46fe1269a844733 /httemplate | |
parent | bfd2c9a7e80f665beca0254065d3f3c7945c23ca (diff) |
all taxes now have names. closes: Bug#15
Diffstat (limited to 'httemplate')
-rwxr-xr-x | httemplate/browse/cust_main_county.cgi | 11 | ||||
-rw-r--r-- | httemplate/docs/schema.dia | bin | 14438 -> 14438 bytes | |||
-rw-r--r-- | httemplate/docs/schema.html | 2 | ||||
-rwxr-xr-x | httemplate/edit/cust_main_county.cgi | 5 | ||||
-rwxr-xr-x | httemplate/edit/process/cust_main_county.cgi | 17 |
5 files changed, 25 insertions, 10 deletions
diff --git a/httemplate/browse/cust_main_county.cgi b/httemplate/browse/cust_main_county.cgi index 991606087..c2473c4c8 100755 --- a/httemplate/browse/cust_main_county.cgi +++ b/httemplate/browse/cust_main_county.cgi @@ -21,7 +21,8 @@ print '<BR><BR>'. &table(). <<END; <TH><FONT SIZE=-1>Country</FONT></TH> <TH><FONT SIZE=-1>State</FONT></TH> <TH>County</TH> - <TH>Taxclass</TH> + <TH>Taxclass<BR><FONT SIZE=-1>(per-package classification)</FONT></TH> + <TH>Tax name<BR><FONT SIZE=-1>(printed on invoices)</FONT></TH> <TH><FONT SIZE=-1>Tax</FONT></TH> <TH><FONT SIZE=-1>Exempt<BR>per<BR>month</TH> </TR> @@ -111,6 +112,14 @@ END } print "</TD>"; + print "<TD"; + if ( $hashref->{taxname} ) { + print ' BGCOLOR="#ffffff">'. $hashref->{taxname}; + } else { + print ' BGCOLOR="#cccccc">Tax'; + } + print "</TD>"; + print "<TD BGCOLOR=\"#ffffff\">$hashref->{tax}%</TD>". '<TD BGCOLOR="#ffffff">$'. sprintf("%.2f", $hashref->{exempt_amount} || 0). '</TD>'. diff --git a/httemplate/docs/schema.dia b/httemplate/docs/schema.dia Binary files differindex c0842a602..746561550 100644 --- a/httemplate/docs/schema.dia +++ b/httemplate/docs/schema.dia diff --git a/httemplate/docs/schema.html b/httemplate/docs/schema.html index 54adec3a7..c518d4a4d 100644 --- a/httemplate/docs/schema.html +++ b/httemplate/docs/schema.html @@ -57,6 +57,7 @@ <li>recur - recurring fee <li>sdate - starting date <li>edate - ending date + <li>itemdesc - Line item description (currently used only when pkgnum is 0) </ul> <li><a name="cust_credit" href="man/FS/cust_credit.html">cust_credit</a> - Credits. The equivalent of a negative <a href="#cust_bill">cust_bill</a> record. <ul> @@ -133,6 +134,7 @@ <li>tax - % rate <li>taxclass <li>exempt_amount + <li>taxname - if defined, printed on invoices instead of "Tax" </ul> <li><a name="cust_tax_exempt" href="man/FS/cust_tax_exempt.html">cust_tax_exempt</a> - Tax exemption record <ul> diff --git a/httemplate/edit/cust_main_county.cgi b/httemplate/edit/cust_main_county.cgi index 7ef37a48d..f3d28825a 100755 --- a/httemplate/edit/cust_main_county.cgi +++ b/httemplate/edit/cust_main_county.cgi @@ -15,7 +15,8 @@ print qq!<FORM ACTION="!, popurl(1), <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></TH> + <TH><FONT SIZE=-1>Taxclass</FONT><BR><FONT SIZE=-2>(per-package classification)</FONT></TH> + <TH><FONT SIZE=-1>Tax name</FONT><BR><FONT SIZE=-2>(printed on invoices)</FONT></TH> <TH><FONT SIZE=-1>Tax</FONT></TH> <TH><FONT SIZE=-1>Exempt<BR>per<BR>month</TH> </TR> @@ -46,6 +47,8 @@ END : ' BGCOLOR="#cccccc">(ALL)' , "</TD>"; + print qq!<TD><INPUT TYPE="text" NAME="taxname!, $hashref->{taxnum}, + qq!" VALUE="!, $hashref->{taxname}, qq!"></TD>!; print qq!<TD><INPUT TYPE="text" NAME="tax!, $hashref->{taxnum}, qq!" VALUE="!, $hashref->{tax}, qq!" SIZE=6 MAXLENGTH=6>%</TD>!; print qq!<TD>\$<INPUT TYPE="text" NAME="exempt_amount!, $hashref->{taxnum}, diff --git a/httemplate/edit/process/cust_main_county.cgi b/httemplate/edit/process/cust_main_county.cgi index 990a23919..6d80ad512 100755 --- a/httemplate/edit/process/cust_main_county.cgi +++ b/httemplate/edit/process/cust_main_county.cgi @@ -2,17 +2,18 @@ foreach ( grep { /^tax\d+$/ } $cgi->param ) { /^tax(\d+)$/ or die "Illegal form $_!"; - my($taxnum)=$1; - my($old)=qsearchs('cust_main_county',{'taxnum'=>$taxnum}) + my $taxnum = $1; + my $old = qsearchs('cust_main_county', { 'taxnum' => $taxnum }) or die "Couldn't find taxnum $taxnum!"; - my $exempt_amount = $cgi->param("exempt_amount$taxnum"); - next unless $old->tax ne $cgi->param("tax$taxnum") - || $old->exempt_amount ne $exempt_amount; + next unless $old->tax != $cgi->param("tax$taxnum") + || $old->exempt_amount != $cgi->param("exempt_amount$taxnum") + || $old->taxname ne $cgi->param("taxname$taxnum"); my %hash = $old->hash; $hash{tax} = $cgi->param("tax$taxnum"); - $hash{exempt_amount} = $exempt_amount; - my($new)=new FS::cust_main_county \%hash; - my($error)=$new->replace($old); + $hash{exempt_amount} = $cgi->param("exempt_amount$taxnum"); + $hash{taxname} = $cgi->param("taxname$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 ); |