[freeside-commits] branch FREESIDE_3_BRANCH updated. 5b27ffc34056dbd340f83db34f00defc7cccae24

[Mark Wells]

The branch, FREESIDE_3_BRANCH has been updated
       via  5b27ffc34056dbd340f83db34f00defc7cccae24 (commit)
       via  28061a709c2d15f481fce9787b32b39b347d747d (commit)
      from  453d0509426c36f94868c06823327bb58871a763 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5b27ffc34056dbd340f83db34f00defc7cccae24
Author: Mark Wells <mark at freeside.biz>
Date:   Sat Oct 3 16:12:38 2015 -0700

    fix region-filtering of credit application search from tax report, #37088

diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 615abe5..0ad143f 100644
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -77,7 +77,7 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
 %   # 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};
-%   my $rowregion = '';
+%   my $rowregion = ';country=' . $cgi->param('country');
 %   foreach my $loc (qw(state county city district)) {
 %     if ( $row->{$loc} ) {
 %       $rowregion .= ";$loc=" . uri_escape($row->{$loc});
@@ -88,6 +88,7 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
 %     $rowlink .= ';classnum=' . ($row->{pkgclass} || 0);
 %     $rowregion .= ';classnum=' . ($row->{pkgclass} || 0);
 %   }
+%warn $rowregion;
 %
 %   if ( $row->{total} ) {
   </TBODY><TBODY CLASS="total">

commit 28061a709c2d15f481fce9787b32b39b347d747d
Author: Mark Wells <mark at freeside.biz>
Date:   Fri Oct 2 17:19:14 2015 -0700

    fix placement of "taxable" column, #37088

diff --git a/httemplate/search/report_tax.cgi b/httemplate/search/report_tax.cgi
index 6d0e95d..615abe5 100644
--- a/httemplate/search/report_tax.cgi
+++ b/httemplate/search/report_tax.cgi
@@ -125,14 +125,14 @@ TD.rowhead { font-weight: bold; text-align: left; padding: 0px 3px }
         <% $money_sprintf->( $row->{sales_credited} ) %>
       </A>
     </TD>
-    <TD CLASS="bigmath"> × </TD>
-    <TD><% $row->{rate} %></TD>
 %   # taxable sales
     <TD>
       <A HREF="<% $saleslink . $rowlink . ";taxable=1" %>">
         <% $money_sprintf->( $row->{taxable} ) %>
       </A>
     </TD>
+    <TD CLASS="bigmath"> × </TD>
+    <TD><% $row->{rate} %></TD>
 %   # estimated tax
     <TD CLASS="bigmath"> = </TD>
     <TD>

-----------------------------------------------------------------------

Summary of changes:
 httemplate/search/report_tax.cgi |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)