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 'add/ajustar_margen'

Browse Source 
Mergeados UserModel's y eliminadas referencias a App\Models\UserModel a favor...

See merge request jjimenez/safekat!654
This commit is contained in:
Jaime Jimenez Ortega
2025-04-04 15:03:45 +00:00
parent cddf64b025 c9d6196aac
commit 244361a1ce
13 changed files with 155 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ci4/app/Controllers/Presupuestos/Presupuestoadmin.php
View File

@ -651,8 +651,8 @@ class Presupuestoadmin extends \App\Controllers\BaseResourceController
$data['resumen']['iva_reducido'] = $presupuesto->iva_reducido;
$data['created_by'] = model('App\Models\UserModel')->getFullName($presupuesto->user_created_id);
$data['updated_by'] = model('App\Models\UserModel')->getFullName($presupuesto->user_update_id);
$data['created_by'] = model('App\Models\Usuarios\UserModel')->getFullName($presupuesto->user_created_id);
$data['updated_by'] = model('App\Models\Usuarios\UserModel')->getFullName($presupuesto->user_update_id);
$data['created_at'] = date(' H:i d/m/Y', strtotime($presupuesto->created_at));
$data['updated_at'] = date(' H:i d/m/Y', strtotime($presupuesto->updated_at));