CRM-16146 - fix typo and incorrect date range calc for Fiscal Year ranges.

----------------------------------------
* CRM-16146: Fiscal year filters have typos and (slightly) incorrect date ranges
  https://issues.civicrm.org/jira/browse/CRM-16146

diff --git a/CRM/Utils/Date.php b/CRM/Utils/Date.php
index 582a7f6d0e3e66eaf8378d119fc68f16845ad8f8..726d79c32da61e440dc94171ad2668af1f1460e5 100644 (file)
--- a/CRM/Utils/Date.php
+++ b/CRM/Utils/Date.php
@@ -1098,7 +1098,7 @@ class CRM_Utils_Date {
         switch ($relativeTerm) {
           case 'this':
             $from['Y'] = $fYear;
-            $fiscalYear = mktime(0, 0, 0, $from['M'], $form['d'], $from['Y'] + 1);
+            $fiscalYear = mktime(0, 0, 0, $from['M'], $from['d'] - 1, $from['Y'] + 1);
             $fiscalEnd = explode('-', date("Y-m-d", $fiscalYear));
 
             $to['d'] = $fiscalEnd['2'];
@@ -1108,7 +1108,7 @@ class CRM_Utils_Date {
 
           case 'previous':
             $from['Y'] = $fYear - 1;
-            $fiscalYear = mktime(0, 0, 0, $from['M'], $form['d'], $from['Y'] + 1);
+            $fiscalYear = mktime(0, 0, 0, $from['M'], $from['d'] - 1, $from['Y'] + 1);
             $fiscalEnd = explode('-', date("Y-m-d", $fiscalYear));
             $to['d'] = $fiscalEnd['2'];
             $to['M'] = $fiscalEnd['1'];
@@ -1117,7 +1117,7 @@ class CRM_Utils_Date {
 
           case 'next':
             $from['Y'] = $fYear + 1;
-            $fiscalYear = mktime(0, 0, 0, $from['M'], $from['d'], $from['Y'] + 1);
+            $fiscalYear = mktime(0, 0, 0, $from['M'], $from['d'] - 1, $from['Y'] + 1);
             $fiscalEnd = explode('-', date("Y-m-d", $fiscalYear));
             $to['d'] = $fiscalEnd['2'];
             $to['M'] = $fiscalEnd['1'];