Merge branch 'main' into 'mod/presupuesto_admin'

Main See merge request jjimenez/safekat!453
2025-07-25 22:52:08 +00:00 · 2024-12-26 13:18:04 +00:00
parent 2890eacb74 afb7ca0812
commit d53b63d032
9 changed files with 75 additions and 25 deletions
--- a/ci4/app/Models/Configuracion/MaquinaModel.php
+++ b/ci4/app/Models/Configuracion/MaquinaModel.php
@ -15,7 +15,7 @@ class MaquinaModel extends \App\Models\BaseModel

    const SORTABLE = [
        0 => "t1.id",
-        1 => "t2.nombre",
+        1 => "t1.nombre",
        2 => "t1.tipo",
        3 => "t1.ancho_impresion",
        4 => "t1.alto_impresion",