From 4e2b0b934d568e9b512bc45bf684bf5f23ae63b6 Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 11 Jun 2010 21:17:48 +0000 Subject: RT#7266: continue fixing aging reports --- FS/FS/cust_main.pm | 6 ++++-- FS/FS/cust_pay.pm | 2 +- FS/FS/cust_refund.pm | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'FS') diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm index 46f32e5db..c2107125b 100644 --- a/FS/FS/cust_main.pm +++ b/FS/FS/cust_main.pm @@ -7486,9 +7486,11 @@ Available options are: =cut sub unapplied_payments_date_sql { - my( $class, $start, $end, ) = @_; + my( $class, $start, $end, %opt ) = @_; + + my $cutoff = $opt{'cutoff'}; - my $unapp_pay = FS::cust_pay->unapplied_sql; + my $unapp_pay = FS::cust_pay->unapplied_sql($cutoff); my $pay_where = $class->_money_table_where( 'cust_pay', $start, $end, 'unapplied_date'=>1 ); diff --git a/FS/FS/cust_pay.pm b/FS/FS/cust_pay.pm index ff8226c8d..261bb4fd0 100644 --- a/FS/FS/cust_pay.pm +++ b/FS/FS/cust_pay.pm @@ -659,7 +659,7 @@ Returns an SQL fragment to retreive the unapplied amount. =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" : ''; diff --git a/FS/FS/cust_refund.pm b/FS/FS/cust_refund.pm index 6d08c8621..39603701f 100644 --- a/FS/FS/cust_refund.pm +++ b/FS/FS/cust_refund.pm @@ -343,7 +343,7 @@ Returns an SQL fragment to retreive the unapplied amount. =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" : ''; -- cgit v1.2.1