[freeside-commits] branch master updated. 6a3667417caf5efcd06c3ded9da2df7021a38fe9

[Mark Wells]

The branch, master has been updated
       via  6a3667417caf5efcd06c3ded9da2df7021a38fe9 (commit)
       via  686ecf55b716396505eefde07593d7de3a423751 (commit)
      from  a205ffec778bd42eb084bcffec6884063263f634 (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 6a3667417caf5efcd06c3ded9da2df7021a38fe9
Author: Mark Wells <mark at freeside.biz>
Date:   Fri Mar 22 14:52:14 2013 -0700

    fix warnings on upgrade, #22121

diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm
index fa5672c..6d09f89 100644
--- a/FS/FS/cust_pay.pm
+++ b/FS/FS/cust_pay.pm
@@ -1033,13 +1033,17 @@ sub _upgrade_data {  #class method
 
   # not only cust_pay, but also voided and refunded payments
   if (!FS::upgrade_journal->is_done('cust_pay__parse_paybatch_1')) {
+    local $FS::Record::nowarn_classload=1;
     # really inefficient, but again, only has to run once
     foreach my $table (qw(cust_pay cust_pay_void cust_refund)) {
+      my $and_batchnum_is_null =
+        ( $table =~ /^cust_pay/ ? ' AND batchnum IS NULL' : '' );
       foreach my $object ( qsearch({
             table     => $table,
             extra_sql => "WHERE payby IN('CARD','CHEK') ".
                          "AND (paybatch IS NOT NULL ".
-                         "OR (paybatch IS NULL AND auth IS NULL) )",
+                         "OR (paybatch IS NULL AND auth IS NULL
+                         $and_batchnum_is_null ) )",
           }) )
       {
         if ( $object->paybatch eq '' ) {

commit 686ecf55b716396505eefde07593d7de3a423751
Author: Mark Wells <mark at freeside.biz>
Date:   Fri Mar 22 14:02:04 2013 -0700

    allow open pay_batches to be included in search

diff --git a/httemplate/search/pay_batch.cgi b/httemplate/search/pay_batch.cgi
index 00c6ba1..620996a 100755
--- a/httemplate/search/pay_batch.cgi
+++ b/httemplate/search/pay_batch.cgi
@@ -150,8 +150,8 @@ my($begin, $end) = ( '', '' );
 my @where;
 
 my($beginning,$ending) = FS::UI::Web::parse_beginning_ending($cgi);
-push @where, "download >= $beginning",
-             "download <= $ending";
+push @where, "( (download >= $beginning AND download <= $ending) ".
+             ' OR download IS NULL )';
 
 my @status;
 if ( $cgi->param('open') ) {

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

Summary of changes:
 FS/FS/cust_pay.pm               |    6 +++++-
 httemplate/search/pay_batch.cgi |    4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)