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/ui-ajustes'

Browse Source 
# Conflicts:
#   ci4/app/Entities/Tarifas/TarifapreimpresionEntity.php
#   ci4/app/Language/es/Tarifaacabado.php
#   ci4/app/Language/es/Tarifamanipulado.php
#   ci4/app/Language/es/Tarifapreimpresion.php
#   ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/_tarifapreimpresionFormItems.php
This commit is contained in:
Ignacio Martinez Navajas
2023-07-13 20:00:25 +00:00
parent 975a440e9c 4af11ec3e2
commit d8400dd195
25 changed files with 1164 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci4/app/Models/Tarifas/TarifaacabadoModel.php
View File

@ -23,7 +23,7 @@ class TarifaacabadoModel extends \App\Models\GoBaseModel
"deleted_at",
"is_deleted",
"user_created_id",
"user_update_id",
"user_updated_id",
];
protected $returnType = 'App\Entities\Tarifas\TarifaacabadoEntity';