-- fixed for CRM-12680, line items were not created properly when trying to submit...

[civicrm-core.git] / CRM / Contribute / Form / ContributionCharts.php

diff --git a/CRM/Contribute/Form/ContributionCharts.php b/CRM/Contribute/Form/ContributionCharts.php
index 2ad052ad554c45625f8d3c97368f72e0d1272e30..ce2fdc288aa19f9a3e55223a058ccc6d347e9f0f 100644 (file)
--- a/CRM/Contribute/Form/ContributionCharts.php
+++ b/CRM/Contribute/Form/ContributionCharts.php
@@ -200,8 +200,14 @@ class CRM_Contribute_Form_ContributionCharts extends CRM_Core_Form {
           $urlParams     = "reset=1&force=1&status=1&start={$startDate}&end={$endDate}&test=0";
         }
         elseif ($chartKey == 'by_year') {
-          $startDate = CRM_Utils_Date::format(array('Y' => substr($index,0,4)));
-          $endDate   = date('Ymd', mktime(0, 0, 0, 13, 0, substr($index,0,4)));
+          if (!empty($config->fiscalYearStart) && ($config->fiscalYearStart['M'] != 1 || $config->fiscalYearStart['d'] != 1)) {
+            $startDate = date('Ymd', mktime(0, 0, 0, $config->fiscalYearStart['M'], $config->fiscalYearStart['d'], substr($index,0,4)));
+            $endDate   = date('Ymd', mktime(0, 0, 0, $config->fiscalYearStart['M'], $config->fiscalYearStart['d'], substr($index,0,4)+1));
+          }
+          else {
+            $startDate = CRM_Utils_Date::format(array('Y' => substr($index,0,4)));
+            $endDate   = date('Ymd', mktime(0, 0, 0, 13, 0, substr($index,0,4)));
+          }
           $urlParams = "reset=1&force=1&status=1&start={$startDate}&end={$endDate}&test=0";
         }
         if ($urlParams) {