[freeside-commits] branch FREESIDE_3_BRANCH updated. 1dd6898c05a298171fba7f38ef100036541d387e

[Mark Wells]

The branch, FREESIDE_3_BRANCH has been updated
       via  1dd6898c05a298171fba7f38ef100036541d387e (commit)
       via  b3bcf26c00ae0a5685e1b5db82669c03321532ce (commit)
       via  cc767315b0b128af86831baa29cac9ccc5549a12 (commit)
      from  e0dd3887a47d291f804d20fb5a47bf1587663160 (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 1dd6898c05a298171fba7f38ef100036541d387e
Merge: b3bcf26 e0dd388
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Sep 9 21:51:40 2015 -0700

    Merge branch 'FREESIDE_3_BRANCH' of git.freeside.biz:/home/git/freeside into 3.x


commit b3bcf26c00ae0a5685e1b5db82669c03321532ce
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 de60cff..b18f8ee 100644
--- a/FS/FS/tax_rate.pm
+++ b/FS/FS/tax_rate.pm
@@ -2287,7 +2287,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 cc767315b0b128af86831baa29cac9ccc5549a12
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 fcf2110..f200e08 100644
--- a/httemplate/search/cust_bill_pkg.cgi
+++ b/httemplate/search/cust_bill_pkg.cgi
@@ -580,6 +580,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(-)