X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Ftax_rate.pm;h=48c01967dea29a21d726a0d31b2fc9940fc3eb35;hb=80511cb4158b98db01deec317e5408675487bc6e;hp=351c3f79a256b29783dfc2592600786ffc254414;hpb=788c20506afc3475c02b05620b8bbb64150d22b7;p=freeside.git diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm index 351c3f79a..48c01967d 100644 --- a/FS/FS/tax_rate.pm +++ b/FS/FS/tax_rate.pm @@ -18,6 +18,7 @@ use DBIx::DBSchema; use DBIx::DBSchema::Table; use DBIx::DBSchema::Column; use FS::Record qw( qsearch qsearchs dbh dbdef ); +use FS::Conf; use FS::tax_class; use FS::cust_bill_pkg; use FS::cust_tax_location; @@ -27,6 +28,8 @@ use FS::part_pkg_taxproduct; use FS::cust_main; use FS::Misc qw( csv_from_fixed ); +use URI::Escape; + @ISA = qw( FS::Record ); $DEBUG = 0; @@ -441,20 +444,35 @@ sub taxline { my $taxable_units = 0; unless ($self->recurtax =~ /^Y$/i) { - if (( $self->unittype || 0 ) == 0) { + + if (( $self->unittype || 0 ) == 0) { #access line my %seen = (); foreach (@cust_bill_pkg) { $taxable_units += $_->units - unless $seen{$_->pkgnum}; - $seen{$_->pkgnum}++; + unless $seen{$_->pkgnum}++; } - }elsif ($self->unittype == 1) { + + } elsif ($self->unittype == 1) { #minute return $self->_fatal_or_null( 'fee with minute unit type' ); - }elsif ($self->unittype == 2) { - $taxable_units = 1; - }else { + + } elsif ($self->unittype == 2) { #account + + my $conf = new FS::Conf; + if ( $conf->exists('tax-pkg_address') ) { + #number of distinct locations + my %seen = (); + foreach (@cust_bill_pkg) { + $taxable_units++ + unless $seen{$_->cust_pkg->locationnum}++; + } + } else { + $taxable_units = 1; + } + + } else { return $self->_fatal_or_null( 'unknown unit type in tax'. $self->taxnum ); } + } # @@ -502,7 +520,9 @@ given customer (see L) =cut + #hot sub tax_on_tax { + #akshun my $self = shift; my $cust_main = shift; @@ -959,9 +979,9 @@ sub _perform_batch_import { unless $keep_cch_files; push @insert_list, $name, $insertname, $import_sub, $format; if ( $name eq 'GEOCODE' ) { #handle this whole ordering issue better - unshift @predelete_list, $name, $deletename, $import_sub; + unshift @predelete_list, $name, $deletename, $import_sub, $format; } else { - unshift @delete_list, $name, $deletename, $import_sub; + unshift @delete_list, $name, $deletename, $import_sub, $format; } } else { @@ -1176,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 ); @@ -1263,7 +1288,7 @@ sub _remember_tax_products { if $part_pkg_taxproduct && $part_pkg_taxproduct->data_vendor eq $format; foreach my $option ( $part_pkg->part_pkg_option ) { - next unless $option->optionname =~ /^usage_taxproductnum_(\w)$/; + next unless $option->optionname =~ /^usage_taxproductnum_(\w+)$/; my $class = $1; $part_pkg_taxproduct = $part_pkg->taxproduct($class); @@ -1312,7 +1337,7 @@ sub _restore_remembered_tax_products { unless ( $part_pkg_taxproduct ) { return "failed to find part_pkg_taxproduct (". - $taxproduct->{pkgpart}->{$class}. ") for pkgpart $pkgpart\n"; + $taxproduct->{$pkgpart}->{$class}. ") for pkgpart $pkgpart\n"; } if ( $class eq '' ) { @@ -1655,10 +1680,9 @@ sub process_download_and_update { warn "processing $dir.new/$name.txt\n" if $DEBUG; my $olddir = $update ? "$dir.1" : ""; $difffile = _perform_cch_diff( $name, "$dir.new", $olddir ); - } else { - $difffile =~ s/^$cache_dir//; - push @list, "${name}file:$difffile"; } + $difffile =~ s/^$cache_dir//; + push @list, "${name}file:$difffile"; } # perform the import @@ -1756,117 +1780,311 @@ sub browse_queries { return ($query, "SELECT COUNT(*) FROM tax_rate $extra_sql"); } -# _upgrade_data -# -# Used by FS::Upgrade to migrate to a new database. -# -# +=item queue_liability_report PARAMS -sub _upgrade_data { # class method - my ($self, %opts) = @_; - my $dbh = dbh; +Launches a tax liability report. +=cut + +sub queue_liability_report { + my $job = shift; + my $param = thaw(decode_base64(shift)); - warn "$me upgrading $self\n" if $DEBUG; + my $cgi = new CGI; + $cgi->param('beginning', $param->{beginning}); + $cgi->param('ending', $param->{ending}); + my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi); + my $agentnum = $param->{agentnum}; + if ($agentnum =~ /^(\d+)$/) { $agentnum = $1; } else { $agentnum = ''; }; + generate_liability_report( + 'beginning' => $beginning, + 'ending' => $ending, + 'agentnum' => $agentnum, + 'p' => $param->{RootURL}, + 'job' => $job, + ); +} - my @column = qw ( tax excessrate usetax useexcessrate fee excessfee - feebase feemax ); +=item generate_liability_report PARAMS - if ( $dbh->{Driver}->{Name} eq 'Pg' ) { +Generates a tax liability report. Provide a hash including desired +agentnum, beginning, and ending - eval "use DBI::Const::GetInfoType;"; - die $@ if $@; +=cut - my $major_version = 0; - $dbh->get_info( $GetInfoType{SQL_DBMS_VER} ) =~ /^(\d{2})/ - && ( $major_version = sprintf("%d", $1) ); +#shit, all sorts of false laxiness w/report_newtax.cgi +sub generate_liability_report { + my %args = @_; - if ( $major_version > 7 ) { + my ( $count, $last, $min_sec ) = _progressbar_foo(); - # ideally this would be supported in DBIx-DBSchema and friends + #let us open the temp file early + my $dir = '%%%FREESIDE_CACHE%%%/cache.'. $FS::UID::datasrc; + my $report = new File::Temp( TEMPLATE => 'report.tax.liability.XXXXXXXX', + DIR => $dir, + UNLINK => 0, # not so temp + ) or die "can't open report file: $!\n"; - foreach my $column ( @column ) { - my $columndef = dbdef->table($self->table)->column($column); - unless ($columndef->type eq 'numeric') { + my $conf = new FS::Conf; + my $money_char = $conf->config('money_char') || '$'; - warn "updating tax_rate column $column to numeric\n" if $DEBUG; - my $sql = "ALTER TABLE tax_rate ALTER $column TYPE numeric(14,8)"; - my $sth = $dbh->prepare($sql) or die $dbh->errstr; - $sth->execute or die $sth->errstr; + my $join_cust = " + JOIN cust_bill USING ( invnum ) + LEFT JOIN cust_main USING ( custnum ) + "; - warn "updating h_tax_rate column $column to numeric\n" if $DEBUG; - $sql = "ALTER TABLE h_tax_rate ALTER $column TYPE numeric(14,8)"; - $sth = $dbh->prepare($sql) or die $dbh->errstr; - $sth->execute or die $sth->errstr; + my $join_loc = + "LEFT JOIN cust_bill_pkg_tax_rate_location USING ( billpkgnum )"; + my $join_tax_loc = "LEFT JOIN tax_rate_location USING ( taxratelocationnum )"; - } + my $addl_from = " $join_cust $join_loc $join_tax_loc "; + + my $where = "WHERE _date >= $args{beginning} AND _date <= $args{ending} "; + + my $agentname = ''; + if ( $args{agentnum} =~ /^(\d+)$/ ) { + my $agent = qsearchs('agent', { 'agentnum' => $1 } ); + die "agent not found" unless $agent; + $agentname = $agent->agent; + $where .= ' AND cust_main.agentnum = '. $agent->agentnum; + } + + #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'; + + #false laziness w/FS::Report::Table::Monthly (sub should probably be moved up + #to FS::Report or FS::Record or who the fuck knows where) + my $scalar_sql = sub { + my( $r, $param, $sql ) = @_; + my $sth = dbh->prepare($sql) or die dbh->errstr; + $sth->execute( map $r->$_(), @$param ) + or die "Unexpected error executing statement $sql: ". $sth->errstr; + $sth->fetchrow_arrayref->[0] || 0; + }; + + my $tax = 0; + my $credit = 0; + my %taxes = (); + my %basetaxes = (); + my $calculated = 0; + my @tax_and_location = qsearch({ table => 'cust_bill_pkg', + select => $select, + hashref => { pkgpart => 0 }, + addl_from => $addl_from, + extra_sql => $where, + }); + $count = scalar(@tax_and_location); + foreach my $t ( @tax_and_location ) { + + if ( $args{job} ) { + if ( time - $min_sec > $last ) { + $args{job}->update_statustext( int( 100 * $calculated / $count ). + ",Calculating" + ); + $last = time; } + } - } elsif ( $dbh->{pg_server_version} =~ /^704/ ) { + #my @params = map { my $f = $_; $f =~ s/.*\.//; $f } @taxparam; + my $label = join('~', map { $t->$_ } @params); + $label = 'Tax'. $label if $label =~ /^~/; + unless ( exists( $taxes{$label} ) ) { + my ($baselabel, @trash) = split /~/, $label; - # ideally this would be supported in DBIx-DBSchema and friends + $taxes{$label}->{'label'} = join(', ', split(/~/, $label) ); + $taxes{$label}->{'url_param'} = + join(';', map { "$_=". uri_escape($t->$_) } @params); - foreach my $column ( @column ) { - my $columndef = dbdef->table($self->table)->column($column); - unless ($columndef->type eq 'numeric') { + my $payby_itemdesc_loc = + " payby != 'COMP' ". + "AND ( itemdesc = ? OR ? = '' AND itemdesc IS NULL ) ". + "AND ". FS::tax_rate_location->location_sql( map { $_ => $t->$_ } + @taxparams + ); - warn "updating tax_rate column $column to numeric\n" if $DEBUG; + my $taxwhere = + "FROM cust_bill_pkg $addl_from $where AND $payby_itemdesc_loc"; - foreach my $table ( qw( tax_rate h_tax_rate ) ) { + my $sql = "SELECT SUM(amount) $taxwhere AND cust_bill_pkg.pkgnum = 0"; - my $sql = "ALTER TABLE $table RENAME $column TO old_$column"; - my $sth = $dbh->prepare($sql) or die $dbh->errstr; - $sth->execute or die $sth->errstr; + my $x = &{$scalar_sql}($t, [ 'itemdesc', 'itemdesc' ], $sql ); + $tax += $x; + $taxes{$label}->{'tax'} += $x; - my $def = dbdef->table($table)->column($column); - $def->type('numeric'); - $def->length('14,8'); - my $null = $def->null; - $def->null('NULL'); + 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 = "ALTER TABLE $table ADD COLUMN ". $def->line($dbh); - $sth = $dbh->prepare($sql) or die $dbh->errstr; - $sth->execute or die $sth->errstr; + $sql = "SELECT SUM(cust_credit_bill_pkg.amount) ". + " $creditwhere AND cust_bill_pkg.pkgnum = 0"; - $sql = "UPDATE $table SET $column = CAST( old_$column AS numeric )"; - $sth = $dbh->prepare($sql) or die $dbh->errstr; - $sth->execute or die $sth->errstr; + my $y = &{$scalar_sql}($t, [ 'itemdesc', 'itemdesc' ], $sql ); + $credit += $y; + $taxes{$label}->{'credit'} += $y; - unless ( $null eq 'NULL' ) { - $sql = "ALTER TABLE $table ALTER $column SET NOT NULL"; - $sth = $dbh->prepare($sql) or die $dbh->errstr; - $sth->execute or die $sth->errstr; - } + unless ( exists( $taxes{$baselabel} ) ) { - $sql = "ALTER TABLE $table DROP old_$column"; - $sth = $dbh->prepare($sql) or die $dbh->errstr; - $sth->execute or die $sth->errstr; + $basetaxes{$baselabel}->{'label'} = $baselabel; + $basetaxes{$baselabel}->{'url_param'} = "itemdesc=$baselabel"; + $basetaxes{$baselabel}->{'base'} = 1; - } - } } - } else { + $basetaxes{$baselabel}->{'tax'} += $x; + $basetaxes{$baselabel}->{'credit'} += $y; + + } - warn "WARNING: tax_rate table upgrade unsupported for this Pg version\n"; + # calculate customer-exemption for this tax + # calculate package-exemption for this tax + # calculate monthly exemption (texas tax) for this tax + # count up all the cust_tax_exempt_pkg records associated with + # the actual line items. + } - } - } else { + #ordering - warn "WARNING: tax_rate table upgrade only supported for Pg 8+\n"; + if ( $args{job} ) { + $args{job}->update_statustext( "0,Sorted" ); + $last = time; + } + my @taxes = (); + + foreach my $tax ( sort { $a cmp $b } keys %taxes ) { + my ($base, @trash) = split '~', $tax; + my $basetax = delete( $basetaxes{$base} ); + if ($basetax) { + if ( $basetax->{tax} == $taxes{$tax}->{tax} ) { + $taxes{$tax}->{base} = 1; + } else { + push @taxes, $basetax; + } + } + push @taxes, $taxes{$tax}; } - ''; + push @taxes, { + 'label' => 'Total', + 'url_param' => '', + 'tax' => $tax, + 'credit' => $credit, + 'base' => 1, + }; + + + my $dateagentlink = "begin=$args{beginning};end=$args{ending}"; + $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 < + + <% include('/elements/table-grid.html') %> + + + + + Tax invoiced +      + + Tax credited + +EOF + + my $bgcolor1 = '#eeeeee'; + my $bgcolor2 = '#ffffff'; + my $bgcolor = ''; + + $count = scalar(@taxes); + $calculated = 0; + foreach my $tax ( @taxes ) { + + if ( $args{job} ) { + if ( time - $min_sec > $last ) { + $args{job}->update_statustext( int( 100 * $calculated / $count ). + ",Generated" + ); + $last = time; + } + } + + if ( $bgcolor eq $bgcolor1 ) { + $bgcolor = $bgcolor2; + } else { + $bgcolor = $bgcolor1; + } + + my $link = ''; + if ( $tax->{'label'} ne 'Total' ) { + $link = ';'. $tax->{'url_param'}; + } + + print $report < + <% '$tax->{label}' %> + <% ($tax->{base}) ? qq!! : '' %> + + <% '$money_char' %><% sprintf('%.2f', $tax->{'tax'} ) %> + + <% !($tax->{base}) ? qq!! : '' %> + + <% ($tax->{base}) ? qq!! : '' %> + + <% '$money_char' %><% sprintf('%.2f', $tax->{'credit'} ) %> + + <% !($tax->{base}) ? qq!! : '' %> + +EOF + } + + print $report < + + + +EOF + + my $reportname = $report->filename; + close $report; + + my $dropstring = '%%%FREESIDE_CACHE%%%/cache.'. $FS::UID::datasrc. '/report.'; + $reportname =~ s/^$dropstring//; + + my $reporturl = "%%%ROOTURL%%%/misc/queued_report?report=$reportname"; + die "view\n"; } + + =back =head1 BUGS Mixing automatic and manual editing works poorly at present. + Tax liability calculations take too long and arguably don't belong here. + Tax liability report generation not entirely safe (escaped). + =head1 SEE ALSO L, L, L, schema.html from the base