[freeside-commits] freeside/FS/FS cust_main.pm, 1.464.2.30, 1.464.2.31 cust_pay.pm, 1.74.2.1, 1.74.2.2 cust_refund.pm, 1.33.4.1, 1.33.4.2

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv32724/FS/FS

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	cust_main.pm cust_pay.pm cust_refund.pm 
Log Message:
RT#7266: continue fixing aging reports

Index: cust_pay.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_pay.pm,v
retrieving revision 1.74.2.1
retrieving revision 1.74.2.2
diff -u -w -d -r1.74.2.1 -r1.74.2.2
--- cust_pay.pm	20 May 2010 01:34:20 -0000	1.74.2.1
+++ cust_pay.pm	11 Jun 2010 21:18:11 -0000	1.74.2.2
@@ -657,7 +657,7 @@
 =cut 
 
 sub unapplied_sql {
-  my ($class, $start, $end) = shift;
+  my ($class, $start, $end) = @_;
   my $bill_start   = $start ? "AND cust_bill_pay._date <= $start"   : '';
   my $bill_end     = $end   ? "AND cust_bill_pay._date > $end"     : '';
   my $refund_start = $start ? "AND cust_pay_refund._date <= $start" : '';

Index: cust_refund.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_refund.pm,v
retrieving revision 1.33.4.1
retrieving revision 1.33.4.2
diff -u -w -d -r1.33.4.1 -r1.33.4.2
--- cust_refund.pm	20 May 2010 01:34:20 -0000	1.33.4.1
+++ cust_refund.pm	11 Jun 2010 21:18:11 -0000	1.33.4.2
@@ -321,7 +321,7 @@
 =cut 
 
 sub unapplied_sql {
-  my ($class, $start, $end) = shift;
+  my ($class, $start, $end) = @_;
   my $credit_start = $start ? "AND cust_credit_refund._date <= $start" : '';
   my $credit_end   = $end   ? "AND cust_credit_refund._date > $end"   : '';
   my $pay_start    = $start ? "AND cust_pay_refund._date <= $start"    : '';

Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.464.2.30
retrieving revision 1.464.2.31
diff -u -w -d -r1.464.2.30 -r1.464.2.31
--- cust_main.pm	6 Jun 2010 02:27:42 -0000	1.464.2.30
+++ cust_main.pm	11 Jun 2010 21:18:11 -0000	1.464.2.31
@@ -8301,9 +8301,11 @@
 =cut
 
 sub unapplied_payments_date_sql {
-  my( $class, $start, $end, ) = @_;
+  my( $class, $start, $end, %opt ) = @_;
 
-  my $unapp_pay    = FS::cust_pay->unapplied_sql;
+  my $cutoff = $opt{'cutoff'};
+
+  my $unapp_pay    = FS::cust_pay->unapplied_sql($cutoff);
 
   my $pay_where = $class->_money_table_where( 'cust_pay', $start, $end,
                                                           'unapplied_date'=>1 );