|
|
@@ -448,10 +448,12 @@ class RecordIN extends Component
|
|
|
foreach($months as $idx => $m)
|
|
|
{
|
|
|
$this->rows[0]["when"][$idx]["month"] = $m;
|
|
|
- if ($m > date("M"))
|
|
|
- $this->rows[0]["when"][$idx]["year"] = $m < env('FISCAL_YEAR_MONTH_FROM', 1) ? (date("Y") + 1) : date("Y");
|
|
|
- else
|
|
|
- $this->rows[0]["when"][$idx]["year"] = $m > env('FISCAL_YEAR_MONTH_TO', 1) ? (date("Y")) : date("Y") + 1;
|
|
|
+
|
|
|
+ if ((date("n") + 7) > env('FISCAL_YEAR_MONTH_TO', 1)) { // mese attuale nel primo periodo fiscale [9-12]
|
|
|
+ $this->rows[0]["when"][$idx]["year"] = $m < env('FISCAL_YEAR_MONTH_TO', 1) ? (date("Y") + 1) : date("Y");
|
|
|
+ } else { // mese attuale nel secondo periodo fiscale [1-8]
|
|
|
+ $this->rows[0]["when"][$idx]["year"] = $m < env('FISCAL_YEAR_MONTH_TO', 1) ? date("Y") : (date("Y") - 1);
|
|
|
+ }
|
|
|
|
|
|
if ($idx > 0)
|
|
|
{
|