[freeside-commits] branch master updated. 0ed150d5dd7027513942b74eb362460bc7c2e884

[Mark Wells]

The branch, master has been updated
       via  0ed150d5dd7027513942b74eb362460bc7c2e884 (commit)
      from  85d0dbbdb844857f17192c5f0740f63c9681b9e6 (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 0ed150d5dd7027513942b74eb362460bc7c2e884
Author: Mark Wells <mark at freeside.biz>
Date:   Thu Dec 1 14:35:59 2016 -0800

    fix subtotal and per-group item count on payment report, #25944 and #71364

diff --git a/httemplate/search/elements/grouped-search/core b/httemplate/search/elements/grouped-search/core
index 3d38a8c..b15fe86 100644
--- a/httemplate/search/elements/grouped-search/core
+++ b/httemplate/search/elements/grouped-search/core
@@ -110,7 +110,7 @@ for my $i (0 .. scalar(@groups) - 1) {
   push @group_labels, $label;
 
   my @footer;
-  if ($opt{'subtotal_row'}) {
+  if ($opt{'subtotal_row'} and @groups > 1) {
     for( my $col = 0;
          exists($opt{'subtotal_row'}[$col]) or exists($opt{'header'}[$col]);
          $col++
diff --git a/httemplate/search/elements/grouped-search/html b/httemplate/search/elements/grouped-search/html
index 9c2418a..28d0040 100644
--- a/httemplate/search/elements/grouped-search/html
+++ b/httemplate/search/elements/grouped-search/html
@@ -106,14 +106,18 @@ if ($group_info->{num} > 1) {
 &>
 
 <DIV CLASS="fstabcontainer">
+% if ( $group->num_rows > 0 ) {
+<P><% emt('[quant,_1,_2]', $group->num_rows, $opt{name_singular}) %>
+</P>
 %# download links
-<P><% emt('Download full results') %><BR>
+<P><% emt('Download results:') %>
 % $cgi->param('type', 'xls');
-<A HREF="<% $cgi->self_url %>"><% emt('as Excel spreadsheet') %></A><BR>
+<A HREF="<% $cgi->self_url %>"><% emt('Spreadsheet') %></A> | 
 % $cgi->param('type', 'html-print');
-<A HREF="<% $cgi->self_url %>"><% emt('as printable copy') %></A><BR>
+<A HREF="<% $cgi->self_url %>"><% emt('webpage') %></A>
 % $cgi->delete('type');
 </P>
+% }
 
 <% $pager %>
 

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

Summary of changes:
 httemplate/search/elements/grouped-search/core |    2 +-
 httemplate/search/elements/grouped-search/html |   10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)