Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / httemplate / graph / signupdate.cgi

diff --git a/httemplate/graph/signupdate.cgi b/httemplate/graph/signupdate.cgi
index 23e4596..8261257 100644 (file)
--- a/httemplate/graph/signupdate.cgi
+++ b/httemplate/graph/signupdate.cgi
@@ -40,13 +40,14 @@ my $sdate = DateTime->new(
 
 my $edate = DateTime->new(
     year       => $cgi->param('end_year'),
-    month      => ($cgi->param('end_month') % 12 + 1) # first day of the next month
-)->epoch();
+    month      => $cgi->param('end_month')
+)->add( months => 1 )->epoch();
 
-my $where .= " AND signupdate >= $sdate ".
-             " AND signupdate <= $edate ";
+my $where = (%where ? ' AND ' : ' WHERE ');
+$where .= " signupdate >= $sdate ".
+          " AND signupdate < $edate ";
 
-foreach my $cust (qsearch({ table   => 'cust_main', 
+foreach my $cust (qsearch({ table   => 'cust_main',
                             hashref => \%where,
                             extra_sql => $where } )) {
   next if !$cust->signupdate;