[freeside-commits] branch FREESIDE_3_BRANCH updated. dc34663a13aa6bf07e3c0c6da0e30149d65e2b7b

[Mark Wells]

The branch, FREESIDE_3_BRANCH has been updated
       via  dc34663a13aa6bf07e3c0c6da0e30149d65e2b7b (commit)
       via  45b1d2bf265890e1872420580a907ada70fb6c4b (commit)
      from  85f0e2caa759102f68fe28278faf5f65c7b33b3c (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 dc34663a13aa6bf07e3c0c6da0e30149d65e2b7b
Author: Mark Wells <mark at freeside.biz>
Date:   Fri Jul 17 15:20:37 2015 -0700

    also fix searching by charged/owed amount

diff --git a/FS/FS/cust_bill/Search.pm b/FS/FS/cust_bill/Search.pm
index fa552f0..58c75e3 100644
--- a/FS/FS/cust_bill/Search.pm
+++ b/FS/FS/cust_bill/Search.pm
@@ -288,7 +288,7 @@ sub search_sql_where {
     my @owed = ref($param->{owed})
                  ? @{ $param->{owed} }
                  : ($param->{owed});
-    push @search, map { s/^owed/$owed_sql/ } @owed;
+    push @search, map { s/^owed/$owed_sql/; $_ } @owed;
   }
 
   #open/net flags

commit 45b1d2bf265890e1872420580a907ada70fb6c4b
Author: Mark Wells <mark at freeside.biz>
Date:   Fri Jul 17 15:08:57 2015 -0700

    fix invoice reprinting + cust_bill::Search changes, #37320, from #25943

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 69fdc91..7e068ab 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -3016,6 +3016,9 @@ sub process_re_X {
 
 }
 
+# this is called from search/cust_bill.html and given all its search 
+# parameters, so it needs to perform the same search.
+
 sub re_X {
   # spool_invoice ftp_invoice fax_invoice print_invoice
   my($method, $job, %param ) = @_;
@@ -3025,22 +3028,15 @@ sub re_X {
   }
 
   #some false laziness w/search/cust_bill.html
-  my $distinct = '';
-  my $orderby = 'ORDER BY cust_bill._date';
-
-  my $extra_sql = ' WHERE '. FS::cust_bill->search_sql_where(\%param);
-
-  my $addl_from = 'LEFT JOIN cust_main USING ( custnum )';
-     
-  my @cust_bill = qsearch( {
-    #'select'    => "cust_bill.*",
-    'table'     => 'cust_bill',
-    'addl_from' => $addl_from,
-    'hashref'   => {},
-    'extra_sql' => $extra_sql,
-    'order_by'  => $orderby,
-    'debug' => 1,
-  } );
+  $param{'order_by'} = 'cust_bill._date';
+
+  my $query = FS::cust_bill->search(\%param);
+  delete $query->{'count_query'};
+  delete $query->{'count_addl'};
+
+  $query->{debug} = 1; # was in here before, is obviously useful  
+
+  my @cust_bill = qsearch( $query );
 
   $method .= '_invoice' unless $method eq 'email' || $method eq 'print';
 

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

Summary of changes:
 FS/FS/cust_bill.pm        |   28 ++++++++++++----------------
 FS/FS/cust_bill/Search.pm |    2 +-
 2 files changed, 13 insertions(+), 17 deletions(-)