X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Ftax_rate.pm;h=48c01967dea29a21d726a0d31b2fc9940fc3eb35;hb=b79a8cb932946c849328a3c117c35821d9d21e66;hp=334c31e953e7549df45f42d86ea2125ef25aaecb;hpb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c;p=freeside.git

diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm
index 334c31e95..48c01967d 100644
--- a/FS/FS/tax_rate.pm
+++ b/FS/FS/tax_rate.pm
@@ -1196,9 +1196,14 @@ sub _cch_extract_csv_from_dbf {
           $date;
         };
   while (my $row = $cursor->fetch_hashref) {
-    $csv->combine( map { ($table->field_type($_) eq 'D')
-                         ? &{$format_date}($row->{$_}) 
-                         : $row->{$_}
+    $csv->combine( map { my $type = $table->field_type($_);
+                         if ($type eq 'D') {
+                           &{$format_date}($row->{$_}) ;
+                         } elsif ($type eq 'N' && $row->{$_} =~ /e-/i ) {
+                           sprintf('%.8f', $row->{$_}); #db row is numeric(14,8)
+                         } else {
+                           $row->{$_};
+                         }
                        }
                    @fields
     );
@@ -1843,12 +1848,9 @@ sub generate_liability_report {
     $where .= ' AND cust_main.agentnum = '. $agent->agentnum;
   }
 
-  # my ( $location_sql, @location_param ) = FS::cust_pkg->location_sql;
-  # $where .= " AND $location_sql";
-  #my @taxparam = ( 'itemdesc', @location_param );
-  # now something along the lines of geocode matching ?
-  #$where .= FS::cust_pkg->_location_sql_where('cust_tax_location');;
-  my @taxparam = ( 'itemdesc', 'tax_rate_location.state', 'tax_rate_location.county', 'tax_rate_location.city', 'cust_bill_pkg_tax_rate_location.locationtaxid' );
+  #my @taxparam = ( 'itemdesc', 'tax_rate_location.state', 'tax_rate_location.county', 'tax_rate_location.city', 'cust_bill_pkg_tax_rate_location.locationtaxid' );
+  my @taxparams = qw( city county state locationtaxid );
+  my @params = ('itemdesc', @taxparams);
 
   my $select = 'DISTINCT itemdesc,locationtaxid,tax_rate_location.state,tax_rate_location.county,tax_rate_location.city';
 
@@ -1879,13 +1881,13 @@ sub generate_liability_report {
     if ( $args{job} ) {
       if ( time - $min_sec > $last ) {
         $args{job}->update_statustext( int( 100 * $calculated / $count ).
-                                       ",Calculated"
+                                       ",Calculating"
                                      );
         $last = time;
       }
     }
 
-    my @params = map { my $f = $_; $f =~ s/.*\.//; $f } @taxparam;
+    #my @params = map { my $f = $_; $f =~ s/.*\.//; $f } @taxparam;
     my $label = join('~', map { $t->$_ } @params);
     $label = 'Tax'. $label if $label =~ /^~/;
     unless ( exists( $taxes{$label} ) ) {
@@ -1895,24 +1897,31 @@ sub generate_liability_report {
       $taxes{$label}->{'url_param'} =
         join(';', map { "$_=". uri_escape($t->$_) } @params);
 
-      my $taxwhere = "FROM cust_bill_pkg $addl_from $where AND payby != 'COMP' ".
-        "AND ". join( ' AND ', map { "( $_ = ? OR ? = '' AND $_ IS NULL)" } @taxparam );
+      my $payby_itemdesc_loc = 
+        "    payby != 'COMP' ".
+        "AND ( itemdesc = ? OR ? = '' AND itemdesc IS NULL ) ".
+        "AND ". FS::tax_rate_location->location_sql( map { $_ => $t->$_ }
+                                                         @taxparams
+                                                   );
+
+      my $taxwhere =
+        "FROM cust_bill_pkg $addl_from $where AND $payby_itemdesc_loc";
 
       my $sql = "SELECT SUM(amount) $taxwhere AND cust_bill_pkg.pkgnum = 0";
 
-      my $x = &{$scalar_sql}($t, [ map { $_, $_ } @params ], $sql );
+      my $x = &{$scalar_sql}($t, [ 'itemdesc', 'itemdesc' ], $sql );
       $tax += $x;
       $taxes{$label}->{'tax'} += $x;
 
-      my $creditfrom = " JOIN cust_credit_bill_pkg USING (billpkgnum,billpkgtaxratelocationnum) ";
-      my $creditwhere = "FROM cust_bill_pkg $addl_from $creditfrom $where ".
-        "AND payby != 'COMP' ".
-        "AND ". join( ' AND ', map { "( $_ = ? OR ? = '' AND $_ IS NULL)" } @taxparam );
+      my $creditfrom =
+       "JOIN cust_credit_bill_pkg USING (billpkgnum,billpkgtaxratelocationnum)";
+      my $creditwhere =
+        "FROM cust_bill_pkg $addl_from $creditfrom $where AND $payby_itemdesc_loc";
 
       $sql = "SELECT SUM(cust_credit_bill_pkg.amount) ".
              " $creditwhere AND cust_bill_pkg.pkgnum = 0";
 
-      my $y = &{$scalar_sql}($t, [ map { $_, $_ } @params ], $sql );
+      my $y = &{$scalar_sql}($t, [ 'itemdesc', 'itemdesc' ], $sql );
       $credit += $y;
       $taxes{$label}->{'credit'} += $y;
 
@@ -1972,7 +1981,7 @@ sub generate_liability_report {
   $dateagentlink .= ';agentnum='. $args{agentnum}
     if length($agentname);
   my $baselink   = $args{p}. "search/cust_bill_pkg.cgi?$dateagentlink";
-
+  my $creditlink = $args{p}. "search/cust_credit_bill_pkg.html?$dateagentlink";
 
   print $report <<EOF;
   
@@ -1994,7 +2003,7 @@ sub generate_liability_report {
     <TR>
       <TH CLASS="grid" BGCOLOR="#cccccc"></TH>
       <TH CLASS="grid" BGCOLOR="#cccccc"></TH>
-      <TH CLASS="grid" BGCOLOR="#cccccc">Tax collected</TH>
+      <TH CLASS="grid" BGCOLOR="#cccccc">Tax invoiced</TH>
       <TH CLASS="grid" BGCOLOR="#cccccc">&nbsp;&nbsp;&nbsp;&nbsp;</TH>
       <TH CLASS="grid" BGCOLOR="#cccccc"></TH>
       <TH CLASS="grid" BGCOLOR="#cccccc">Tax credited</TH>
@@ -2040,7 +2049,7 @@ EOF
         <TD CLASS="grid" BGCOLOR="<% '$bgcolor' %>"></TD>
         <% ($tax->{base}) ? qq!<TD CLASS="grid" BGCOLOR="$bgcolor"></TD>! : '' %>
         <TD CLASS="grid" BGCOLOR="<% '$bgcolor' %>" ALIGN="right">
-          <A HREF="<% '$baselink$link' %>;istax=1;iscredit=rate"><% '$money_char' %><% sprintf('%.2f', $tax->{'credit'} ) %></A>
+          <A HREF="<% '$creditlink$link' %>;istax=1;iscredit=rate"><% '$money_char' %><% sprintf('%.2f', $tax->{'credit'} ) %></A>
         </TD>
         <% !($tax->{base}) ? qq!<TD CLASS="grid" BGCOLOR="$bgcolor"></TD>! : '' %>
       </TR>