From: ivan <ivan>
Date: Fri, 23 Apr 2004 12:19:40 +0000 (+0000)
Subject: credit report, add some links to sales/credits/receipts summary, move payment search... 
X-Git-Tag: BEFORE_FINAL_MASONIZE~1133
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=87227cd405166484ca7b791b2bd3c8829ce8d969

credit report, add some links to sales/credits/receipts summary, move payment search to template
---

diff --git a/FS/FS/Report/Table/Monthly.pm b/FS/FS/Report/Table/Monthly.pm
index 3bbf01f39..d3ff5d1db 100644
--- a/FS/FS/Report/Table/Monthly.pm
+++ b/FS/FS/Report/Table/Monthly.pm
@@ -18,7 +18,7 @@ FS::Report::Table::Monthly - Tables of report data, indexed monthly
 
   use FS::Report::Table::Monthly;
 
-  my $report = new FS::Report::Table (
+  my $report = new FS::Report::Table::Monthly (
     'items' => [ 'invoiced', 'netsales', 'credits', 'receipts', ],
     'start_month' => 4,
     'start_year'  => 2000,
@@ -53,8 +53,10 @@ sub data {
     push @{$data{label}}, "$smonth/$syear";
 
     my $speriod = timelocal(0,0,0,1,$smonth-1,$syear);
+    push @{$data{speriod}}, $speriod;
     if ( ++$smonth == 13 ) { $syear++; $smonth=1; }
     my $eperiod = timelocal(0,0,0,1,$smonth-1,$syear);
+    push @{$data{eperiod}}, $eperiod;
   
     foreach my $item ( @{$self->{'items'}} ) {
       push @{$data{$item}}, $self->$item($speriod, $eperiod);
@@ -95,7 +97,7 @@ sub netsales { #net sales
     AND LOWER(part_pkg.pkg) LIKE 'expense _%'
   ");
 
-  $self->invoiced($speriod,$eperiod)-$credited-$expenses;
+  $self->invoiced($speriod,$eperiod) - $credited - $expenses;
 }
 
 #deferred revenue
@@ -103,12 +105,6 @@ sub netsales { #net sales
 sub receipts { #cashflow
   my( $self, $speriod, $eperiod ) = ( shift, shift, shift );
 
-  #cashflow
-  my $paid = $self->scalar_sql("
-    SELECT SUM(paid) FROM cust_pay
-    WHERE ". $self->in_time_period($speriod, $eperiod)
-  );
-
   my $refunded = $self->scalar_sql("
     SELECT SUM(refund) FROM cust_refund
     WHERE ". $self->in_time_period($speriod, $eperiod)
@@ -129,7 +125,15 @@ sub receipts { #cashflow
   ");
   #    my $expenses_sql2 = "SELECT SUM(cust_bill_pay.amount) FROM cust_bill_pay, cust_bill_pkg, cust_bill, cust_pkg, part_pkg WHERE cust_bill_pay.invnum = cust_bill.invnum AND cust_bill.invnum = cust_bill_pkg.invnum AND cust_bill_pay._date >= $speriod AND cust_bill_pay._date < $eperiod AND cust_pkg.pkgnum = cust_bill_pkg.pkgnum AND cust_pkg.pkgpart = part_pkg.pkgpart AND LOWER(part_pkg.pkg) LIKE 'expense _%'";
   
-  $paid-$refunded-$expenses;
+  $self->payments($speriod, $eperiod) - $refunded - $expenses;
+}
+
+sub payments {
+  my( $self, $speriod, $eperiod ) = ( shift, shift, shift );
+  $self->scalar_sql("
+    SELECT SUM(paid) FROM cust_pay
+    WHERE ". $self->in_time_period($speriod, $eperiod)
+  );
 }
 
 sub credits {
diff --git a/FS/FS/cust_credit.pm b/FS/FS/cust_credit.pm
index 19a54534f..8ec255b95 100644
--- a/FS/FS/cust_credit.pm
+++ b/FS/FS/cust_credit.pm
@@ -300,6 +300,18 @@ sub credited {
   sprintf( "%.2f", $amount );
 }
 
+=item cust_main
+
+Returns the customer (see L<FS::cust_main>) for this credit.
+
+=cut
+
+sub cust_main {
+  my $self = shift;
+  qsearchs( 'cust_main', { 'custnum' => $self->custnum } );
+}
+
+
 =back
 
 =head1 BUGS
diff --git a/httemplate/graph/money_time-graph.cgi b/httemplate/graph/money_time-graph.cgi
index 55e8982b4..bb3d23aae 100755
--- a/httemplate/graph/money_time-graph.cgi
+++ b/httemplate/graph/money_time-graph.cgi
@@ -15,17 +15,19 @@ my $emonth = $cgi->param('emonth') || $curmon+1;
 #my @labels;
 #my %data;
 
-my @items = qw( invoiced netsales credits receipts );
+my @items = qw( invoiced netsales credits payments receipts );
 my %label = (
  'invoiced' => 'Gross Sales (invoiced)', 
  'netsales' => 'Net Sales (invoiced - applied credits)',
  'credits'  => 'Credits',
- 'receipts' => 'Receipts/Cashflow (payments - refunds)',
+ 'payments' => 'Gross Receipts (payments)',
+ 'receipts' => 'Net Receipts/Cashflow (payments - refunds)',
 );
 my %color = (
   'invoiced' => [ 153, 153, 255 ], #light blue
   'netsales' => [   0,   0, 204 ], #blue
   'credits'  => [ 204,   0,   0 ], #red
+  'payments' => [ 153, 204, 153 ], #light green
   'receipts' => [   0, 204,   0 ], #green
 );
 
diff --git a/httemplate/graph/money_time.cgi b/httemplate/graph/money_time.cgi
index e5903168d..1c7d54266 100644
--- a/httemplate/graph/money_time.cgi
+++ b/httemplate/graph/money_time.cgi
@@ -25,19 +25,26 @@ my $emonth = $cgi->param('emonth') || $curmon+1;
 <%= table('e8e8e8') %>
 <%
 
-my @items = qw( invoiced netsales credits receipts );
+my @items = qw( invoiced netsales credits payments receipts );
 my %label = (
   'invoiced' => 'Gross Sales',
   'netsales' => 'Net Sales',
   'credits'  => 'Credits',
-  'receipts' => 'Receipts',
+  'payments' => 'Gross Receipts',
+  'receipts' => 'Net Receipts',
 );
 my %color = (
   'invoiced' => '9999ff', #light blue
   'netsales' => '0000cc', #blue
   'credits'  => 'cc0000', #red
+  'payments' => '99cc99', #light green
   'receipts' => '00cc00', #green
 );
+my %link = (
+  'invoiced' => "${p}search/cust_bill.html?",
+  'credits'  => "${p}search/cust_credit.html?",
+  'payments' => "${p}search/cust_pay.cgi?magic=_date;",
+);
 
 my $report = new FS::Report::Table::Monthly (
   'items' => \@items,
@@ -48,7 +55,6 @@ my $report = new FS::Report::Table::Monthly (
 );
 my $data = $report->data;
 
-
 my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
 
 %>
@@ -64,9 +70,15 @@ my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
 
 <% foreach my $row (@items) { %>
   <TR><TH><FONT COLOR="#<%= $color{$row} %>"><%= $label{$row} %></FONT></TH>
+  <% my $link = exists($link{$row})
+       ? qq(<A HREF="$link{$row})
+       : '';
+     my @speriod = @{$data->{speriod}};
+     my @eperiod = @{$data->{eperiod}};
+  %>
   <% foreach my $column ( @{$data->{$row}} ) { %>
     <TD ALIGN="right" BGCOLOR="#ffffff">
-      <FONT COLOR="#<%= $color{$row} %>">$<%= sprintf("%.2f", $column) %></FONT>
+      <%= $link ? $link. 'begin='. shift(@speriod). ';end='. shift(@eperiod). '">' : '' %><FONT COLOR="#<%= $color{$row} %>">$<%= sprintf("%.2f", $column) %></FONT><%= $link ? '</A>' : '' %>
     </TD>
   <% } %>
   </TR>
diff --git a/httemplate/search/cust_bill.html b/httemplate/search/cust_bill.html
index 51241575c..27b147108 100755
--- a/httemplate/search/cust_bill.html
+++ b/httemplate/search/cust_bill.html
@@ -1,22 +1,30 @@
 <%
    my( $count_query, $sql_query );
-   if ( $cgi->keywords ) {
-     my($query) = $cgi->keywords;
+   if ( $cgi->param('begin') || $cgi->param('end') || $cgi->keywords ) {
+
      my $owed =
        "charged - ( SELECT COALESCE(SUM(amount),0) FROM cust_bill_pay
                     WHERE cust_bill_pay.invnum = cust_bill.invnum )
                 - ( SELECT COALESCE(SUM(amount),0) FROM cust_credit_bill
                     WHERE cust_credit_bill.invnum = cust_bill.invnum )";
+
      my @where;
-     my $orderby = '';
+     my $orderby = 'ORDER BY cust_bill._date';
+
+     if ( $cgi->param('begin') =~ /^(\d+)$/ ) {
+       push @where, "cust_bill._date >= $1",
+     }
+     if ( $cgi->param('end') =~ /^(\d+)$/ ) {
+       push @where, "cust_bill._date < $1",
+     }
+
+     my($query) = $cgi->keywords;
      if ( $query =~ /^(OPEN(\d*)_)?(invnum|date|custnum)$/ ) {
        my($open, $days, $field) = ($1, $2, $3);
        $field = "_date" if $field eq 'date';
        $orderby = "ORDER BY cust_bill.$field";
        push @where, "0 != $owed" if $open;
        push @where, "cust_bill._date < ". (time-86400*$days) if $days;
-     } else {
-       die "unknown query string $query";
      }
    
      my $extra_sql = scalar(@where) ? 'WHERE '. join(' AND ', @where) : '';
@@ -50,12 +58,13 @@
                'name'        => 'invoices',
                'query'       => $sql_query,
                'count_query' => $count_query,
-               'count_addl'  => [ '$%.2f total amount',
+               'count_addl'  => [ '$%.2f total invoiced',
                                   '$%.2f total outstanding balance',
                                 ],
                'redirect'    => $link,
                'header'      =>
-                 [ '', qw(Balance Amount Date ), 'Contact name', 'Company' ],
+                 [ 'Invoice #', qw(Balance Amount Date), 'Contact name',
+                   'Company' ],
                'fields'      => [
                  'invnum',
                  sub { sprintf('$%.2f', shift->get('owed') ) },
diff --git a/httemplate/search/cust_credit.html b/httemplate/search/cust_credit.html
new file mode 100755
index 000000000..c46caba13
--- /dev/null
+++ b/httemplate/search/cust_credit.html
@@ -0,0 +1,76 @@
+<%
+   #my( $count_query, $sql_query );
+
+   my @search = ();
+
+   if ( $cgi->param('otaker') && $cgi->param('otaker') =~ /^([\w\.\-]+)$/ ) {
+     push @search, "otaker = '$1'";
+   }
+
+   #false laziness with cust_pkg.cgi and cust_pay.cgi
+   if ( $cgi->param('beginning')
+        && $cgi->param('beginning') =~ /^([ 0-9\-\/]{1,10})$/ ) {
+     my $beginning = str2time($1);
+     push @search, "_date >= $beginning ";
+   }
+   if ( $cgi->param('ending')
+             && $cgi->param('ending') =~ /^([ 0-9\-\/]{1,10})$/ ) {
+     my $ending = str2time($1) + 86399;
+     push @search, " _date <= $ending ";
+   }
+
+   if ( $cgi->param('begin')
+        && $cgi->param('begin') =~ /^(\d+)$/ ) {
+     push @search, "_date >= $1 ";
+   }
+   if ( $cgi->param('end')
+             && $cgi->param('end') =~ /^(\d+)$/ ) {
+     push @search, " _date < $1 ";
+   }
+
+   my $where = scalar(@search)
+                 ? 'WHERE '. join(' AND ', @search)
+                 : '';
+
+   my $count_query = "SELECT COUNT(*), SUM(amount) FROM cust_credit $where";
+   my $sql_query   = {
+     'table'     => 'cust_credit',
+     'hashref'   => {},
+     'extra_sql' => $where,
+   };
+
+   my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
+
+%>
+<%= include( 'elements/search.html',
+               'title'       => 'Credit Search Results',
+               'name'        => 'credits',
+               'query'       => $sql_query,
+               'count_query' => $count_query,
+               'count_addl'  => [ '$%.2f total credited', ],
+               #'redirect'    => $link,
+               'header'      =>
+                 [ qw(Amount Date), 'Contact name', qw(Company By Reason) ],
+               'fields'      => [
+                 #'crednum',
+                 sub { sprintf('$%.2f', shift->amount ) },
+                 sub { time2str('%b %d %Y', shift->_date ) },
+                 sub { my $cust_main = shift->cust_main;
+                       $cust_main->get('last'). ', '. $cust_main->first;
+                     },
+                 sub { my $cust_main = shift->cust_main;
+                       $cust_main->company;
+                     },
+                 'otaker',
+                 'reason',
+               ],
+               'links' => [
+                 '',
+                 '',
+                 $clink,
+                 $clink,
+                 '',
+                 '',
+               ],
+    )
+%>
diff --git a/httemplate/search/cust_pay.cgi b/httemplate/search/cust_pay.cgi
index 51dd3b340..ba2bc63f0 100755
--- a/httemplate/search/cust_pay.cgi
+++ b/httemplate/search/cust_pay.cgi
@@ -1,185 +1,133 @@
 <%
+   my( $count_query, $sql_query );
+   if ( $cgi->param('magic') && $cgi->param('magic') eq '_date' ) {
+   
+     my %search;
+     my @search;
+   
+     if ( $cgi->param('payby') ) {
+       $cgi->param('payby') =~ /^(CARD|CHEK|BILL)(-(VisaMC|Amex|Discover))?$/
+         or die "illegal payby ". $cgi->param('payby');
+       $search{'payby'} = $1;
+       if ( $3 ) {
+         if ( $3 eq 'VisaMC' ) {
+           #avoid posix regexes for portability
+           push @search, " (    substring(payinfo from 1 for 1) = '4'  ".
+                         "   OR substring(payinfo from 1 for 2) = '51' ".
+                         "   OR substring(payinfo from 1 for 2) = '52' ".
+                         "   OR substring(payinfo from 1 for 2) = '53' ".
+                         "   OR substring(payinfo from 1 for 2) = '54' ".
+                         "   OR substring(payinfo from 1 for 2) = '54' ".
+                         "   OR substring(payinfo from 1 for 2) = '55' ".
+                         " ) ";
+         } elsif ( $3 eq 'Amex' ) {
+           push @search, " (    substring(payinfo from 1 for 2 ) = '34' ".
+                         "   OR substring(payinfo from 1 for 2 ) = '37' ".
+                         " ) ";
+         } elsif ( $3 eq 'Discover' ) {
+           push @search, " substring(payinfo from 1 for 4 ) = '6011' ";
+         } else {
+           die "unknown card type $3";
+         }
+       }
+     }
+   
+     #false laziness with cust_pkg.cgi
+     if ( $cgi->param('beginning')
+          && $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) {
+       my $beginning = str2time($1);
+       push @search, "_date >= $beginning ";
+     }
+     if ( $cgi->param('ending')
+               && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
+       my $ending = str2time($1) + 86399;
+       push @search, " _date <= $ending ";
+     }
+     if ( $cgi->param('begin')
+          && $cgi->param('begin') =~ /^(\d+)$/ ) {
+       push @search, "_date >= $1 ";
+     }
+     if ( $cgi->param('end')
+               && $cgi->param('end') =~ /^(\d+)$/ ) {
+       push @search, " _date < $1 ";
+     }
+   
+     my $search;
+     if ( @search ) {
+       $search = ( scalar(keys %search) ? ' AND ' : ' WHERE ' ).
+                 join(' AND ', @search);
+     }
+
+     my $hsearch = join(' AND ', map { "$_ = '$search{$_}'" } keys %search );
+     $count_query = "SELECT COUNT(*), SUM(paid) FROM cust_pay ".
+                    ( $hsearch ? " WHERE $hsearch " : '' ).
+                    $search;
+   
+     $sql_query = {
+       'table'     => 'cust_pay',
+       'hashref'   => \%search,
+       'extra_sql' => "$search ORDER BY _date",
+     };
+   
+   } else {
+   
+     $cgi->param('payinfo') =~ /^\s*(\d+)\s*$/ or die "illegal payinfo";
+     my $payinfo = $1;
+   
+     $cgi->param('payby') =~ /^(\w+)$/ or die "illegal payby";
+     my $payby = $1;
+   
+     $count_query = "SELECT COUNT(*), SUM(paid) FROM cust_pay ".
+                    "WHERE payinfo = '$payinfo' AND payby = '$payby'";
+   
+     $sql_query = {
+       'table'     => 'cust_pay',
+       'hashref'   => { 'payinfo' => $payinfo,
+                        'payby'   => $payby    },
+       'extra_sql' => "ORDER BY _date",
+     };
+   
+   }
+
+   my $link = [ "${p}view/cust_main.cgi?", 'custnum' ];
 
-my $sortby;
-my @cust_pay;
-if ( $cgi->param('magic') && $cgi->param('magic') eq '_date' ) {
-
-  my %search;
-  my @search;
-
-  if ( $cgi->param('payby') ) {
-    $cgi->param('payby') =~ /^(CARD|CHEK|BILL)(-(VisaMC|Amex|Discover))?$/
-      or die "illegal payby ". $cgi->param('payby');
-    $search{'payby'} = $1;
-    if ( $3 ) {
-      if ( $3 eq 'VisaMC' ) {
-        #avoid posix regexes for portability
-        push @search, " (    substring(payinfo from 1 for 1) = '4'  ".
-                      "   OR substring(payinfo from 1 for 2) = '51' ".
-                      "   OR substring(payinfo from 1 for 2) = '52' ".
-                      "   OR substring(payinfo from 1 for 2) = '53' ".
-                      "   OR substring(payinfo from 1 for 2) = '54' ".
-                      "   OR substring(payinfo from 1 for 2) = '54' ".
-                      "   OR substring(payinfo from 1 for 2) = '55' ".
-                      " ) ";
-      } elsif ( $3 eq 'Amex' ) {
-        push @search, " (    substring(payinfo from 1 for 2 ) = '34' ".
-                      "   OR substring(payinfo from 1 for 2 ) = '37' ".
-                      " ) ";
-      } elsif ( $3 eq 'Discover' ) {
-        push @search, " substring(payinfo from 1 for 4 ) = '6011' ";
-      } else {
-        die "unknown card type $3";
-      }
-    }
-  }
-
-  #false laziness with cust_pkg.cgi
-  if ( $cgi->param('beginning')
-       && $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) {
-    my $beginning = str2time($1);
-    push @search, "_date >= $beginning ";
-  }
-  if ( $cgi->param('ending')
-            && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
-    my $ending = str2time($1) + 86399;
-    push @search, " _date <= $ending ";
-  }
-  my $search;
-  if ( @search ) {
-    $search = ( scalar(keys %search) ? ' AND ' : ' WHERE ' ).
-              join(' AND ', @search);
-  }
-
-  @cust_pay = qsearch('cust_pay', \%search, '', $search );
-
-  $sortby = \*date_sort;
-
-} else {
-
-  $cgi->param('payinfo') =~ /^\s*(\d+)\s*$/ or die "illegal payinfo";
-  my $payinfo = $1;
-
-  $cgi->param('payby') =~ /^(\w+)$/ or die "illegal payby";
-  my $payby = $1;
-
-  @cust_pay = qsearch('cust_pay', { 'payinfo' => $payinfo,
-                                     'payby'   => $payby    } );
-  $sortby = \*date_sort;
-
-}
-
-if (0) {
-#if ( scalar(@cust_pay) == 1 ) {
-#  my $invnum = $cust_bill[0]->invnum;
-#  print $cgi->redirect(popurl(2). "view/cust_bill.cgi?$invnum");  #redirect
-} elsif ( scalar(@cust_pay) == 0 ) {
-%>
-<!-- mason kludge -->
-<%
-  idiot("Payment not found.");
-  #exit;
-} else {
-  my $total = scalar(@cust_pay);
-  my $s = $total > 1 ? 's' : '';
 %>
-<!-- mason kludge -->
-<%
-  print header("Payment Search Results", menubar(
-          'Main Menu', popurl(2)
-        )), "$total matching payment$s found<BR>", &table(), <<END;
-      <TR>
-        <TH></TH>
-        <TH>Amount</TH>
-        <TH>Date</TH>
-        <TH>Contact name</TH>
-        <TH>Company</TH>
-      </TR>
-END
-
-  my(%saw, $cust_pay);
-  my $tot_amount = 0;
-  foreach my $cust_pay (
-    sort $sortby grep(!$saw{$_->paynum}++, @cust_pay)
-  ) {
-    my($paynum, $custnum, $payby, $payinfo, $amount, $date ) = (
-      $cust_pay->paynum,
-      $cust_pay->custnum,
-      $cust_pay->payby,
-      $cust_pay->payinfo,
-      sprintf("%.2f", $cust_pay->paid),
-      $cust_pay->_date,
-    );
-    $tot_amount += $amount;
-    my $pdate = time2str("%b&nbsp;%d&nbsp;%Y", $date);
-
-    my $rowspan = 1;
-
-    my $view = popurl(2). "view/cust_main.cgi?". $custnum. 
-               "#". $payby. $payinfo;
-
-    my $payment_info;
-    if ( $payby eq 'CARD' ) {
-      $payment_info = 'Card&nbsp;#'. 'x'x(length($payinfo)-4).
-                      substr($payinfo,(length($payinfo)-4));
-    } elsif ( $payby eq 'CHEK' ) {
-      $payment_info = "E-check&nbsp;acct#$payinfo";
-    } elsif ( $payby eq 'BILL' ) {
-      $payment_info = "Check&nbsp;#$payinfo";
-    } else {
-      $payment_info = "$payby&nbsp;$payinfo";
-    }
-
-    print <<END;
-      <TR>
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$payment_info</FONT></A></TD>
-        <TD ROWSPAN=$rowspan ALIGN="right"><A HREF="$view"><FONT SIZE=-1>\$$amount</FONT></A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$pdate</FONT></A></TD>
-END
-    my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
-    if ( $cust_main ) {
-      #my $cview = popurl(2). "view/cust_main.cgi?". $cust_main->custnum;
-      my ( $name, $company ) = (
-        $cust_main->last. ', '. $cust_main->first,
-        $cust_main->company,
-      );
-      print <<END;
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$name</FONT></A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$company</FONT></A></TD>
-END
-    } else {
-      print <<END
-        <TD ROWSPAN=$rowspan COLSPAN=2>WARNING: couldn't find cust_main.custnum $custnum (cust_pay.paynum $paynum)</TD>
-END
-    }
-
-    print "</TR>";
-  }
-
-  $tot_amount = sprintf("%.2f", $tot_amount);
-  print '</TABLE><BR>'. table(). <<END;
-      <TR>
-        <TH>Total&nbsp;Amount</TH>
-        <TD ALIGN="right">\$$tot_amount</TD>
-      </TR>
-    </TABLE>
-  </BODY>
-</HTML>
-END
-
-}
-
-#
-
-#sub invnum_sort {
-#  $a->invnum <=> $b->invnum;
-#}
-#
-#sub custnum_sort {
-#  $a->custnum <=> $b->custnum || $a->invnum <=> $b->invnum;
-#}
-
-sub date_sort {
-  $a->_date <=> $b->_date || $a->invnum <=> $b->invnum;
-}
+<%= include( 'elements/search.html',
+               'title'       => 'Payment Search Results',
+               'name'        => 'payments',
+               'query'       => $sql_query,
+               'count_query' => $count_query,
+               'count_addl'  => [ '$%.2f total paid', ],
+               'header'      =>
+                 [ qw(Payment Amount Date), 'Contact name', 'Company', ],
+               'fields'      => [
+                 sub {
+                   my $cust_pay = shift;
+                   if ( $cust_pay->payby eq 'CARD' ) {
+                     'Card #'. $cust_pay->payinfo_masked;
+                   } elsif ( $cust_pay->payby eq 'CHEK' ) {
+                     'E-check acct#'. $cust_pay->payinfo;
+                   } elsif ( $cust_pay->payby eq 'BILL' ) {
+                     'Check #'. $cust_pay->payinfo;
+                   } else {
+                     $cust_pay->payby. ' '. $cust_pay->payinfo;
+                   }
+                 },
+                 sub { sprintf('$%.2f', shift->paid ) },
+                 sub { time2str('%b %d %Y', shift->_date ) },
+                 sub { my $cust_main = shift->cust_main;
+                       $cust_main->get('last'). ', '. $cust_main->first;
+                     },
+                 sub { my $cust_main = shift->cust_main;
+                       $cust_main->company;
+                     },
+               ],
+               'links' => [
+                 '',
+                 '',
+                 '',
+                 $link,
+                 $link,
+               ],
+    )
 %>
diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html
index 37a3718ce..226c4f784 100644
--- a/httemplate/search/elements/search.html
+++ b/httemplate/search/elements/search.html
@@ -50,11 +50,11 @@
     $header ||= $sth->{NAME};
   }
 
-  if ( exists($opt{'redirect'}) && scalar(@$rows) == 1 ) {
+  if ( exists($opt{'redirect'}) && scalar(@$rows) == 1 && $total == 1 ) {
     my( $url, $method ) = @{$opt{'redirect'}};
     redirect( $url. $rows->[0]->$method() );
   } else {
-
+    $opt{'name'} =~ s/s$// if $total == 1;
 %>
 <%= include( '/elements/header.html', $opt{'title'},
                include( '/elements/menubar.html', 'Main menu' => $p )
@@ -87,9 +87,16 @@
          <% foreach my $field ( @{$opt{'fields'}} ) { %>
            <% my $a = ''; %>
            <% if ( $links ) {
-                my( $url, $method ) = @{shift @$links};
-                $a = $url. $row->$method();
-                $a = qq(<A HREF="$a">);
+                my $link = shift @$links;
+                if ( $link ) {
+                  my( $url, $method ) = @{$link};
+                  if ( ref($method) eq 'CODE' ) {
+                    $a = $url. &{$method}($row);
+                  } else {
+                    $a = $url. $row->$method();
+                  }
+                  $a = qq(<A HREF="$a">);
+                }
               }
            %>
            <% if ( ref($field) eq 'CODE' ) { %>
diff --git a/httemplate/search/report_cust_credit.html b/httemplate/search/report_cust_credit.html
index 1b30685dc..8a0f0ed7b 100644
--- a/httemplate/search/report_cust_credit.html
+++ b/httemplate/search/report_cust_credit.html
@@ -1,26 +1,29 @@
 <HTML>
   <HEAD>
-    <TITLE>Payment report criteria</TITLE>
+    <TITLE>Credit report criteria</TITLE>
     <LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
     <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
     <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
     <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
   </HEAD>
   <BODY BGCOLOR="#e8e8e8">
-    <H1>Payment report criteria</H1>
-    <FORM ACTION="cust_pay.cgi" METHOD="post">
+    <H1>Credit report criteria</H1>
+    <FORM ACTION="cust_credit.html" METHOD="post">
     <INPUT TYPE="hidden" NAME="magic" VALUE="_date">
     <TABLE>
       <TR>
-        <TD ALIGN="right">Payments of type: </TD>
-        <TD><SELECT NAME="payby">
+        <TD ALIGN="right">Credits by employee: </TD>
+<%
+  my $sth = dbh->prepare("SELECT DISTINCT otaker FROM cust_credit")
+    or die dbh->errstr;
+  $sth->execute or die $sth->errstr;
+  my @otakers = map { $_->[0] } @{$sth->fetchall_arrayref};
+%>
+        <TD><SELECT NAME="otaker">
               <OPTION VALUE="">all</OPTION>
-              <OPTION VALUE="CARD">credit card (all)</OPTION>
-              <OPTION VALUE="CARD-VisaMC">credit card (Visa/MasterCard)</OPTION>
-              <OPTION VALUE="CARD-Amex">credit card (American Express)</OPTION>
-              <OPTION VALUE="CARD-Discover">credit card (Discover)</OPTION>
-              <OPTION VALUE="CHEK">electronic check / ACH</OPTION>
-              <OPTION VALUE="BILL">check / cash</OPTION>
+              <% foreach my $otaker ( @otakers ) { %>
+                <OPTION VALUE="<%= $otaker %>"><%= $otaker %></OPTION>
+              <% } %>
             </SELECT>
         </TD>
       </TR>