[freeside-commits] freeside/httemplate/search report_cust_bill.html, 1.11, 1.12 cust_bill.html, 1.36, 1.37

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail.420.am:/tmp/cvs-serv14592

Modified Files:
	report_cust_bill.html cust_bill.html 
Log Message:
Filter invoice report by payby, RT#9263

Index: report_cust_bill.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_cust_bill.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -d -r1.11 -r1.12
--- report_cust_bill.html	16 Nov 2009 03:55:18 -0000	1.11
+++ report_cust_bill.html	28 Aug 2010 00:18:27 -0000	1.12
@@ -25,6 +25,13 @@
                 field   => 'owed',
             )
   %>
+  <% include( '/elements/tr-select-payby.html',
+                label   => 'Payment method:',
+                payby_type   => 'cust',
+                multiple     => 1,
+                all_selected => 1,
+            )
+  %>
 
   <TR>
     <TD ALIGN="right"><INPUT TYPE="checkbox" NAME="open" VALUE="1" CHECKED></TD>

Index: cust_bill.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_bill.html,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -w -d -r1.36 -r1.37
--- cust_bill.html	24 Jan 2010 19:53:43 -0000	1.36
+++ cust_bill.html	28 Aug 2010 00:18:28 -0000	1.37
@@ -123,7 +123,15 @@
     $count_query = "SELECT COUNT(DISTINCT cust_bill.custnum), 'N/A', 'N/A'";
   }
 
-  my $extra_sql = ' WHERE '. FS::cust_bill->search_sql_where( \%search );
+  my $payby_sql = '';
+  $payby_sql = ' AND (' . 
+    join(' OR ', map { "cust_main.payby = '$_'" } $cgi->param('payby') ) . 
+    ')' 
+    if $cgi->param('payby');
+
+  my $extra_sql = ' WHERE '.
+    FS::cust_bill->search_sql_where( \%search ).
+    $payby_sql;
 
   unless ( $count_query ) {
     $count_query = 'SELECT COUNT(*), '. join(', ',