projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f0097d0
)
fix 'Use of uninitialized value' spew, fallout from RT#7266
author
ivan
<ivan>
Fri, 21 May 2010 19:57:49 +0000
(19:57 +0000)
committer
ivan
<ivan>
Fri, 21 May 2010 19:57:49 +0000
(19:57 +0000)
FS/FS/cust_bill.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_bill.pm
b/FS/FS/cust_bill.pm
index
2c67895
..
272b1b2
100644
(file)
--- a/
FS/FS/cust_bill.pm
+++ b/
FS/FS/cust_bill.pm
@@
-4320,8
+4320,7
@@
Returns an SQL fragment to retreive the amount owed (charged minus credited and
=cut
sub owed_sql {
=cut
sub owed_sql {
- my $class = shift;
- my ($start, $end) = @_;
+ my ($class, $start, $end) = @_;
'charged - '.
$class->paid_sql($start, $end). ' - '.
$class->credited_sql($start, $end);
'charged - '.
$class->paid_sql($start, $end). ' - '.
$class->credited_sql($start, $end);
@@
-4334,8
+4333,7
@@
Returns an SQL fragment to retreive the net amount (charged minus credited).
=cut
sub net_sql {
=cut
sub net_sql {
- my $class = shift;
- my ($start, $end) = @_;
+ my ($class, $start, $end) = @_;
'charged - '. $class->credited_sql($start, $end);
}
'charged - '. $class->credited_sql($start, $end);
}
@@
-4348,7
+4346,9
@@
Returns an SQL fragment to retreive the amount paid against this invoice.
sub paid_sql {
my ($class, $start, $end) = @_;
$start &&= "AND cust_bill_pay._date <= $start";
sub paid_sql {
my ($class, $start, $end) = @_;
$start &&= "AND cust_bill_pay._date <= $start";
- $end &&= "AND cust_bill_pay._date > $end";
+ $end &&= "AND cust_bill_pay._date > $end";
+ $start = '' unless defined($start);
+ $end = '' unless defined($end);
"( SELECT COALESCE(SUM(amount),0) FROM cust_bill_pay
WHERE cust_bill.invnum = cust_bill_pay.invnum $start $end )";
}
"( SELECT COALESCE(SUM(amount),0) FROM cust_bill_pay
WHERE cust_bill.invnum = cust_bill_pay.invnum $start $end )";
}
@@
-4362,7
+4362,9
@@
Returns an SQL fragment to retreive the amount credited against this invoice.
sub credited_sql {
my ($class, $start, $end) = shift;
$start &&= "AND cust_credit_bill._date <= $start";
sub credited_sql {
my ($class, $start, $end) = shift;
$start &&= "AND cust_credit_bill._date <= $start";
- $end &&= "AND cust_credit_bill._date > $end";
+ $end &&= "AND cust_credit_bill._date > $end";
+ $start = '' unless defined($start);
+ $end = '' unless defined($end);
"( SELECT COALESCE(SUM(amount),0) FROM cust_credit_bill
WHERE cust_bill.invnum = cust_credit_bill.invnum $start $end )";
}
"( SELECT COALESCE(SUM(amount),0) FROM cust_credit_bill
WHERE cust_bill.invnum = cust_credit_bill.invnum $start $end )";
}