From 5e99c8bf1671bcfdf3597f8bbdaf49621141d237 Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 11 Jun 2010 21:18:11 +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 0e04df3bc..de398743a 100644 --- a/FS/FS/cust_main.pm +++ b/FS/FS/cust_main.pm @@ -8301,9 +8301,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 f9185cc4b..a78cb5de0 100644 --- a/FS/FS/cust_pay.pm +++ b/FS/FS/cust_pay.pm @@ -657,7 +657,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 894d19086..044d16cb0 100644 --- a/FS/FS/cust_refund.pm +++ b/FS/FS/cust_refund.pm @@ -321,7 +321,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