X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_tax.cgi;h=410fe46039135f45403deb9bf554a23afba81021;hp=3e9d7653a4c9ef07aa18a08a1ad2f242b2c35d70;hb=1fc8addc56f8daf12397da568eb1ac1b27fd3984;hpb=bee4494248009b7b998391bc68c5d10a31220057 diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi index 3e9d7653a..410fe4603 100644 --- a/httemplate/search/report_tax.cgi +++ b/httemplate/search/report_tax.cgi @@ -18,11 +18,12 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px } .bigmath { font-size: large; font-weight: bold; font: sans-serif; text-align: center } .total { font-style: italic } + <& /elements/table-grid.html &> - Sales + Sales Rate @@ -32,6 +33,8 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px } Tax credited Net tax due + + Tax collected @@ -39,6 +42,7 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px } Non-taxable Non-taxable Non-taxable + Credited Taxable @@ -71,17 +75,39 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px } % } # if $row->{pkgclass} ne ... % # construct base links that limit to the tax rates described by this row +% # cust_bill_pkg.cgi wants a list of specific taxnums (and package class) +% # cust_credit_bill_pkg.html wants a geographic scope (and package class) % my $rowlink = ';taxnum=' . $row->{taxnums}; -% # and also the package class, if we're limiting package class -% $rowlink .= ';pkgclass='.$row->{pkgclass} -% if $params{breakdown}->{pkgclass}; +% if ( $params{breakdown}->{pkgclass} ) { +% $rowlink .= ';classnum=' . ($row->{pkgclass} || 0); +% # $rowregion .= ';classnum=' . ($row->{pkgclass} || 0); +% } % % if ( $row->{total} ) { % } % # Row label - <% $row->{label} |h %> +% # Special: If this report is showing all taxes, link the row label to +% # the detailed tax report for that taxname/country. + +% if ( $all ) { +% my $newcgi = CGI->new($cgi); +% $newcgi->delete('all'); +% $newcgi->param('country', $row->{country}); +% $newcgi->param('taxname', $row->{taxname}); +% $newcgi->param('breakdown', qw(city district)); + + + <% $row->{label} |h %> + + +% } else { # on the per-taxname report, just show the label with no link + + <% $row->{label} |h %> + +% } + % # Total sales @@ -106,6 +132,12 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px } <% $money_sprintf->( $row->{exempt_monthly} ) %> +% # credited sales + + + <% $money_sprintf->( $row->{sales_credited} ) %> + + % # taxable sales "> @@ -130,28 +162,32 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px } % # credited tax − - - <% $money_sprintf->( $row->{credit} ) %> - +%# currently broken + <% $money_sprintf->( $row->{tax_credited} ) %> +%# % # net tax due = - <% $money_sprintf->( $row->{tax} - $row->{credit} ) %> + <% $money_sprintf->( $row->{tax} - $row->{tax_credited} ) %> +% # tax collected +   + <% $money_sprintf->( $row->{tax_paid} ) %> % $rownum++; % $prev_row = $row; % } # foreach my $row % # at the end of everything -% if ( $report->{outside} > 0 ) { +% # the all-taxes report doesn't have "out of region" +% if ( !$all and $report->{out_sales} > 0 ) { <% emt('Out of taxable region') %> - - <% $money_sprintf->( $report->{outside } ) %> + + <% $money_sprintf->( $report->{out_sales} ) %> @@ -160,6 +196,101 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px } % } +
+<& /elements/table-grid.html &> + + + + Total credits + Applied to + + + Taxable sales + Tax-exempt sales + Taxes + + + +% $rownum = 0; +% $prev_row = { pkgclass => 'DUMMY PKGCLASS' }; + + +% # mostly duplicates the stuff above... +% # but putting it all in one giant table is no good +% foreach my $row (@rows) { +% if ( $row->{pkgclass} ne $prev_row->{pkgclass} ) { +% if ( $rownum > 0 ) { # start a new section +% $rownum = 0; + +% } +% if ( $params{breakdown}->{pkgclass} ) { # and caption the new section + + + <% $pkgclass_name{$row->{pkgclass}} %> + + +% } +% } # if $row->{pkgclass} ne ... + +% my $rowlink = ';taxnum=' . $row->{taxnums}; +% +% if ( $row->{total} ) { + +% } + + <% $row->{label} |h %> + +% # Total credits + <% $money_sprintf->( $row->{credits} ) %> + +% # Credits to taxable sales + + + <% $money_sprintf->( $row->{sales_credited} ) %> + + +% # ... to exempt sales (link is the same, it shows both exempt and taxable) + + + <% $money_sprintf->( $row->{exempt_credited} ) %> + + +% # ... to taxes + +%# currently broken + <% $money_sprintf->( $row->{tax_credited} ) %> +%# + + +% $rownum++; +% $prev_row = $row; +% } # foreach my $row +% # "out of taxable region" for credits (there is a need for it) +% if ( !$all and $report->{out_credit} > 0 ) { +% my $creditlink = "cust_credit_bill_pkg.html?out=1;$dateagentlink"; +% if ( $params{'credit_date'} eq 'cust_credit_bill' ) { +% $creditlink =~ s/begin/credit_begin/; +% $creditlink =~ s/end/credit_end/; +% } +% $creditlink .= ";taxname=" . encode_entities($params{'taxname'}); + + + + <% emt('Out of taxable region') %> + + + + <% $money_sprintf->( $report->{out_credit} ) %> + + + + + +% } + + + + <& /elements/footer.html &> <%init> @@ -176,32 +307,48 @@ my %params = ( beginning => $beginning, ending => $ending, ); -$params{country} = $cgi->param('country'); $params{debug} = $DEBUG; -$params{breakdown} = { map { $_ => 1 } $cgi->param('breakdown') }; - my $agentname; + +# filter by agentnum if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) { my $agent = FS::agent->by_key($1) or die "unknown agentnum $1"; $params{agentnum} = $1; $agentname = $agent->agentname; } -if ( $cgi->param('taxname') =~ /^([\w ]+)$/ ) { - $params{taxname} = $1; -} else { - die "taxname required"; -} - +# credit date behavior: limit by the date of the credit application, or +# the invoice? if ( $cgi->param('credit_date') eq 'cust_credit_bill' ) { $params{credit_date} = 'cust_credit_bill'; } else { $params{credit_date} = 'cust_bill'; } -warn "PARAMS:\n".Dumper(\%params)."\n\n" if $DEBUG; +my $all = $cgi->param('all'); +my $report_class; -my $report = FS::Report::Tax->report_internal(%params); +if ( $all ) { + # then show the master report, no country, no taxname, no breakdown + $report_class = 'FS::Report::Tax::All'; +} else { + $report_class = 'FS::Report::Tax::ByName'; + $params{country} = $cgi->param('country'); + $params{breakdown} = { map { $_ => 1 } $cgi->param('breakdown') }; + + # allow anything in here; FS::Report::Tax will treat it as unsafe + if ( length($cgi->param('taxname')) ) { + $params{taxname} = $cgi->param('taxname'); + } else { + die "taxname required"; + } +} + +if ($DEBUG) { + warn "REPORT: $report_class\nPARAMS:\n".Dumper(\%params)."\n\n"; +} + +my $report = $report_class->report(%params); my @rows = $report->table; # array of hashrefs my $money_char = $conf->config('money_char') || '$'; @@ -210,16 +357,24 @@ my $money_sprintf = sub { }; my $dateagentlink = "begin=$beginning;end=$ending"; -$dateagentlink .= $params{agentnum} if $params{agentnum}; +if ( $params{agentnum} ) { + $dateagentlink .= ';agentnum=' . $params{agentnum}; +} my $saleslink = $p. "search/cust_bill_pkg.cgi?$dateagentlink;nottax=1"; my $taxlink = $p. "search/cust_bill_pkg.cgi?$dateagentlink;istax=1"; my $exemptlink = $p. "search/cust_tax_exempt_pkg.cgi?$dateagentlink"; -my $creditlink = $p. "search/cust_bill_pkg.cgi?$dateagentlink;credit=1;istax=1"; - +my $salescreditlink = $p. "search/cust_bill_pkg.cgi?$dateagentlink;nottax=1;credit=1"; if ( $params{'credit_date'} eq 'cust_credit_bill' ) { - $creditlink =~ s/begin/credit_begin/; - $creditlink =~ s/end/credit_end/; + $salescreditlink =~ s/begin/credit_begin/; + $salescreditlink =~ s/end/credit_end/; + $saleslink .= ";credit_begin=$beginning;credit_end=$ending"; } +#my $creditlink = $p. "search/cust_bill_pkg.cgi?$dateagentlink;credit=1;istax=1"; +#if ( $params{'credit_date'} eq 'cust_credit_bill' ) { +# $creditlink =~ s/begin/credit_begin/; +# $creditlink =~ s/end/credit_end/; +#} +my $creditlink = ''; # disabled until we find a sane way to do this my %pkgclass_name = map { $_->classnum, $_->classname } qsearch('pkg_class'); $pkgclass_name{''} = 'Unclassified';