Merge branch 'main' into mod/presupuesto_cliente

This commit is contained in:
2025-06-24 13:52:22 +02:00
4 changed files with 838 additions and 767 deletions

View File

@ -131,6 +131,7 @@ class MaquinasPapelesImpresionModel extends \App\Models\BaseModel
$builder->where("t1.papel_impresion_id", $papel_id);
$builder->where("t2.is_deleted", 0);
$builder->where("t2.is_rotativa", $isRotativa);
$builder->where("t2.tipo", 'impresion');
$builder->where("t3.is_deleted", 0);
$builder->where("t3.isActivo", 1);