Merge branch 'main' into 'feat/listados_cliente_form'

Main

See merge request jjimenez/safekat!629
This commit is contained in:
2025-03-31 07:48:41 +00:00
38 changed files with 1730 additions and 573 deletions

View File

@ -28,6 +28,8 @@ class OrdenTrabajoTarea extends Model
"imposicion_id",
"tiempo_estimado",
"tiempo_real",
"is_corte",
"tipo_corte",
"comment"
];

View File

@ -2,8 +2,9 @@
namespace App\Models\Tarifas\Maquinas;
use App\Entities\Configuracion\Maquina;
use App\Entities\Tarifas\Maquinas\TarifaEncuadernacionMaquinaEntity;
use App\Models\Configuracion\MaquinaModel;
use CodeIgniter\Database\BaseBuilder;
use CodeIgniter\Model;
@ -71,4 +72,5 @@ class TarifaEncuadernacionMaquinaModel extends Model
$query->where("tarifa_encuadernacion_maquinas.tarifa_encuadernacion_id", $tarifa_encuadernacion_id);
return $query;
}
}