diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php
index 4aff5c7d..b4f6144b 100644
--- a/ci4/app/Config/Routes.php
+++ b/ci4/app/Config/Routes.php
@@ -919,6 +919,8 @@ $routes->group('chat', ['namespace' => 'App\Controllers\Chat'], function ($route
     $routes->get('hebra/presupuesto/(:num)', "ChatController::get_hebra_presupuesto/$1", ["as" => "getHebraPresupuesto"]);
     $routes->get('hebra/pedido/(:num)', "ChatController::get_hebra_pedido/$1", ["as" => "getHebraPedido"]);
     $routes->get('hebra/factura/(:num)', "ChatController::get_hebra_factura/$1", ["as" => "getHebraFactura"]);
+
+    $routes->get('users/notifications-unviewed/(:num)','ChatController::get_notifications_not_viewed_from_chat/$1');
 });
 
 
diff --git a/ci4/app/Controllers/Chat/ChatController.php b/ci4/app/Controllers/Chat/ChatController.php
index 0be4e8ed..872235f4 100644
--- a/ci4/app/Controllers/Chat/ChatController.php
+++ b/ci4/app/Controllers/Chat/ChatController.php
@@ -60,7 +60,8 @@ class ChatController extends BaseController
         $data = $this->chatDeparmentModel->getChatDepartments();
         return $this->response->setJSON($data);
     }
-    public function get_chat_department_select(){
+    public function get_chat_department_select()
+    {
         $query = $this->chatDeparmentModel->getChatDepartmentSelect($this->request->getGet("q"));
         return $this->response->setJSON($query->get()->getResultObject());
     }
@@ -142,9 +143,9 @@ class ChatController extends BaseController
         $this->chatModel->setAsViewedChatUserNotifications($chat_id, $auth_user->id);
         $this->chatModel->setAsUnviewedChatUserMessages($chat_id, $auth_user->id);
 
-        if($chat->chat_department_id){
+        if ($chat->chat_department_id) {
             return view(static::$viewPath . 'messageChatPresupuesto', $this->viewData);
-        }else{
+        } else {
             return view(static::$viewPath . 'messageChatInternal', $this->viewData);
         }
     }
@@ -160,9 +161,9 @@ class ChatController extends BaseController
         $auth_user = auth()->user();
         $this->chatModel->setAsViewedChatUserNotifications($chat_id, $auth_user->id);
         $this->chatModel->setAsUnviewedChatUserMessages($chat_id, $auth_user->id);
-        if($chat->chat_department_id ){
+        if ($chat->chat_department_id) {
             return view(static::$viewPath . 'messageChatPedido', $this->viewData);
-        }else{
+        } else {
             return view(static::$viewPath . 'messageChatInternal', $this->viewData);
         }
     }
@@ -179,9 +180,9 @@ class ChatController extends BaseController
         $this->chatModel->setAsViewedChatUserNotifications($chat_id, $auth_user->id);
         $this->chatModel->setAsUnviewedChatUserMessages($chat_id, $auth_user->id);
 
-        if($chat->chat_department_id){
+        if ($chat->chat_department_id) {
             return view(static::$viewPath . 'messageChatFactura', $this->viewData);
-        }else{
+        } else {
             return view(static::$viewPath . 'messageChatInternal', $this->viewData);
         }
     }
@@ -411,7 +412,7 @@ class ChatController extends BaseController
         )
             ->where("deleted_at", null)
             ->whereNotIn("id", [auth()->user()->id])
-            ->where("cliente_id",$p->cliente_id);
+            ->where("cliente_id", $p->cliente_id);
         if ($this->request->getGet("q")) {
             $query->groupStart()
                 ->orLike("users.username", $this->request->getGet("q"))
@@ -433,7 +434,7 @@ class ChatController extends BaseController
         )
             ->where("deleted_at", null)
             ->whereNotIn("id", [auth()->user()->id])
-            ->where("cliente_id",$p->cliente()->id);
+            ->where("cliente_id", $p->cliente()->id);
         if ($this->request->getGet("q")) {
             $query->groupStart()
                 ->orLike("users.username", $this->request->getGet("q"))
@@ -455,7 +456,7 @@ class ChatController extends BaseController
         )
             ->where("deleted_at", null)
             ->whereNotIn("id", [auth()->user()->id])
-            ->where("cliente_id",$f->cliente_id);
+            ->where("cliente_id", $f->cliente_id);
         if ($this->request->getGet("q")) {
             $query->groupStart()
                 ->orLike("users.username", $this->request->getGet("q"))
@@ -619,53 +620,79 @@ class ChatController extends BaseController
     public function datatable_messages()
     {
         $auth_user_id = auth()->user()->id;
+        $isAdmin = auth()->user()->inGroup('admin');
         $query = $this->chatModel->getQueryDatatable($auth_user_id);
         return DataTable::of($query)
             ->edit('created_at', fn($q) => Time::createFromFormat('Y-m-d H:i:s', $q->created_at)->format("d/m/Y H:i"))
             ->edit('updated_at', fn($q) => Time::createFromFormat('Y-m-d H:i:s', $q->updated_at)->format("d/m/Y H:i"))
             ->add("creator", fn($q) => $this->chatModel->getChatFirstUser($q->id)->userFullName)
             ->add("viewed", fn($q) =>  $this->chatModel->isMessageChatViewed($q->id, $auth_user_id))
-            ->add("action", fn($q) => ["type" => "direct","modelId" => $q->id])
+            ->add("action", fn($q) => [
+                "type" => "direct",
+                "modelId" => $q->id,
+                "isAdmin" => $isAdmin,
+                "lang" => [
+                    "view_chat" => lang('Chat.view_chat'),
+                    "view_by_alt_message" => lang('Chat.view_by_alt_message')
+                ]
+            ])
             ->toJson(true);
     }
     public function datatable_presupuesto_messages()
     {
         $auth_user_id = auth()->user()->id;
+        $isAdmin = auth()->user()->inGroup('admin');
         $query = $this->chatModel->getQueryDatatableMessagePresupuesto($auth_user_id);
         return DataTable::of($query)
             ->edit('created_at', fn($q) => $q->created_at ? Time::createFromFormat('Y-m-d H:i:s', $q->created_at)->format("d/m/Y H:i") : "")
             ->edit('updated_at', fn($q) => $q->updated_at ? Time::createFromFormat('Y-m-d H:i:s', $q->updated_at)->format("d/m/Y H:i") : "")
             ->add("creator", fn($q) => $this->chatModel->getChatFirstUser($q->id)->userFullName)
             ->add("viewed", fn($q) =>  $this->chatModel->isMessageChatViewed($q->id, $auth_user_id))
-            ->add("action", fn($q) => ["type" => "presupuesto","modelId" => $q->id])
+            ->add("action", fn($q) => ["type" => "presupuesto", "modelId" => $q->id, "isAdmin" => $isAdmin, "lang" => [
+                "view_chat" => lang('Chat.view_chat'),
+                "view_by_alt_message" => lang('Chat.view_by_alt_message')
+            ]])
             ->toJson(true);
     }
     public function datatable_pedido_messages()
     {
         $auth_user_id = auth()->user()->id;
+        $isAdmin = auth()->user()->inGroup('admin');
         $query = $this->chatModel->getQueryDatatableMessagePedido($auth_user_id);
         return DataTable::of($query)
             ->edit('created_at', fn($q) => $q->created_at ? Time::createFromFormat('Y-m-d H:i:s', $q->created_at)->format("d/m/Y H:i") : "")
             ->edit('updated_at', fn($q) => $q->updated_at ? Time::createFromFormat('Y-m-d H:i:s', $q->updated_at)->format("d/m/Y H:i") : "")
             ->add("creator", fn($q) => $this->chatModel->getChatFirstUser($q->id)->userFullName)
             ->add("viewed", fn($q) =>  $this->chatModel->isMessageChatViewed($q->id, $auth_user_id))
-            ->add("action", fn($q) => ["type" => "pedido","modelId" => $q->id])
+            ->add("action", fn($q) => ["type" => "pedido", "modelId" => $q->id, "isAdmin" => $isAdmin, "lang" => [
+                "view_chat" => lang('Chat.view_chat'),
+                "view_by_alt_message" => lang('Chat.view_by_alt_message')
+            ]])
 
             ->toJson(true);
     }
     public function datatable_factura_messages()
     {
         $auth_user_id = auth()->user()->id;
+        $isAdmin = auth()->user()->inGroup('admin');
         $query = $this->chatModel->getQueryDatatableMessageFactura($auth_user_id);
         return DataTable::of($query)
             ->edit('created_at', fn($q) => $q->created_at ? Time::createFromFormat('Y-m-d H:i:s', $q->created_at)->format("d/m/Y H:i") : "")
             ->edit('updated_at', fn($q) => $q->updated_at ? Time::createFromFormat('Y-m-d H:i:s', $q->updated_at)->format("d/m/Y H:i") : "")
             ->add("creator", fn($q) => $this->chatModel->getChatFirstUser($q->id)->userFullName)
             ->add("viewed", fn($q) =>  $this->chatModel->isMessageChatViewed($q->id, $auth_user_id))
-            ->add("action", fn($q) => ["type" => "factura","modelId" => $q->id])
+            ->add("action", fn($q) => ["type" => "factura", "modelId" => $q->id, "isAdmin" => $isAdmin, "lang" => [
+                "view_chat" => lang('Chat.view_chat'),
+                "view_by_alt_message" => lang('Chat.view_by_alt_message')
+            ]])
 
             ->toJson(true);
     }
+    public function get_notifications_not_viewed_from_chat(int $chat_id)
+    {
+        $data = $this->chatModel->getUsersNotificationNotViewedFromChat($chat_id);
+        return $this->response->setJSON(["data" => $data, "chat_id" => $chat_id]);
+    }
     public function store_new_direct_message()
     {
         $bodyData = $this->request->getPost();
@@ -702,7 +729,7 @@ class ChatController extends BaseController
             ]);
         }
         $users = $this->chatDeparmentModel->getChatDepartmentUsers($bodyData["chat_department_id"]);
-        $bodyData["users"] = array_map(fn($q) => $q->id,$users);
+        $bodyData["users"] = array_map(fn($q) => $q->id, $users);
         dd(1);
         $this->chatModel->createNewDirectChat(...$bodyData);
         return $this->response->setJSON(["message" => lang("Chat.new_message_ok"), "status" => true]);
@@ -770,7 +797,7 @@ class ChatController extends BaseController
     {
         $bodyData = $this->request->getPost();
         $messageService = service('messages');
-        $r = $messageService->createErrorMessagePresupuesto("Error",$bodyData['presupuesto_id']);
-        return $this->response->setJSON(["message" => "ok","data" => $r]);
+        $r = $messageService->createErrorMessagePresupuesto("Error", $bodyData['presupuesto_id']);
+        return $this->response->setJSON(["message" => "ok", "data" => $r]);
     }
 }
diff --git a/ci4/app/Language/es/Chat.php b/ci4/app/Language/es/Chat.php
index 62d3ad0c..e9f32692 100644
--- a/ci4/app/Language/es/Chat.php
+++ b/ci4/app/Language/es/Chat.php
@@ -33,5 +33,7 @@ return [
     "check_as_unviewed" => "Marcar como no leídos",
     "add_notification_message" => "Envía a los usuarios añadidos una notificación con los mensajes presentes en el chat.",
     "chat_title_presupuesto" => 'Presupuesto[{title,string,0}][{id}]',
-    "no_messages_notification" => 'No hay mensajes que revisar por el momento'
+    "no_messages_notification" => 'No hay mensajes que revisar por el momento',
+    "view_chat" => 'Ver chat',
+    "view_by_alt_message" => 'Muestra los usuarios que han leído o no los mensajes'
 ];
\ No newline at end of file
diff --git a/ci4/app/Models/Chat/ChatDeparmentModel.php b/ci4/app/Models/Chat/ChatDeparmentModel.php
index 1681f814..f729ec04 100644
--- a/ci4/app/Models/Chat/ChatDeparmentModel.php
+++ b/ci4/app/Models/Chat/ChatDeparmentModel.php
@@ -11,7 +11,7 @@ class ChatDeparmentModel extends Model
     protected $primaryKey       = 'id';
     protected $useAutoIncrement = true;
     protected $returnType       = 'object';
-    protected $useSoftDeletes   = false;
+    protected $useSoftDeletes   = true;
     protected $protectFields    = true;
     protected $allowedFields    = [
         "name",
@@ -107,7 +107,7 @@ class ChatDeparmentModel extends Model
     }
     public function getChatDepartmentUsers(int $chat_deparment_id)
     {
-        $result = $this->db->table('chat_departments')
+        $result = $this->builder()
             ->select(
                 [
                     "users.*"
@@ -123,6 +123,8 @@ class ChatDeparmentModel extends Model
                 "chat_department_users.user_id = users.id",
                 'left'
             )->where("chat_departments.id", $chat_deparment_id)
+            ->where("chat_department_users.deleted_at",null)
+            ->where("users.deleted_at",null)
             ->get()->getResultObject();
         return $result;
     }
diff --git a/ci4/app/Models/Chat/ChatDeparmentUserModel.php b/ci4/app/Models/Chat/ChatDeparmentUserModel.php
index 717c738a..9dbde312 100644
--- a/ci4/app/Models/Chat/ChatDeparmentUserModel.php
+++ b/ci4/app/Models/Chat/ChatDeparmentUserModel.php
@@ -52,7 +52,9 @@ class ChatDeparmentUserModel extends Model
         return $this->db->table($this->table." t1")
         ->select("chat_departments.*")
         ->join("chat_departments","t1.chat_department_id = chat_departments.id","left")
-        ->where("t1.user_id",$user_id)->get()->getResultObject();
+        ->where("t1.user_id",$user_id)
+        ->where("t1.deleted_at",null)
+        ->get()->getResultObject();
  
     }
 }
diff --git a/ci4/app/Models/Chat/ChatModel.php b/ci4/app/Models/Chat/ChatModel.php
index 0a110442..4055fca9 100644
--- a/ci4/app/Models/Chat/ChatModel.php
+++ b/ci4/app/Models/Chat/ChatModel.php
@@ -344,9 +344,9 @@ class ChatModel extends Model
             if ($row->presupuestoId) {
                 $row->model = $presupuestoModel->find($row->presupuestoId);
                 if ($auth_user->cliente_id) {
-                    $row->uri = "/presupuestocliente/edit/" . $row->presupuestoId."#accordionChatPresupuesto";
+                    $row->uri = "/presupuestocliente/edit/" . $row->presupuestoId . "#accordionChatPresupuesto";
                 } else {
-                    $row->uri = "/presupuestoadmin/edit/" . $row->presupuestoId."#accordionChatPresupuesto";
+                    $row->uri = "/presupuestoadmin/edit/" . $row->presupuestoId . "#accordionChatPresupuesto";
                 }
                 $row->title = $row->presupuestoId;
                 if ($row->chatDepartmentId) {
@@ -369,7 +369,7 @@ class ChatModel extends Model
                 $rows_new[] = $row;
             } elseif ($row->facturaId) {
                 $row->model = $facturaModel->find($row->facturaId);
-                $row->uri = "/chat/factura/" . $row->facturaId."#accordionChatFactura";
+                $row->uri = "/chat/factura/" . $row->facturaId . "#accordionChatFactura";
                 $row->avatar = "F";
                 if ($row->chatDepartmentId) {
                     $row->chatDisplay .= "[INTERNAL]";
@@ -409,7 +409,7 @@ class ChatModel extends Model
             if ($row->presupuestoId) {
                 $row->model = $presupuestoModel->find($row->presupuestoId);
                 if ($auth_user->cliente_id) {
-                    $row->uri = "/presupuestocliente/edit/" . $row->presupuestoId."#accordionChatPresupuesto";
+                    $row->uri = "/presupuestocliente/edit/" . $row->presupuestoId . "#accordionChatPresupuesto";
                 } else {
                     $row->uri = "/presupuestoadmin/edit/" . $row->presupuestoId . "#accordionChatPresupuesto";
                 }
@@ -677,7 +677,7 @@ class ChatModel extends Model
         return $q->get()->getFirstRow();
     }
     /**
-     * Check if all messages of a chat sended to an user have been viewed.
+     * Check if all messages of a chat sent to an user have been viewed.
      *
      * @param integer $chat_id 
      * @param integer $user_id
@@ -689,7 +689,7 @@ class ChatModel extends Model
             ->join("chat_messages", "chat_messages.chat_id = chats.id", 'left')
             ->join("chat_notifications", "chat_notifications.chat_message_id = chat_messages.id", 'left')
             ->where("chats.id", $chat_id)
-            ->where("chat_notifications.user_id", $user_id)
+            // ->where("chat_notifications.user_id", $user_id)
             ->where("chat_notifications.viewed", false);
         $unread_messages_count = $q->countAllResults();
         if ($unread_messages_count > 0) {
@@ -699,24 +699,54 @@ class ChatModel extends Model
         }
         return $result;
     }
+    /**
+     * Return users who did not read the message.
+     *
+     * @param integer $chat_id 
+     * @return array True : All messages readed
+     */
+    public function getUsersNotificationNotViewedFromChat(int $chat_id): array
+    {
+        $q = $this->builder()->distinct()->select(
+            [
+                "CONCAT(users.first_name,' ',users.last_name) as userFullName",
+                "users.username as userName",
+                "SUM(chat_notifications.viewed) as viewed_count",
+                "COUNT(chat_notifications.id) as notification_count"
 
+            ]
+
+        )
+            ->join("chat_messages", "chat_messages.chat_id = chats.id", 'left')
+            ->join("chat_notifications", "chat_notifications.chat_message_id = chat_messages.id", 'left')
+            ->join("users", "users.id = chat_notifications.user_id", 'left')
+            ->where("chats.id", $chat_id)
+            ->where("chat_notifications.deleted_at", null)
+            ->get()->getResultArray();
+        return $q;
+    }
     public function getQueryDatatable(int $user_id): BaseBuilder
     {
         $query = $this->builder()
             ->select([
                 "chats.id",
                 "chats.created_at",
-                "chats.updated_at",
+                "cm.updated_at",
                 "chats.title",
             ])
             ->join("chat_users", "chat_users.chat_id = chats.id", "left")
+            ->join("chat_messages cm", "chats.id = cm.chat_id", "left")
             ->where("chat_department_id", null)
             ->where("pedido_id", null)
             ->where("presupuesto_id", null)
             ->where("factura_id", null)
             ->where("chat_users.user_id", $user_id)
-            ->orderBy("created_at", "DESC")
-            ->groupBy("chats.id");
+            ->where("cm.updated_at = (
+                SELECT cm2.updated_at
+                FROM chat_messages cm2
+                WHERE cm2.chat_id = chats.id
+                ORDER BY cm2.updated_at DESC LIMIT 1
+            )");
 
         return $query;
     }
@@ -726,18 +756,23 @@ class ChatModel extends Model
             ->select([
                 "chats.id",
                 "chats.created_at",
-                "chats.updated_at",
+                "cm.updated_at",
                 "chats.title",
             ])
             ->join("chat_users", "chats.id = chat_users.chat_id", "left")
             ->join("presupuestos", "presupuestos.id = chats.presupuesto_id", 'left')
-            ->where("presupuesto_id is NOT NULL", NULL, FALSE)
-            ->groupBy("chats.id");
+            ->join("chat_messages cm", "chats.id = cm.chat_id", "left")
+            ->where("chats.presupuesto_id is NOT NULL", NULL, FALSE)
+            ->where("cm.updated_at = (
+                SELECT cm2.updated_at
+                FROM chat_messages cm2
+                WHERE cm2.chat_id = chats.id
+                ORDER BY cm2.updated_at DESC LIMIT 1
+            )");
         if (auth()->user()->inGroup("admin") == false) {
             $query->where('presupuestos.cliente_id', auth()->user()->cliente_id)
                 ->where("chat_department_id is NOT NULL", NULL, FALSE);
         }
-        $query->orderBy("created_at", "DESC");
         return $query;
     }
     public function getQueryDatatableMessagePedido(int $user_id): BaseBuilder
@@ -746,19 +781,24 @@ class ChatModel extends Model
             ->select([
                 "chats.id",
                 "chats.created_at",
-                "chats.updated_at",
+                "cm.updated_at",
                 "chats.title",
             ])
             ->join("chat_users", "chat_users.chat_id = chats.id", "left")
             ->join("pedidos_linea", "pedidos_linea.pedido_id = chats.pedido_id", 'left')
+            ->join("chat_messages cm", "chats.id = cm.chat_id", "left")
             ->join("presupuestos", "presupuestos.id = pedidos_linea.presupuesto_id", 'left')
             ->where("chats.pedido_id is NOT NULL", NULL, FALSE)
-            ->groupBy("chats.id");
+            ->where("cm.updated_at = (
+                SELECT cm2.updated_at
+                FROM chat_messages cm2
+                WHERE cm2.chat_id = chats.id
+                ORDER BY cm2.updated_at DESC LIMIT 1
+            )");
         if (auth()->user()->inGroup("admin") == false) {
             $query->where('presupuestos.cliente_id', auth()->user()->cliente_id)
                 ->where("chat_department_id is NOT NULL", NULL, FALSE);
         }
-        $query->orderBy("created_at", "DESC");
         return $query;
     }
     public function getQueryDatatableMessageFactura(int $user_id): BaseBuilder
@@ -767,20 +807,25 @@ class ChatModel extends Model
             ->select([
                 "chats.id",
                 "chats.created_at",
-                "chats.updated_at",
+                "cm.updated_at",
                 "chats.title",
             ])
             ->join("chat_users", "chat_users.chat_id = chats.id", "left")
+            ->join("chat_messages cm", "chats.id = cm.chat_id", "left")
             ->join("facturas", "facturas.id = chats.factura_id", "left")
             ->where("chats.factura_id is NOT NULL", NULL, FALSE)
-            ->groupBy("chats.id");
+            ->where("cm.updated_at = (
+                SELECT cm2.updated_at
+                FROM chat_messages cm2
+                WHERE cm2.chat_id = chats.id
+                ORDER BY cm2.updated_at DESC LIMIT 1
+            )");
         if (auth()->user()->inGroup("admin") == false) {
             if (auth()->user()->inGroup("admin") == false) {
                 $query->where('facturas.cliente_id', auth()->user()->cliente_id)
                     ->where("chat_department_id is NOT NULL", NULL, FALSE);
             }
         }
-        $query->orderBy("created_at", "DESC");
         return $query;
     }
     public function createNewDirectChat(string $title, string $message, array $users)
diff --git a/ci4/app/Models/Presupuestos/PresupuestoLineaModel.php b/ci4/app/Models/Presupuestos/PresupuestoLineaModel.php
index 0c792c5d..e6ce9656 100755
--- a/ci4/app/Models/Presupuestos/PresupuestoLineaModel.php
+++ b/ci4/app/Models/Presupuestos/PresupuestoLineaModel.php
@@ -556,9 +556,10 @@ class PresupuestoLineaModel extends \App\Models\BaseModel
         $builder = $this->db
             ->table($this->table . " t1")
             ->select(
-                "t1.paginas AS paginas, t1.papel_impresion AS papel, t1.gramaje AS gramaje"
+                "t1.paginas AS paginas, t2.nombre AS papel, t1.gramaje AS gramaje"
             )
             ->where("t1.presupuesto_id", $presupuesto_id)
+            ->join("lg_papel_generico t2", "t1.papel_id = t2.id", "left")
             ->whereIn('t1.tipo', ['lp_bn', 'lp_bnhq', 'lp_rot_bn']);
 
         return $builder;
@@ -569,9 +570,10 @@ class PresupuestoLineaModel extends \App\Models\BaseModel
         $builder = $this->db
             ->table($this->table . " t1")
             ->select(
-                "t1.paginas AS paginas, t1.papel_impresion AS papel, t1.gramaje AS gramaje"
+                "t1.paginas AS paginas, t2.nombre AS papel, t1.gramaje AS gramaje"
             )
             ->where("t1.presupuesto_id", $presupuesto_id)
+            ->join("lg_papel_generico t2", "t1.papel_id = t2.id", "left")
             ->whereIn('t1.tipo', ['lp_color', 'lp_colorhq', 'lp_rot_color']);
 
         return $builder;
@@ -582,9 +584,10 @@ class PresupuestoLineaModel extends \App\Models\BaseModel
         $builder = $this->db
             ->table($this->table . " t1")
             ->select(
-                "t1.paginas AS paginas, t1.papel_impresion AS papel, t1.gramaje AS gramaje"
+                "t1.paginas AS paginas, t2.nombre AS papel, t1.gramaje AS gramaje"
             )
             ->where("t1.presupuesto_id", $presupuesto_id)
+            ->join("lg_papel_generico t2", "t1.papel_id = t2.id", "left")
             ->whereIn('t1.tipo', ['lp_cubierta']);
 
         return $builder;
@@ -595,9 +598,10 @@ class PresupuestoLineaModel extends \App\Models\BaseModel
         $builder = $this->db
             ->table($this->table . " t1")
             ->select(
-                "t1.paginas AS paginas, t1.papel_impresion AS papel, t1.gramaje AS gramaje"
+                "t1.paginas AS paginas, t2.nombre AS papel, t1.gramaje AS gramaje"
             )
             ->where("t1.presupuesto_id", $presupuesto_id)
+            ->join("lg_papel_generico t2", "t1.papel_id = t2.id", "left")
             ->whereIn('t1.tipo', ['lp_sobrecubierta']);
 
         return $builder;
@@ -608,9 +612,10 @@ class PresupuestoLineaModel extends \App\Models\BaseModel
         $builder = $this->db
             ->table($this->table . " t1")
             ->select(
-                "t1.paginas AS paginas, t1.papel_impresion AS papel, t1.gramaje AS gramaje"
+                "t1.paginas AS paginas, t2.nombre AS papel, t1.gramaje AS gramaje"
             )
             ->where("t1.presupuesto_id", $presupuesto_id)
+            ->join("lg_papel_generico t2", "t1.papel_id = t2.id", "left")
             ->whereIn('t1.tipo', ['lp_guardas']);
 
         return $builder;
diff --git a/ci4/app/Models/Presupuestos/PresupuestoModel.php b/ci4/app/Models/Presupuestos/PresupuestoModel.php
index 9db7175d..341b10b9 100755
--- a/ci4/app/Models/Presupuestos/PresupuestoModel.php
+++ b/ci4/app/Models/Presupuestos/PresupuestoModel.php
@@ -324,6 +324,7 @@ class PresupuestoModel extends \App\Models\BaseModel
                 t1.comentarios_pdf AS comentarios_pdf, t1.tirada_alternativa_json_data AS tiradas_alternativas,
                 t1.total_presupuesto AS total_presupuesto, t1.total_precio_unidad AS total_precio_unidad,
                 t1.papel_formato_personalizado AS isPersonalizado, t1.envios_recoge_cliente AS recoge_cliente,
+                t1.solapas_ancho_faja_color AS ancho_solapas_faja,
                 CONCAT(t1.papel_formato_ancho, 'x', t1.papel_formato_alto) AS formatoPersonalizado,
                 t2.nombre AS cliente,
                 CONCAT(t3.first_name, ' ', t3.last_name) AS comercial, t5.secret AS email_comercial,
diff --git a/ci4/app/Views/themes/vuexy/form/mensajes/mensajesView.php b/ci4/app/Views/themes/vuexy/form/mensajes/mensajesView.php
index 2288d375..07428fcb 100644
--- a/ci4/app/Views/themes/vuexy/form/mensajes/mensajesView.php
+++ b/ci4/app/Views/themes/vuexy/form/mensajes/mensajesView.php
@@ -66,6 +66,7 @@
 <?= $this->endSection() ?>
 <?= $this->section("additionalExternalJs") ?>
 <script src="<?= site_url("themes/vuexy/vendor/libs/formvalidation/dist/js/FormValidation.js") ?>"></script>
+<script src="<?= site_url('themes/vuexy/vendor/libs/popper/popper.js') ?>"></script>
 <script src="<?= site_url("themes/vuexy/vendor/libs/formvalidation/dist/js/plugins/Bootstrap5.min.js") ?>"></script>
 <script src="<?= site_url("themes/vuexy/vendor/libs/formvalidation/dist/js/plugins/AutoFocus.min.js") ?>"></script>
 <script type="module" src="<?= site_url('assets/js/safekat/pages/configuracion/messages/index.js') ?>">
diff --git a/ci4/app/Views/themes/vuexy/pdfs/presupuesto.php b/ci4/app/Views/themes/vuexy/pdfs/presupuesto.php
index 9c631113..99a685b3 100644
--- a/ci4/app/Views/themes/vuexy/pdfs/presupuesto.php
+++ b/ci4/app/Views/themes/vuexy/pdfs/presupuesto.php
@@ -232,13 +232,40 @@
                     <td class="t">Guardas</td>
                     <td class="v" colspan="5"><?php echo (($lp_Guardas !== null) ? "SI" : "NO"); ?></td>
                 </tr>
+
+                <?php if ($lp_Sobrecubierta !== null && $presupuesto->solapas_sobrecubierta !== null): ?>
+                    <tr>
+                        <td class="t">Sobrecubierta</td>
+                        <td class="v" colspan="1">SI</td>
+                        <td class="t">Solapas</td>
+                        <td class="v">
+                            <?= $presupuesto->solapas_sobrecubierta !== null ? 'SI' : 'NO' ?>
+                        </td>
+                        <td class="t">Ancho</td>
+                        <td class="v">
+                            <?= $presupuesto->solapas_sobrecubierta_ancho !== null ?
+                                number_format($presupuesto->solapas_sobrecubierta_ancho, 2, ",", ".") :
+                                '0,00' ?> mm
+                        </td>
+                    </tr>
+                <?php endif; ?>
                 <tr>
                     <td class="t">Marcapáginas</td>
                     <td class="v" colspan="5"><?php echo (($presupuesto->marcapaginas == 1) ? "SI" : "NO"); ?></td>
                 </tr>
                 <tr>
                     <td class="t">Faja</td>
-                    <td class="v" colspan="5"><?php echo (($lp_Faja !== null) ? "SI" : "NO"); ?></td>
+                    <td class="v" colspan="1"><?php echo (($lp_Faja !== null) ? "SI" : "NO"); ?></td>
+                    <td class="t">Solapas</td>
+                    <td class="v">
+                        <?= ($lp_Faja !== null && $presupuesto->ancho_solapas_faja !== null) ? 'SI' : 'NO' ?>
+                    </td>
+                    <td class="t">Ancho</td>
+                    <td class="v">
+                        <?= ($lp_Faja !== null && $presupuesto->ancho_solapas_faja !== null) ?
+                            number_format($presupuesto->ancho_solapas_faja, 2, ",", ".") :
+                            '0,00' ?> mm
+                    </td>
                 </tr>
             </tbody>
         </table>
diff --git a/httpdocs/assets/js/safekat/components/datatables/MessagesDatatable.js b/httpdocs/assets/js/safekat/components/datatables/MessagesDatatable.js
index 9afea4ec..c27f70ef 100644
--- a/httpdocs/assets/js/safekat/components/datatables/MessagesDatatable.js
+++ b/httpdocs/assets/js/safekat/components/datatables/MessagesDatatable.js
@@ -14,7 +14,7 @@ class MessagesDatatable {
             { data: 'title', searchable: true, sortable: true },
             { data: 'creator', searchable: false, sortable: false },
             {
-                data: 'viewed', searchable: false, sortable: false,
+                data: 'viewed', searchable: false, sortable: true,
                 render: (d, t) => {
                     const iconClass = d == true ? "ti ti-sm ti-check" : "ti ti-sm ti-x"
                     return `<span class="${iconClass}"</span>`
@@ -24,8 +24,19 @@ class MessagesDatatable {
                 data: 'action', searchable: false, sortable: false,
                 render: (d, t) => {
                     return `<div class="btn-group btn-group-sm">
-                    <a href="/chat/${d.type}/${d.modelId}" class="message-edit"><i class="ti ti-eye ti-sm mx-2"></i></a>
-                </div>`
+                    <a href="/chat/${d.type}/${d.modelId}" class="message-edit" title="${d.lang.view_chat}"><i class="ti ti-eye ti-sm mx-2"></i></a>
+                    ${d.isAdmin ?
+                            `<div class="btn-group dropstart btn-group-sm">
+                        <button data-id="${d.modelId}" type="button" title="${d.lang.view_by_alt_message}" class="btn btn-icon rounded-pill dropdown-toggle hide-arrow text-primary btn-notification-viewed" data-bs-toggle="dropdown">
+                        <i class="icon-base ti ti-messages"></i>
+                        </button>
+                        <ul class="dropdown-menu" id="dropdown-viewed-${d.modelId}">
+                        </ul>
+                    </div>` : ""
+                        }
+                    </div>
+                    `
+
                 }
             }
         ]
@@ -34,8 +45,14 @@ class MessagesDatatable {
 
     }
     init() {
+        this.item.on('click', '.btn-notification-viewed', (event) => {
+            const chatId = $(event.currentTarget).data('id')
+            $(`#dropdown-viewed-${chatId}`).empty()
+            this.handleDropUp(chatId)
+        })
         this.datatable = this.datatableItem.DataTable({
             processing: true,
+            order: [[1, 'desc']],
             layout: {
                 topStart: 'pageLength',
                 topEnd: 'search',
@@ -53,6 +70,7 @@ class MessagesDatatable {
 
         this.datatablePresupuestoMessage = this.datatablePresupuestoMessageItem.DataTable({
             processing: true,
+            order: [[1, 'desc']],
             layout: {
                 topStart: 'pageLength',
                 topEnd: 'search',
@@ -69,6 +87,7 @@ class MessagesDatatable {
         });
         this.datatablePedidoMessage = this.datatablePedidoMessageItem.DataTable({
             processing: true,
+            order: [[1, 'desc']],
             layout: {
                 topStart: 'pageLength',
                 topEnd: 'search',
@@ -85,6 +104,7 @@ class MessagesDatatable {
         });
         this.datatableFacturaMessage = this.datatableFacturaMessageItem.DataTable({
             processing: true,
+            order: [[1, 'desc']],
             layout: {
                 topStart: 'pageLength',
                 topEnd: 'search',
@@ -102,6 +122,46 @@ class MessagesDatatable {
 
     }
 
+    handleDropUp(chatId) {
+        let ajax = new Ajax('/chat/users/notifications-unviewed/' + chatId,
+            null,
+            null,
+            this.handleDropUpSuccess.bind(this),
+            this.handleDropUpError.bind(this)
+
+        )
+        ajax.get();
+    }
+    handleDropUpSuccess(response) {
+        const chatId = response.chat_id
+        const users = response.data
+        if (users.length > 0) {
+
+            users.forEach(user => {
+                const viewed = (user.notification_count - user.viewed_count) == 0
+                if (user.userFullName || user.userName) {
+
+                    $(`#dropdown-viewed-${chatId}`)
+                        .append(`
+                            <li >
+                            <a class="d-flex flex-row justify-content-start align-items-center dropdown-item px-2 gap-2" href="javascript:void(0);"  >
+                            <span> ${user.userFullName ?? user.userName} </span>
+                            <span class="badge badge-center rounded-pill text-bg-secondary">
+                            <i class="ti ti-xs ti-${viewed ? "eye-check" : "eye-off"} "></i>
+                            </span>
+                            </a>
+                            </li>
+                            `)
+                }
+
+            });
+        } else {
+            $(`#dropdown-viewed-${chatId}`).append(`<li><a class="dropdown-item" href="javascript:void(0);" >Visto</a></li>`)
+        }
+    }
+    handleDropUpError() { }
+
+
 }
 
 export default MessagesDatatable;
\ No newline at end of file
diff --git a/httpdocs/themes/vuexy/css/pdf.presupuesto.css b/httpdocs/themes/vuexy/css/pdf.presupuesto.css
index a2a427f8..d700da62 100644
--- a/httpdocs/themes/vuexy/css/pdf.presupuesto.css
+++ b/httpdocs/themes/vuexy/css/pdf.presupuesto.css
@@ -286,6 +286,10 @@ body table.extras td.t {
   border-right: 1px dotted black;
 }
 
+body table.extras td.v {
+  border-right: 1px dotted black;
+}
+
 body table.envio {
   width: 100%;
   font-size: 11px;