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/papeles_from_bd_presu_cliente'

Browse Source 
Main

See merge request jjimenez/safekat!393
This commit is contained in:
Jaime Jimenez Ortega
2024-11-21 19:20:44 +00:00
parent 3af5851af7 a529f88edf
commit 9a19c67cd9
9 changed files with 63 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ci4/app/Models/Configuracion/PapelImpresionModel.php
View File

@ -24,8 +24,7 @@ class PapelImpresionModel extends \App\Models\BaseModel
8 => "t1.inkjet",
9 => "t1.rotativa",
10 => "t1.isActivo",
11 => "t1.show_in_client",
12 => "t1.show_in_client_special"
11 => "t1.use_in_client",
];
@ -46,8 +45,7 @@ class PapelImpresionModel extends \App\Models\BaseModel
"inkjet",
"rotativa",
"isActivo",
"show_in_client",
"show_in_client_special",
"use_in_client",
"deleted_at",
"is_deleted",
"user_updated_id",
@ -155,7 +153,7 @@ class PapelImpresionModel extends \App\Models\BaseModel
t1.bn AS bn, t1.color AS color, t1.cubierta AS cubierta, t1.sobrecubierta AS sobrecubierta, t1.guardas AS guardas,
t1.inkjet AS inkjet, t1.rotativa AS rotativa,
t1.isActivo AS isActivo, t2.nombre AS papel_generico_id,
t1.show_in_client AS show_in_client, t1.show_in_client_special AS show_in_client_special"
t1.use_in_client AS use_in_client"
);
$builder->join("lg_papel_generico t2", "t1.papel_generico_id = t2.id", "left");