X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2F477partIIB.html;h=bd56ecc60e0b49f20f32189c3e2a405222d81681;hb=d63803bbc79722f255b40f3fb4a060a241a43230;hp=cb181f4fd85f163cd111fc5c33ebc15d716c68c3;hpb=ca76f8dfa059fc73a73b687339da9fcd038db0f6;p=freeside.git

diff --git a/httemplate/search/477partIIB.html b/httemplate/search/477partIIB.html
index cb181f4fd..bd56ecc60 100755
--- a/httemplate/search/477partIIB.html
+++ b/httemplate/search/477partIIB.html
@@ -46,28 +46,29 @@ my $curuser = $FS::CurrentUser::CurrentUser;
 die "access denied"
   unless $curuser->access_right('List packages');
 
+my %opt = @_;
 my %search_hash = ();
 
 $search_hash{'agentnum'} = $cgi->param('agentnum');
 $search_hash{'state'}    = $cgi->param('state');
 $search_hash{'classnum'} = [ $cgi->param('classnum') ];
-$search_hash{'status'}   = 'active';
+$search_hash{'active'}   = [ $opt{date}, $opt{date} ];
 
 my @row_option;
 foreach ($cgi->param('part2b_row_option')) {
   push @row_option, (/^\d+$/ ? $_ : undef);
 }
 
-my $is_residential = "AND COALESCE(cust_main.company, '') = ''";
+my $is_residential = " AND COALESCE(cust_main.company, '') = ''";
 my $has_report_option = sub {
   map {
     defined($row_option[$_]) ?
-    "AND EXISTS(
+    " AND EXISTS(
       SELECT 1 FROM part_pkg_option 
       WHERE part_pkg_option.pkgpart = part_pkg.pkgpart
       AND optionname = 'report_option_" . $row_option[$_]."'
       AND optionvalue = '1'
-    )" : 'AND FALSE'
+    )" : ' AND FALSE'
   } @_
 };
 
@@ -117,11 +118,14 @@ foreach (@col_conds) {
     if ( $row == 0 ) {
       $col_data[$row] = $count; # the raw count
     } else {
+      # the rows that are percentages of the raw count
       if ( $col_data[0] == 0 ) {
-        $col_data[$row] = ''; # show nothing in this row, then
+        # 0 out of 0 is not 0%, but supposedly this works
+        $col_data[$row] = '0.000';
       } else {
-        $col_data[$row] = sprintf('%.3f', 100 * $count / $col_data[0]) . '%';
+        $col_data[$row] = sprintf('%.3f', 100 * $count / $col_data[0]);
       }
+      $col_data[$row] .= '%' unless $cgi->param('_type') eq 'xml';
     } #if $row == 0
     $row++;
   }