[freeside-commits] branch FREESIDE_4_BRANCH updated. e1887ef9da2b3f715af9f1b3d6b0e0eec7fdc751

[Mark Wells]

The branch, FREESIDE_4_BRANCH has been updated
       via  e1887ef9da2b3f715af9f1b3d6b0e0eec7fdc751 (commit)
       via  ca3444a48d89ada75cbf9ea140997364bc6ec108 (commit)
       via  ec9276cca14688d6e6ef8cefb8eb4f50fc1c1923 (commit)
      from  6de15e421a9de5a4d3f011047f26ba275a0925a8 (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 e1887ef9da2b3f715af9f1b3d6b0e0eec7fdc751
Merge: ca3444a 6de15e4
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Sep 9 21:51:32 2015 -0700

    Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into 4.x


commit ca3444a48d89ada75cbf9ea140997364bc6ec108
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Sep 9 19:20:18 2015 -0700

    fix bad internal link

diff --git a/FS/FS/tax_rate.pm b/FS/FS/tax_rate.pm
index 1094968..c6fe243 100644
--- a/FS/FS/tax_rate.pm
+++ b/FS/FS/tax_rate.pm
@@ -2328,7 +2328,7 @@ EOF
   my $dropstring = '%%%FREESIDE_CACHE%%%/cache.'. $FS::UID::datasrc. '/report.';
   $reportname =~ s/^$dropstring//;
 
-  my $reporturl = "%%%ROOTURL%%%/misc/queued_report?report=$reportname";
+  my $reporturl = "%%%ROOTURL%%%/misc/queued_report.html?report=$reportname";
   die "<a href=$reporturl>view</a>\n";
 
 }

commit ec9276cca14688d6e6ef8cefb8eb4f50fc1c1923
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Sep 9 19:18:45 2015 -0700

    fix itemdesc filter, #38020, from #26770

diff --git a/httemplate/search/cust_bill_pkg.cgi b/httemplate/search/cust_bill_pkg.cgi
index 4fb9b66..278382f 100644
--- a/httemplate/search/cust_bill_pkg.cgi
+++ b/httemplate/search/cust_bill_pkg.cgi
@@ -601,6 +601,16 @@ if ( $cgi->param('nottax') ) {
       }
     }
 
+    # itemdesc, for breakdown from the vendor tax report
+    # (this is definitely used)
+    if ( $cgi->param('itemdesc') ) {
+      if ( $cgi->param('itemdesc') eq 'Tax' ) {
+        push @where, "($itemdesc = 'Tax' OR $itemdesc is null)";
+      } else {
+        push @where, "$itemdesc = ". dbh->quote($cgi->param('itemdesc'));
+      }
+    }
+
   } else { # the internal-tax case
 
     my $tax_select = 'SELECT tax.billpkgnum, SUM(tax.amount) as tax_total';

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

Summary of changes:
 FS/FS/tax_rate.pm                   |    2 +-
 httemplate/search/cust_bill_pkg.cgi |   10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)