From 59c422112fc751ad8b31cad9a386a1d745c1821f Mon Sep 17 00:00:00 2001 From: levinse Date: Tue, 26 Apr 2011 00:19:19 +0000 Subject: [PATCH] fix billday.pm bugs, RT10813 --- FS/FS/part_event/Condition/billday.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/FS/FS/part_event/Condition/billday.pm b/FS/FS/part_event/Condition/billday.pm index b150a6cb8..e067f87f7 100644 --- a/FS/FS/part_event/Condition/billday.pm +++ b/FS/FS/part_event/Condition/billday.pm @@ -6,7 +6,7 @@ use Tie::IxHash; use base qw( FS::part_event::Condition ); sub description { - "Customer's monthly billing day matches current day or customer has no billing day"; + "Customer's monthly billing day is before or on current day or customer has no billing day"; } sub condition { @@ -16,7 +16,7 @@ sub condition { my($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time); - ($mday == $cust_main->billday) || (!$cust_main->billday); + (!$cust_main->billday) || ($mday >= $cust_main->billday); } sub condition_sql { @@ -24,7 +24,7 @@ sub condition_sql { my($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time); - "cust_main.billday is null or cust_main.billday = $mday"; + "cust_main.billday is null or $mday >= cust_main.billday"; } 1; -- 2.11.0