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

Modificando usuarios y roles

Browse Source
This commit is contained in:
imnavajas
2024-05-03 01:09:25 +02:00
parent 497e55f593
commit 9858616b6e
20 changed files with 57 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ci4/app/Models/Presupuestos/PresupuestoModel.php
View File

@ -205,8 +205,8 @@ class PresupuestoModel extends \App\Models\BaseModel
t6 ON t1.pais_id = t6.id = t7.id LEFT JOIN presupuesto_estados
t7 ON t1.estado_id = t8.id LEFT JOIN lg_papel_formato
t8 ON t1.papel_formato_id = t9.id LEFT JOIN lg_papel_generico
t9 ON t1.total_confirmado_user_id = t26.id_user LEFT JOIN auth_user
t10 ON t1.aprobado_user_id = t27.id_user LEFT JOIN auth_user";
t9 ON t1.total_confirmado_user_id = t26.id LEFT JOIN users
t10 ON t1.aprobado_user_id = t27.id LEFT JOIN users";
if (!is_null($limit) && intval($limit) > 0) {
$sql .= " LIMIT " . intval($limit);
@ -239,7 +239,7 @@ class PresupuestoModel extends \App\Models\BaseModel
t1.total_presupuesto AS total_presupuesto, t1.total_presupuesto AS total_presupuesto, t6.estado AS estado"
);
$builder->join("clientes t2", "t1.cliente_id = t2.id", "left");
$builder->join("auth_user t3", "t1.user_update_id = t3.id_user", "left");
$builder->join("users t3", "t1.user_update_id = t3.id", "left");
$builder->join("lg_paises t5", "t1.pais_id = t5.id", "left");
$builder->join("presupuesto_estados t6", "t1.estado_id = t6.id", "left");
@ -299,7 +299,7 @@ class PresupuestoModel extends \App\Models\BaseModel
CONCAT(t4.ancho, 'x', t4.alto) AS formato"
);
$builder->join("clientes t2", "t1.cliente_id = t2.id", "left");
$builder->join("auth_user t3", "t1.user_update_id = t3.id_user", "left");
$builder->join("users t3", "t1.user_update_id = t3.id", "left");
$builder->join("lg_papel_formato t4", "t1.papel_formato_id = t4.id", "left");
$builder->where("t1.is_deleted", 0);