Merge branch 'main' into feat/ordenes-trabajo

2025-07-25 22:52:08 +00:00 · 2024-12-26 13:38:29 +01:00
parent 2d9b1603a3 33a20b9b25
commit 340ab4ec5f
10 changed files with 105 additions and 22 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",