[freeside-commits] branch master updated. 76c65a36dd5590cf0e2a3ea2bded217c048a8645

[Mark Wells]

The branch, master has been updated
       via  76c65a36dd5590cf0e2a3ea2bded217c048a8645 (commit)
       via  34eed3944f194c9a1c20420801c05fd134cf6147 (commit)
       via  e75f08d15a25977a68948399350f6e13303d560a (commit)
      from  2602299667c4c548ba52d6cc301082bd34a3c707 (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 76c65a36dd5590cf0e2a3ea2bded217c048a8645
Merge: 34eed39 2602299
Author: Mark Wells <mark at freeside.biz>
Date:   Wed Sep 9 21:51:16 2015 -0700

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit 34eed3944f194c9a1c20420801c05fd134cf6147
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 e75f08d15a25977a68948399350f6e13303d560a
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(-)