freeside/httemplate/search report_tax.cgi,1.5.4.13,1.5.4.14
ivan
ivan at pouncequick.420.am
Tue Nov 9 01:13:03 PST 2004
Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory pouncequick:/tmp/cvs-serv27860
Modified Files:
Tag: FREESIDE_1_4_BRANCH
report_tax.cgi
Log Message:
sync up w/1.5
Index: report_tax.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_tax.cgi,v
retrieving revision 1.5.4.13
retrieving revision 1.5.4.14
diff -u -d -r1.5.4.13 -r1.5.4.14
--- report_tax.cgi 26 Oct 2004 06:33:30 -0000 1.5.4.13
+++ report_tax.cgi 9 Nov 2004 09:12:57 -0000 1.5.4.14
@@ -42,7 +42,7 @@
)
";
-my($total, $exempt, $taxable, $tax) = ( 0, 0, 0, 0 );
+my($total, $exempt, $taxable, $owed, $tax) = ( 0, 0, 0, 0, 0 );
my $out = 'Out of taxable region(s)';
my %regions;
foreach my $r (qsearch('cust_main_county', {}, '', $gotcust) ) {
@@ -153,7 +153,11 @@
sub getlabel {
my $r = shift;
+
+ my $label;
if ( $r->tax == 0 ) {
+ #kludge to avoid "will not stay shared" warning
+ my $out = 'Out of taxable region(s)';
$label = $out;
} elsif ( $r->taxname ) {
$label = $r->taxname;
More information about the freeside-commits
mailing list