jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 'dev/vuexy'

Browse Source 
# Conflicts:
#   ci4/app/Controllers/Home.php
#   ci4/app/Controllers/Test.php
This commit is contained in:
Ignacio Martinez Navajas
2023-05-10 10:56:57 +00:00
parent 95d79d1dc5 fc0d7e0298
commit aa87d0325f
51 changed files with 2172 additions and 916 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci4/app/Language/en/App.php
View File

@ -639,6 +639,7 @@ return [
"permisos_serviciocliente" => "Customer service",
"permisos_calendario" => "Calendar",
"permisos_correo" => "Mail",
"permisos_paises" => "Countries",
"permisos_presupuestos" => "Budgets",
"permisos_presupuestomaquetacion" => "Layout",
@ -675,6 +676,7 @@ return [
"menu_configuration" => "Settings",
"menu_calendario" => "Calendar",
"menu_paises" => "Countries",
"menu_correo" => "Mail",
"menu_formaspago" => "Payment methods",
"menu_imposiciones" => "Impositions",

10
ci4/app/Language/en/Paises.php
View File

@ -8,11 +8,11 @@ return [
'id' => 'ID',
'keyErp' => 'Key Erp',
'moduleTitle' => 'Paises',
'moneda' => 'Moneda',
'nombre' => 'Nombre',
'pais' => 'Pais',
'paisList' => 'Pais List',
'paises' => 'Paises',
'moneda' => 'Currency',
'nombre' => 'Name',
'pais' => 'Country',
'paisList' => 'Country List',
'paises' => 'Countries',
'showErp' => 'Show Erp',
'urlErp' => 'URL Erp',
'userErp' => 'User Erp',