projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dadb0f3
)
AND helps alot, RT#5572 for real
author
ivan
<ivan>
Fri, 19 Jun 2009 07:46:29 +0000
(07:46 +0000)
committer
ivan
<ivan>
Fri, 19 Jun 2009 07:46:29 +0000
(07:46 +0000)
FS/FS/cust_main.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_main.pm
b/FS/FS/cust_main.pm
index
a428f89
..
9f9ae18
100644
(file)
--- a/
FS/FS/cust_main.pm
+++ b/
FS/FS/cust_main.pm
@@
-2263,7
+2263,7
@@
sub cancel_expired_pkgs {
my ( $self, $time ) = @_;
my @cancel_pkgs = $self->ncancelled_pkgs( {
my ( $self, $time ) = @_;
my @cancel_pkgs = $self->ncancelled_pkgs( {
- 'extra_sql' => "
expire IS NOT NULL AND expire > 0 AND expire <= $time ",
+ 'extra_sql' => "
AND expire IS NOT NULL AND expire > 0 AND expire <= $time "
} );
foreach my $cust_pkg ( @cancel_pkgs ) {
} );
foreach my $cust_pkg ( @cancel_pkgs ) {
@@
-2285,10
+2285,10
@@
sub suspend_adjourned_pkgs {
my @susp_pkgs = $self->ncancelled_pkgs( {
'extra_sql' =>
my @susp_pkgs = $self->ncancelled_pkgs( {
'extra_sql' =>
- " ( susp IS NULL OR susp = 0 )
-
AND ( ( bill IS NOT NULL AND bill != 0 AND bill < $time )
-
OR ( adjourn IS NOT NULL AND adjourn != 0 AND adjourn <= $time )
-
)
+ "
AND
( susp IS NULL OR susp = 0 )
+ AND ( ( bill IS NOT NULL AND bill != 0 AND bill < $time )
+ OR ( adjourn IS NOT NULL AND adjourn != 0 AND adjourn <= $time )
+ )
",
} );
",
} );