X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_tax.cgi;h=587665740d9808c27a5d960ae264182ad0ad6551;hb=f2ccd32479007116f0008ffe67e933300b763b33;hp=aa9ed6f11c587b1bd30f790521444f2749cd3eb2;hpb=717d562bcfb691d971a01b738d0b55cdda480cf0;p=freeside.git

diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index aa9ed6f11..587665740 100755
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -42,7 +42,8 @@ my $gotcust = "
             )
 ";
 
-my($total, $exempt, $taxable, $tax) = ( 0, 0, 0, 0 );
+my $monthly_exempt_warning = 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) ) {
@@ -76,23 +77,46 @@ foreach my $r (qsearch('cust_main_county', {}, '', $gotcust) ) {
     $regions{$label}->{'exempt'} += $x;
   }
 
+  my($t, $x) = (0, 0);
   foreach my $e ( grep { $r->get($_.'tax') !~ /^Y/i }
                        qw( cust_bill_pkg.setup cust_bill_pkg.recur ) ) {
-    my $t = scalar_sql($r, \@param, 
+    $t += scalar_sql($r, \@param, 
       "SELECT SUM($e) $fromwhere AND $nottax AND ( tax != 'Y' OR tax IS NULL )"
     );
-    $taxable += $t;
-    $regions{$label}->{'taxable'} += $t;
-    $owed += $t * ($r->tax/100);
-    $regions{$label}->{'owed'} += $t * ($r->tax/100);
 
-    my $x = scalar_sql($r, \@param, 
+    $x += scalar_sql($r, \@param, 
       "SELECT SUM($e) $fromwhere AND $nottax AND tax = 'Y'"
     );
-    $exempt += $x;
-    $regions{$label}->{'exempt'} += $x;
   }
 
+  my($sday,$smon,$syear) = (localtime($beginning) )[ 3, 4, 5 ];
+  $monthly_exempt_warning=1 if $sday != 1 && $beginning;
+  $smon++; $syear+=1900;
+
+  my $eending = ( $ending == 4294967295 ) ? time : $ending;
+  my($eday,$emon,$eyear) = (localtime($eending) )[ 3, 4, 5 ];
+  $emon++; $eyear+=1900;
+
+  my $monthly_exemption = scalar_sql($r, [ 'taxnum' ],
+    "SELECT SUM(amount) FROM cust_tax_exempt where taxnum = ? ".
+    "  AND ( year > $syear OR ( year = $syear and month >= $smon ) )".
+    "  AND ( year < $eyear OR ( year = $eyear and month <= $emon ) )"
+  );
+  #warn $r->taxnum(). ": $monthly_exemption\n";
+  if ( $monthly_exemption ) {
+    $t -= $monthly_exemption;
+    $x += $monthly_exemption;
+  }
+
+  $taxable += $t;
+  $regions{$label}->{'taxable'} += $t;
+
+  $exempt += $x;
+  $regions{$label}->{'exempt'} += $x;
+
+  $owed += $t * ($r->tax/100);
+  $regions{$label}->{'owed'} += $t * ($r->tax/100);
+
   if ( defined($regions{$label}->{'rate'})
        && $regions{$label}->{'rate'} != $r->tax.'%' ) {
     $regions{$label}->{'rate'} = 'variable';
@@ -125,7 +149,7 @@ foreach my $r (
   my $named_tax =
     $r->taxname
       ? 'AND itemdesc = '. dbh->quote($r->taxname)
-      : "AND itemdesc IS NULL or itemdesc = ''";
+      : "AND ( itemdesc IS NULL OR itemdesc = '' OR itemdesc = 'Tax' )";
   my $x = scalar_sql($r, \@taxparam,
     "SELECT SUM(cust_bill_pkg.setup+cust_bill_pkg.recur) $taxwhere ".
     "AND pkgnum = 0 $named_tax",
@@ -146,6 +170,7 @@ push @regions, {
   'exempt'    => $exempt,
   'taxable'   => $taxable,
   'rate'      => '',
+  'owed'      => $owed,
   'tax'       => $tax,
 };
 
@@ -153,7 +178,11 @@ push @regions, {
 
 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;
@@ -210,6 +239,14 @@ sub scalar_sql {
 
 </TABLE>
 
+<% if ( $monthly_exempt_warning ) { %>
+  <BR>
+  Partial-month tax reports (except for current month) may not be correct due
+  to month-granularity tax exemption (usually "texas tax").  For an accurate
+  report, start on the first of a month and end on the last day of a month (or
+  leave blank for to now).
+<% } %>
+
 </BODY>
 </HTML>