Merge branch 'dev/presupuestos3' into 'dev/presupuestos_pdf'

# Conflicts:
#   ci4/app/Config/Routes.php
#   ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaForm.php
This commit is contained in:
Ignacio Martinez Navajas
2023-11-06 10:35:22 +00:00
89 changed files with 6395 additions and 1902 deletions

View File

@ -14,6 +14,8 @@ return [
'Clone' => 'Duplicar',
'Dashboard' => 'Panel de control',
'Delete' => 'Borrar',
'Clone' => 'Duplicar',
'Print' => 'Imprimir',
'Error' => 'Error',
'Groups' => 'Grupos',
'Home' => 'Inicio',