Skip to content

Commit

Permalink
Merge pull request #1 from FacturaScripts/3083-modelo-190
Browse files Browse the repository at this point in the history
Tarea #3083 - Añadido modelo 190
  • Loading branch information
NeoRazorX authored Aug 8, 2024
2 parents de2162f + 3a8a839 commit bb017fe
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 4 deletions.
10 changes: 8 additions & 2 deletions Controller/Modelo111.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,16 @@ public function allPeriods(): array
'T1' => 'first-trimester',
'T2' => 'second-trimester',
'T3' => 'third-trimester',
'T4' => 'fourth-trimester'
'T4' => 'fourth-trimester',
'Annual' => 'annual-190',
];
}

public function getPageData(): array
{
$data = parent::getPageData();
$data['menu'] = 'reports';
$data['title'] = 'model-111';
$data['title'] = 'model-111-190';
$data['icon'] = 'fas fa-book';
return $data;
}
Expand Down Expand Up @@ -119,6 +120,11 @@ protected function loadDates(): void
$this->dateEnd = date('30-09-Y', strtotime($exercise->fechainicio));
break;

case 'Annual':
$this->dateStart = date('01-01-Y', strtotime($exercise->fechainicio));
$this->dateEnd = date('31-12-Y', strtotime($exercise->fechainicio));
break;

default:
$this->dateStart = date('01-10-Y', strtotime($exercise->fechainicio));
$this->dateEnd = date('31-12-Y', strtotime($exercise->fechainicio));
Expand Down
3 changes: 2 additions & 1 deletion View/Modelo111.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
<h1 class="h2">
<i class="fas fa-book fa-fw"></i> {{ trans(fsc.title) }}
</h1>
<p>{{ trans('model-111-p') }}</p>
<p class="mb-0">{{ trans('model-111-p') }}</p>
<p>{{ trans('model-190-p') }}</p>
</div>
</div>
<div class="row align-items-end">
Expand Down
2 changes: 1 addition & 1 deletion facturascripts.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name = 'Modelo111'
description = 'Permite obtener los datos necesarios para el modelo 111 de la hacienda española.'
description = 'Permite obtener los datos necesarios para el modelo 111 y 190 de la hacienda española.'
version = 1.2
min_version = 2022.6

0 comments on commit bb017fe

Please sign in to comment.