Merge branch 'main' into feat/sk-40/sk-37

This commit is contained in:
amazuecos
2025-04-14 08:50:36 +02:00
7 changed files with 70 additions and 18 deletions

View File

@ -151,7 +151,7 @@ class ClientePlantillaPreciosLineasModel extends \App\Models\BaseModel
$builder->join("users t2", "t1.user_updated_id = t2.id", "left");
$builder->where('t1.deleted_at', 0);
$builder->where('t1.deleted_at', null);
$builder->where('t1.plantilla_id', $plantilla_id);
if (empty($search))

View File

@ -388,7 +388,7 @@ class ClientePreciosModel extends \App\Models\BaseModel
$builder->join("users t2", "t1.user_updated_id = t2.id", "left");
$builder->where('t1.deleted_at', 0);
$builder->where('t1.deleted_at', null);
$builder->where('t1.cliente_id', $cliente_id);
if (empty($search))