Merge branch 'main' into 'dev/settings'

# Conflicts:
#   ci4/app/Config/Routes.php
This commit is contained in:
Ignacio Martinez Navajas
2023-05-28 14:58:36 +00:00
46 changed files with 3311 additions and 124 deletions

View File

@ -682,6 +682,7 @@ return [
"menu_imposiciones" => "Imposiciones",
"menu_maquina" => "Maquinas",
"menu_papelgenerico" => "Papel generico",
"menu_papelimpresion" => "Papel impresión",
"menu_seriefactura" => "Series facturas",
"menu_serviciocliente" => "Servicio cliente",
"menu_tamanioformatos" => "Tamaño formatos",