From bf9ed99a90fa56ac26476013a79c8f634cb2d4ec Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Sat, 7 Mar 2026 19:27:23 +0100
Subject: [PATCH] .

---
 apps/web/src/routes/app-routes.tsx            |  26 +-
 modules/core/src/api/application/index.ts     |   1 +
 .../core/src/api/application/mappers/index.ts |   1 +
 .../mappers/mapper.interface.ts}              |  18 +-
 modules/core/src/api/domain/index.ts          |   1 -
 .../core/src/api/domain/repositories/index.ts |   1 -
 .../mappers/sequelize-domain-mapper.ts        |   2 +-
 .../mappers/sequelize-mapper.interface.ts     |   2 +-
 .../mappers/sequelize-read-model-mapper.ts    |   8 +-
 .../application-models/index.ts               |   0
 .../application/issued-invoices/dtos/index.ts |   1 -
 .../api/application/issued-invoices/index.ts  |   3 +-
 ...ssued-invoice-summary-mapper.interface.ts} |   6 +-
 .../issued-invoices/models/index.ts           |   1 +
 .../issued-invoice-summary.ts}                |   2 +-
 .../issued-invoice-repository.interface.ts    |   4 +-
 .../services/issued-invoice-finder.ts         |   6 +-
 ...sued-invoice-list-item-snapshot-builder.ts |   6 +-
 .../proformas/application-models/index.ts     |   0
 .../api/application/proformas/dtos/index.ts   |   1 -
 .../src/api/application/proformas/index.ts    |   3 +-
 .../mappers/proforma-list-mapper.interface.ts |   2 +-
 .../api/application/proformas/models/index.ts |   1 +
 .../proforma-resume.ts}                       |   0
 .../proforma-repository.interface.ts          |   2 +-
 .../proformas/services/proforma-finder.ts     |   2 +-
 .../proforma-list-item-snapshot-builder.ts    |   2 +-
 .../aggregates/customer-invoice.aggregate.ts  |   1 +
 ...ze-issued-invoice-recipient.list.mapper.ts |   4 +-
 .../sequelize-issued-invoice.list.mapper.ts   |  17 +-
 .../repositories/issued-invoice.repository.ts |   6 +-
 .../proformas/di/proforma-public-services.ts  |  18 +-
 .../repositories/proforma.repository.ts       |   6 +-
 .../src/web/customer-invoice-routes.tsx       |  27 +-
 .../issued-invoice-summary-dto.adapter.ts     |  10 +-
 .../src/web/proformas/create/index.ts         |   1 +
 .../src/web/proformas/create/ui/index.ts      |   1 +
 .../web/proformas/create/ui/pages/index.ts    |   1 +
 .../create/ui/pages/proforma-create-page.tsx  |  47 ++
 .../list/ui/pages/proforma-list-page.tsx      |   1 -
 .../customer-application.service.ts           |   4 +-
 .../api/application/di/customer-finder.di.ts  |   6 +
 .../di/customer-snapshot-builders.di.ts       |  41 ++
 .../application/di/customer-use-cases.di.ts   |  83 ++++
 .../customers/src/api/application/di/index.ts |   5 +
 .../customers/src/api/application/index.ts    |   8 +-
 .../customer-domain-mapper.interface.ts       |   7 +
 .../customer-summary-mapper.interface.ts      |   7 +
 .../src/api/application/mappers/index.ts      |   2 +
 .../application/models/customer-summary.ts    |  41 ++
 .../src/api/application/models/index.ts       |   1 +
 .../customer-repository.interface.ts          |  13 +-
 .../repositories/index.ts                     |   0
 .../application/services/customer-finder.ts   |  56 +++
 .../src/api/application/services/index.ts     |   1 +
 .../application/snapshot-builders/index.ts    |   3 +
 .../customer-list-item-snapshot-builder.ts    |  14 +
 .../customer-list-item-snapshot.interface.ts  |   1 +
 .../snapshot-builders/list/index.ts           |   2 +
 .../map-dto-to-create-customer-props.ts       |   4 +-
 .../use-cases/list-customers.use-case.ts      |  52 ++-
 .../{customer.ts => customer.aggregate.ts}    |  22 +-
 .../src/api/domain/aggregates/index.ts        |   2 +-
 modules/customers/src/api/domain/index.ts     |   1 -
 ...ss-type.ts => customer-address-type.vo.ts} |   0
 ...stomer-number.ts => customer-number.vo.ts} |   0
 ...customer-serie.ts => customer-serie.vo.ts} |   0
 ...stomer-status.ts => customer-status.vo.ts} |   0
 .../src/api/domain/value-objects/index.ts     |   8 +-
 modules/customers/src/api/index.ts            |  20 +-
 .../src/api/infrastructure/dependencies.ts    |   4 +-
 .../di/customer-persistence-mappers.di.ts     |  36 ++
 .../di/customer-repositories.di.ts            |  14 +
 .../src/api/infrastructure/di/customers.di.ts |  73 +++
 .../src/api/infrastructure/di/index.ts        |   1 +
 .../express/customers.routes.ts               |   2 +-
 .../mappers/domain/customer.mapper.ts         |  22 +-
 ...t.mapper.ts => customer-summary.mapper.ts} |  52 +--
 .../infrastructure/mappers/queries/index.ts   |   2 +-
 .../repositories/customer.repository.ts       |  62 +--
 .../web/components/client-selector-modal.tsx  | 118 ++---
 .../customer-modal-selector/customer-card.tsx |  78 ++--
 .../customer-create-modal.tsx                 |  86 ++--
 .../customer-modal-selector-field.tsx         |  24 +-
 .../customer-modal-selector.tsx               |  94 ++--
 .../customer-search-dialog.tsx                |  75 ++--
 .../customer-view-dialog.tsx                  | 417 +++++++++---------
 .../src/web/components/customers-layout.tsx   |   7 -
 .../customer-additional-config-fields.tsx     |  40 +-
 .../editor/customer-address-fields.tsx        |  64 +--
 .../editor/customer-editor-skeleton.tsx       |  23 +-
 modules/customers/src/web/components/index.ts |   2 -
 modules/customers/src/web/customer-routes.tsx |  20 +-
 modules/customers/src/web/hooks/index.ts      |   1 -
 .../adapters/customer-summary-dto.adapter.ts  |  12 +
 .../customers/src/web/list/adapters/index.ts  |   1 +
 .../src/web/list/api/get-customer-list.api.ts |  18 +
 modules/customers/src/web/list/api/index.ts   |   1 +
 .../src/web/list/controllers/index.ts         |   1 +
 .../use-customer-list-page.controller.ts      |   9 +
 .../use-customer-list.controller.ts           |  43 ++
 modules/customers/src/web/list/hooks/index.ts |   1 +
 .../hooks/use-customer-list-query.tsx         |  51 ++-
 modules/customers/src/web/list/index.ts       |   1 +
 .../blocks/customers-grid/customers-grid.tsx  |  61 +++
 .../list/ui/blocks/customers-grid/index.ts    |   2 +
 .../use-customer-grid-columns.tsx             | 201 +++++++++
 .../customers/src/web/list/ui/blocks/index.ts |   1 +
 .../web/list/ui/components/address-cell.tsx   |  18 +
 .../web/list/ui/components/contact-cell.tsx   |  35 ++
 .../src/web/list/ui/components/index.ts       |   5 +
 .../src/web/list/ui/components/initials.tsx   |   4 +
 .../src/web/list/ui/components/kind-badge.tsx |   9 +
 .../src/web/list/ui/components/soft.tsx       |   5 +
 modules/customers/src/web/list/ui/index.ts    |   3 +
 .../web/list/ui/pages/customer-list-page.tsx  |  73 +++
 .../customers/src/web/list/ui/pages/index.ts  |   1 +
 .../web/pages/create/customer-create-page.tsx |  39 +-
 .../create/use-customer-create-controller.ts  |   5 +-
 .../web/pages/list/customers-list-page.tsx    | 102 -----
 modules/customers/src/web/pages/list/index.ts |   2 +-
 .../pages/list/use-customers-list-columns.tsx |  18 +-
 .../pages/update/customer-update-modal.tsx    |  54 +--
 .../web/pages/update/customer-update-page.tsx |  49 +-
 .../update/use-customer-update-controller.ts  |   7 +-
 .../src/web/pages/view/customer-view-page.tsx | 221 +++++-----
 .../web/types/customer-summary.web.schema.ts  |   9 +
 .../src/web/types/customer.api.schema.ts      |  17 +
 modules/customers/src/web/types/index.ts      |   2 +
 .../src/web/ui/blocks/customer-layout.tsx     |   6 +
 modules/customers/src/web/ui/blocks/index.ts  |   1 +
 .../components/customer-status-badge.tsx      |   0
 .../src/web/ui/components/error-alert.tsx     |  16 +
 .../customers/src/web/ui/components/index.ts  |   2 +
 modules/customers/src/web/ui/index.ts         |   2 +
 135 files changed, 1988 insertions(+), 1083 deletions(-)
 create mode 100644 modules/core/src/api/application/mappers/index.ts
 rename modules/core/src/api/{domain/repositories/repository.interface.ts => application/mappers/mapper.interface.ts} (82%)
 delete mode 100644 modules/core/src/api/domain/repositories/index.ts
 delete mode 100644 modules/customer-invoices/src/api/application/issued-invoices/application-models/index.ts
 delete mode 100644 modules/customer-invoices/src/api/application/issued-invoices/dtos/index.ts
 rename modules/customer-invoices/src/api/application/issued-invoices/mappers/{issued-invoice-list-mapper.interface.ts => issued-invoice-summary-mapper.interface.ts} (57%)
 create mode 100644 modules/customer-invoices/src/api/application/issued-invoices/models/index.ts
 rename modules/customer-invoices/src/api/application/issued-invoices/{dtos/issued-invoice-list.dto.ts => models/issued-invoice-summary.ts} (95%)
 delete mode 100644 modules/customer-invoices/src/api/application/proformas/application-models/index.ts
 delete mode 100644 modules/customer-invoices/src/api/application/proformas/dtos/index.ts
 create mode 100644 modules/customer-invoices/src/api/application/proformas/models/index.ts
 rename modules/customer-invoices/src/api/application/proformas/{dtos/proforma-list.dto.ts => models/proforma-resume.ts} (100%)
 create mode 100644 modules/customer-invoices/src/web/proformas/create/index.ts
 create mode 100644 modules/customer-invoices/src/web/proformas/create/ui/index.ts
 create mode 100644 modules/customer-invoices/src/web/proformas/create/ui/pages/index.ts
 create mode 100644 modules/customer-invoices/src/web/proformas/create/ui/pages/proforma-create-page.tsx
 create mode 100644 modules/customers/src/api/application/di/customer-finder.di.ts
 create mode 100644 modules/customers/src/api/application/di/customer-snapshot-builders.di.ts
 create mode 100644 modules/customers/src/api/application/di/customer-use-cases.di.ts
 create mode 100644 modules/customers/src/api/application/di/index.ts
 create mode 100644 modules/customers/src/api/application/mappers/customer-domain-mapper.interface.ts
 create mode 100644 modules/customers/src/api/application/mappers/customer-summary-mapper.interface.ts
 create mode 100644 modules/customers/src/api/application/mappers/index.ts
 create mode 100644 modules/customers/src/api/application/models/customer-summary.ts
 create mode 100644 modules/customers/src/api/application/models/index.ts
 rename modules/customers/src/api/{domain => application}/repositories/customer-repository.interface.ts (84%)
 rename modules/customers/src/api/{domain => application}/repositories/index.ts (100%)
 create mode 100644 modules/customers/src/api/application/services/customer-finder.ts
 create mode 100644 modules/customers/src/api/application/services/index.ts
 create mode 100644 modules/customers/src/api/application/snapshot-builders/index.ts
 create mode 100644 modules/customers/src/api/application/snapshot-builders/list/customer-list-item-snapshot-builder.ts
 create mode 100644 modules/customers/src/api/application/snapshot-builders/list/customer-list-item-snapshot.interface.ts
 create mode 100644 modules/customers/src/api/application/snapshot-builders/list/index.ts
 rename modules/customers/src/api/domain/aggregates/{customer.ts => customer.aggregate.ts} (88%)
 rename modules/customers/src/api/domain/value-objects/{customer-address-type.ts => customer-address-type.vo.ts} (100%)
 rename modules/customers/src/api/domain/value-objects/{customer-number.ts => customer-number.vo.ts} (100%)
 rename modules/customers/src/api/domain/value-objects/{customer-serie.ts => customer-serie.vo.ts} (100%)
 rename modules/customers/src/api/domain/value-objects/{customer-status.ts => customer-status.vo.ts} (100%)
 create mode 100644 modules/customers/src/api/infrastructure/di/customer-persistence-mappers.di.ts
 create mode 100644 modules/customers/src/api/infrastructure/di/customer-repositories.di.ts
 create mode 100644 modules/customers/src/api/infrastructure/di/customers.di.ts
 create mode 100644 modules/customers/src/api/infrastructure/di/index.ts
 rename modules/customers/src/api/infrastructure/mappers/queries/{customer.list.mapper.ts => customer-summary.mapper.ts} (82%)
 delete mode 100644 modules/customers/src/web/components/customers-layout.tsx
 create mode 100644 modules/customers/src/web/list/adapters/customer-summary-dto.adapter.ts
 create mode 100644 modules/customers/src/web/list/adapters/index.ts
 create mode 100644 modules/customers/src/web/list/api/get-customer-list.api.ts
 create mode 100644 modules/customers/src/web/list/api/index.ts
 create mode 100644 modules/customers/src/web/list/controllers/index.ts
 create mode 100644 modules/customers/src/web/list/controllers/use-customer-list-page.controller.ts
 create mode 100644 modules/customers/src/web/list/controllers/use-customer-list.controller.ts
 create mode 100644 modules/customers/src/web/list/hooks/index.ts
 rename modules/customers/src/web/{ => list}/hooks/use-customer-list-query.tsx (60%)
 create mode 100644 modules/customers/src/web/list/index.ts
 create mode 100644 modules/customers/src/web/list/ui/blocks/customers-grid/customers-grid.tsx
 create mode 100644 modules/customers/src/web/list/ui/blocks/customers-grid/index.ts
 create mode 100644 modules/customers/src/web/list/ui/blocks/customers-grid/use-customer-grid-columns.tsx
 create mode 100644 modules/customers/src/web/list/ui/blocks/index.ts
 create mode 100644 modules/customers/src/web/list/ui/components/address-cell.tsx
 create mode 100644 modules/customers/src/web/list/ui/components/contact-cell.tsx
 create mode 100644 modules/customers/src/web/list/ui/components/index.ts
 create mode 100644 modules/customers/src/web/list/ui/components/initials.tsx
 create mode 100644 modules/customers/src/web/list/ui/components/kind-badge.tsx
 create mode 100644 modules/customers/src/web/list/ui/components/soft.tsx
 create mode 100644 modules/customers/src/web/list/ui/index.ts
 create mode 100644 modules/customers/src/web/list/ui/pages/customer-list-page.tsx
 create mode 100644 modules/customers/src/web/list/ui/pages/index.ts
 delete mode 100644 modules/customers/src/web/pages/list/customers-list-page.tsx
 create mode 100644 modules/customers/src/web/types/customer-summary.web.schema.ts
 create mode 100644 modules/customers/src/web/types/customer.api.schema.ts
 create mode 100644 modules/customers/src/web/types/index.ts
 create mode 100644 modules/customers/src/web/ui/blocks/customer-layout.tsx
 create mode 100644 modules/customers/src/web/ui/blocks/index.ts
 rename modules/customers/src/web/{ => ui}/components/customer-status-badge.tsx (100%)
 create mode 100644 modules/customers/src/web/ui/components/error-alert.tsx
 create mode 100644 modules/customers/src/web/ui/components/index.ts
 create mode 100644 modules/customers/src/web/ui/index.ts

diff --git a/apps/web/src/routes/app-routes.tsx b/apps/web/src/routes/app-routes.tsx
index 4284531e..396df5cf 100644
--- a/apps/web/src/routes/app-routes.tsx
+++ b/apps/web/src/routes/app-routes.tsx
@@ -1,7 +1,9 @@
-import { IModuleClient } from "@erp/core/client";
+import type { IModuleClient } from "@erp/core/client";
 import { AppLayout } from "@repo/rdx-ui/components";
-import { createBrowserRouter, createRoutesFromElements, Navigate, Route } from "react-router-dom";
+import { Navigate, Route, createBrowserRouter, createRoutesFromElements } from "react-router-dom";
+
 import { ModuleRoutes } from "@/components/module-routes";
+
 import { ErrorPage, LoginForm } from "../pages";
 import { modules } from "../register-modules"; // Aquí ca
 
@@ -33,24 +35,24 @@ export const getAppRouter = () => {
 
   return createBrowserRouter(
     createRoutesFromElements(
-      <Route path='/'>
+      <Route path="/">
         {/* Auth Layout */}
-        <Route path='/auth'>
-          <Route index element={<Navigate to='login' />} />
-          <Route path='login' element={<LoginForm />} />
-          <Route path='*' element={<ModuleRoutes modules={grouped.auth} params={params} />} />
+        <Route path="/auth">
+          <Route element={<Navigate to="login" />} index />
+          <Route element={<LoginForm />} path="login" />
+          <Route element={<ModuleRoutes modules={grouped.auth} params={params} />} path="*" />
         </Route>
 
         {/* App Layout */}
         <Route element={<AppLayout />}>
           {/* Dynamic Module Routes */}
-          <Route path='*' element={<ModuleRoutes modules={grouped.app} params={params} />} />
+          <Route element={<ModuleRoutes modules={grouped.app} params={params} />} path="*" />
 
           {/* Main Layout */}
-          <Route path='/dashboard' element={<ErrorPage />} />
-          <Route path='/settings' element={<ErrorPage />} />
-          <Route path='/catalog' element={<ErrorPage />} />
-          <Route path='/quotes' element={<ErrorPage />} />
+          <Route element={<ErrorPage />} path="/dashboard" />
+          <Route element={<ErrorPage />} path="/settings" />
+          <Route element={<ErrorPage />} path="/catalog" />
+          <Route element={<ErrorPage />} path="/quotes" />
         </Route>
       </Route>
     )
diff --git a/modules/core/src/api/application/index.ts b/modules/core/src/api/application/index.ts
index a48e02db..0419356e 100644
--- a/modules/core/src/api/application/index.ts
+++ b/modules/core/src/api/application/index.ts
@@ -1,4 +1,5 @@
 export * from "./documents";
+export * from "./mappers";
 export * from "./presenters";
 export * from "./renderers";
 export * from "./snapshot-builders";
diff --git a/modules/core/src/api/application/mappers/index.ts b/modules/core/src/api/application/mappers/index.ts
new file mode 100644
index 00000000..9fe93da2
--- /dev/null
+++ b/modules/core/src/api/application/mappers/index.ts
@@ -0,0 +1 @@
+export * from "./mapper.interface";
diff --git a/modules/core/src/api/domain/repositories/repository.interface.ts b/modules/core/src/api/application/mappers/mapper.interface.ts
similarity index 82%
rename from modules/core/src/api/domain/repositories/repository.interface.ts
rename to modules/core/src/api/application/mappers/mapper.interface.ts
index 501bb752..e616aa62 100644
--- a/modules/core/src/api/domain/repositories/repository.interface.ts
+++ b/modules/core/src/api/application/mappers/mapper.interface.ts
@@ -56,23 +56,21 @@ export type DomainMapperWithBulk<TPersistence, TDomain> = IDomainMapper<TPersist
   Partial<IBulkDomainMapper<TPersistence, TDomain>>;
 
 /**
- *
- * 👓 Mapper de Read Model (Persistencia ↔ DTO/Proyección de Lectura)
- * - Responsabilidad: transformar registros de persistencia en DTOs para lectura (listados, resúmenes, informes).
+ * 👓 Mapper de Read Model (Persistencia → Read Model/Proyección de Lectura)
+ * - Responsabilidad: transformar registros de persistencia en read models para lectura (listados, resúmenes, informes).
  * - No intenta reconstruir agregados ni validar value objects de dominio.
  **/
-export interface IQueryMapperWithBulk<TPersistence, TDTO> {
+export interface IQueryMapperWithBulk<TPersistence, TReadModel> {
   /**
-   * Convierte un registro crudo en un DTO de lectura.
+   * Convierte un registro crudo en un read model de lectura.
    */
-  mapToDTO(raw: TPersistence, params?: MapperParamsType): Result<TDTO, Error>;
-
+  mapToReadModel(raw: TPersistence, params?: MapperParamsType): Result<TReadModel, Error>;
   /**
-   * Convierte múltiples registros crudos en una Collection de DTOs de lectura.
+   * Convierte múltiples registros crudos en una Collection de read models de lectura.
    */
-  mapToDTOCollection(
+  mapToReadModelCollection(
     raws: TPersistence[],
     totalCount: number,
     params?: MapperParamsType
-  ): Result<Collection<TDTO>, Error>;
+  ): Result<Collection<TReadModel>, Error>;
 }
diff --git a/modules/core/src/api/domain/index.ts b/modules/core/src/api/domain/index.ts
index 02c26663..ba0555aa 100644
--- a/modules/core/src/api/domain/index.ts
+++ b/modules/core/src/api/domain/index.ts
@@ -1,3 +1,2 @@
 export * from "./errors";
-export * from "./repositories";
 export * from "./value-objects";
diff --git a/modules/core/src/api/domain/repositories/index.ts b/modules/core/src/api/domain/repositories/index.ts
deleted file mode 100644
index fa66b99c..00000000
--- a/modules/core/src/api/domain/repositories/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./repository.interface";
diff --git a/modules/core/src/api/infrastructure/persistence/sequelize/mappers/sequelize-domain-mapper.ts b/modules/core/src/api/infrastructure/persistence/sequelize/mappers/sequelize-domain-mapper.ts
index ec8bb20b..f1212aca 100644
--- a/modules/core/src/api/infrastructure/persistence/sequelize/mappers/sequelize-domain-mapper.ts
+++ b/modules/core/src/api/infrastructure/persistence/sequelize/mappers/sequelize-domain-mapper.ts
@@ -1,7 +1,7 @@
 import { Collection, Result, ResultCollection } from "@repo/rdx-utils";
 import type { Model } from "sequelize";
 
-import type { MapperParamsType } from "../../../../domain";
+import type { MapperParamsType } from "../../../../application";
 
 import type { ISequelizeDomainMapper } from "./sequelize-mapper.interface";
 
diff --git a/modules/core/src/api/infrastructure/persistence/sequelize/mappers/sequelize-mapper.interface.ts b/modules/core/src/api/infrastructure/persistence/sequelize/mappers/sequelize-mapper.interface.ts
index ae32a8c5..b3d4e3b7 100644
--- a/modules/core/src/api/infrastructure/persistence/sequelize/mappers/sequelize-mapper.interface.ts
+++ b/modules/core/src/api/infrastructure/persistence/sequelize/mappers/sequelize-mapper.interface.ts
@@ -1,4 +1,4 @@
-import type { DomainMapperWithBulk, IQueryMapperWithBulk } from "../../../../domain";
+import type { DomainMapperWithBulk, IQueryMapperWithBulk } from "@erp/core/api/application";
 
 export interface ISequelizeDomainMapper<TModel, TModelAttributes, TEntity>
   extends DomainMapperWithBulk<TModel | TModelAttributes, TEntity> {}
diff --git a/modules/core/src/api/infrastructure/persistence/sequelize/mappers/sequelize-read-model-mapper.ts b/modules/core/src/api/infrastructure/persistence/sequelize/mappers/sequelize-read-model-mapper.ts
index 7351e319..9f88c13f 100644
--- a/modules/core/src/api/infrastructure/persistence/sequelize/mappers/sequelize-read-model-mapper.ts
+++ b/modules/core/src/api/infrastructure/persistence/sequelize/mappers/sequelize-read-model-mapper.ts
@@ -1,16 +1,16 @@
 import { Collection, Result } from "@repo/rdx-utils";
 import type { Model } from "sequelize";
 
-import type { MapperParamsType } from "../../../../domain";
+import type { MapperParamsType } from "../../../../application";
 
 import type { ISequelizeQueryMapper } from "./sequelize-mapper.interface";
 
 export abstract class SequelizeQueryMapper<TModel extends Model, TEntity>
   implements ISequelizeQueryMapper<TModel, TEntity>
 {
-  public abstract mapToDTO(raw: TModel, params?: MapperParamsType): Result<TEntity, Error>;
+  public abstract mapToReadModel(raw: TModel, params?: MapperParamsType): Result<TEntity, Error>;
 
-  public mapToDTOCollection(
+  public mapToReadModelCollection(
     raws: TModel[],
     totalCount: number,
     params?: MapperParamsType
@@ -23,7 +23,7 @@ export abstract class SequelizeQueryMapper<TModel extends Model, TEntity>
       }
 
       const items = _source.map((value, index) => {
-        const result = this.mapToDTO(value as TModel, { index, ...params });
+        const result = this.mapToReadModel(value as TModel, { index, ...params });
         if (result.isFailure) {
           throw result.error;
         }
diff --git a/modules/customer-invoices/src/api/application/issued-invoices/application-models/index.ts b/modules/customer-invoices/src/api/application/issued-invoices/application-models/index.ts
deleted file mode 100644
index e69de29b..00000000
diff --git a/modules/customer-invoices/src/api/application/issued-invoices/dtos/index.ts b/modules/customer-invoices/src/api/application/issued-invoices/dtos/index.ts
deleted file mode 100644
index 7e005094..00000000
--- a/modules/customer-invoices/src/api/application/issued-invoices/dtos/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./issued-invoice-list.dto";
diff --git a/modules/customer-invoices/src/api/application/issued-invoices/index.ts b/modules/customer-invoices/src/api/application/issued-invoices/index.ts
index 680f4d36..b68ea0dc 100644
--- a/modules/customer-invoices/src/api/application/issued-invoices/index.ts
+++ b/modules/customer-invoices/src/api/application/issued-invoices/index.ts
@@ -1,7 +1,6 @@
-export * from "./application-models";
 export * from "./di";
-export * from "./dtos";
 export * from "./mappers";
+export * from "./models";
 export * from "./repositories";
 export * from "./services";
 export * from "./snapshot-builders";
diff --git a/modules/customer-invoices/src/api/application/issued-invoices/mappers/issued-invoice-list-mapper.interface.ts b/modules/customer-invoices/src/api/application/issued-invoices/mappers/issued-invoice-summary-mapper.interface.ts
similarity index 57%
rename from modules/customer-invoices/src/api/application/issued-invoices/mappers/issued-invoice-list-mapper.interface.ts
rename to modules/customer-invoices/src/api/application/issued-invoices/mappers/issued-invoice-summary-mapper.interface.ts
index c0e4334c..2d4727c1 100644
--- a/modules/customer-invoices/src/api/application/issued-invoices/mappers/issued-invoice-list-mapper.interface.ts
+++ b/modules/customer-invoices/src/api/application/issued-invoices/mappers/issued-invoice-summary-mapper.interface.ts
@@ -1,8 +1,8 @@
 import type { MapperParamsType } from "@erp/core/api";
 import type { Result } from "@repo/rdx-utils";
 
-import type { IssuedInvoiceListDTO } from "../dtos";
+import type { IssuedInvoiceSummary } from "../models";
 
-export interface IIssuedInvoiceListMapper {
-  mapToDTO(raw: unknown, params?: MapperParamsType): Result<IssuedInvoiceListDTO, Error>;
+export interface IIssuedInvoiceSummaryMapper {
+  mapToDTO(raw: unknown, params?: MapperParamsType): Result<IssuedInvoiceSummary, Error>;
 }
diff --git a/modules/customer-invoices/src/api/application/issued-invoices/models/index.ts b/modules/customer-invoices/src/api/application/issued-invoices/models/index.ts
new file mode 100644
index 00000000..c056b01a
--- /dev/null
+++ b/modules/customer-invoices/src/api/application/issued-invoices/models/index.ts
@@ -0,0 +1 @@
+export * from "./issued-invoice-summary";
diff --git a/modules/customer-invoices/src/api/application/issued-invoices/dtos/issued-invoice-list.dto.ts b/modules/customer-invoices/src/api/application/issued-invoices/models/issued-invoice-summary.ts
similarity index 95%
rename from modules/customer-invoices/src/api/application/issued-invoices/dtos/issued-invoice-list.dto.ts
rename to modules/customer-invoices/src/api/application/issued-invoices/models/issued-invoice-summary.ts
index 1a9fc20f..fea0d4c8 100644
--- a/modules/customer-invoices/src/api/application/issued-invoices/dtos/issued-invoice-list.dto.ts
+++ b/modules/customer-invoices/src/api/application/issued-invoices/models/issued-invoice-summary.ts
@@ -10,7 +10,7 @@ import type {
   VerifactuRecord,
 } from "../../../domain";
 
-export type IssuedInvoiceListDTO = {
+export type IssuedInvoiceSummary = {
   id: UniqueID;
   companyId: UniqueID;
 
diff --git a/modules/customer-invoices/src/api/application/issued-invoices/repositories/issued-invoice-repository.interface.ts b/modules/customer-invoices/src/api/application/issued-invoices/repositories/issued-invoice-repository.interface.ts
index f7a1b0de..b4b6f2c9 100644
--- a/modules/customer-invoices/src/api/application/issued-invoices/repositories/issued-invoice-repository.interface.ts
+++ b/modules/customer-invoices/src/api/application/issued-invoices/repositories/issued-invoice-repository.interface.ts
@@ -3,7 +3,7 @@ import type { UniqueID } from "@repo/rdx-ddd";
 import type { Collection, Result } from "@repo/rdx-utils";
 
 import type { IssuedInvoice } from "../../../domain";
-import type { IssuedInvoiceListDTO } from "../dtos";
+import type { IssuedInvoiceSummary } from "../models";
 
 export interface IIssuedInvoiceRepository {
   create(invoice: IssuedInvoice, transaction?: unknown): Promise<Result<void, Error>>;
@@ -24,5 +24,5 @@ export interface IIssuedInvoiceRepository {
     companyId: UniqueID,
     criteria: Criteria,
     transaction: unknown
-  ): Promise<Result<Collection<IssuedInvoiceListDTO>, Error>>;
+  ): Promise<Result<Collection<IssuedInvoiceSummary>, Error>>;
 }
diff --git a/modules/customer-invoices/src/api/application/issued-invoices/services/issued-invoice-finder.ts b/modules/customer-invoices/src/api/application/issued-invoices/services/issued-invoice-finder.ts
index 1b736d98..ecff558a 100644
--- a/modules/customer-invoices/src/api/application/issued-invoices/services/issued-invoice-finder.ts
+++ b/modules/customer-invoices/src/api/application/issued-invoices/services/issued-invoice-finder.ts
@@ -4,7 +4,7 @@ import type { Collection, Result } from "@repo/rdx-utils";
 import type { Transaction } from "sequelize";
 
 import type { IssuedInvoice } from "../../../domain";
-import type { IssuedInvoiceListDTO } from "../dtos";
+import type { IssuedInvoiceSummary } from "../models";
 import type { IIssuedInvoiceRepository } from "../repositories";
 
 export interface IIssuedInvoiceFinder {
@@ -24,7 +24,7 @@ export interface IIssuedInvoiceFinder {
     companyId: UniqueID,
     criteria: Criteria,
     transaction?: Transaction
-  ): Promise<Result<Collection<IssuedInvoiceListDTO>, Error>>;
+  ): Promise<Result<Collection<IssuedInvoiceSummary>, Error>>;
 }
 
 export class IssuedInvoiceFinder implements IIssuedInvoiceFinder {
@@ -50,7 +50,7 @@ export class IssuedInvoiceFinder implements IIssuedInvoiceFinder {
     companyId: UniqueID,
     criteria: Criteria,
     transaction?: Transaction
-  ): Promise<Result<Collection<IssuedInvoiceListDTO>, Error>> {
+  ): Promise<Result<Collection<IssuedInvoiceSummary>, Error>> {
     return this.repository.findByCriteriaInCompany(companyId, criteria, transaction);
   }
 }
diff --git a/modules/customer-invoices/src/api/application/issued-invoices/snapshot-builders/list/issued-invoice-list-item-snapshot-builder.ts b/modules/customer-invoices/src/api/application/issued-invoices/snapshot-builders/list/issued-invoice-list-item-snapshot-builder.ts
index 7ba4f346..22743b80 100644
--- a/modules/customer-invoices/src/api/application/issued-invoices/snapshot-builders/list/issued-invoice-list-item-snapshot-builder.ts
+++ b/modules/customer-invoices/src/api/application/issued-invoices/snapshot-builders/list/issued-invoice-list-item-snapshot-builder.ts
@@ -1,15 +1,15 @@
 import type { ISnapshotBuilder } from "@erp/core/api";
 import { maybeToEmptyString } from "@repo/rdx-ddd";
 
-import type { IssuedInvoiceListDTO } from "../../dtos";
+import type { IssuedInvoiceSummary } from "../../models";
 
 import type { IIssuedInvoiceListItemSnapshot } from "./issued-invoice-list-item-snapshot.interface";
 
 export interface IIssuedInvoiceListItemSnapshotBuilder
-  extends ISnapshotBuilder<IssuedInvoiceListDTO, IIssuedInvoiceListItemSnapshot> {}
+  extends ISnapshotBuilder<IssuedInvoiceSummary, IIssuedInvoiceListItemSnapshot> {}
 
 export class IssuedInvoiceListItemSnapshotBuilder implements IIssuedInvoiceListItemSnapshotBuilder {
-  toOutput(invoice: IssuedInvoiceListDTO): IIssuedInvoiceListItemSnapshot {
+  toOutput(invoice: IssuedInvoiceSummary): IIssuedInvoiceListItemSnapshot {
     const recipient = invoice.recipient.toObjectString();
 
     const verifactu = invoice.verifactu.match(
diff --git a/modules/customer-invoices/src/api/application/proformas/application-models/index.ts b/modules/customer-invoices/src/api/application/proformas/application-models/index.ts
deleted file mode 100644
index e69de29b..00000000
diff --git a/modules/customer-invoices/src/api/application/proformas/dtos/index.ts b/modules/customer-invoices/src/api/application/proformas/dtos/index.ts
deleted file mode 100644
index 4d243ca9..00000000
--- a/modules/customer-invoices/src/api/application/proformas/dtos/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from "./proforma-list.dto";
diff --git a/modules/customer-invoices/src/api/application/proformas/index.ts b/modules/customer-invoices/src/api/application/proformas/index.ts
index 680f4d36..b68ea0dc 100644
--- a/modules/customer-invoices/src/api/application/proformas/index.ts
+++ b/modules/customer-invoices/src/api/application/proformas/index.ts
@@ -1,7 +1,6 @@
-export * from "./application-models";
 export * from "./di";
-export * from "./dtos";
 export * from "./mappers";
+export * from "./models";
 export * from "./repositories";
 export * from "./services";
 export * from "./snapshot-builders";
diff --git a/modules/customer-invoices/src/api/application/proformas/mappers/proforma-list-mapper.interface.ts b/modules/customer-invoices/src/api/application/proformas/mappers/proforma-list-mapper.interface.ts
index d2dc4668..c98fddf8 100644
--- a/modules/customer-invoices/src/api/application/proformas/mappers/proforma-list-mapper.interface.ts
+++ b/modules/customer-invoices/src/api/application/proformas/mappers/proforma-list-mapper.interface.ts
@@ -1,7 +1,7 @@
 import type { MapperParamsType } from "@erp/core/api";
 import type { Result } from "@repo/rdx-utils";
 
-import type { ProformaListDTO } from "../dtos";
+import type { ProformaListDTO } from "../models";
 
 export interface IProformaListMapper {
   mapToDTO(raw: unknown, params?: MapperParamsType): Result<ProformaListDTO, Error>;
diff --git a/modules/customer-invoices/src/api/application/proformas/models/index.ts b/modules/customer-invoices/src/api/application/proformas/models/index.ts
new file mode 100644
index 00000000..f1197467
--- /dev/null
+++ b/modules/customer-invoices/src/api/application/proformas/models/index.ts
@@ -0,0 +1 @@
+export * from "./proforma-resume";
diff --git a/modules/customer-invoices/src/api/application/proformas/dtos/proforma-list.dto.ts b/modules/customer-invoices/src/api/application/proformas/models/proforma-resume.ts
similarity index 100%
rename from modules/customer-invoices/src/api/application/proformas/dtos/proforma-list.dto.ts
rename to modules/customer-invoices/src/api/application/proformas/models/proforma-resume.ts
diff --git a/modules/customer-invoices/src/api/application/proformas/repositories/proforma-repository.interface.ts b/modules/customer-invoices/src/api/application/proformas/repositories/proforma-repository.interface.ts
index aefc9ffe..53b9c524 100644
--- a/modules/customer-invoices/src/api/application/proformas/repositories/proforma-repository.interface.ts
+++ b/modules/customer-invoices/src/api/application/proformas/repositories/proforma-repository.interface.ts
@@ -3,7 +3,7 @@ import type { UniqueID } from "@repo/rdx-ddd";
 import type { Collection, Result } from "@repo/rdx-utils";
 
 import type { InvoiceStatus, Proforma } from "../../../domain";
-import type { ProformaListDTO } from "../dtos";
+import type { ProformaListDTO } from "../models";
 
 export interface IProformaRepository {
   create(proforma: Proforma, transaction?: unknown): Promise<Result<void, Error>>;
diff --git a/modules/customer-invoices/src/api/application/proformas/services/proforma-finder.ts b/modules/customer-invoices/src/api/application/proformas/services/proforma-finder.ts
index 83f0e53b..d2c9e54a 100644
--- a/modules/customer-invoices/src/api/application/proformas/services/proforma-finder.ts
+++ b/modules/customer-invoices/src/api/application/proformas/services/proforma-finder.ts
@@ -4,7 +4,7 @@ import type { Collection, Result } from "@repo/rdx-utils";
 import type { Transaction } from "sequelize";
 
 import type { Proforma } from "../../../domain";
-import type { ProformaListDTO } from "../dtos";
+import type { ProformaListDTO } from "../models";
 import type { IProformaRepository } from "../repositories";
 
 export interface IProformaFinder {
diff --git a/modules/customer-invoices/src/api/application/proformas/snapshot-builders/list/proforma-list-item-snapshot-builder.ts b/modules/customer-invoices/src/api/application/proformas/snapshot-builders/list/proforma-list-item-snapshot-builder.ts
index 62cfedba..c2bd5dfe 100644
--- a/modules/customer-invoices/src/api/application/proformas/snapshot-builders/list/proforma-list-item-snapshot-builder.ts
+++ b/modules/customer-invoices/src/api/application/proformas/snapshot-builders/list/proforma-list-item-snapshot-builder.ts
@@ -1,7 +1,7 @@
 import type { ISnapshotBuilder } from "@erp/core/api";
 import { maybeToEmptyString } from "@repo/rdx-ddd";
 
-import type { ProformaListDTO } from "../../dtos";
+import type { ProformaListDTO } from "../../models";
 
 import type { IProformaListItemSnapshot } from "./proforma-list-item-snapshot.interface";
 
diff --git a/modules/customer-invoices/src/api/domain/aggregates/customer-invoice.aggregate.ts b/modules/customer-invoices/src/api/domain/aggregates/customer-invoice.aggregate.ts
index a65f1e79..9eb46685 100644
--- a/modules/customer-invoices/src/api/domain/aggregates/customer-invoice.aggregate.ts
+++ b/modules/customer-invoices/src/api/domain/aggregates/customer-invoice.aggregate.ts
@@ -192,6 +192,7 @@ export class CustomerInvoice
   }
 
   // Method to get the complete list of line items
+
   public get items(): CustomerInvoiceItems {
     return this._items;
   }
diff --git a/modules/customer-invoices/src/api/infrastructure/issued-invoices/persistence/sequelize/mappers/list/sequelize-issued-invoice-recipient.list.mapper.ts b/modules/customer-invoices/src/api/infrastructure/issued-invoices/persistence/sequelize/mappers/list/sequelize-issued-invoice-recipient.list.mapper.ts
index 47e0d596..ade5b2f3 100644
--- a/modules/customer-invoices/src/api/infrastructure/issued-invoices/persistence/sequelize/mappers/list/sequelize-issued-invoice-recipient.list.mapper.ts
+++ b/modules/customer-invoices/src/api/infrastructure/issued-invoices/persistence/sequelize/mappers/list/sequelize-issued-invoice-recipient.list.mapper.ts
@@ -14,7 +14,7 @@ import {
 } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
 
-import type { IssuedInvoiceListDTO } from "../../../../../../application";
+import type { IssuedInvoiceSummary } from "../../../../../../application";
 import { InvoiceRecipient } from "../../../../../../domain";
 import type { CustomerInvoiceModel } from "../../../../../common";
 
@@ -32,7 +32,7 @@ export class SequelizeIssuedInvoiceRecipientListMapper extends SequelizeQueryMap
 
     const { errors, attributes } = params as {
       errors: ValidationErrorDetail[];
-      attributes: Partial<IssuedInvoiceListDTO>;
+      attributes: Partial<IssuedInvoiceSummary>;
     };
 
     const { isProforma } = attributes;
diff --git a/modules/customer-invoices/src/api/infrastructure/issued-invoices/persistence/sequelize/mappers/list/sequelize-issued-invoice.list.mapper.ts b/modules/customer-invoices/src/api/infrastructure/issued-invoices/persistence/sequelize/mappers/list/sequelize-issued-invoice.list.mapper.ts
index 60d011ac..ac8e2856 100644
--- a/modules/customer-invoices/src/api/infrastructure/issued-invoices/persistence/sequelize/mappers/list/sequelize-issued-invoice.list.mapper.ts
+++ b/modules/customer-invoices/src/api/infrastructure/issued-invoices/persistence/sequelize/mappers/list/sequelize-issued-invoice.list.mapper.ts
@@ -11,7 +11,10 @@ import {
 } from "@repo/rdx-ddd";
 import { Maybe, Result } from "@repo/rdx-utils";
 
-import type { IIssuedInvoiceListMapper, IssuedInvoiceListDTO } from "../../../../../../application";
+import type {
+  IIssuedInvoiceSummaryMapper,
+  IssuedInvoiceSummary,
+} from "../../../../../../application";
 import {
   InvoiceAmount,
   InvoiceNumber,
@@ -25,8 +28,8 @@ import { SequelizeIssuedInvoiceRecipientListMapper } from "./sequelize-issued-in
 import { SequelizeVerifactuRecordListMapper } from "./sequelize-verifactu-record.list.mapper";
 
 export class SequelizeIssuedInvoiceListMapper
-  extends SequelizeQueryMapper<CustomerInvoiceModel, IssuedInvoiceListDTO>
-  implements IIssuedInvoiceListMapper
+  extends SequelizeQueryMapper<CustomerInvoiceModel, IssuedInvoiceSummary>
+  implements IIssuedInvoiceSummaryMapper
 {
   private _recipientMapper: SequelizeIssuedInvoiceRecipientListMapper;
   private _verifactuMapper: SequelizeVerifactuRecordListMapper;
@@ -37,14 +40,14 @@ export class SequelizeIssuedInvoiceListMapper
     this._verifactuMapper = new SequelizeVerifactuRecordListMapper();
   }
 
-  public mapToDTO(
+  public mapToReadModel(
     raw: CustomerInvoiceModel,
     params?: MapperParamsType
-  ): Result<IssuedInvoiceListDTO, Error> {
+  ): Result<IssuedInvoiceSummary, Error> {
     const errors: ValidationErrorDetail[] = [];
 
     // 1) Valores escalares (atributos generales)
-    const attributes = this.mapAttributesToDTO(raw, { errors, ...params });
+    const attributes = this._mapAttributesToReadModel(raw, { errors, ...params });
 
     // 2) Recipient (snapshot en la factura o include)
     const recipientResult = this._recipientMapper.mapToDTO(raw, {
@@ -111,7 +114,7 @@ export class SequelizeIssuedInvoiceListMapper
     });
   }
 
-  private mapAttributesToDTO(raw: CustomerInvoiceModel, params?: MapperParamsType) {
+  private _mapAttributesToReadModel(raw: CustomerInvoiceModel, params?: MapperParamsType) {
     const { errors } = params as {
       errors: ValidationErrorDetail[];
     };
diff --git a/modules/customer-invoices/src/api/infrastructure/issued-invoices/persistence/sequelize/repositories/issued-invoice.repository.ts b/modules/customer-invoices/src/api/infrastructure/issued-invoices/persistence/sequelize/repositories/issued-invoice.repository.ts
index 7689bff3..41875bf8 100644
--- a/modules/customer-invoices/src/api/infrastructure/issued-invoices/persistence/sequelize/repositories/issued-invoice.repository.ts
+++ b/modules/customer-invoices/src/api/infrastructure/issued-invoices/persistence/sequelize/repositories/issued-invoice.repository.ts
@@ -4,7 +4,7 @@ import type { UniqueID } from "@repo/rdx-ddd";
 import { type Collection, Result } from "@repo/rdx-utils";
 import type { FindOptions, InferAttributes, OrderItem, Sequelize, Transaction } from "sequelize";
 
-import type { IIssuedInvoiceRepository, IssuedInvoiceListDTO } from "../../../../../application";
+import type { IIssuedInvoiceRepository, IssuedInvoiceSummary } from "../../../../../application";
 import type { IssuedInvoice } from "../../../../../domain";
 import {
   CustomerInvoiceItemModel,
@@ -212,7 +212,7 @@ export class IssuedInvoiceRepository
     criteria: Criteria,
     transaction: Transaction,
     options: FindOptions<InferAttributes<CustomerInvoiceModel>> = {}
-  ): Promise<Result<Collection<IssuedInvoiceListDTO>, Error>> {
+  ): Promise<Result<Collection<IssuedInvoiceSummary>, Error>> {
     const { CustomerModel } = this.database.models;
 
     try {
@@ -301,7 +301,7 @@ export class IssuedInvoiceRepository
         }),
       ]);
 
-      return this.listMapper.mapToDTOCollection(rows, count);
+      return this.listMapper.mapToReadModelCollection(rows, count);
     } catch (err: unknown) {
       return Result.fail(translateSequelizeError(err));
     }
diff --git a/modules/customer-invoices/src/api/infrastructure/proformas/di/proforma-public-services.ts b/modules/customer-invoices/src/api/infrastructure/proformas/di/proforma-public-services.ts
index 972eb3ab..97c0a20e 100644
--- a/modules/customer-invoices/src/api/infrastructure/proformas/di/proforma-public-services.ts
+++ b/modules/customer-invoices/src/api/infrastructure/proformas/di/proforma-public-services.ts
@@ -2,23 +2,23 @@ import type { ProformasInternalDeps } from "./proformas.di";
 
 export type ProformasServicesDeps = {
   services: {
-    listIssuedInvoices: (filters: unknown, context: unknown) => null;
-    getIssuedInvoiceById: (id: unknown, context: unknown) => null;
-    generateIssuedInvoiceReport: (id: unknown, options: unknown, context: unknown) => null;
+    listProformas: (filters: unknown, context: unknown) => null;
+    getProformaById: (id: unknown, context: unknown) => null;
+    generateProformaReport: (id: unknown, options: unknown, context: unknown) => null;
   };
 };
 
 export function buildProformaServices(deps: ProformasInternalDeps): ProformasServicesDeps {
   return {
     services: {
-      listIssuedInvoices: (filters, context) => null,
-      //internal.useCases.listIssuedInvoices().execute(filters, context),
+      listProformas: (filters, context) => null,
+      //internal.useCases.listProformas().execute(filters, context),
 
-      getIssuedInvoiceById: (id, context) => null,
-      //internal.useCases.getIssuedInvoiceById().execute(id, context),
+      getProformaById: (id, context) => null,
+      //internal.useCases.getProformaById().execute(id, context),
 
-      generateIssuedInvoiceReport: (id, options, context) => null,
-      //internal.useCases.reportIssuedInvoice().execute(id, options, context),
+      generateProformaReport: (id, options, context) => null,
+      //internal.useCases.reportProforma().execute(id, options, context),
     },
   };
 }
diff --git a/modules/customer-invoices/src/api/infrastructure/proformas/persistence/sequelize/repositories/proforma.repository.ts b/modules/customer-invoices/src/api/infrastructure/proformas/persistence/sequelize/repositories/proforma.repository.ts
index b4ec2068..df19136c 100644
--- a/modules/customer-invoices/src/api/infrastructure/proformas/persistence/sequelize/repositories/proforma.repository.ts
+++ b/modules/customer-invoices/src/api/infrastructure/proformas/persistence/sequelize/repositories/proforma.repository.ts
@@ -368,10 +368,12 @@ export class ProformaRepository
           ? [options.include]
           : [];
 
+      console.log(query.where);
+
       query.where = {
         ...query.where,
         ...(options.where ?? {}),
-        is_proforma: false,
+        is_proforma: true,
         company_id: companyId.toString(),
         deleted_at: null,
       };
@@ -422,7 +424,7 @@ export class ProformaRepository
         }),
       ]);
 
-      return this.listMapper.mapToDTOCollection(rows, count);
+      return this.listMapper.mapToReadModelCollection(rows, count);
     } catch (err: unknown) {
       return Result.fail(translateSequelizeError(err));
     }
diff --git a/modules/customer-invoices/src/web/customer-invoice-routes.tsx b/modules/customer-invoices/src/web/customer-invoice-routes.tsx
index 1ebfef71..b6da56d9 100644
--- a/modules/customer-invoices/src/web/customer-invoice-routes.tsx
+++ b/modules/customer-invoices/src/web/customer-invoice-routes.tsx
@@ -2,29 +2,32 @@ import type { ModuleClientParams } from "@erp/core/client";
 import { lazy } from "react";
 import { Outlet, type RouteObject } from "react-router-dom";
 
+import { ProformaCreatePage } from "./proformas/create";
+
 const ProformaLayout = lazy(() =>
   import("./proformas/ui").then((m) => ({ default: m.ProformaLayout }))
 );
 
-const IssuedInvoicesLayout = lazy(() =>
-  import("./issued-invoices/ui").then((m) => ({ default: m.IssuedInvoicesLayout }))
-);
-
 const ProformasListPage = lazy(() =>
   import("./proformas/list").then((m) => ({ default: m.ProformaListPage }))
 );
 
+const ProformasCreatePage = lazy(() =>
+  import("./proformas/create").then((m) => ({ default: m.ProformaCreatePage }))
+);
+
+/*const InvoiceUpdatePage = lazy(() =>
+  import("./pages").then((m) => ({ default: m.InvoiceUpdatePage }))
+);*/
+
+const IssuedInvoicesLayout = lazy(() =>
+  import("./issued-invoices/ui").then((m) => ({ default: m.IssuedInvoicesLayout }))
+);
+
 const IssuedInvoiceListPage = lazy(() =>
   import("./issued-invoices/list").then((m) => ({ default: m.IssuedInvoiceListPage }))
 );
 
-/*const CustomerInvoiceAdd = lazy(() =>
-  import("./pages").then((m) => ({ default: m.CustomerInvoiceCreate }))
-);
-const InvoiceUpdatePage = lazy(() =>
-  import("./pages").then((m) => ({ default: m.InvoiceUpdatePage }))
-);*/
-
 export const CustomerInvoiceRoutes = (params: ModuleClientParams): RouteObject[] => {
   return [
     {
@@ -37,7 +40,7 @@ export const CustomerInvoiceRoutes = (params: ModuleClientParams): RouteObject[]
       children: [
         { path: "", index: true, element: <ProformasListPage /> }, // index
         { path: "list", element: <ProformasListPage /> },
-        //{ path: "create", element: <CustomerInvoiceAdd /> },
+        { path: "create", element: <ProformaCreatePage /> },
         //{ path: ":id/edit", element: <InvoiceUpdatePage /> },
       ],
     },
diff --git a/modules/customer-invoices/src/web/issued-invoices/list/adapters/issued-invoice-summary-dto.adapter.ts b/modules/customer-invoices/src/web/issued-invoices/list/adapters/issued-invoice-summary-dto.adapter.ts
index b3bb11c0..e1a441c6 100644
--- a/modules/customer-invoices/src/web/issued-invoices/list/adapters/issued-invoice-summary-dto.adapter.ts
+++ b/modules/customer-invoices/src/web/issued-invoices/list/adapters/issued-invoice-summary-dto.adapter.ts
@@ -1,4 +1,4 @@
-import { MoneyDTOHelper, PercentageDTOHelper, formatCurrency } from "@erp/core";
+import { MoneyDTOHelper, formatCurrency } from "@erp/core";
 
 import type {
   IssuedInvoiceSummaryData,
@@ -26,14 +26,14 @@ export const IssuedInvoiceSummaryDtoAdapter = {
               summaryDto.language_code
             ),
 
-            discount_percentage: PercentageDTOHelper.toNumber(summaryDto.discount_percentage),
+            /*discount_percentage: PercentageDTOHelper.toNumber(summaryDto.discount_percentage),
             discount_percentage_fmt: PercentageDTOHelper.toNumericString(
               summaryDto.discount_percentage
-            ),
+            ),*/
 
-            discount_amount: MoneyDTOHelper.toNumber(summaryDto.discount_amount),
+            discount_amount: MoneyDTOHelper.toNumber(summaryDto.total_discount_amount),
             discount_amount_fmt: formatCurrency(
-              MoneyDTOHelper.toNumber(summaryDto.discount_amount),
+              MoneyDTOHelper.toNumber(summaryDto.total_discount_amount),
               Number(summaryDto.total_amount.scale || 2),
               summaryDto.currency_code,
               summaryDto.language_code
diff --git a/modules/customer-invoices/src/web/proformas/create/index.ts b/modules/customer-invoices/src/web/proformas/create/index.ts
new file mode 100644
index 00000000..4aedf593
--- /dev/null
+++ b/modules/customer-invoices/src/web/proformas/create/index.ts
@@ -0,0 +1 @@
+export * from "./ui";
diff --git a/modules/customer-invoices/src/web/proformas/create/ui/index.ts b/modules/customer-invoices/src/web/proformas/create/ui/index.ts
new file mode 100644
index 00000000..c4e34b27
--- /dev/null
+++ b/modules/customer-invoices/src/web/proformas/create/ui/index.ts
@@ -0,0 +1 @@
+export * from "./pages";
diff --git a/modules/customer-invoices/src/web/proformas/create/ui/pages/index.ts b/modules/customer-invoices/src/web/proformas/create/ui/pages/index.ts
new file mode 100644
index 00000000..6af8f18e
--- /dev/null
+++ b/modules/customer-invoices/src/web/proformas/create/ui/pages/index.ts
@@ -0,0 +1 @@
+export * from "./proforma-create-page";
diff --git a/modules/customer-invoices/src/web/proformas/create/ui/pages/proforma-create-page.tsx b/modules/customer-invoices/src/web/proformas/create/ui/pages/proforma-create-page.tsx
new file mode 100644
index 00000000..d8538824
--- /dev/null
+++ b/modules/customer-invoices/src/web/proformas/create/ui/pages/proforma-create-page.tsx
@@ -0,0 +1,47 @@
+import { PageHeader } from "@erp/core/components";
+import { AppContent, AppHeader } from "@repo/rdx-ui/components";
+import { Button } from "@repo/shadcn-ui/components";
+import { PlusIcon } from "lucide-react";
+import { useNavigate } from "react-router-dom";
+
+import { useTranslation } from "../../../../i18n";
+
+export const ProformaCreatePage = () => {
+  const { t } = useTranslation();
+  const navigate = useNavigate();
+
+  return (
+    <>
+      <AppHeader>
+        <PageHeader
+          description={t("pages.proformas.list.description")}
+          rightSlot={
+            <Button
+              aria-label={t("pages.proformas.create.title")}
+              onClick={() => navigate("/proformas/create")}
+            >
+              <PlusIcon aria-hidden className="mr-2 size-4" />
+              {t("pages.proformas.create.title")}
+            </Button>
+          }
+          title={t("pages.proformas.list.title")}
+        />
+      </AppHeader>
+
+      <AppContent>
+        <div className="flex items-center justify-between space-y-2">
+          <div>
+            <h2 className="text-2xl font-bold tracking-tight">{t("pages.create.title")}</h2>
+            <p className="text-muted-foreground">{t("pages.create.description")}</p>
+          </div>
+          <div className="flex items-center justify-end mb-4">
+            <Button className="cursor-pointer" onClick={() => navigate("/customer-invoices/list")}>
+              {t("pages.create.back_to_list")}
+            </Button>
+          </div>
+        </div>
+        <div className="flex flex-1 flex-col gap-4 p-4">hola</div>
+      </AppContent>
+    </>
+  );
+};
diff --git a/modules/customer-invoices/src/web/proformas/list/ui/pages/proforma-list-page.tsx b/modules/customer-invoices/src/web/proformas/list/ui/pages/proforma-list-page.tsx
index e8a10aa8..24826cfb 100644
--- a/modules/customer-invoices/src/web/proformas/list/ui/pages/proforma-list-page.tsx
+++ b/modules/customer-invoices/src/web/proformas/list/ui/pages/proforma-list-page.tsx
@@ -63,7 +63,6 @@ export const ProformaListPage = () => {
           rightSlot={
             <Button
               aria-label={t("pages.proformas.create.title")}
-              className="hidden"
               onClick={() => navigate("/proformas/create")}
             >
               <PlusIcon aria-hidden className="mr-2 size-4" />
diff --git a/modules/customers/src/api/application/customer-application.service.ts b/modules/customers/src/api/application/customer-application.service.ts
index 9332adff..9fba012d 100644
--- a/modules/customers/src/api/application/customer-application.service.ts
+++ b/modules/customers/src/api/application/customer-application.service.ts
@@ -3,7 +3,7 @@ import { Criteria } from "@repo/rdx-criteria/server";
 import { UniqueID } from "@repo/rdx-ddd";
 import { Collection, Result } from "@repo/rdx-utils";
 import { Transaction } from "sequelize";
-import { Customer, CustomerPatchProps, CustomerProps, ICustomerRepository } from "../domain";
+import { Customer, CustomerPatchProps, ICustomerProps, ICustomerRepository } from "../domain";
 import { CustomerListDTO } from "../infrastructure";
 
 export class CustomerApplicationService {
@@ -19,7 +19,7 @@ export class CustomerApplicationService {
    */
   buildCustomerInCompany(
     companyId: UniqueID,
-    props: Omit<CustomerProps, "companyId">,
+    props: Omit<ICustomerProps, "companyId">,
     customerId?: UniqueID
   ): Result<Customer, Error> {
     return Customer.create({ ...props, companyId }, customerId);
diff --git a/modules/customers/src/api/application/di/customer-finder.di.ts b/modules/customers/src/api/application/di/customer-finder.di.ts
new file mode 100644
index 00000000..e673d320
--- /dev/null
+++ b/modules/customers/src/api/application/di/customer-finder.di.ts
@@ -0,0 +1,6 @@
+import type { IProformaRepository } from "../repositories";
+import { type IProformaFinder, ProformaFinder } from "../services";
+
+export function buildProformaFinder(repository: IProformaRepository): IProformaFinder {
+  return new ProformaFinder(repository);
+}
diff --git a/modules/customers/src/api/application/di/customer-snapshot-builders.di.ts b/modules/customers/src/api/application/di/customer-snapshot-builders.di.ts
new file mode 100644
index 00000000..aa7e7b05
--- /dev/null
+++ b/modules/customers/src/api/application/di/customer-snapshot-builders.di.ts
@@ -0,0 +1,41 @@
+// application/issued-invoices/di/snapshot-builders.di.ts
+
+import {
+  CustomerFullSnapshotBuilder,
+  CustomerItemReportSnapshotBuilder,
+  CustomerItemsFullSnapshotBuilder,
+  CustomerListItemSnapshotBuilder,
+  CustomerRecipientFullSnapshotBuilder,
+  CustomerReportSnapshotBuilder,
+  CustomerTaxReportSnapshotBuilder,
+  CustomerTaxesFullSnapshotBuilder,
+} from "../snapshot-builders";
+
+export function buildCustomerSnapshotBuilders() {
+  const itemsBuilder = new CustomerItemsFullSnapshotBuilder();
+
+  const taxesBuilder = new CustomerTaxesFullSnapshotBuilder();
+
+  const recipientBuilder = new CustomerRecipientFullSnapshotBuilder();
+
+  const fullSnapshotBuilder = new CustomerFullSnapshotBuilder(
+    itemsBuilder,
+    recipientBuilder,
+    taxesBuilder
+  );
+
+  const listSnapshotBuilder = new CustomerListItemSnapshotBuilder();
+
+  const itemsReportBuilder = new CustomerItemReportSnapshotBuilder();
+  const taxesReportBuilder = new CustomerTaxReportSnapshotBuilder();
+  const reportSnapshotBuilder = new CustomerReportSnapshotBuilder(
+    itemsReportBuilder,
+    taxesReportBuilder
+  );
+
+  return {
+    full: fullSnapshotBuilder,
+    list: listSnapshotBuilder,
+    report: reportSnapshotBuilder,
+  };
+}
diff --git a/modules/customers/src/api/application/di/customer-use-cases.di.ts b/modules/customers/src/api/application/di/customer-use-cases.di.ts
new file mode 100644
index 00000000..cc300ae9
--- /dev/null
+++ b/modules/customers/src/api/application/di/customer-use-cases.di.ts
@@ -0,0 +1,83 @@
+import type { ITransactionManager } from "@erp/core/api";
+
+import type { ICreateCustomerInputMapper } from "../mappers";
+import type {
+  ICustomerCreator,
+  ICustomerFinder,
+  CustomerDocumentGeneratorService,
+} from "../services";
+import type {
+  ICustomerListItemSnapshotBuilder,
+  ICustomerReportSnapshotBuilder,
+} from "../snapshot-builders";
+import type { ICustomerFullSnapshotBuilder } from "../snapshot-builders/full";
+import { GetCustomerByIdUseCase, ListCustomersUseCase, ReportCustomerUseCase } from "../use-cases";
+import { CreateCustomerUseCase } from "../use-cases/create-customer";
+
+export function buildGetCustomerByIdUseCase(deps: {
+  finder: ICustomerFinder;
+  fullSnapshotBuilder: ICustomerFullSnapshotBuilder;
+  transactionManager: ITransactionManager;
+}) {
+  return new GetCustomerByIdUseCase(deps.finder, deps.fullSnapshotBuilder, deps.transactionManager);
+}
+
+export function buildListCustomersUseCase(deps: {
+  finder: ICustomerFinder;
+  itemSnapshotBuilder: ICustomerListItemSnapshotBuilder;
+  transactionManager: ITransactionManager;
+}) {
+  return new ListCustomersUseCase(deps.finder, deps.itemSnapshotBuilder, deps.transactionManager);
+}
+
+export function buildReportCustomerUseCase(deps: {
+  finder: ICustomerFinder;
+  fullSnapshotBuilder: ICustomerFullSnapshotBuilder;
+  reportSnapshotBuilder: ICustomerReportSnapshotBuilder;
+  documentService: CustomerDocumentGeneratorService;
+  transactionManager: ITransactionManager;
+}) {
+  return new ReportCustomerUseCase(
+    deps.finder,
+    deps.fullSnapshotBuilder,
+    deps.reportSnapshotBuilder,
+    deps.documentService,
+    deps.transactionManager
+  );
+}
+
+export function buildCreateCustomerUseCase(deps: {
+  creator: ICustomerCreator;
+  dtoMapper: ICreateCustomerInputMapper;
+  fullSnapshotBuilder: ICustomerFullSnapshotBuilder;
+  transactionManager: ITransactionManager;
+}) {
+  return new CreateCustomerUseCase({
+    dtoMapper: deps.dtoMapper,
+    creator: deps.creator,
+    fullSnapshotBuilder: deps.fullSnapshotBuilder,
+    transactionManager: deps.transactionManager,
+  });
+}
+
+/*export function buildUpdateCustomerUseCase(deps: {
+  finder: ICustomerFinder;
+  fullSnapshotBuilder: ICustomerFullSnapshotBuilder;
+}) {
+  return new UpdateCustomerUseCase(deps.finder, deps.fullSnapshotBuilder);
+}
+
+export function buildDeleteCustomerUseCase(deps: { finder: ICustomerFinder }) {
+  return new DeleteCustomerUseCase(deps.finder);
+}
+
+export function buildIssueCustomerUseCase(deps: { finder: ICustomerFinder }) {
+  return new IssueCustomerUseCase(deps.finder);
+}
+
+export function buildChangeStatusCustomerUseCase(deps: {
+  finder: ICustomerFinder;
+  transactionManager: ITransactionManager;
+}) {
+  return new ChangeStatusCustomerUseCase(deps.finder, deps.transactionManager);
+}*/
diff --git a/modules/customers/src/api/application/di/index.ts b/modules/customers/src/api/application/di/index.ts
new file mode 100644
index 00000000..4e27b007
--- /dev/null
+++ b/modules/customers/src/api/application/di/index.ts
@@ -0,0 +1,5 @@
+export * from "./customer-creator.di";
+export * from "./customer-finder.di";
+export * from "./customer-input-mappers.di";
+export * from "./customer-snapshot-builders.di";
+export * from "./customer-use-cases.di";
diff --git a/modules/customers/src/api/application/index.ts b/modules/customers/src/api/application/index.ts
index 2881f328..b68ea0dc 100644
--- a/modules/customers/src/api/application/index.ts
+++ b/modules/customers/src/api/application/index.ts
@@ -1,3 +1,7 @@
-//export * from "./customer-application.service";
-//export * from "./presenters";
+export * from "./di";
+export * from "./mappers";
+export * from "./models";
+export * from "./repositories";
+export * from "./services";
+export * from "./snapshot-builders";
 export * from "./use-cases";
diff --git a/modules/customers/src/api/application/mappers/customer-domain-mapper.interface.ts b/modules/customers/src/api/application/mappers/customer-domain-mapper.interface.ts
new file mode 100644
index 00000000..0fe0039f
--- /dev/null
+++ b/modules/customers/src/api/application/mappers/customer-domain-mapper.interface.ts
@@ -0,0 +1,7 @@
+import type { DomainMapperWithBulk } from "@erp/core/api";
+
+import type { Customer } from "../../domain";
+import type { CustomerCreationAttributes, CustomerModel } from "../../infrastructure";
+
+export interface ICustomerDomainMapper
+  extends DomainMapperWithBulk<CustomerModel | CustomerCreationAttributes, Customer> {}
diff --git a/modules/customers/src/api/application/mappers/customer-summary-mapper.interface.ts b/modules/customers/src/api/application/mappers/customer-summary-mapper.interface.ts
new file mode 100644
index 00000000..442346a7
--- /dev/null
+++ b/modules/customers/src/api/application/mappers/customer-summary-mapper.interface.ts
@@ -0,0 +1,7 @@
+import type { IQueryMapperWithBulk } from "@erp/core/api";
+
+import type { CustomerModel } from "../../infrastructure";
+import type { CustomerSummary } from "../models";
+
+export interface ICustomerSummaryMapper
+  extends IQueryMapperWithBulk<CustomerModel, CustomerSummary> {}
diff --git a/modules/customers/src/api/application/mappers/index.ts b/modules/customers/src/api/application/mappers/index.ts
new file mode 100644
index 00000000..8377a3ba
--- /dev/null
+++ b/modules/customers/src/api/application/mappers/index.ts
@@ -0,0 +1,2 @@
+export * from "./customer-domain-mapper.interface";
+export * from "./customer-summary-mapper.interface";
diff --git a/modules/customers/src/api/application/models/customer-summary.ts b/modules/customers/src/api/application/models/customer-summary.ts
new file mode 100644
index 00000000..f34879cc
--- /dev/null
+++ b/modules/customers/src/api/application/models/customer-summary.ts
@@ -0,0 +1,41 @@
+import type {
+  CurrencyCode,
+  EmailAddress,
+  LanguageCode,
+  Name,
+  PhoneNumber,
+  PostalAddress,
+  TINNumber,
+  URLAddress,
+  UniqueID,
+} from "@repo/rdx-ddd";
+import type { Maybe } from "@repo/rdx-utils";
+
+import type { CustomerStatus } from "../../domain";
+
+export type CustomerSummary = {
+  id: UniqueID;
+  companyId: UniqueID;
+  status: CustomerStatus;
+  reference: Maybe<Name>;
+
+  isCompany: boolean;
+  name: Name;
+  tradeName: Maybe<Name>;
+  tin: Maybe<TINNumber>;
+
+  address: PostalAddress;
+
+  emailPrimary: Maybe<EmailAddress>;
+  emailSecondary: Maybe<EmailAddress>;
+  phonePrimary: Maybe<PhoneNumber>;
+  phoneSecondary: Maybe<PhoneNumber>;
+  mobilePrimary: Maybe<PhoneNumber>;
+  mobileSecondary: Maybe<PhoneNumber>;
+
+  fax: Maybe<PhoneNumber>;
+  website: Maybe<URLAddress>;
+
+  languageCode: LanguageCode;
+  currencyCode: CurrencyCode;
+};
diff --git a/modules/customers/src/api/application/models/index.ts b/modules/customers/src/api/application/models/index.ts
new file mode 100644
index 00000000..51c283fb
--- /dev/null
+++ b/modules/customers/src/api/application/models/index.ts
@@ -0,0 +1 @@
+export * from "./customer-summary";
diff --git a/modules/customers/src/api/domain/repositories/customer-repository.interface.ts b/modules/customers/src/api/application/repositories/customer-repository.interface.ts
similarity index 84%
rename from modules/customers/src/api/domain/repositories/customer-repository.interface.ts
rename to modules/customers/src/api/application/repositories/customer-repository.interface.ts
index 671b51a1..0bb36c36 100644
--- a/modules/customers/src/api/domain/repositories/customer-repository.interface.ts
+++ b/modules/customers/src/api/application/repositories/customer-repository.interface.ts
@@ -1,8 +1,9 @@
-import { Criteria } from "@repo/rdx-criteria/server";
-import { UniqueID } from "@repo/rdx-ddd";
-import { Collection, Result } from "@repo/rdx-utils";
-import { CustomerListDTO } from "../../infrastructure/mappers";
-import { Customer } from "../aggregates";
+import type { Criteria } from "@repo/rdx-criteria/server";
+import type { UniqueID } from "@repo/rdx-ddd";
+import type { Collection, Result } from "@repo/rdx-utils";
+
+import type { Customer } from "../../domain/aggregates";
+import type { CustomerSummary } from "../models";
 
 /**
  * Interfaz del repositorio para el agregado `Customer`.
@@ -56,7 +57,7 @@ export interface ICustomerRepository {
     companyId: UniqueID,
     criteria: Criteria,
     transaction: unknown
-  ): Promise<Result<Collection<CustomerListDTO>, Error>>;
+  ): Promise<Result<Collection<CustomerSummary>, Error>>;
 
   /**
    * Elimina un Customer por su ID, dentro de una empresa.
diff --git a/modules/customers/src/api/domain/repositories/index.ts b/modules/customers/src/api/application/repositories/index.ts
similarity index 100%
rename from modules/customers/src/api/domain/repositories/index.ts
rename to modules/customers/src/api/application/repositories/index.ts
diff --git a/modules/customers/src/api/application/services/customer-finder.ts b/modules/customers/src/api/application/services/customer-finder.ts
new file mode 100644
index 00000000..dfb4880f
--- /dev/null
+++ b/modules/customers/src/api/application/services/customer-finder.ts
@@ -0,0 +1,56 @@
+import type { Criteria } from "@repo/rdx-criteria/server";
+import type { UniqueID } from "@repo/rdx-ddd";
+import type { Collection, Result } from "@repo/rdx-utils";
+import type { Transaction } from "sequelize";
+
+import type { Customer } from "../../domain";
+import type { CustomerListDTO } from "../dtos";
+import type { ICustomerRepository } from "../repositories";
+
+export interface ICustomerFinder {
+  findCustomerById(
+    companyId: UniqueID,
+    invoiceId: UniqueID,
+    transaction?: Transaction
+  ): Promise<Result<Customer, Error>>;
+
+  customerExists(
+    companyId: UniqueID,
+    invoiceId: UniqueID,
+    transaction?: Transaction
+  ): Promise<Result<boolean, Error>>;
+
+  findCustomersByCriteria(
+    companyId: UniqueID,
+    criteria: Criteria,
+    transaction?: Transaction
+  ): Promise<Result<Collection<CustomerListDTO>, Error>>;
+}
+
+export class CustomerFinder implements ICustomerFinder {
+  constructor(private readonly repository: ICustomerRepository) {}
+
+  async findCustomerById(
+    companyId: UniqueID,
+    customerId: UniqueID,
+    transaction?: Transaction
+  ): Promise<Result<Customer, Error>> {
+    return this.repository.getByIdInCompany(companyId, customerId, transaction);
+  }
+
+  async customerExists(
+    companyId: UniqueID,
+    customerId: UniqueID,
+    transaction?: Transaction
+  ): Promise<Result<boolean, Error>> {
+    return this.repository.existsByIdInCompany(companyId, customerId, transaction);
+  }
+
+  async findCustomersByCriteria(
+    companyId: UniqueID,
+    criteria: Criteria,
+    transaction?: Transaction
+  ): Promise<Result<Collection<CustomerListDTO>, Error>> {
+    return this.repository.findByCriteriaInCompany(companyId, criteria, transaction);
+  }
+}
diff --git a/modules/customers/src/api/application/services/index.ts b/modules/customers/src/api/application/services/index.ts
new file mode 100644
index 00000000..92596a25
--- /dev/null
+++ b/modules/customers/src/api/application/services/index.ts
@@ -0,0 +1 @@
+export * from "./customer-finder";
diff --git a/modules/customers/src/api/application/snapshot-builders/index.ts b/modules/customers/src/api/application/snapshot-builders/index.ts
new file mode 100644
index 00000000..2a83d3de
--- /dev/null
+++ b/modules/customers/src/api/application/snapshot-builders/index.ts
@@ -0,0 +1,3 @@
+//export * from "./full";
+export * from "./list";
+//export * from "./report";
diff --git a/modules/customers/src/api/application/snapshot-builders/list/customer-list-item-snapshot-builder.ts b/modules/customers/src/api/application/snapshot-builders/list/customer-list-item-snapshot-builder.ts
new file mode 100644
index 00000000..376d2d54
--- /dev/null
+++ b/modules/customers/src/api/application/snapshot-builders/list/customer-list-item-snapshot-builder.ts
@@ -0,0 +1,14 @@
+import type { ISnapshotBuilder } from "@erp/core/api";
+
+import type { CustomerListDTO } from "../../dtos";
+
+import type { ICustomerListItemSnapshot } from "./customer-list-item-snapshot.interface";
+
+export interface ICustomerListItemSnapshotBuilder
+  extends ISnapshotBuilder<CustomerListDTO, ICustomerListItemSnapshot> {}
+
+export class CustomerListItemSnapshotBuilder implements ICustomerListItemSnapshotBuilder {
+  toOutput(customer: CustomerListDTO): ICustomerListItemSnapshot {
+    return {};
+  }
+}
diff --git a/modules/customers/src/api/application/snapshot-builders/list/customer-list-item-snapshot.interface.ts b/modules/customers/src/api/application/snapshot-builders/list/customer-list-item-snapshot.interface.ts
new file mode 100644
index 00000000..c55a2708
--- /dev/null
+++ b/modules/customers/src/api/application/snapshot-builders/list/customer-list-item-snapshot.interface.ts
@@ -0,0 +1 @@
+export type ICustomerListItemSnapshot = {};
diff --git a/modules/customers/src/api/application/snapshot-builders/list/index.ts b/modules/customers/src/api/application/snapshot-builders/list/index.ts
new file mode 100644
index 00000000..5218181e
--- /dev/null
+++ b/modules/customers/src/api/application/snapshot-builders/list/index.ts
@@ -0,0 +1,2 @@
+export * from "./customer-list-item-snapshot.interface";
+export * from "./customer-list-item-snapshot-builder";
diff --git a/modules/customers/src/api/application/use-cases/create/map-dto-to-create-customer-props.ts b/modules/customers/src/api/application/use-cases/create/map-dto-to-create-customer-props.ts
index 6a4b72ec..57c4be32 100644
--- a/modules/customers/src/api/application/use-cases/create/map-dto-to-create-customer-props.ts
+++ b/modules/customers/src/api/application/use-cases/create/map-dto-to-create-customer-props.ts
@@ -24,7 +24,7 @@ import {
 import { Collection, Result, isNullishOrEmpty } from "@repo/rdx-utils";
 
 import type { CreateCustomerRequestDTO } from "../../../../common";
-import { type CustomerProps, CustomerStatus } from "../../../domain";
+import { type ICustomerProps, CustomerStatus } from "../../../domain";
 
 /**
  * Convierte el DTO a las props validadas (CustomerProps).
@@ -197,7 +197,7 @@ export function mapDTOToCreateCustomerProps(dto: CreateCustomerRequestDTO) {
       errors
     );
 
-    const customerProps: Omit<CustomerProps, "companyId"> = {
+    const customerProps: Omit<ICustomerProps, "companyId"> = {
       status: status!,
       reference: reference!,
 
diff --git a/modules/customers/src/api/application/use-cases/list-customers.use-case.ts b/modules/customers/src/api/application/use-cases/list-customers.use-case.ts
index 178033a7..c93fe04f 100644
--- a/modules/customers/src/api/application/use-cases/list-customers.use-case.ts
+++ b/modules/customers/src/api/application/use-cases/list-customers.use-case.ts
@@ -1,11 +1,12 @@
-import { IPresenterRegistry, ITransactionManager } from "@erp/core/api";
-import { Criteria } from "@repo/rdx-criteria/server";
-import { UniqueID } from "@repo/rdx-ddd";
+import type { ITransactionManager } from "@erp/core/api";
+import type { Criteria } from "@repo/rdx-criteria/server";
+import type { UniqueID } from "@repo/rdx-ddd";
 import { Result } from "@repo/rdx-utils";
-import { Transaction } from "sequelize";
-import { ListCustomersResponseDTO } from "../../../common/dto";
-import { CustomerApplicationService } from "../../application";
-import { ListCustomersPresenter } from "../presenters";
+import type { Transaction } from "sequelize";
+
+import type { ListCustomersResponseDTO } from "../../../common/dto";
+import type { ICustomerFinder } from "../services";
+import type { ICustomerListItemSnapshotBuilder } from "../snapshot-builders/list";
 
 type ListCustomersUseCaseInput = {
   companyId: UniqueID;
@@ -14,39 +15,42 @@ type ListCustomersUseCaseInput = {
 
 export class ListCustomersUseCase {
   constructor(
-    private readonly service: CustomerApplicationService,
-    private readonly transactionManager: ITransactionManager,
-    private readonly presenterRegistry: IPresenterRegistry
+    private readonly finder: ICustomerFinder,
+    private readonly listItemSnapshotBuilder: ICustomerListItemSnapshotBuilder,
+    private readonly transactionManager: ITransactionManager
   ) {}
 
   public execute(
     params: ListCustomersUseCaseInput
   ): Promise<Result<ListCustomersResponseDTO, Error>> {
     const { criteria, companyId } = params;
-    const presenter = this.presenterRegistry.getPresenter({
-      resource: "customer",
-      projection: "LIST",
-    }) as ListCustomersPresenter;
 
     return this.transactionManager.complete(async (transaction: Transaction) => {
       try {
-        const result = await this.service.findCustomerByCriteriaInCompany(
-          companyId,
-          criteria,
-          transaction
-        );
+        const result = await this.finder.findCustomersByCriteria(companyId, criteria, transaction);
 
         if (result.isFailure) {
           return Result.fail(result.error);
         }
 
         const customers = result.data;
-        const dto = presenter.toOutput({
-          customers,
-          criteria,
-        });
+        const totalCustomers = customers.total();
 
-        return Result.ok(dto);
+        const items = customers.map((item) => this.listItemSnapshotBuilder.toOutput(item));
+
+        const snapshot = {
+          page: criteria.pageNumber,
+          per_page: criteria.pageSize,
+          total_pages: Math.ceil(totalCustomers / criteria.pageSize),
+          total_items: totalCustomers,
+          items: items,
+          metadata: {
+            entity: "customers",
+            criteria: criteria.toJSON(),
+          },
+        };
+
+        return Result.ok(snapshot);
       } catch (error: unknown) {
         return Result.fail(error as Error);
       }
diff --git a/modules/customers/src/api/domain/aggregates/customer.ts b/modules/customers/src/api/domain/aggregates/customer.aggregate.ts
similarity index 88%
rename from modules/customers/src/api/domain/aggregates/customer.ts
rename to modules/customers/src/api/domain/aggregates/customer.aggregate.ts
index bc688df5..576270ea 100644
--- a/modules/customers/src/api/domain/aggregates/customer.ts
+++ b/modules/customers/src/api/domain/aggregates/customer.aggregate.ts
@@ -17,7 +17,7 @@ import { type Collection, type Maybe, Result } from "@repo/rdx-utils";
 
 import type { CustomerStatus } from "../value-objects";
 
-export interface CustomerProps {
+export interface ICustomerProps {
   companyId: UniqueID;
   status: CustomerStatus;
   reference: Maybe<Name>;
@@ -49,7 +49,7 @@ export interface CustomerProps {
   currencyCode: CurrencyCode;
 }
 
-export type CustomerPatchProps = Partial<Omit<CustomerProps, "companyId" | "address">> & {
+export type CustomerPatchProps = Partial<Omit<ICustomerProps, "companyId" | "address">> & {
   address?: PostalAddressPatchProps;
 };
 
@@ -90,8 +90,12 @@ export interface ICustomer {
   readonly currencyCode: CurrencyCode;
 }
 
-export class Customer extends AggregateRoot<CustomerProps> implements ICustomer {
-  static create(props: CustomerProps, id?: UniqueID): Result<Customer, Error> {
+type CreateCustomerProps = ICustomerProps;
+type InternalCustomerProps = ICustomerProps;
+
+export class Customer extends AggregateRoot<InternalCustomerProps> implements ICustomer {
+
+  static create(props: CreateCustomerProps, id?: UniqueID): Result<Customer, Error> {
     const contact = new Customer(props, id);
 
     // Reglas de negocio / validaciones
@@ -105,12 +109,18 @@ export class Customer extends AggregateRoot<CustomerProps> implements ICustomer
     return Result.ok(contact);
   }
 
+  // Rehidratación desde persistencia
+  static rehydrate(props: InternalCustomerProps, id: UniqueID): Customer {
+    return new Customer(props, id);
+  }
+
+
   public update(partialCustomer: CustomerPatchProps): Result<Customer, Error> {
     const { address: partialAddress, ...rest } = partialCustomer;
     const updatedProps = {
       ...this.props,
       ...rest,
-    } as CustomerProps;
+    } as ICustomerProps;
 
     if (partialAddress) {
       const updatedAddressOrError = this.address.update(partialAddress);
@@ -124,6 +134,8 @@ export class Customer extends AggregateRoot<CustomerProps> implements ICustomer
     return Customer.create(updatedProps, this.id);
   }
 
+  // Getters
+
   public get isIndividual(): boolean {
     return !this.props.isCompany;
   }
diff --git a/modules/customers/src/api/domain/aggregates/index.ts b/modules/customers/src/api/domain/aggregates/index.ts
index 2b295031..1c821cb8 100644
--- a/modules/customers/src/api/domain/aggregates/index.ts
+++ b/modules/customers/src/api/domain/aggregates/index.ts
@@ -1 +1 @@
-export * from "./customer";
+export * from "./customer.aggregate";
diff --git a/modules/customers/src/api/domain/index.ts b/modules/customers/src/api/domain/index.ts
index ccbba3a8..ed09726f 100644
--- a/modules/customers/src/api/domain/index.ts
+++ b/modules/customers/src/api/domain/index.ts
@@ -1,4 +1,3 @@
 export * from "./aggregates";
 export * from "./errors";
-export * from "./repositories";
 export * from "./value-objects";
diff --git a/modules/customers/src/api/domain/value-objects/customer-address-type.ts b/modules/customers/src/api/domain/value-objects/customer-address-type.vo.ts
similarity index 100%
rename from modules/customers/src/api/domain/value-objects/customer-address-type.ts
rename to modules/customers/src/api/domain/value-objects/customer-address-type.vo.ts
diff --git a/modules/customers/src/api/domain/value-objects/customer-number.ts b/modules/customers/src/api/domain/value-objects/customer-number.vo.ts
similarity index 100%
rename from modules/customers/src/api/domain/value-objects/customer-number.ts
rename to modules/customers/src/api/domain/value-objects/customer-number.vo.ts
diff --git a/modules/customers/src/api/domain/value-objects/customer-serie.ts b/modules/customers/src/api/domain/value-objects/customer-serie.vo.ts
similarity index 100%
rename from modules/customers/src/api/domain/value-objects/customer-serie.ts
rename to modules/customers/src/api/domain/value-objects/customer-serie.vo.ts
diff --git a/modules/customers/src/api/domain/value-objects/customer-status.ts b/modules/customers/src/api/domain/value-objects/customer-status.vo.ts
similarity index 100%
rename from modules/customers/src/api/domain/value-objects/customer-status.ts
rename to modules/customers/src/api/domain/value-objects/customer-status.vo.ts
diff --git a/modules/customers/src/api/domain/value-objects/index.ts b/modules/customers/src/api/domain/value-objects/index.ts
index 76ac2983..faadcba4 100644
--- a/modules/customers/src/api/domain/value-objects/index.ts
+++ b/modules/customers/src/api/domain/value-objects/index.ts
@@ -1,4 +1,4 @@
-export * from "./customer-address-type";
-export * from "./customer-number";
-export * from "./customer-serie";
-export * from "./customer-status";
+export * from "./customer-address-type.vo";
+export * from "./customer-number.vo";
+export * from "./customer-serie.vo";
+export * from "./customer-status.vo";
diff --git a/modules/customers/src/api/index.ts b/modules/customers/src/api/index.ts
index 2c4892f2..9055941f 100644
--- a/modules/customers/src/api/index.ts
+++ b/modules/customers/src/api/index.ts
@@ -1,6 +1,6 @@
 import type { IModuleServer } from "@erp/core/api";
 
-import { models } from "./infrastructure";
+import { customersRouter, models } from "./infrastructure";
 
 export * from "./infrastructure/sequelize";
 
@@ -19,25 +19,29 @@ export const customersAPIModule: IModuleServer = {
   async setup(params) {
     const { env: ENV, app, database, baseRoutePath: API_BASE_PATH, logger } = params;
 
+    
+    // 1) Dominio interno
+    //const customerInternalDeps = buildCustomerDependencies(params);
+
+    // 2) Servicios públicos (Application Services)
+    //const customerServices = buildCustomerServices(customerInternalDeps);
+
     logger.info("🚀 Customers module dependencies registered", {
       label: this.name,
     });
+
     return {
       // Modelos Sequelize del módulo
       models,
 
       // Servicios expuestos a otros módulos
       services: {
-        customers: {
-          /*...*/
-        },
+        //customers: customerServices,
       },
 
       // Implementación privada del módulo
       internal: {
-        customers: {
-          /*...*/
-        },
+        //customers: customerInternalDeps,
       },
     };
   },
@@ -56,7 +60,7 @@ export const customersAPIModule: IModuleServer = {
     const customersInternalDeps = getInternal("customers", "customers");
 
     // Registro de rutas HTTP
-    //customersRouter(params, customersInternalDeps);
+    customersRouter(params, customersInternalDeps);
 
     logger.info("🚀 Customers module started", {
       label: this.name,
diff --git a/modules/customers/src/api/infrastructure/dependencies.ts b/modules/customers/src/api/infrastructure/dependencies.ts
index bd7c58c9..99d6016d 100644
--- a/modules/customers/src/api/infrastructure/dependencies.ts
+++ b/modules/customers/src/api/infrastructure/dependencies.ts
@@ -14,7 +14,7 @@ import {
 import { CustomerApplicationService } from "../application/customer-application.service";
 import { CustomerFullPresenter, ListCustomersPresenter } from "../application/presenters";
 
-import { CustomerDomainMapper, CustomerListMapper } from "./mappers";
+import { CustomerDomainMapper, CustomerSummaryMapper } from "./mappers";
 import { CustomerRepository } from "./sequelize";
 
 export type CustomerDeps = {
@@ -40,7 +40,7 @@ export function buildCustomerDependencies(params: ModuleParams): CustomerDeps {
   const mapperRegistry = new InMemoryMapperRegistry();
   mapperRegistry
     .registerDomainMapper({ resource: "customer" }, new CustomerDomainMapper())
-    .registerQueryMapper({ resource: "customer", query: "LIST" }, new CustomerListMapper());
+    .registerQueryMapper({ resource: "customer", query: "LIST" }, new CustomerSummaryMapper());
 
   // Repository & Services
   const repo = new CustomerRepository({ mapperRegistry, database });
diff --git a/modules/customers/src/api/infrastructure/di/customer-persistence-mappers.di.ts b/modules/customers/src/api/infrastructure/di/customer-persistence-mappers.di.ts
new file mode 100644
index 00000000..92400af5
--- /dev/null
+++ b/modules/customers/src/api/infrastructure/di/customer-persistence-mappers.di.ts
@@ -0,0 +1,36 @@
+import {
+  CreateCustomerInputMapper,
+  type ICatalogs,
+  type ICustomerDomainMapper,
+  type ICustomerListMapper,
+} from "../../../application";
+import { SequelizeCustomerDomainMapper, SequelizeCustomerListMapper } from "../persistence";
+
+export interface ICustomerPersistenceMappers {
+  domainMapper: ICustomerDomainMapper;
+  listMapper: ICustomerListMapper;
+
+  createMapper: CreateCustomerInputMapper;
+}
+
+export const buildCustomerPersistenceMappers = (
+  catalogs: ICatalogs
+): ICustomerPersistenceMappers => {
+  const { taxCatalog } = catalogs;
+
+  // Mappers para el repositorio
+  const domainMapper = new SequelizeCustomerDomainMapper({
+    taxCatalog,
+  });
+  const listMapper = new SequelizeCustomerListMapper();
+
+  // Mappers el DTO a las props validadas (CustomerProps) y luego construir agregado
+  const createMapper = new CreateCustomerInputMapper({ taxCatalog });
+
+  return {
+    domainMapper,
+    listMapper,
+
+    createMapper,
+  };
+};
diff --git a/modules/customers/src/api/infrastructure/di/customer-repositories.di.ts b/modules/customers/src/api/infrastructure/di/customer-repositories.di.ts
new file mode 100644
index 00000000..59ef66cc
--- /dev/null
+++ b/modules/customers/src/api/infrastructure/di/customer-repositories.di.ts
@@ -0,0 +1,14 @@
+import type { Sequelize } from "sequelize";
+
+import { CustomerRepository } from "../persistence";
+
+import type { ICustomerPersistenceMappers } from "./customer-persistence-mappers.di";
+
+export const buildCustomerRepository = (params: {
+  database: Sequelize;
+  mappers: ICustomerPersistenceMappers;
+}) => {
+  const { database, mappers } = params;
+
+  return new CustomerRepository(mappers.domainMapper, mappers.listMapper, database);
+};
diff --git a/modules/customers/src/api/infrastructure/di/customers.di.ts b/modules/customers/src/api/infrastructure/di/customers.di.ts
new file mode 100644
index 00000000..2dc3c272
--- /dev/null
+++ b/modules/customers/src/api/infrastructure/di/customers.di.ts
@@ -0,0 +1,73 @@
+import { type ModuleParams, buildCatalogs, buildTransactionManager } from "@erp/core/api";
+
+export type CustomersInternalDeps = {
+  useCases: {
+    listCustomers: () => ListCustomersUseCase;
+    getCustomerById: () => GetCustomerByIdUseCase;
+    reportCustomer: () => ReportCustomerUseCase;
+    createCustomer: () => CreateCustomerUseCase;
+
+    /*
+    updateCustomer: () => UpdateCustomerUseCase;
+    deleteCustomer: () => DeleteCustomerUseCase;
+    issueCustomer: () => IssueCustomerUseCase;
+    changeStatusCustomer: () => ChangeStatusCustomerUseCase;*/
+  };
+};
+
+
+export function buildCustomersDependencies(params: ModuleParams): CustomersInternalDeps {
+  const { database } = params;
+
+  // Infrastructure
+  const transactionManager = buildTransactionManager(database);
+  const catalogs = buildCatalogs();
+  const persistenceMappers = buildCustomerPersistenceMappers(catalogs);
+
+  const repository = buildCustomerRepository({ database, mappers: persistenceMappers });
+  const numberService = buildCustomerNumberGenerator();
+
+  // Application helpers
+  const inputMappers = buildCustomerInputMappers(catalogs);
+  const finder = buildCustomerFinder(repository);
+  const creator = buildCustomerCreator({ numberService, repository });
+
+  const snapshotBuilders = buildCustomersnapshotBuilders();
+  const documentGeneratorPipeline = buildCustomerDocumentService(params);
+
+  // Internal use cases (factories)
+  return {
+    useCases: {
+      listCustomers: () =>
+        buildListCustomersUseCase({
+          finder,
+          itemSnapshotBuilder: snapshotBuilders.list,
+          transactionManager,
+        }),
+
+      getCustomerById: () =>
+        buildGetCustomerByIdUseCase({
+          finder,
+          fullSnapshotBuilder: snapshotBuilders.full,
+          transactionManager,
+        }),
+
+      reportCustomer: () =>
+        buildReportCustomerUseCase({
+          finder,
+          fullSnapshotBuilder: snapshotBuilders.full,
+          reportSnapshotBuilder: snapshotBuilders.report,
+          documentService: documentGeneratorPipeline,
+          transactionManager,
+        }),
+
+      createCustomer: () =>
+        buildCreateCustomerUseCase({
+          creator,
+          dtoMapper: inputMappers.createInputMapper,
+          fullSnapshotBuilder: snapshotBuilders.full,
+          transactionManager,
+        }),
+    },
+  };
+}
diff --git a/modules/customers/src/api/infrastructure/di/index.ts b/modules/customers/src/api/infrastructure/di/index.ts
new file mode 100644
index 00000000..47860a30
--- /dev/null
+++ b/modules/customers/src/api/infrastructure/di/index.ts
@@ -0,0 +1 @@
+export * from "./customers.di";
\ No newline at end of file
diff --git a/modules/customers/src/api/infrastructure/express/customers.routes.ts b/modules/customers/src/api/infrastructure/express/customers.routes.ts
index 2ddbcbbe..7d632a41 100644
--- a/modules/customers/src/api/infrastructure/express/customers.routes.ts
+++ b/modules/customers/src/api/infrastructure/express/customers.routes.ts
@@ -25,7 +25,7 @@ import {
   UpdateCustomerController,
 } from "./controllers";
 
-export const customersRouter = (params: ModuleParams) => {
+export const customersRouter = (params: ModuleParams, deps: CustomerInternalDeps) => {
   const { app, baseRoutePath, logger } = params as {
     app: Application;
     database: Sequelize;
diff --git a/modules/customers/src/api/infrastructure/mappers/domain/customer.mapper.ts b/modules/customers/src/api/infrastructure/mappers/domain/customer.mapper.ts
index 3221d0dd..e5d40eb5 100644
--- a/modules/customers/src/api/infrastructure/mappers/domain/customer.mapper.ts
+++ b/modules/customers/src/api/infrastructure/mappers/domain/customer.mapper.ts
@@ -1,8 +1,5 @@
-import {
-  type ISequelizeDomainMapper,
-  type MapperParamsType,
-  SequelizeDomainMapper,
-} from "@erp/core/api";
+import { type MapperParamsType, SequelizeDomainMapper } from "@erp/core/api";
+import type { ICustomerDomainMapper } from "@erp/customers/api/application";
 import {
   City,
   Country,
@@ -16,7 +13,7 @@ import {
   Province,
   Street,
   TINNumber,
-  TaxCode,
+  type TaxCode,
   TextValue,
   URLAddress,
   UniqueID,
@@ -26,14 +23,11 @@ import {
   maybeFromNullableResult,
   maybeToNullable,
 } from "@repo/rdx-ddd";
-import { Collection, Result, isNullishOrEmpty } from "@repo/rdx-utils";
+import { Collection, Result } from "@repo/rdx-utils";
 
-import { Customer, type CustomerProps, CustomerStatus } from "../../../domain";
+import { Customer, CustomerStatus, type ICustomerProps } from "../../../domain";
 import type { CustomerCreationAttributes, CustomerModel } from "../../sequelize";
 
-export interface ICustomerDomainMapper
-  extends ISequelizeDomainMapper<CustomerModel, CustomerCreationAttributes, Customer> {}
-
 export class CustomerDomainMapper
   extends SequelizeDomainMapper<CustomerModel, CustomerCreationAttributes, Customer>
   implements ICustomerDomainMapper
@@ -175,14 +169,14 @@ export class CustomerDomainMapper
 
       // source.default_taxes is stored as a comma-separated string
       const defaultTaxes = new Collection<TaxCode>();
-      if (!isNullishOrEmpty(source.default_taxes)) {
+      /*if (!isNullishOrEmpty(source.default_taxes)) {
         source.default_taxes!.split(",").map((taxCode, index) => {
           const tax = extractOrPushError(TaxCode.create(taxCode), `default_taxes.${index}`, errors);
           if (tax) {
             defaultTaxes.add(tax!);
           }
         });
-      }
+      }*/
 
       // Now, create the PostalAddress VO
       const postalAddressProps = {
@@ -205,7 +199,7 @@ export class CustomerDomainMapper
         return Result.fail(new ValidationErrorCollection("Customer props mapping failed", errors));
       }
 
-      const customerProps: CustomerProps = {
+      const customerProps: ICustomerProps = {
         companyId: companyId!,
         status: status!,
         reference: reference!,
diff --git a/modules/customers/src/api/infrastructure/mappers/queries/customer.list.mapper.ts b/modules/customers/src/api/infrastructure/mappers/queries/customer-summary.mapper.ts
similarity index 82%
rename from modules/customers/src/api/infrastructure/mappers/queries/customer.list.mapper.ts
rename to modules/customers/src/api/infrastructure/mappers/queries/customer-summary.mapper.ts
index 46818758..2d130c04 100644
--- a/modules/customers/src/api/infrastructure/mappers/queries/customer.list.mapper.ts
+++ b/modules/customers/src/api/infrastructure/mappers/queries/customer-summary.mapper.ts
@@ -1,8 +1,4 @@
-import {
-  type ISequelizeQueryMapper,
-  type MapperParamsType,
-  SequelizeQueryMapper,
-} from "@erp/core/api";
+import { type MapperParamsType, SequelizeQueryMapper } from "@erp/core/api";
 import {
   City,
   Country,
@@ -24,46 +20,20 @@ import {
   extractOrPushError,
   maybeFromNullableResult,
 } from "@repo/rdx-ddd";
-import { type Maybe, Result } from "@repo/rdx-utils";
+import { Result } from "@repo/rdx-utils";
 
+import type { CustomerSummary, ICustomerSummaryMapper } from "../../../application";
 import { CustomerStatus } from "../../../domain";
 import type { CustomerModel } from "../../sequelize";
 
-export type CustomerListDTO = {
-  id: UniqueID;
-  companyId: UniqueID;
-  status: CustomerStatus;
-  reference: Maybe<Name>;
-
-  isCompany: boolean;
-  name: Name;
-  tradeName: Maybe<Name>;
-  tin: Maybe<TINNumber>;
-
-  address: PostalAddress;
-
-  emailPrimary: Maybe<EmailAddress>;
-  emailSecondary: Maybe<EmailAddress>;
-  phonePrimary: Maybe<PhoneNumber>;
-  phoneSecondary: Maybe<PhoneNumber>;
-  mobilePrimary: Maybe<PhoneNumber>;
-  mobileSecondary: Maybe<PhoneNumber>;
-
-  fax: Maybe<PhoneNumber>;
-  website: Maybe<URLAddress>;
-
-  languageCode: LanguageCode;
-  currencyCode: CurrencyCode;
-};
-
-export interface ICustomerListMapper
-  extends ISequelizeQueryMapper<CustomerModel, CustomerListDTO> {}
-
-export class CustomerListMapper
-  extends SequelizeQueryMapper<CustomerModel, CustomerListDTO>
-  implements ICustomerListMapper
+export class CustomerSummaryMapper
+  extends SequelizeQueryMapper<CustomerModel, CustomerSummary>
+  implements ICustomerSummaryMapper
 {
-  public mapToDTO(raw: CustomerModel, params?: MapperParamsType): Result<CustomerListDTO, Error> {
+  public mapToReadModel(
+    raw: CustomerModel,
+    params?: MapperParamsType
+  ): Result<CustomerSummary, Error> {
     const errors: ValidationErrorDetail[] = [];
 
     // 1) Valores escalares (atributos generales)
@@ -217,7 +187,7 @@ export class CustomerListMapper
       );
     }
 
-    return Result.ok<CustomerListDTO>({
+    return Result.ok<CustomerSummary>({
       id: customerId!,
       companyId: companyId!,
       status: status!,
diff --git a/modules/customers/src/api/infrastructure/mappers/queries/index.ts b/modules/customers/src/api/infrastructure/mappers/queries/index.ts
index 019cce62..6565e4ad 100644
--- a/modules/customers/src/api/infrastructure/mappers/queries/index.ts
+++ b/modules/customers/src/api/infrastructure/mappers/queries/index.ts
@@ -1 +1 @@
-export * from "./customer.list.mapper";
+export * from "./customer-summary.mapper";
diff --git a/modules/customers/src/api/infrastructure/sequelize/repositories/customer.repository.ts b/modules/customers/src/api/infrastructure/sequelize/repositories/customer.repository.ts
index 2fdf7694..3e1a50f4 100644
--- a/modules/customers/src/api/infrastructure/sequelize/repositories/customer.repository.ts
+++ b/modules/customers/src/api/infrastructure/sequelize/repositories/customer.repository.ts
@@ -7,16 +7,25 @@ import {
 import { type Criteria, CriteriaToSequelizeConverter } from "@repo/rdx-criteria/server";
 import type { UniqueID } from "@repo/rdx-ddd";
 import { type Collection, Result } from "@repo/rdx-utils";
-import type { Transaction } from "sequelize";
+import type { Sequelize, Transaction } from "sequelize";
 
-import type { Customer, ICustomerRepository } from "../../../domain";
-import type { CustomerListDTO, ICustomerDomainMapper, ICustomerListMapper } from "../../mappers";
+import type { CustomerSummary, ICustomerRepository } from "../../../application";
+import type { Customer } from "../../../domain";
+import type { ICustomerDomainMapper, ICustomerListMapper } from "../../mappers";
 import { CustomerModel } from "../models/customer.model";
 
 export class CustomerRepository
   extends SequelizeRepository<Customer>
   implements ICustomerRepository
 {
+  constructor(
+    private readonly domainMapper: ICustomerDomainMapper,
+    private readonly listMapper: ICustomerListMapper,
+    database: Sequelize
+  ) {
+    super({ database });
+  }
+
   /**
    *
    * Crea un nuevo cliente
@@ -27,18 +36,15 @@ export class CustomerRepository
    */
   async create(customer: Customer, transaction?: Transaction): Promise<Result<void, Error>> {
     try {
-      const mapper: ICustomerDomainMapper = this._registry.getDomainMapper({
-        resource: "customer",
-      });
-      const dto = mapper.mapToPersistence(customer);
+      const dtoResult = this.domainMapper.mapToPersistence(customer);
 
-      if (dto.isFailure) {
-        return Result.fail(dto.error);
+      if (dtoResult.isFailure) {
+        return Result.fail(dtoResult.error);
       }
 
-      const { data } = dto;
+      const dto = dtoResult.data;
 
-      await CustomerModel.create(data, {
+      await CustomerModel.create(dto, {
         include: [{ all: true }],
         transaction,
       });
@@ -58,12 +64,9 @@ export class CustomerRepository
    */
   async update(customer: Customer, transaction?: Transaction): Promise<Result<void, Error>> {
     try {
-      const mapper: ICustomerDomainMapper = this._registry.getDomainMapper({
-        resource: "customer",
-      });
-      const dto = mapper.mapToPersistence(customer);
+      const dtoResult = this.domainMapper.mapToPersistence(customer);
 
-      const { id, ...updatePayload } = dto.data;
+      const { id, ...updatePayload } = dtoResult.data;
       const [affected] = await CustomerModel.update(updatePayload, {
         where: { id /*, version */ },
         //fields: Object.keys(updatePayload),
@@ -146,7 +149,7 @@ export class CustomerRepository
    * @param companyId - Identificador UUID de la empresa a la que pertenece el cliente.
    * @param criteria - Criterios de búsqueda.
    * @param transaction - Transacción activa para la operación.
-   * @returns Result<Collection<Customer>, Error>
+   * @returns Result<Collection<CustomerListDTO>, Error>
    *
    * @see Criteria
    */
@@ -154,15 +157,10 @@ export class CustomerRepository
     companyId: UniqueID,
     criteria: Criteria,
     transaction?: Transaction
-  ): Promise<Result<Collection<CustomerListDTO>, Error>> {
+  ): Promise<Result<Collection<CustomerSummary>, Error>> {
     try {
-      const mapper: ICustomerListMapper = this._registry.getQueryMapper({
-        resource: "customer",
-        query: "LIST",
-      });
-
-      const converter = new CriteriaToSequelizeConverter();
-      const query = converter.convert(criteria, {
+      const criteriaConverter = new CriteriaToSequelizeConverter();
+      const query = criteriaConverter.convert(criteria, {
         searchableFields: [
           "name",
           "trade_name",
@@ -195,19 +193,7 @@ export class CustomerRepository
         transaction,
       });
 
-      /*const [rows, count] = await Promise.all([
-        CustomerModel.findAll({
-          ...CustomerModel,
-          transaction,
-        }),
-        CustomerModel.count({
-          where: query.where,
-          distinct: true, // evita duplicados por LEFT JOIN
-          transaction,
-        }),
-      ]);*/
-
-      return mapper.mapToDTOCollection(rows, count);
+      return this.listMapper.mapToDTOCollection(rows, count);
     } catch (err: unknown) {
       return Result.fail(translateSequelizeError(err));
     }
diff --git a/modules/customers/src/web/components/client-selector-modal.tsx b/modules/customers/src/web/components/client-selector-modal.tsx
index a14d72ee..de914979 100644
--- a/modules/customers/src/web/components/client-selector-modal.tsx
+++ b/modules/customers/src/web/components/client-selector-modal.tsx
@@ -1,8 +1,5 @@
-import { LookupDialog } from "@repo/rdx-ui/components";
-import DataTable, { TableColumn } from "react-data-table-component";
-import { useDebounce } from "use-debounce";
-
 import { buildTextFilters } from "@erp/core/client";
+import { LookupDialog } from "@repo/rdx-ui/components";
 import {
   Badge,
   Button,
@@ -18,7 +15,10 @@ import {
 } from "@repo/shadcn-ui/components";
 import { Building, Calendar, Mail, MapPin, Phone, Plus, User } from "lucide-react";
 import { useState } from "react";
-import { ListCustomersResponseDTO } from "../../common";
+import DataTable, { type TableColumn } from "react-data-table-component";
+import { useDebounce } from "use-debounce";
+
+import type { ListCustomersResponseDTO } from "../../common";
 import { useCustomerListQuery } from "../hooks";
 
 type Customer = ListCustomersResponseDTO["items"][number];
@@ -143,96 +143,96 @@ export const ClientSelectorModal = () => {
   };
 
   return (
-    <div className='space-y-4 max-w-2xl'>
-      <div className='space-y-1'>
+    <div className="space-y-4 max-w-2xl">
+      <div className="space-y-1">
         <Label>Cliente</Label>
-        <Button variant='outline' className='w-full justify-start' onClick={handleSelectClient}>
-          <User className='h-4 w-4 mr-2' />
+        <Button className="w-full justify-start" onClick={handleSelectClient} variant="outline">
+          <User className="h-4 w-4 mr-2" />
           {selectedCustomer ? selectedCustomer.name : "Seleccionar cliente"}
         </Button>
       </div>
 
       {selectedCustomer && (
         <Card>
-          <CardContent className='p-4 space-y-2'>
-            <div className='flex items-center justify-between'>
-              <div className='flex items-center gap-2'>
-                <User className='h-6 w-6 text-primary' />
-                <h3 className='font-semibold'>{selectedCustomer.name}</h3>
+          <CardContent className="p-4 space-y-2">
+            <div className="flex items-center justify-between">
+              <div className="flex items-center gap-2">
+                <User className="h-6 w-6 text-primary" />
+                <h3 className="font-semibold">{selectedCustomer.name}</h3>
                 <Badge
+                  className="text-xs"
                   variant={selectedCustomer.status === "Activo" ? "default" : "secondary"}
-                  className='text-xs'
                 >
                   {selectedCustomer.status}
                 </Badge>
               </div>
-              <span className='text-sm text-muted-foreground'>{selectedCustomer.company}</span>
+              <span className="text-sm text-muted-foreground">{selectedCustomer.company}</span>
             </div>
-            <p className='text-sm text-muted-foreground'>{selectedCustomer.email}</p>
+            <p className="text-sm text-muted-foreground">{selectedCustomer.email}</p>
           </CardContent>
         </Card>
       )}
 
       <LookupDialog
-        open={open}
-        onOpenChange={setOpen}
-        items={data?.items ?? []}
-        totalItems={data?.total_items ?? 0}
-        search={search}
-        onSearchChange={setSearch}
-        isLoading={isLoading}
+        description="Busca un cliente por nombre, email o empresa"
         isError={isError}
-        refetch={refetch}
-        title='Seleccionar cliente'
-        description='Busca un cliente por nombre, email o empresa'
-        onSelect={(customer) => {
-          setSelectedCustomer(customer);
-          setOpen(false);
-        }}
+        isLoading={isLoading}
+        items={data?.items ?? []}
         onCreate={(e) => {
           e.preventDefault();
           setOpen(true);
           console.log("Crear nuevo cliente");
         }}
+        onOpenChange={setOpen}
+        onPageChange={setPageNumber}
+        onSearchChange={setSearch}
+        onSelect={(customer) => {
+          setSelectedCustomer(customer);
+          setOpen(false);
+        }}
+        open={open}
         page={pageNumber}
         perPage={pageSize}
-        onPageChange={setPageNumber}
-        renderItem={() => null} // No se usa con DataTable
+        refetch={refetch}
         renderContainer={(items) => (
           <DataTable
             columns={columns}
             data={items}
+            highlightOnHover
+            noDataComponent="No se encontraron resultados"
+            onChangePage={(p) => setPageNumber(p)}
             onRowClicked={(item) => {
               setSelectedCustomer(item);
               setOpen(false);
             }}
             pagination
-            paginationServer
             paginationPerPage={pageSize}
+            paginationServer
             paginationTotalRows={data?.total_items ?? 0}
-            onChangePage={(p) => setPageNumber(p)}
-            highlightOnHover
             pointerOnHover
-            noDataComponent='No se encontraron resultados'
           />
         )}
+        renderItem={() => null}
+        search={search}
+        title="Seleccionar cliente" // No se usa con DataTable
+        totalItems={data?.total_items ?? 0}
       />
 
-      <Dialog open={isCreateOpen} onOpenChange={setIsCreateOpen}>
-        <DialogContent className='max-w-md'>
+      <Dialog onOpenChange={setIsCreateOpen} open={isCreateOpen}>
+        <DialogContent className="max-w-md">
           <DialogHeader>
-            <DialogTitle className='flex items-center gap-2'>
-              <Plus className='size-5' />
+            <DialogTitle className="flex items-center gap-2">
+              <Plus className="size-5" />
               Nuevo Cliente
             </DialogTitle>
           </DialogHeader>
-          <p className='text-muted-foreground text-sm mb-4'>Formulario de creación pendiente…</p>
+          <p className="text-muted-foreground text-sm mb-4">Formulario de creación pendiente…</p>
           <DialogFooter>
-            <Button variant='outline' onClick={() => setIsCreateOpen(false)}>
+            <Button onClick={() => setIsCreateOpen(false)} variant="outline">
               Cancelar
             </Button>
             <Button>
-              <Plus className='h-4 w-4 mr-2' />
+              <Plus className="h-4 w-4 mr-2" />
               Crear
             </Button>
           </DialogFooter>
@@ -246,33 +246,33 @@ export const ClientSelectorModal = () => {
 
 const CustomerCard = ({ customer }: { customer: Customer }) => (
   <Card>
-    <CardContent className='p-4 space-y-2'>
-      <div className='flex items-center gap-2'>
-        <User className='size-5' />
-        <span className='font-semibold'>{customer.name}</span>
+    <CardContent className="p-4 space-y-2">
+      <div className="flex items-center gap-2">
+        <User className="size-5" />
+        <span className="font-semibold">{customer.name}</span>
         <Badge variant={customer.status === "Activo" ? "default" : "secondary"}>
           {customer.status}
         </Badge>
       </div>
-      <div className='text-sm text-muted-foreground flex flex-col gap-1'>
-        <div className='flex items-center gap-1'>
-          <Mail className='h-4 w-4' />
+      <div className="text-sm text-muted-foreground flex flex-col gap-1">
+        <div className="flex items-center gap-1">
+          <Mail className="h-4 w-4" />
           {customer.email}
         </div>
-        <div className='flex items-center gap-1'>
-          <Building className='h-4 w-4' />
+        <div className="flex items-center gap-1">
+          <Building className="h-4 w-4" />
           {customer.company}
         </div>
-        <div className='flex items-center gap-1'>
-          <Phone className='h-4 w-4' />
+        <div className="flex items-center gap-1">
+          <Phone className="h-4 w-4" />
           {customer.phone}
         </div>
-        <div className='flex items-center gap-1'>
-          <MapPin className='h-4 w-4' />
+        <div className="flex items-center gap-1">
+          <MapPin className="h-4 w-4" />
           {customer.address}
         </div>
-        <div className='flex items-center gap-1'>
-          <Calendar className='h-4 w-4' />
+        <div className="flex items-center gap-1">
+          <Calendar className="h-4 w-4" />
           {new Date(customer.createdAt).toLocaleDateString("es-ES")}
         </div>
       </div>
diff --git a/modules/customers/src/web/components/customer-modal-selector/customer-card.tsx b/modules/customers/src/web/components/customer-modal-selector/customer-card.tsx
index 1c74913e..b2c85cff 100644
--- a/modules/customers/src/web/components/customer-modal-selector/customer-card.tsx
+++ b/modules/customers/src/web/components/customer-modal-selector/customer-card.tsx
@@ -1,19 +1,9 @@
-import {
-  Button, Item,
-  ItemContent,
-  ItemFooter,
-  ItemTitle
-} from "@repo/shadcn-ui/components";
-import { cn } from '@repo/shadcn-ui/lib/utils';
-import {
-  EyeIcon,
-  MapPinIcon,
-  RefreshCwIcon,
-  UserPlusIcon
-} from "lucide-react";
-import React, { useMemo } from 'react';
-import { CustomerSummary } from "../../schemas";
+import { Button, Item, ItemContent, ItemFooter, ItemTitle } from "@repo/shadcn-ui/components";
+import { cn } from "@repo/shadcn-ui/lib/utils";
+import { EyeIcon, MapPinIcon, RefreshCwIcon, UserPlusIcon } from "lucide-react";
+import React, { useMemo } from "react";
 
+import type { CustomerSummary } from "../../schemas";
 
 interface CustomerCardProps {
   customer: CustomerSummary;
@@ -57,42 +47,38 @@ export const CustomerCard = ({
   const address = useMemo(() => buildAddress(customer), [customer]);
 
   return (
-    <Item variant="outline" className={className}>
+    <Item className={className} variant="outline">
       <ItemContent>
         <ItemTitle className="flex items-start gap-2 w-full justify-between">
           <span className="grow text-balance">{customer.name}</span>
           {/* Eye solo si onViewCustomer existe */}
           {onViewCustomer && (
             <Button
-              type='button'
-              variant='ghost'
-              size='sm'
-              className='cursor-pointer'
+              aria-label="Ver ficha completa del cliente"
+              className="cursor-pointer"
               onClick={onViewCustomer}
-              aria-label='Ver ficha completa del cliente'
+              size="sm"
+              type="button"
+              variant="ghost"
             >
-              <EyeIcon className='size-4 text-muted-foreground' />
+              <EyeIcon className="size-4 text-muted-foreground" />
             </Button>
           )}
         </ItemTitle>
         <div
-          data-slot="item-description"
           className={cn(
             "text-muted-foreground line-clamp-2 text-sm leading-normal font-normal text-balance",
             "[&>a:hover]:text-primary [&>a]:underline [&>a]:underline-offset-4",
             "text-sm text-muted-foreground"
-          )}>
-          {/* TIN en su propia línea si existe */}
-          {customer.tin && (
-            <div className="font-mono tabular-nums">{customer.tin}</div>
           )}
+          data-slot="item-description"
+        >
+          {/* TIN en su propia línea si existe */}
+          {customer.tin && <div className="font-mono tabular-nums">{customer.tin}</div>}
 
           {/* Dirección */}
           {address.has ? (
-            <address
-              className="not-italic mt-1 text-pretty"
-              aria-label={address.full}
-            >
+            <address aria-label={address.full} className="not-italic mt-1 text-pretty">
               {/* Desktop/tablet: compacto en una línea (o dos por wrap natural) */}
               <div className="hidden sm:flex items-center gap-1 flex-wrap">
                 <MapPinIcon aria-hidden className="size-3.5 translate-y-[1px]" />
@@ -101,7 +87,9 @@ export const CustomerCard = ({
                   <React.Fragment key={i}>
                     <span>{part}</span>
                     {i < address.stack.length - 1 && (
-                      <span aria-hidden className="mx-1">·</span>
+                      <span aria-hidden className="mx-1">
+                        ·
+                      </span>
                     )}
                   </React.Fragment>
                 ))}
@@ -129,29 +117,29 @@ export const CustomerCard = ({
       <ItemFooter className="flex-wrap gap-2">
         {onChangeCustomer && (
           <Button
-            type='button'
-            variant='outline'
-            size='sm'
+            className="flex-1 min-w-36 gap-2 cursor-pointer"
             onClick={onChangeCustomer}
-            className='flex-1 min-w-36 gap-2 cursor-pointer'
+            size="sm"
+            type="button"
+            variant="outline"
           >
-            <RefreshCwIcon className='size-4' />
-            <span className='text-sm text-muted-foreground'>Cambiar de cliente</span>
+            <RefreshCwIcon className="size-4" />
+            <span className="text-sm text-muted-foreground">Cambiar de cliente</span>
           </Button>
         )}
         {onAddNewCustomer && (
           <Button
-            type='button'
-            variant='outline'
-            size='sm'
+            className="flex-1 min-w-36 gap-2 cursor-pointer"
             onClick={onAddNewCustomer}
-            className='flex-1 min-w-36 gap-2 cursor-pointer'
+            size="sm"
+            type="button"
+            variant="outline"
           >
-            <UserPlusIcon className='size-4' />
-            <span className='text-sm text-muted-foreground'>Nuevo cliente</span>
+            <UserPlusIcon className="size-4" />
+            <span className="text-sm text-muted-foreground">Nuevo cliente</span>
           </Button>
         )}
       </ItemFooter>
     </Item>
   );
-};
\ No newline at end of file
+};
diff --git a/modules/customers/src/web/components/customer-modal-selector/customer-create-modal.tsx b/modules/customers/src/web/components/customer-modal-selector/customer-create-modal.tsx
index b48b13f5..dac6ec63 100644
--- a/modules/customers/src/web/components/customer-modal-selector/customer-create-modal.tsx
+++ b/modules/customers/src/web/components/customer-modal-selector/customer-create-modal.tsx
@@ -1,4 +1,3 @@
-
 import { UnsavedChangesProvider, useUnsavedChangesContext } from "@erp/core/hooks";
 import {
   Button,
@@ -10,12 +9,12 @@ import {
   DialogTitle,
 } from "@repo/shadcn-ui/components";
 import { Plus } from "lucide-react";
-import { useCallback, useId } from 'react';
-import { useTranslation } from "../../i18n";
-import { useCustomerCreateController } from '../../pages/create/use-customer-create-controller';
-import { CustomerFormData } from "../../schemas";
-import { CustomerEditForm } from '../editor';
+import { useCallback, useId } from "react";
 
+import { useTranslation } from "../../i18n";
+import { useCustomerCreateController } from "../../pages/create/use-customer-create-controller";
+import type { CustomerFormData } from "../../schemas";
+import { CustomerEditForm } from "../editor";
 
 type CustomerCreateModalProps = {
   open: boolean;
@@ -25,62 +24,61 @@ type CustomerCreateModalProps = {
   onSubmit: () => void; // ← mantenemos tu firma (no se usa directamente aquí)
 };
 
-export function CustomerCreateModal({
-  open,
-  onOpenChange,
-}: CustomerCreateModalProps) {
+export function CustomerCreateModal({ open, onOpenChange }: CustomerCreateModalProps) {
   const { t } = useTranslation();
   const formId = useId();
 
   const { requestConfirm } = useUnsavedChangesContext();
 
-  const {
-    form, isCreating, isCreateError, createError,
-    handleSubmit, handleError, FormProvider
-  } = useCustomerCreateController();
+  const { form, isCreating, isCreateError, createError, handleSubmit, handleError, FormProvider } =
+    useCustomerCreateController();
 
   const { isDirty } = form.formState;
 
-  const guardClose = useCallback(async (nextOpen: boolean) => {
-    if (nextOpen) return onOpenChange(true);
+  const guardClose = useCallback(
+    async (nextOpen: boolean) => {
+      if (nextOpen) return onOpenChange(true);
 
-    if (isCreating) return;
+      if (isCreating) return;
 
-    if (!isDirty) {
-      return onOpenChange(false);
-    }
+      if (!isDirty) {
+        return onOpenChange(false);
+      }
 
-    if (await requestConfirm()) {
-      return onOpenChange(false);
-    }
-  }, [requestConfirm, isCreating, onOpenChange, isDirty]);
+      if (await requestConfirm()) {
+        return onOpenChange(false);
+      }
+    },
+    [requestConfirm, isCreating, onOpenChange, isDirty]
+  );
 
-
-  const handleFormSubmit = (data: CustomerFormData) => handleSubmit(data /*, () => onOpenChange(false)*/);
+  const handleFormSubmit = (data: CustomerFormData) =>
+    handleSubmit(data /*, () => onOpenChange(false)*/);
 
   return (
     <UnsavedChangesProvider isDirty={isDirty}>
-
-      <Dialog open={open} onOpenChange={guardClose}>
+      <Dialog onOpenChange={guardClose} open={open}>
         <DialogContent className="bg-card border-border p-0 max-w-[calc(100vw-2rem)] sm:[calc(max-w-3xl-2rem)] h-[calc(100dvh-2rem)]">
           <DialogHeader className="px-6 pt-6 pb-4 border-b">
             <DialogTitle className="flex items-center gap-2">
               <Plus className="size-5" /> {t("pages.create.title")}
             </DialogTitle>
-            <DialogDescription className='text-left'>{t("pages.create.description")}</DialogDescription>
+            <DialogDescription className="text-left">
+              {t("pages.create.description")}
+            </DialogDescription>
           </DialogHeader>
 
           <div className="overflow-y-auto h:[calc(100%-8rem)]">
             <FormProvider {...form}>
               <CustomerEditForm
-                formId={formId}
-                onSubmit={handleFormSubmit}
-                onError={handleError}
                 className="max-w-none"
+                formId={formId}
+                onError={handleError}
+                onSubmit={handleFormSubmit}
               />
 
               {isCreateError && (
-                <p role="alert" className="mt-3 text-sm text-destructive">
+                <p className="mt-3 text-sm text-destructive" role="alert">
                   {(createError as Error)?.message}
                 </p>
               )}
@@ -88,16 +86,26 @@ export function CustomerCreateModal({
           </div>
 
           <DialogFooter className="px-6 py-4 border-t bg-card">
-            <Button type="button" form={formId} variant="outline" className='cursor-pointer' onClick={() => guardClose(false)} disabled={isCreating}>
-              {t('common.cancel', "Cancelar")}
+            <Button
+              className="cursor-pointer"
+              disabled={isCreating}
+              form={formId}
+              onClick={() => guardClose(false)}
+              type="button"
+              variant="outline"
+            >
+              {t("common.cancel", "Cancelar")}
             </Button>
-            <Button type="submit" form={formId} disabled={isCreating} className='cursor-pointer'>
-              {isCreating ? <span aria-live="polite">{t('common.saving', "Guardando")}</span> : <span>{t('common.save', "Guardar")}</span>}
+            <Button className="cursor-pointer" disabled={isCreating} form={formId} type="submit">
+              {isCreating ? (
+                <span aria-live="polite">{t("common.saving", "Guardando")}</span>
+              ) : (
+                <span>{t("common.save", "Guardar")}</span>
+              )}
             </Button>
           </DialogFooter>
         </DialogContent>
       </Dialog>
-
     </UnsavedChangesProvider>
   );
-}
\ No newline at end of file
+}
diff --git a/modules/customers/src/web/components/customer-modal-selector/customer-modal-selector-field.tsx b/modules/customers/src/web/components/customer-modal-selector/customer-modal-selector-field.tsx
index 78828f4a..e61fff2a 100644
--- a/modules/customers/src/web/components/customer-modal-selector/customer-modal-selector-field.tsx
+++ b/modules/customers/src/web/components/customer-modal-selector/customer-modal-selector-field.tsx
@@ -1,8 +1,9 @@
 import { Field, FieldLabel } from "@repo/shadcn-ui/components";
+import { cn } from "@repo/shadcn-ui/lib/utils";
+import { type Control, Controller, type FieldPath, type FieldValues } from "react-hook-form";
+
+import type { CustomerSummary } from "../../schemas";
 
-import { cn } from '@repo/shadcn-ui/lib/utils';
-import { Control, Controller, FieldPath, FieldValues } from "react-hook-form";
-import { CustomerSummary } from '../../schemas';
 import { CustomerModalSelector } from "./customer-modal-selector";
 
 type CustomerModalSelectorFieldProps<TFormValues extends FieldValues> = {
@@ -12,7 +13,7 @@ type CustomerModalSelectorFieldProps<TFormValues extends FieldValues> = {
   label?: string;
   description?: string;
 
-  orientation?: "vertical" | "horizontal" | "responsive",
+  orientation?: "vertical" | "horizontal" | "responsive";
 
   disabled?: boolean;
   required?: boolean;
@@ -28,8 +29,7 @@ export function CustomerModalSelectorField<TFormValues extends FieldValues>({
   label,
   description,
 
-  orientation = 'vertical',
-
+  orientation = "vertical",
 
   disabled = false,
   required = false,
@@ -49,25 +49,25 @@ export function CustomerModalSelectorField<TFormValues extends FieldValues>({
 
         return (
           <Field
+            className={cn("gap-1", className)}
             data-invalid={fieldState.invalid}
             orientation={orientation}
-            className={cn("gap-1", className)}
           >
             {label && (
-              <FieldLabel className='text-xs text-muted-foreground text-nowrap' htmlFor={name}>
+              <FieldLabel className="text-xs text-muted-foreground text-nowrap" htmlFor={name}>
                 {label}
               </FieldLabel>
             )}
             <CustomerModalSelector
-              value={value}
-              onValueChange={onChange}
               disabled={isDisabled}
-              readOnly={isReadOnly}
               initialCustomer={initiaCustomer as CustomerSummary}
+              onValueChange={onChange}
+              readOnly={isReadOnly}
+              value={value}
             />
           </Field>
         );
       }}
     />
   );
-}
\ No newline at end of file
+}
diff --git a/modules/customers/src/web/components/customer-modal-selector/customer-modal-selector.tsx b/modules/customers/src/web/components/customer-modal-selector/customer-modal-selector.tsx
index 808a64c0..3ed2242d 100644
--- a/modules/customers/src/web/components/customer-modal-selector/customer-modal-selector.tsx
+++ b/modules/customers/src/web/components/customer-modal-selector/customer-modal-selector.tsx
@@ -1,11 +1,17 @@
 import { useEffect, useId, useMemo, useState } from "react";
+
 import { useCustomerListQuery } from "../../hooks";
-import { CustomerFormData, CustomerSummary, defaultCustomerFormData } from "../../schemas";
+import {
+  type CustomerFormData,
+  type CustomerSummary,
+  defaultCustomerFormData,
+} from "../../schemas";
+
 import { CustomerCard } from "./customer-card";
-import { CustomerCreateModal } from './customer-create-modal';
+import { CustomerCreateModal } from "./customer-create-modal";
 import { CustomerEmptyCard } from "./customer-empty-card";
 import { CustomerSearchDialog } from "./customer-search-dialog";
-import { CustomerViewDialog } from './customer-view-dialog';
+import { CustomerViewDialog } from "./customer-view-dialog";
 
 // Debounce pequeño y tipado
 function useDebouncedValue<T>(value: T, delay = 300) {
@@ -17,7 +23,6 @@ function useDebouncedValue<T>(value: T, delay = 300) {
   return debounced;
 }
 
-
 type CustomerModalSelectorProps = {
   value?: string;
   onValueChange?: (id: string) => void;
@@ -25,7 +30,7 @@ type CustomerModalSelectorProps = {
   readOnly?: boolean; // Ver ficha, pero no cambiar/crear
   initialCustomer?: CustomerSummary;
   className?: string;
-}
+};
 
 export const CustomerModalSelector = ({
   value,
@@ -35,7 +40,6 @@ export const CustomerModalSelector = ({
   initialCustomer,
   className,
 }: CustomerModalSelectorProps) => {
-
   const dialogId = useId();
 
   const [showSearch, setShowSearch] = useState(false);
@@ -68,32 +72,28 @@ export const CustomerModalSelector = ({
     isLoading,
     isError,
     error,
-  } = useCustomerListQuery(
-    {
-      enabled: showSearch, // <- evita llamadas innecesarias
-      criteria
-    }
-  );
+  } = useCustomerListQuery({
+    enabled: showSearch, // <- evita llamadas innecesarias
+    criteria,
+  });
 
   // Combinar locales optimistas + remotos
   const customers: CustomerSummary[] = useMemo(() => {
-    const remoteCustomers = remoteCustomersPage ? remoteCustomersPage.items : []
+    const remoteCustomers = remoteCustomersPage ? remoteCustomersPage.items : [];
     const byId = new Map<string, CustomerSummary>();
     [...localCreated, ...remoteCustomers].forEach((c) => byId.set(c.id, c as CustomerSummary));
     return Array.from(byId.values());
   }, [localCreated, remoteCustomersPage]);
 
-
   // Sync con value e initialCustomer
   useEffect(() => {
     const found = customers.find((c) => c.id === value) ?? initialCustomer ?? null;
     setSelected(found ?? null);
   }, [value, customers, initialCustomer]);
 
-
   // Crear cliente (optimista) mapeando desde CustomerDraft -> CustomerSummary
   const handleCreate = () => {
-    if (!newClient.name || !newClient.email_primary) return;
+    if (!(newClient.name && newClient.email_primary)) return;
 
     const newCustomer: CustomerSummary = defaultCustomerFormData as CustomerSummary;
 
@@ -104,8 +104,8 @@ export const CustomerModalSelector = ({
   };
 
   // Handlers de tarjeta según modo
-  const canChange = !disabled && !readOnly;
-  const canCreate = !disabled && !readOnly;
+  const canChange = !(disabled || readOnly);
+  const canCreate = !(disabled || readOnly);
   const canView = !!selected && !disabled;
 
   return (
@@ -115,63 +115,65 @@ export const CustomerModalSelector = ({
           <CustomerCard
             className={className}
             customer={selected}
-            onViewCustomer={canView ? () => setShowView(true) : undefined}
-            onChangeCustomer={canChange ? () => setShowSearch(true) : undefined}
             onAddNewCustomer={canCreate ? () => setShowNewForm(true) : undefined}
+            onChangeCustomer={canChange ? () => setShowSearch(true) : undefined}
+            onViewCustomer={canView ? () => setShowView(true) : undefined}
           />
         ) : (
           <CustomerEmptyCard
-            className={className}
-            onClick={!disabled && !readOnly ? () => setShowSearch(true) : undefined}
-            onKeyDown={
-              !disabled && !readOnly
-                ? (e) => {
-                  if (e.key === "Enter" || e.key === " ") setShowSearch(true);
-                }
-                : undefined
-            }
-            aria-haspopup="dialog"
             aria-controls={dialogId}
             aria-disabled={disabled || readOnly}
+            aria-haspopup="dialog"
+            className={className}
+            onClick={disabled || readOnly ? undefined : () => setShowSearch(true)}
+            onKeyDown={
+              disabled || readOnly
+                ? undefined
+                : (e) => {
+                    if (e.key === "Enter" || e.key === " ") setShowSearch(true);
+                  }
+            }
           />
         )}
       </div>
 
       <CustomerSearchDialog
-        open={showSearch}
-        onOpenChange={setShowSearch}
-        searchQuery={searchQuery}
-        onSearchQueryChange={setSearchQuery}
         customers={customers}
-        selectedClient={selected}
+        errorMessage={
+          isError ? ((error as Error)?.message ?? "Error al cargar clientes") : undefined
+        }
+        isError={isError}
+        isLoading={isLoading}
+        onCreateClient={(name) => {
+          setNewClient((prev) => ({ ...prev, name: name ?? "" }));
+          setShowNewForm(true);
+        }}
+        onOpenChange={setShowSearch}
+        onSearchQueryChange={setSearchQuery}
         onSelectClient={(c) => {
           setSelected(c);
           onValueChange?.(c.id);
           setShowSearch(false);
         }}
-        onCreateClient={(name) => {
-          setNewClient((prev) => ({ ...prev, name: name ?? "" }));
-          setShowNewForm(true);
-        }}
-        isLoading={isLoading}
-        isError={isError}
-        errorMessage={isError ? ((error as Error)?.message ?? "Error al cargar clientes") : undefined}
+        open={showSearch}
+        searchQuery={searchQuery}
+        selectedClient={selected}
       />
 
       <CustomerViewDialog
         customerId={selected?.id ?? null}
-        open={showView}
         onOpenChange={setShowView}
+        open={showView}
       />
 
       {/* Diálogo de alta rápida */}
       <CustomerCreateModal
-        open={showNewForm}
-        onOpenChange={setShowNewForm}
         client={newClient}
         onChange={setNewClient}
+        onOpenChange={setShowNewForm}
         onSubmit={handleCreate}
+        open={showNewForm}
       />
     </>
   );
-};
\ No newline at end of file
+};
diff --git a/modules/customers/src/web/components/customer-modal-selector/customer-search-dialog.tsx b/modules/customers/src/web/components/customer-modal-selector/customer-search-dialog.tsx
index 5c6febb6..57e90487 100644
--- a/modules/customers/src/web/components/customer-modal-selector/customer-search-dialog.tsx
+++ b/modules/customers/src/web/components/customer-modal-selector/customer-search-dialog.tsx
@@ -24,7 +24,8 @@ import {
   UserIcon,
   UserPlusIcon,
 } from "lucide-react";
-import { CustomerSummary } from "../../schemas";
+
+import type { CustomerSummary } from "../../schemas";
 
 interface CustomerSearchDialogProps {
   open: boolean;
@@ -53,45 +54,45 @@ export const CustomerSearchDialog = ({
   isError,
   errorMessage,
 }: CustomerSearchDialogProps) => {
-  const isEmpty = !isLoading && !isError && customers && customers.length === 0;
+  const isEmpty = !(isLoading || isError) && customers && customers.length === 0;
 
   return (
-    <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className='sm:max-w-2xl bg-card border-border p-0'>
-        <DialogHeader className='px-6 pt-6 pb-4'>
-          <DialogTitle className='flex items-center justify-between'>
-            <span className='flex items-center gap-2'>
-              <User className='size-5' />
+    <Dialog onOpenChange={onOpenChange} open={open}>
+      <DialogContent className="sm:max-w-2xl bg-card border-border p-0">
+        <DialogHeader className="px-6 pt-6 pb-4">
+          <DialogTitle className="flex items-center justify-between">
+            <span className="flex items-center gap-2">
+              <User className="size-5" />
               Seleccionar Cliente
             </span>
           </DialogTitle>
           <DialogDescription>Busca un cliente existente o crea uno nuevo.</DialogDescription>
         </DialogHeader>
 
-        <div className='px-6 pb-3'>
-          <Command className='border rounded-lg' shouldFilter={false}>
+        <div className="px-6 pb-3">
+          <Command className="border rounded-lg" shouldFilter={false}>
             <CommandInput
               autoFocus
+              onValueChange={onSearchQueryChange}
               placeholder="Buscar cliente..."
               value={searchQuery}
-              onValueChange={onSearchQueryChange}
             />
 
-            <CommandList className='max-h-[600px]'>
+            <CommandList className="max-h-[600px]">
               <CommandEmpty>
-                <div className='flex flex-col items-center gap-2 py-6 text-sm'>
-                  <User className='size-8 text-muted-foreground/50' />
+                <div className="flex flex-col items-center gap-2 py-6 text-sm">
+                  <User className="size-8 text-muted-foreground/50" />
                   {isLoading && <p>Cargando…</p>}
-                  {isError && <p className='text-destructive'>{errorMessage}</p>}
-                  {!isLoading && !isError && (
+                  {isError && <p className="text-destructive">{errorMessage}</p>}
+                  {!(isLoading || isError) && (
                     <>
                       <p>No se encontraron clientes</p>
                       {searchQuery && (
                         <Button
+                          className="cursor-pointer"
                           onClick={() => onCreateClient(searchQuery)}
-                          className='cursor-pointer'
                         >
-                          <UserPlusIcon className='mr-2 size-4' />
+                          <UserPlusIcon className="mr-2 size-4" />
                           Crear cliente "{searchQuery}"
                         </Button>
                       )}
@@ -104,38 +105,38 @@ export const CustomerSearchDialog = ({
                 {customers.map((customer) => {
                   return (
                     <CommandItem
+                      className="flex items-center gap-x-4 py-5 cursor-pointer"
                       key={customer.id}
-                      value={customer.id}
                       onSelect={() => onSelectClient(customer)}
-                      className='flex items-center gap-x-4 py-5 cursor-pointer'
+                      value={customer.id}
                     >
-                      <div className='flex size-12  items-center justify-center rounded-full bg-primary/10'>
-                        <UserIcon className='size-8 stroke-1 text-primary' />
+                      <div className="flex size-12  items-center justify-center rounded-full bg-primary/10">
+                        <UserIcon className="size-8 stroke-1 text-primary" />
                       </div>
-                      <div className='flex-1 space-y-1 min-w-0'>
-                        <div className='flex items-center gap-2'>
-                          <span className='text-sm font-semibold'>{customer.name}</span>
+                      <div className="flex-1 space-y-1 min-w-0">
+                        <div className="flex items-center gap-2">
+                          <span className="text-sm font-semibold">{customer.name}</span>
                           {customer.trade_name && (
-                            <Badge variant='secondary' className='text-sm'>
+                            <Badge className="text-sm" variant="secondary">
                               {customer.trade_name}
                             </Badge>
                           )}
                         </div>
-                        <div className='flex items-center gap-6 text-sm font-medium text-muted-foreground'>
+                        <div className="flex items-center gap-6 text-sm font-medium text-muted-foreground">
                           {customer.tin && (
-                            <div className='flex items-center gap-2 text-sm text-muted-foreground'>
-                              <CreditCardIcon className='h-4 w-4 shrink-0' />
-                              <span className='font-medium'>{customer.tin}</span>
+                            <div className="flex items-center gap-2 text-sm text-muted-foreground">
+                              <CreditCardIcon className="h-4 w-4 shrink-0" />
+                              <span className="font-medium">{customer.tin}</span>
                             </div>
                           )}
                           {customer.email_primary && (
-                            <span className='flex items-center gap-1'>
-                              <MailIcon className='size-4' /> {customer.email_primary}
+                            <span className="flex items-center gap-1">
+                              <MailIcon className="size-4" /> {customer.email_primary}
                             </span>
                           )}
                           {customer.mobile_primary && (
-                            <span className='flex items-center gap-1'>
-                              <SmartphoneIcon className='size-4' /> {customer.mobile_primary}
+                            <span className="flex items-center gap-1">
+                              <SmartphoneIcon className="size-4" /> {customer.mobile_primary}
                             </span>
                           )}
                         </div>
@@ -153,12 +154,12 @@ export const CustomerSearchDialog = ({
             </CommandList>
           </Command>
         </div>
-        <DialogFooter className='sm:justify-center px-6 pb-6'>
+        <DialogFooter className="sm:justify-center px-6 pb-6">
           <Button
+            className="cursor-pointer text-center"
             onClick={() => onCreateClient(searchQuery)}
-            className='cursor-pointer text-center'
           >
-            <UserPlusIcon className='mr-2 size-4' />
+            <UserPlusIcon className="mr-2 size-4" />
             Añadir nuevo cliente
           </Button>
         </DialogFooter>
diff --git a/modules/customers/src/web/components/customer-modal-selector/customer-view-dialog.tsx b/modules/customers/src/web/components/customer-modal-selector/customer-view-dialog.tsx
index 5c91937b..b39c7fe2 100644
--- a/modules/customers/src/web/components/customer-modal-selector/customer-view-dialog.tsx
+++ b/modules/customers/src/web/components/customer-modal-selector/customer-view-dialog.tsx
@@ -1,209 +1,224 @@
 import {
-    Badge, Button, Card, CardContent, CardHeader, CardTitle,
-    Dialog,
-    DialogContent,
-    DialogDescription,
-    DialogHeader,
-    DialogTitle,
+  Badge,
+  Button,
+  Card,
+  CardContent,
+  CardHeader,
+  CardTitle,
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogHeader,
+  DialogTitle,
 } from "@repo/shadcn-ui/components";
 import { Banknote, FileText, Languages, Mail, MapPin, Phone, Smartphone, X } from "lucide-react";
+
 // CustomerViewDialog.tsx
 import { useCustomerQuery } from "../../hooks";
 
 type CustomerViewDialogProps = {
-    customerId: string | null;
-    open: boolean;
-    onOpenChange: (open: boolean) => void;
-}
-
-export const CustomerViewDialog = ({
-    customerId,
-    open,
-    onOpenChange,
-}: CustomerViewDialogProps) => {
-    const {
-        data: customer,
-        isLoading,
-        isError,
-        error,
-    } = useCustomerQuery(customerId ?? "", { enabled: open && !!customerId });
-
-    return (
-        <Dialog open={open} onOpenChange={onOpenChange}>
-            <DialogContent className="sm:max-w-3xl bg-card border-border p-0">
-                <DialogHeader className="px-6 pt-6">
-                    <DialogTitle id="customer-view-title" className="flex items-center justify-between">
-                        <span className="text-balance">
-                            {customer?.name ?? "Cliente"}
-                            {customer?.trade_name && (
-                                <span className="ml-2 text-muted-foreground">({customer.trade_name})</span>
-                            )}
-                        </span>
-                        <Button
-                            type="button"
-                            size="icon"
-                            variant="ghost"
-                            className="cursor-pointer"
-                            onClick={() => onOpenChange(false)}
-                            aria-label="Cerrar"
-                        >
-                            <X className="size-4" />
-                        </Button>
-                    </DialogTitle>
-                    <DialogDescription className="px-0">
-                        {customer?.tin ? (
-                            <Badge variant="secondary" className="ml-0 font-mono">{customer.tin}</Badge>
-                        ) : (
-                            <span className="text-muted-foreground">Ficha del cliente</span>
-                        )}
-                    </DialogDescription>
-                </DialogHeader>
-
-                <div className="px-6 pb-6">
-                    {isLoading && <p role="status" aria-live="polite">Cargando…</p>}
-                    {isError && (
-                        <p role="alert" className="text-destructive">
-                            {(error as Error)?.message ?? "No se pudo cargar el cliente"}
-                        </p>
-                    )}
-
-                    {!isLoading && !isError && customer && (
-                        <div className="grid gap-6 md:grid-cols-2 max-h-[70vh] overflow-y-auto pr-1">
-                            <Card>
-                                <CardHeader>
-                                    <CardTitle className="flex items-center gap-2 text-lg">
-                                        <FileText className="size-5 text-primary" />
-                                        Información Básica
-                                    </CardTitle>
-                                </CardHeader>
-                                <CardContent className="space-y-3">
-                                    <div>
-                                        <dt className="text-sm text-muted-foreground">Nombre</dt>
-                                        <dd className="mt-1">{customer.name}</dd>
-                                    </div>
-                                    {customer.reference && (
-                                        <div>
-                                            <dt className="text-sm text-muted-foreground">Referencia</dt>
-                                            <dd className="mt-1 font-mono">{customer.reference}</dd>
-                                        </div>
-                                    )}
-                                    {customer.legal_record && (
-                                        <div>
-                                            <dt className="text-sm text-muted-foreground">Registro Legal</dt>
-                                            <dd className="mt-1">{customer.legal_record}</dd>
-                                        </div>
-                                    )}
-                                    {!!customer.default_taxes?.length && (
-                                        <div>
-                                            <dt className="text-sm text-muted-foreground">Impuestos por defecto</dt>
-                                            <dd className="mt-1 flex flex-wrap gap-1">
-                                                {customer.default_taxes.map((tax: string) => (
-                                                    <Badge key={tax} variant="secondary">{tax}</Badge>
-                                                ))}
-                                            </dd>
-                                        </div>
-                                    )}
-                                </CardContent>
-                            </Card>
-
-                            <Card>
-                                <CardHeader>
-                                    <CardTitle className="flex items-center gap-2 text-lg">
-                                        <MapPin className="size-5 text-primary" />
-                                        Dirección
-                                    </CardTitle>
-                                </CardHeader>
-                                <CardContent className="space-y-3">
-                                    <div>
-                                        <dt className="text-sm text-muted-foreground">Calle</dt>
-                                        <dd className="mt-1">
-                                            {customer.street}
-                                            {customer.street2 && (<><br />{customer.street2}</>)}
-                                        </dd>
-                                    </div>
-                                    <div className="grid grid-cols-2 gap-4">
-                                        <div>
-                                            <dt className="text-sm text-muted-foreground">Ciudad</dt>
-                                            <dd className="mt-1">{customer.city}</dd>
-                                        </div>
-                                        <div>
-                                            <dt className="text-sm text-muted-foreground">Código Postal</dt>
-                                            <dd className="mt-1">{customer.postal_code}</dd>
-                                        </div>
-                                    </div>
-                                    <div className="grid grid-cols-2 gap-4">
-                                        <div>
-                                            <dt className="text-sm text-muted-foreground">Provincia</dt>
-                                            <dd className="mt-1">{customer.province}</dd>
-                                        </div>
-                                        <div>
-                                            <dt className="text-sm text-muted-foreground">País</dt>
-                                            <dd className="mt-1">{customer.country}</dd>
-                                        </div>
-                                    </div>
-                                </CardContent>
-                            </Card>
-
-                            <Card className="md:col-span-2">
-                                <CardHeader>
-                                    <CardTitle className="flex items-center gap-2 text-lg">
-                                        <Mail className="size-5 text-primary" />
-                                        Contacto y Preferencias
-                                    </CardTitle>
-                                </CardHeader>
-                                <CardContent className="grid gap-6 md:grid-cols-2">
-                                    <div className="space-y-3">
-                                        {customer.email_primary && (
-                                            <div className="flex items-start gap-3">
-                                                <Mail className="mt-0.5 size-4 text-muted-foreground" />
-                                                <div className="flex-1">
-                                                    <dt className="text-sm text-muted-foreground">Email</dt>
-                                                    <dd className="mt-1">{customer.email_primary}</dd>
-                                                </div>
-                                            </div>
-                                        )}
-                                        {customer.mobile_primary && (
-                                            <div className="flex items-start gap-3">
-                                                <Smartphone className="mt-0.5 size-4 text-muted-foreground" />
-                                                <div className="flex-1">
-                                                    <dt className="text-sm text-muted-foreground">Móvil</dt>
-                                                    <dd className="mt-1">{customer.mobile_primary}</dd>
-                                                </div>
-                                            </div>
-                                        )}
-                                        {customer.phone_primary && (
-                                            <div className="flex items-start gap-3">
-                                                <Phone className="mt-0.5 size-4 text-muted-foreground" />
-                                                <div className="flex-1">
-                                                    <dt className="text-sm text-muted-foreground">Teléfono</dt>
-                                                    <dd className="mt-1">{customer.phone_primary}</dd>
-                                                </div>
-                                            </div>
-                                        )}
-                                    </div>
-
-                                    <div className="space-y-3">
-                                        <div className="flex items-start gap-3">
-                                            <Languages className="mt-0.5 size-4 text-muted-foreground" />
-                                            <div className="flex-1">
-                                                <dt className="text-sm text-muted-foreground">Idioma</dt>
-                                                <dd className="mt-1">{customer.language_code}</dd>
-                                            </div>
-                                        </div>
-                                        <div className="flex items-start gap-3">
-                                            <Banknote className="mt-0.5 size-4 text-muted-foreground" />
-                                            <div className="flex-1">
-                                                <dt className="text-sm text-muted-foreground">Moneda</dt>
-                                                <dd className="mt-1">{customer.currency_code}</dd>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </CardContent>
-                            </Card>
-                        </div>
-                    )}
-                </div>
-            </DialogContent>
-        </Dialog>
-    );
+  customerId: string | null;
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+};
+
+export const CustomerViewDialog = ({ customerId, open, onOpenChange }: CustomerViewDialogProps) => {
+  const {
+    data: customer,
+    isLoading,
+    isError,
+    error,
+  } = useCustomerQuery(customerId ?? "", { enabled: open && !!customerId });
+
+  return (
+    <Dialog onOpenChange={onOpenChange} open={open}>
+      <DialogContent className="sm:max-w-3xl bg-card border-border p-0">
+        <DialogHeader className="px-6 pt-6">
+          <DialogTitle className="flex items-center justify-between" id="customer-view-title">
+            <span className="text-balance">
+              {customer?.name ?? "Cliente"}
+              {customer?.trade_name && (
+                <span className="ml-2 text-muted-foreground">({customer.trade_name})</span>
+              )}
+            </span>
+            <Button
+              aria-label="Cerrar"
+              className="cursor-pointer"
+              onClick={() => onOpenChange(false)}
+              size="icon"
+              type="button"
+              variant="ghost"
+            >
+              <X className="size-4" />
+            </Button>
+          </DialogTitle>
+          <DialogDescription className="px-0">
+            {customer?.tin ? (
+              <Badge className="ml-0 font-mono" variant="secondary">
+                {customer.tin}
+              </Badge>
+            ) : (
+              <span className="text-muted-foreground">Ficha del cliente</span>
+            )}
+          </DialogDescription>
+        </DialogHeader>
+
+        <div className="px-6 pb-6">
+          {isLoading && (
+            <p aria-live="polite" role="status">
+              Cargando…
+            </p>
+          )}
+          {isError && (
+            <p className="text-destructive" role="alert">
+              {(error as Error)?.message ?? "No se pudo cargar el cliente"}
+            </p>
+          )}
+
+          {!(isLoading || isError) && customer && (
+            <div className="grid gap-6 md:grid-cols-2 max-h-[70vh] overflow-y-auto pr-1">
+              <Card>
+                <CardHeader>
+                  <CardTitle className="flex items-center gap-2 text-lg">
+                    <FileText className="size-5 text-primary" />
+                    Información Básica
+                  </CardTitle>
+                </CardHeader>
+                <CardContent className="space-y-3">
+                  <div>
+                    <dt className="text-sm text-muted-foreground">Nombre</dt>
+                    <dd className="mt-1">{customer.name}</dd>
+                  </div>
+                  {customer.reference && (
+                    <div>
+                      <dt className="text-sm text-muted-foreground">Referencia</dt>
+                      <dd className="mt-1 font-mono">{customer.reference}</dd>
+                    </div>
+                  )}
+                  {customer.legal_record && (
+                    <div>
+                      <dt className="text-sm text-muted-foreground">Registro Legal</dt>
+                      <dd className="mt-1">{customer.legal_record}</dd>
+                    </div>
+                  )}
+                  {!!customer.default_taxes?.length && (
+                    <div>
+                      <dt className="text-sm text-muted-foreground">Impuestos por defecto</dt>
+                      <dd className="mt-1 flex flex-wrap gap-1">
+                        {customer.default_taxes.map((tax: string) => (
+                          <Badge key={tax} variant="secondary">
+                            {tax}
+                          </Badge>
+                        ))}
+                      </dd>
+                    </div>
+                  )}
+                </CardContent>
+              </Card>
+
+              <Card>
+                <CardHeader>
+                  <CardTitle className="flex items-center gap-2 text-lg">
+                    <MapPin className="size-5 text-primary" />
+                    Dirección
+                  </CardTitle>
+                </CardHeader>
+                <CardContent className="space-y-3">
+                  <div>
+                    <dt className="text-sm text-muted-foreground">Calle</dt>
+                    <dd className="mt-1">
+                      {customer.street}
+                      {customer.street2 && (
+                        <>
+                          <br />
+                          {customer.street2}
+                        </>
+                      )}
+                    </dd>
+                  </div>
+                  <div className="grid grid-cols-2 gap-4">
+                    <div>
+                      <dt className="text-sm text-muted-foreground">Ciudad</dt>
+                      <dd className="mt-1">{customer.city}</dd>
+                    </div>
+                    <div>
+                      <dt className="text-sm text-muted-foreground">Código Postal</dt>
+                      <dd className="mt-1">{customer.postal_code}</dd>
+                    </div>
+                  </div>
+                  <div className="grid grid-cols-2 gap-4">
+                    <div>
+                      <dt className="text-sm text-muted-foreground">Provincia</dt>
+                      <dd className="mt-1">{customer.province}</dd>
+                    </div>
+                    <div>
+                      <dt className="text-sm text-muted-foreground">País</dt>
+                      <dd className="mt-1">{customer.country}</dd>
+                    </div>
+                  </div>
+                </CardContent>
+              </Card>
+
+              <Card className="md:col-span-2">
+                <CardHeader>
+                  <CardTitle className="flex items-center gap-2 text-lg">
+                    <Mail className="size-5 text-primary" />
+                    Contacto y Preferencias
+                  </CardTitle>
+                </CardHeader>
+                <CardContent className="grid gap-6 md:grid-cols-2">
+                  <div className="space-y-3">
+                    {customer.email_primary && (
+                      <div className="flex items-start gap-3">
+                        <Mail className="mt-0.5 size-4 text-muted-foreground" />
+                        <div className="flex-1">
+                          <dt className="text-sm text-muted-foreground">Email</dt>
+                          <dd className="mt-1">{customer.email_primary}</dd>
+                        </div>
+                      </div>
+                    )}
+                    {customer.mobile_primary && (
+                      <div className="flex items-start gap-3">
+                        <Smartphone className="mt-0.5 size-4 text-muted-foreground" />
+                        <div className="flex-1">
+                          <dt className="text-sm text-muted-foreground">Móvil</dt>
+                          <dd className="mt-1">{customer.mobile_primary}</dd>
+                        </div>
+                      </div>
+                    )}
+                    {customer.phone_primary && (
+                      <div className="flex items-start gap-3">
+                        <Phone className="mt-0.5 size-4 text-muted-foreground" />
+                        <div className="flex-1">
+                          <dt className="text-sm text-muted-foreground">Teléfono</dt>
+                          <dd className="mt-1">{customer.phone_primary}</dd>
+                        </div>
+                      </div>
+                    )}
+                  </div>
+
+                  <div className="space-y-3">
+                    <div className="flex items-start gap-3">
+                      <Languages className="mt-0.5 size-4 text-muted-foreground" />
+                      <div className="flex-1">
+                        <dt className="text-sm text-muted-foreground">Idioma</dt>
+                        <dd className="mt-1">{customer.language_code}</dd>
+                      </div>
+                    </div>
+                    <div className="flex items-start gap-3">
+                      <Banknote className="mt-0.5 size-4 text-muted-foreground" />
+                      <div className="flex-1">
+                        <dt className="text-sm text-muted-foreground">Moneda</dt>
+                        <dd className="mt-1">{customer.currency_code}</dd>
+                      </div>
+                    </div>
+                  </div>
+                </CardContent>
+              </Card>
+            </div>
+          )}
+        </div>
+      </DialogContent>
+    </Dialog>
+  );
 };
diff --git a/modules/customers/src/web/components/customers-layout.tsx b/modules/customers/src/web/components/customers-layout.tsx
deleted file mode 100644
index 77d9a81c..00000000
--- a/modules/customers/src/web/components/customers-layout.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { PropsWithChildren } from "react";
-
-import { CustomersProvider } from "../context";
-
-export const CustomersLayout = ({ children }: PropsWithChildren) => {
-  return <CustomersProvider>{children}</CustomersProvider>;
-};
diff --git a/modules/customers/src/web/components/editor/customer-additional-config-fields.tsx b/modules/customers/src/web/components/editor/customer-additional-config-fields.tsx
index a9a5b5d9..a9b6a533 100644
--- a/modules/customers/src/web/components/editor/customer-additional-config-fields.tsx
+++ b/modules/customers/src/web/components/editor/customer-additional-config-fields.tsx
@@ -1,18 +1,24 @@
-import { Field, FieldDescription, FieldGroup, FieldLegend, FieldSet } from '@repo/shadcn-ui/components';
-
 import { SelectField } from "@repo/rdx-ui/components";
+import {
+  Field,
+  FieldDescription,
+  FieldGroup,
+  FieldLegend,
+  FieldSet,
+} from "@repo/shadcn-ui/components";
 import { useFormContext } from "react-hook-form";
+
 import { CURRENCY_OPTIONS, LANGUAGE_OPTIONS } from "../../constants";
 import { useTranslation } from "../../i18n";
-import { CustomerFormData } from "../../schemas";
+import type { CustomerFormData } from "../../schemas";
 
 interface CustomerAdditionalConfigFieldsProps {
   className?: string;
 }
 
-
 export const CustomerAdditionalConfigFields = ({
-  className, ...props
+  className,
+  ...props
 }: CustomerAdditionalConfigFieldsProps) => {
   const { t } = useTranslation();
   const { control } = useFormContext<CustomerFormData>();
@@ -21,28 +27,28 @@ export const CustomerAdditionalConfigFields = ({
     <FieldSet className={className} {...props}>
       <FieldLegend>{t("form_groups.preferences.title")}</FieldLegend>
       <FieldDescription>{t("form_groups.preferences.description")}</FieldDescription>
-      <FieldGroup className='grid grid-cols-1 gap-x-6 lg:grid-cols-4'>
-        <Field className='lg:col-span-2'>
+      <FieldGroup className="grid grid-cols-1 gap-x-6 lg:grid-cols-4">
+        <Field className="lg:col-span-2">
           <SelectField
             control={control}
-            name='language_code'
-            required
-            label={t("form_fields.language_code.label")}
-            placeholder={t("form_fields.language_code.placeholder")}
             description={t("form_fields.language_code.description")}
             items={[...LANGUAGE_OPTIONS]}
+            label={t("form_fields.language_code.label")}
+            name="language_code"
+            placeholder={t("form_fields.language_code.placeholder")}
+            required
           />
         </Field>
-        <Field className='lg:col-span-2'>
+        <Field className="lg:col-span-2">
           <SelectField
-            className='lg:col-span-2'
+            className="lg:col-span-2"
             control={control}
-            name='currency_code'
-            required
-            label={t("form_fields.currency_code.label")}
-            placeholder={t("form_fields.currency_code.placeholder")}
             description={t("form_fields.currency_code.description")}
             items={[...CURRENCY_OPTIONS]}
+            label={t("form_fields.currency_code.label")}
+            name="currency_code"
+            placeholder={t("form_fields.currency_code.placeholder")}
+            required
           />
         </Field>
       </FieldGroup>
diff --git a/modules/customers/src/web/components/editor/customer-address-fields.tsx b/modules/customers/src/web/components/editor/customer-address-fields.tsx
index 8be4d7c3..2d9a5a7f 100644
--- a/modules/customers/src/web/components/editor/customer-address-fields.tsx
+++ b/modules/customers/src/web/components/editor/customer-address-fields.tsx
@@ -1,12 +1,16 @@
+import { SelectField, TextField } from "@repo/rdx-ui/components";
 import {
-  SelectField,
-  TextField
-} from "@repo/rdx-ui/components";
-import { Field, FieldDescription, FieldGroup, FieldLegend, FieldSet } from '@repo/shadcn-ui/components';
+  Field,
+  FieldDescription,
+  FieldGroup,
+  FieldLegend,
+  FieldSet,
+} from "@repo/shadcn-ui/components";
 import { useFormContext } from "react-hook-form";
+
 import { COUNTRY_OPTIONS } from "../../constants";
 import { useTranslation } from "../../i18n";
-import { CustomerFormData } from "../../schemas";
+import type { CustomerFormData } from "../../schemas";
 
 interface CustomerAddressFieldsProps {
   className?: string;
@@ -20,58 +24,58 @@ export const CustomerAddressFields = ({ className, ...props }: CustomerAddressFi
     <FieldSet className={className} {...props}>
       <FieldLegend>{t("form_groups.address.title")}</FieldLegend>
       <FieldDescription>{t("form_groups.address.description")}</FieldDescription>
-      <FieldGroup className='grid grid-cols-1 gap-x-6 lg:grid-cols-4'>
+      <FieldGroup className="grid grid-cols-1 gap-x-6 lg:grid-cols-4">
         <TextField
-          className='lg:col-span-2'
+          className="lg:col-span-2"
           control={control}
-          name='street'
-          label={t("form_fields.street.label")}
-          placeholder={t("form_fields.street.placeholder")}
           description={t("form_fields.street.description")}
+          label={t("form_fields.street.label")}
+          name="street"
+          placeholder={t("form_fields.street.placeholder")}
         />
         <TextField
-          className='lg:col-span-2'
+          className="lg:col-span-2"
           control={control}
-          name='street2'
-          label={t("form_fields.street2.label")}
-          placeholder={t("form_fields.street2.placeholder")}
           description={t("form_fields.street2.description")}
+          label={t("form_fields.street2.label")}
+          name="street2"
+          placeholder={t("form_fields.street2.placeholder")}
         />
 
         <TextField
-          className='lg:col-span-2'
+          className="lg:col-span-2"
           control={control}
-          name='city'
-          label={t("form_fields.city.label")}
-          placeholder={t("form_fields.city.placeholder")}
           description={t("form_fields.city.description")}
+          label={t("form_fields.city.label")}
+          name="city"
+          placeholder={t("form_fields.city.placeholder")}
         />
         <TextField
           control={control}
-          name='postal_code'
-          label={t("form_fields.postal_code.label")}
-          placeholder={t("form_fields.postal_code.placeholder")}
           description={t("form_fields.postal_code.description")}
+          label={t("form_fields.postal_code.label")}
+          name="postal_code"
+          placeholder={t("form_fields.postal_code.placeholder")}
         />
 
-        <Field className='lg:col-span-2 lg:col-start-1'>
+        <Field className="lg:col-span-2 lg:col-start-1">
           <TextField
             control={control}
-            name='province'
-            label={t("form_fields.province.label")}
-            placeholder={t("form_fields.province.placeholder")}
             description={t("form_fields.province.description")}
+            label={t("form_fields.province.label")}
+            name="province"
+            placeholder={t("form_fields.province.placeholder")}
           />
         </Field>
-        <Field className='lg:col-span-2'>
+        <Field className="lg:col-span-2">
           <SelectField
             control={control}
-            name='country'
-            required
-            label={t("form_fields.country.label")}
-            placeholder={t("form_fields.country.placeholder")}
             description={t("form_fields.country.description")}
             items={[...COUNTRY_OPTIONS]}
+            label={t("form_fields.country.label")}
+            name="country"
+            placeholder={t("form_fields.country.placeholder")}
+            required
           />
         </Field>
       </FieldGroup>
diff --git a/modules/customers/src/web/components/editor/customer-editor-skeleton.tsx b/modules/customers/src/web/components/editor/customer-editor-skeleton.tsx
index 872650b0..2c9df64f 100644
--- a/modules/customers/src/web/components/editor/customer-editor-skeleton.tsx
+++ b/modules/customers/src/web/components/editor/customer-editor-skeleton.tsx
@@ -1,6 +1,7 @@
 // components/CustomerSkeleton.tsx
 import { AppContent, BackHistoryButton } from "@repo/rdx-ui/components";
 import { Button } from "@repo/shadcn-ui/components";
+
 import { useTranslation } from "../../i18n";
 
 export const CustomerEditorSkeleton = () => {
@@ -8,24 +9,24 @@ export const CustomerEditorSkeleton = () => {
   return (
     <>
       <AppContent>
-        <div className='flex items-center justify-between'>
-          <div className='space-y-2' aria-hidden='true'>
-            <div className='h-7 w-64 rounded-md bg-muted animate-pulse' />
-            <div className='h-5 w-96 rounded-md bg-muted animate-pulse' />
+        <div className="flex items-center justify-between">
+          <div aria-hidden="true" className="space-y-2">
+            <div className="h-7 w-64 rounded-md bg-muted animate-pulse" />
+            <div className="h-5 w-96 rounded-md bg-muted animate-pulse" />
           </div>
-          <div className='flex items-center gap-2'>
+          <div className="flex items-center gap-2">
             <BackHistoryButton />
-            <Button disabled aria-busy>
+            <Button aria-busy disabled>
               {t("pages.update.submit")}
             </Button>
           </div>
         </div>
-        <div className='mt-6 grid gap-4' aria-hidden='true'>
-          <div className='h-10 w-full rounded-md bg-muted animate-pulse' />
-          <div className='h-10 w-full rounded-md bg-muted animate-pulse' />
-          <div className='h-28 w-full rounded-md bg-muted animate-pulse' />
+        <div aria-hidden="true" className="mt-6 grid gap-4">
+          <div className="h-10 w-full rounded-md bg-muted animate-pulse" />
+          <div className="h-10 w-full rounded-md bg-muted animate-pulse" />
+          <div className="h-28 w-full rounded-md bg-muted animate-pulse" />
         </div>
-        <span className='sr-only'>{t("pages.update.loading", "Cargando cliente...")}</span>
+        <span className="sr-only">{t("pages.update.loading", "Cargando cliente...")}</span>
       </AppContent>
     </>
   );
diff --git a/modules/customers/src/web/components/index.ts b/modules/customers/src/web/components/index.ts
index dae680dc..f4cec8d0 100644
--- a/modules/customers/src/web/components/index.ts
+++ b/modules/customers/src/web/components/index.ts
@@ -1,7 +1,5 @@
 export * from "./client-selector-modal";
 export * from "./customer-modal-selector";
-export * from "./customer-status-badge";
-export * from "./customers-layout";
 export * from "./editor";
 export * from "./error-alert";
 export * from "./not-found-card";
diff --git a/modules/customers/src/web/customer-routes.tsx b/modules/customers/src/web/customer-routes.tsx
index 9317c1d3..0048d7c5 100644
--- a/modules/customers/src/web/customer-routes.tsx
+++ b/modules/customers/src/web/customer-routes.tsx
@@ -3,31 +3,29 @@ import { lazy } from "react";
 import { Outlet, type RouteObject } from "react-router-dom";
 
 // Lazy load components
-const CustomersLayout = lazy(() =>
-  import("./components").then((m) => ({ default: m.CustomersLayout }))
-);
+const CustomerLayout = lazy(() => import("./ui").then((m) => ({ default: m.CustomerLayout })));
+const CustomersList = lazy(() => import("./list").then((m) => ({ default: m.CustomerListPage })));
 
-const CustomersList = lazy(() => import("./pages").then((m) => ({ default: m.CustomersListPage })));
-const CustomerView = lazy(() => import("./pages").then((m) => ({ default: m.CustomerViewPage })));
-const CustomerAdd = lazy(() => import("./pages").then((m) => ({ default: m.CustomerCreatePage })));
-const CustomerUpdate = lazy(() =>
+//const CustomerView = lazy(() => import("./pages").then((m) => ({ default: m.CustomerViewPage })));
+//const CustomerAdd = lazy(() => import("./pages").then((m) => ({ default: m.CustomerCreatePage })));
+/*const CustomerUpdate = lazy(() =>
   import("./pages").then((m) => ({ default: m.CustomerUpdatePage }))
-);
+);*/
 
 export const CustomerRoutes = (params: ModuleClientParams): RouteObject[] => {
   return [
     {
       path: "customers",
       element: (
-        <CustomersLayout>
+        <CustomerLayout>
           <Outlet context={params} />
-        </CustomersLayout>
+        </CustomerLayout>
       ),
       children: [
         { path: "", index: true, element: <CustomersList /> }, // index
         { path: "list", element: <CustomersList /> },
         //{ path: "create", element: <CustomerAdd /> },
-        { path: ":id", element: <CustomerView /> },
+        //{ path: ":id", element: <CustomerView /> },
         //{ path: ":id/edit", element: <CustomerUpdate /> },
 
         //
diff --git a/modules/customers/src/web/hooks/index.ts b/modules/customers/src/web/hooks/index.ts
index 428eea26..019eb746 100644
--- a/modules/customers/src/web/hooks/index.ts
+++ b/modules/customers/src/web/hooks/index.ts
@@ -1,5 +1,4 @@
 export * from "./use-create-customer-mutation";
-export * from "./use-customer-list-query";
 export * from "./use-customer-query";
 export * from "./use-customers-context";
 export * from "./use-update-customer-mutation";
diff --git a/modules/customers/src/web/list/adapters/customer-summary-dto.adapter.ts b/modules/customers/src/web/list/adapters/customer-summary-dto.adapter.ts
new file mode 100644
index 00000000..6fe1747d
--- /dev/null
+++ b/modules/customers/src/web/list/adapters/customer-summary-dto.adapter.ts
@@ -0,0 +1,12 @@
+import type { CustomerSummaryPage, CustomerSummaryPageData } from "../../types";
+
+/**
+ * Convierte el DTO completo de API a datos numéricos para el formulario.
+ */
+export const CustomerSummaryDtoAdapter = {
+  fromDto(pageDto: CustomerSummaryPage, context?: unknown): CustomerSummaryPageData {
+    return {
+      ...pageDto,
+    };
+  },
+};
diff --git a/modules/customers/src/web/list/adapters/index.ts b/modules/customers/src/web/list/adapters/index.ts
new file mode 100644
index 00000000..96a0d900
--- /dev/null
+++ b/modules/customers/src/web/list/adapters/index.ts
@@ -0,0 +1 @@
+export * from "./customer-summary-dto.adapter";
diff --git a/modules/customers/src/web/list/api/get-customer-list.api.ts b/modules/customers/src/web/list/api/get-customer-list.api.ts
new file mode 100644
index 00000000..0f7d2540
--- /dev/null
+++ b/modules/customers/src/web/list/api/get-customer-list.api.ts
@@ -0,0 +1,18 @@
+import type { CriteriaDTO } from "@erp/core";
+import type { IDataSource } from "@erp/core/client";
+
+import type { CustomerSummaryPage } from "../../types";
+
+export async function getCustomerListApi(
+  dataSource: IDataSource,
+  signal: AbortSignal,
+  criteria: CriteriaDTO
+) {
+  const response = dataSource.getList<CustomerSummaryPage>("customers", {
+    signal,
+    ...criteria,
+  });
+
+  //return mapIssuedInvoiceList(raw);
+  return response;
+}
diff --git a/modules/customers/src/web/list/api/index.ts b/modules/customers/src/web/list/api/index.ts
new file mode 100644
index 00000000..c4929307
--- /dev/null
+++ b/modules/customers/src/web/list/api/index.ts
@@ -0,0 +1 @@
+export * from "./get-customer-list.api";
diff --git a/modules/customers/src/web/list/controllers/index.ts b/modules/customers/src/web/list/controllers/index.ts
new file mode 100644
index 00000000..ef17b46f
--- /dev/null
+++ b/modules/customers/src/web/list/controllers/index.ts
@@ -0,0 +1 @@
+export * from "./use-customer-list-page.controller";
diff --git a/modules/customers/src/web/list/controllers/use-customer-list-page.controller.ts b/modules/customers/src/web/list/controllers/use-customer-list-page.controller.ts
new file mode 100644
index 00000000..78b3c655
--- /dev/null
+++ b/modules/customers/src/web/list/controllers/use-customer-list-page.controller.ts
@@ -0,0 +1,9 @@
+import { useCustomerListController } from "./use-customer-list.controller";
+
+export function useCustomerListPageController() {
+  const listCtrl = useCustomerListController();
+
+  return {
+    listCtrl,
+  };
+}
diff --git a/modules/customers/src/web/list/controllers/use-customer-list.controller.ts b/modules/customers/src/web/list/controllers/use-customer-list.controller.ts
new file mode 100644
index 00000000..8b396cac
--- /dev/null
+++ b/modules/customers/src/web/list/controllers/use-customer-list.controller.ts
@@ -0,0 +1,43 @@
+import type { CriteriaDTO } from "@erp/core";
+import { useDebounce } from "@repo/rdx-ui/components";
+import { useMemo, useState } from "react";
+
+import { CustomerSummaryDtoAdapter } from "../adapters";
+import { useCustomerListQuery } from "../hooks";
+
+export const useCustomerListController = () => {
+  const [pageIndex, setPageIndex] = useState(0);
+  const [pageSize, setPageSize] = useState(10);
+  const [search, setSearch] = useState("");
+
+  const debouncedQ = useDebounce(search, 300);
+
+  const criteria = useMemo<CriteriaDTO>(() => {
+    return {
+      q: debouncedQ || "",
+      pageSize,
+      pageNumber: pageIndex,
+      order: "desc",
+      orderBy: "name",
+    };
+  }, [pageSize, pageIndex, debouncedQ]);
+
+  const query = useCustomerListQuery({ criteria });
+  const data = useMemo(
+    () => (query.data ? CustomerSummaryDtoAdapter.fromDto(query.data) : undefined),
+    [query.data]
+  );
+
+  const setSearchValue = (value: string) => setSearch(value.trim().replace(/\s+/g, " "));
+
+  return {
+    ...query,
+    data,
+    pageIndex,
+    pageSize,
+    search,
+    setPageIndex,
+    setPageSize,
+    setSearchValue,
+  };
+};
diff --git a/modules/customers/src/web/list/hooks/index.ts b/modules/customers/src/web/list/hooks/index.ts
new file mode 100644
index 00000000..f6a23025
--- /dev/null
+++ b/modules/customers/src/web/list/hooks/index.ts
@@ -0,0 +1 @@
+export * from "./use-customer-list-query";
diff --git a/modules/customers/src/web/hooks/use-customer-list-query.tsx b/modules/customers/src/web/list/hooks/use-customer-list-query.tsx
similarity index 60%
rename from modules/customers/src/web/hooks/use-customer-list-query.tsx
rename to modules/customers/src/web/list/hooks/use-customer-list-query.tsx
index d0972773..b880212a 100644
--- a/modules/customers/src/web/hooks/use-customer-list-query.tsx
+++ b/modules/customers/src/web/list/hooks/use-customer-list-query.tsx
@@ -1,39 +1,47 @@
-import { CriteriaDTO, normalizeCriteriaDTO } from '@erp/core';
+import type { CriteriaDTO } from "@erp/core";
 import { useDataSource } from "@erp/core/hooks";
-import { DefaultError, QueryClient, QueryKey, useQuery } from "@tanstack/react-query";
-import { CustomerSummary, CustomersPage } from '../schemas';
+import { INITIAL_PAGE_INDEX, INITIAL_PAGE_SIZE } from "@repo/rdx-criteria";
+import { type DefaultError, type QueryKey, useQuery } from "@tanstack/react-query";
 
-export const CUSTOMERS_LIST_KEY = ["customers", "list"] as const
+import type { CustomerSummaryPage } from "../../types";
+import { getCustomerListApi } from "../api";
 
-export const getCustomersListQueryKey = (criteria: CriteriaDTO) =>
-  [...CUSTOMERS_LIST_KEY, normalizeCriteriaDTO(criteria)] satisfies QueryKey;
+export const CUSTOMERS_QUERY_KEY = (criteria?: CriteriaDTO): QueryKey => [
+  "customers",
+  {
+    pageNumber: criteria?.pageNumber ?? INITIAL_PAGE_INDEX,
+    pageSize: criteria?.pageSize ?? INITIAL_PAGE_SIZE,
+    q: criteria?.q ?? "",
+    filters: criteria?.filters ?? [],
+    orderBy: criteria?.orderBy ?? "",
+    order: criteria?.order ?? "",
+  },
+];
 
-type CustomerListQueryOptions = {
+type CustomersQueryOptions = {
   enabled?: boolean;
-  criteria?: CriteriaDTO
+  criteria?: CriteriaDTO;
 };
 
-// Obtener todos los clientes
-export const useCustomerListQuery = (options?: CustomerListQueryOptions) => {
+export const useCustomerListQuery = (options?: CustomersQueryOptions) => {
   const dataSource = useDataSource();
   const enabled = options?.enabled ?? true;
   const criteria = options?.criteria ?? {};
 
-  return useQuery<CustomersPage, DefaultError>({
-    queryKey: getCustomersListQueryKey(criteria),
-    queryFn: async ({ signal }) => {
-      return await dataSource.getList<CustomersPage>("customers", { signal, ...criteria });
-    },
+  return useQuery<CustomerSummaryPage, DefaultError>({
+    queryKey: CUSTOMERS_QUERY_KEY(criteria),
+    queryFn: async ({ signal }) => getCustomerListApi(dataSource, signal, criteria),
     enabled,
-    placeholderData: (previousData, previousQuery) => previousData, // Mantener datos previos mientras se carga nueva datos (antiguo `keepPreviousData`)
+    placeholderData: (previousData, _previousQuery) => previousData, // Mantener datos previos mientras se carga nueva datos (antiguo `keepPreviousData`)
   });
 };
 
+/*
+
 export function cancelCustomerListQueries(qc: QueryClient) {
   return qc.cancelQueries({ queryKey: CUSTOMERS_LIST_KEY });
 }
 
-
 export function invalidateCustomerListCache(qc: QueryClient) {
   return qc.invalidateQueries({ queryKey: CUSTOMERS_LIST_KEY });
 }
@@ -48,7 +56,6 @@ export function getAllCustomerListQueryKeys(qc: QueryClient): QueryKey[] {
 export function upsertCustomerIntoListCaches(qc: QueryClient, customer: CustomerSummary) {
   const keys = getAllCustomerListQueryKeys(qc);
   for (const key of keys) {
-
     const page = qc.getQueryData<CustomersPage>(key);
     if (!page) continue;
 
@@ -62,7 +69,10 @@ export function upsertCustomerIntoListCaches(qc: QueryClient, customer: Customer
   }
 }
 
-export function deleteCustomerIntoListCaches(qc: QueryClient, customerId: string): {
+export function deleteCustomerIntoListCaches(
+  qc: QueryClient,
+  customerId: string
+): {
   snapshots: Array<{ key: QueryKey; page?: CustomersPage }>;
 } {
   const snapshots = getAllCustomerListQueryKeys(qc).map((key) => ({
@@ -79,4 +89,5 @@ export function deleteCustomerIntoListCaches(qc: QueryClient, customerId: string
     });
   }
   return { snapshots: snapshots as Array<{ key: QueryKey; page?: CustomersPage }> };
-}
\ No newline at end of file
+}
+*/
diff --git a/modules/customers/src/web/list/index.ts b/modules/customers/src/web/list/index.ts
new file mode 100644
index 00000000..4aedf593
--- /dev/null
+++ b/modules/customers/src/web/list/index.ts
@@ -0,0 +1 @@
+export * from "./ui";
diff --git a/modules/customers/src/web/list/ui/blocks/customers-grid/customers-grid.tsx b/modules/customers/src/web/list/ui/blocks/customers-grid/customers-grid.tsx
new file mode 100644
index 00000000..c3a12d19
--- /dev/null
+++ b/modules/customers/src/web/list/ui/blocks/customers-grid/customers-grid.tsx
@@ -0,0 +1,61 @@
+import { DataTable, SkeletonDataTable } from "@repo/rdx-ui/components";
+import type { ColumnDef } from "@tanstack/react-table";
+import { useNavigate } from "react-router-dom";
+
+import { useTranslation } from "../../../../i18n";
+import type { CustomerSummaryData, CustomerSummaryPageData } from "../../../../types";
+
+interface CustomersGridProps {
+  data: CustomerSummaryPageData;
+  loading: boolean;
+
+  columns: ColumnDef<CustomerSummaryData, unknown>[];
+
+  pageIndex: number;
+  pageSize: number;
+  onPageChange: (pageIndex: number) => void;
+  onPageSizeChange: (size: number) => void;
+
+  onRowClick?: (proformaId: string) => void;
+}
+
+export const CustomersGrid = ({
+  data,
+  loading,
+  columns,
+  pageIndex,
+  pageSize,
+  onPageChange,
+  onPageSizeChange,
+  onRowClick,
+}: CustomersGridProps) => {
+  const navigate = useNavigate();
+  const { t } = useTranslation();
+  const { items, total_items } = data;
+
+  if (loading)
+    return (
+      <SkeletonDataTable
+        columns={columns.length}
+        footerProps={{ pageIndex, pageSize, totalItems: total_items ?? 0 }}
+        rows={Math.max(6, pageSize)}
+        showFooter
+      />
+    );
+
+  return (
+    <DataTable
+      columns={columns}
+      data={items}
+      enablePagination
+      enableRowSelection
+      manualPagination
+      onPageChange={onPageChange}
+      onPageSizeChange={onPageSizeChange}
+      onRowClick={(row, _index) => onRowClick?.(row.id)}
+      pageIndex={pageIndex}
+      pageSize={pageSize}
+      totalItems={total_items}
+    />
+  );
+}    
diff --git a/modules/customers/src/web/list/ui/blocks/customers-grid/index.ts b/modules/customers/src/web/list/ui/blocks/customers-grid/index.ts
new file mode 100644
index 00000000..258849a3
--- /dev/null
+++ b/modules/customers/src/web/list/ui/blocks/customers-grid/index.ts
@@ -0,0 +1,2 @@
+export * from "./customers-grid";
+export * from "./use-customer-grid-columns";
diff --git a/modules/customers/src/web/list/ui/blocks/customers-grid/use-customer-grid-columns.tsx b/modules/customers/src/web/list/ui/blocks/customers-grid/use-customer-grid-columns.tsx
new file mode 100644
index 00000000..9fdd3c32
--- /dev/null
+++ b/modules/customers/src/web/list/ui/blocks/customers-grid/use-customer-grid-columns.tsx
@@ -0,0 +1,201 @@
+import { DataTableColumnHeader } from "@repo/rdx-ui/components";
+import {
+  Avatar,
+  AvatarFallback,
+  Button, DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuLabel,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger
+} from "@repo/shadcn-ui/components";
+import type { ColumnDef } from "@tanstack/react-table";
+import {
+  EyeIcon, MoreHorizontalIcon
+} from "lucide-react";
+import * as React from "react";
+
+import { useTranslation } from "../../../../i18n";
+import {
+  type CustomerSummaryData,
+} from "../../../../types";
+import { CustomerStatusBadge } from "../../../../ui";
+import { AddressCell, ContactCell, Initials } from "../../components";
+import { KindBadge } from "../../components/kind-badge";
+import { Soft } from "../../components/soft";
+
+type GridActionHandlers = {
+  onEditClick?: (customer: CustomerSummaryData) => void;
+  onViewClick?: (customer: CustomerSummaryData) => void;
+  onDeleteClick?: (customer: CustomerSummaryData) => void;
+};
+
+function safeHttp(url: string) {
+  if (!url) return "#";
+  if (/^https?:\/\//i.test(url)) return url;
+  return `https://${url}`;
+}
+
+export function useCustomersGridColumns(
+  actionHandlers: GridActionHandlers = {}
+): ColumnDef<CustomerSummaryData, unknown>[] {
+  const { t } = useTranslation();
+
+  return React.useMemo<ColumnDef<CustomerSummaryData, unknown>[]>(
+    () => [
+      /*{
+        id: "select",
+        header: ({ table }) => (
+          <Checkbox
+            aria-label="Seleccionar todo"
+            checked={
+              table.getIsAllPageRowsSelected() ||
+              (table.getIsSomePageRowsSelected() && "indeterminate")
+            }
+            onCheckedChange={(value) => table.toggleAllPageRowsSelected(!!value)}
+          />
+        ),
+        cell: ({ row }) => (
+          <Checkbox
+            aria-label="Seleccionar fila"
+            checked={row.getIsSelected()}
+            onCheckedChange={(value) => row.toggleSelected(!!value)}
+          />
+        ),
+        enableSorting: false,
+        enableHiding: false,
+      },*/
+
+      // Identidad + estado + metadatos (columna compuesta)
+      {
+        id: "customer",
+        header: ({ column }) => (
+          <DataTableColumnHeader
+            className="text-left"
+            column={column}
+            title={t("pages.list.grid_columns.customer")}
+          />
+        ),
+        accessorFn: (row) => row.name, // para ordenar/buscar por nombre
+        enableHiding: false,
+        size: 140,
+        minSize: 120,
+        cell: ({ row }) => {
+          const customer = row.original;
+          const isCompany = String(customer.is_company).toLowerCase() === "true";
+          return (
+            <div className="flex items-start gap-1 my-1.5">
+              <Avatar className="size-10 hidden">
+                <AvatarFallback aria-label={customer.name}><Initials name={customer.name} /></AvatarFallback>
+              </Avatar>
+              <div className="min-w-0 grid gap-1">
+                <div className="flex flex-wrap items-center gap-2">
+                  <CustomerStatusBadge status={customer.status} />{" "}
+                  <span className="font-medium truncate text-primary">{customer.name}</span>
+                  {customer.trade_name && <Soft>({customer.trade_name})</Soft>}
+                </div>
+                <div className="flex flex-wrap items-center gap-2">
+                  {customer.tin && <span className="font-base truncate">{customer.tin}</span>}
+                  <KindBadge isCompany={isCompany} />
+                </div>
+              </div>
+            </div>
+          );
+        },
+      },
+
+      // Contacto (emails, teléfonos, web)
+            {
+              id: "contact",
+              header: ({ column }) => (
+                <DataTableColumnHeader
+                  className="text-left"
+                  column={column}
+                  title={t("pages.list.grid_columns.contact")}
+                />
+              ),
+              accessorFn: (r) => `${r.email_primary} ${r.phone_primary} ${r.mobile_primary} ${r.website}`,
+              size: 140,
+              minSize: 120,
+              cell: ({ row }) => <ContactCell customer={row.original} />,
+            },
+
+    // Dirección (múltiples campos en bloque)
+      {
+        id: "address",
+        header: t("pages.list.grid_columns.address"),
+        accessorFn: (r) =>
+          `${r.street} ${r.street2} ${r.city} ${r.postal_code} ${r.province} ${r.country}`,
+        size: 140,
+        minSize: 120,
+        cell: ({ row }) => <AddressCell customer={row.original} />,
+      },
+
+      {
+        id: "actions",
+        header: ({ column }) => (
+          <DataTableColumnHeader
+            className="text-right"
+            column={column}
+            title={t("pages.list.grid_columns.actions")}
+          />
+        ),
+        size: 64,
+        minSize: 64,
+        enableSorting: false,
+        enableHiding: false,
+        cell: ({ row }) => {
+          const customer = row.original;
+          const { website, email_primary } = customer;
+          return (
+            <div className="flex justify-end">
+              <div className="flex items-center gap-1">
+                <Button
+                  aria-label="Ver cliente"
+                  onClick={() => actionHandlers.onViewClick?.(customer)}
+                  size="icon"
+                  variant="ghost"
+                >
+                  <EyeIcon className="size-4" />
+                </Button>
+
+                  {0 === false && (
+                  <DropdownMenu>
+                    <DropdownMenuTrigger asChild>
+                      <Button aria-label="More actions" size="icon" variant="ghost">
+                        <MoreHorizontalIcon className="size-4" />
+                      </Button>
+                    </DropdownMenuTrigger>
+                    <DropdownMenuContent align="end">
+                      <DropdownMenuLabel>Actions</DropdownMenuLabel>
+                      <DropdownMenuSeparator />
+                      <DropdownMenuItem onClick={() => actionHandlers.onViewClick?.(customer)}>Open</DropdownMenuItem>
+                      <DropdownMenuItem onClick={() => actionHandlers.onEditClick?.(customer)}>Edit</DropdownMenuItem>
+                      <DropdownMenuSeparator />
+                      <DropdownMenuItem onClick={() => window.open(safeHttp(website), "_blank")}>
+                        Visit website
+                      </DropdownMenuItem>
+                      <DropdownMenuItem
+                        onClick={() => navigator.clipboard.writeText(email_primary)}
+                      >
+                        Copy email
+                      </DropdownMenuItem>
+                      <DropdownMenuSeparator />
+                      <DropdownMenuItem
+                        className="text-destructive"
+                        onClick={() => actionHandlers.onDeleteClick?.(customer)}
+                      >
+                        Delete
+                      </DropdownMenuItem>
+                    </DropdownMenuContent>
+                  </DropdownMenu>
+                )}                
+              </div>
+            </div>
+          );
+        },
+      },
+    ],
+    [t, actionHandlers]
+  );
+}
diff --git a/modules/customers/src/web/list/ui/blocks/index.ts b/modules/customers/src/web/list/ui/blocks/index.ts
new file mode 100644
index 00000000..23fe20b5
--- /dev/null
+++ b/modules/customers/src/web/list/ui/blocks/index.ts
@@ -0,0 +1 @@
+export * from "./customers-grid";
diff --git a/modules/customers/src/web/list/ui/components/address-cell.tsx b/modules/customers/src/web/list/ui/components/address-cell.tsx
new file mode 100644
index 00000000..8e713f17
--- /dev/null
+++ b/modules/customers/src/web/list/ui/components/address-cell.tsx
@@ -0,0 +1,18 @@
+import {
+  type CustomerSummaryData,
+} from "../../../types";
+
+import { Soft } from './soft';
+
+
+export const AddressCell = ({ customer }: { customer: CustomerSummaryData; }) => {
+  const line1 = [customer.street, customer.street2].filter(Boolean).join(", ");
+  const line2 = [customer.postal_code, customer.city].filter(Boolean).join(" ");
+  const line3 = [customer.province, customer.country].filter(Boolean).join(", ");
+  return (
+    <address className="not-italic grid gap-1 text-foreground  text-sm">
+      <div>{line1 || <Soft>-</Soft>}</div>
+      <div>{[line2, line3].filter(Boolean).join(" • ")}</div>
+    </address>
+  );
+};
diff --git a/modules/customers/src/web/list/ui/components/contact-cell.tsx b/modules/customers/src/web/list/ui/components/contact-cell.tsx
new file mode 100644
index 00000000..3c719a70
--- /dev/null
+++ b/modules/customers/src/web/list/ui/components/contact-cell.tsx
@@ -0,0 +1,35 @@
+import { MailIcon, PhoneIcon } from 'lucide-react';
+import { Soft } from './soft';
+import {
+    type CustomerSummaryData,
+} from "../../../types";
+
+
+export const ContactCell = ({ customer }: { customer: CustomerSummaryData }) => (
+  <div className="grid gap-1 text-foreground text-sm my-1.5">
+    {customer.email_primary && (
+      <div className="flex items-center gap-2">
+        <MailIcon className="size-3.5" />
+        <a className="group" href={`mailto:${customer.email_primary}`}>
+          {customer.email_primary}
+        </a>
+      </div>
+    )}
+
+    {customer.email_secondary && (
+      <div className="flex items-center gap-2">
+        <MailIcon className="size-3.5" />
+        {customer.email_secondary}
+      </div>
+    )}
+
+    <div className="flex flex-wrap items-center gap-2">
+      <PhoneIcon className="size-3.5 group" />
+      <span>{customer.phone_primary || customer.mobile_primary || <Soft>-</Soft>}</span>
+      {customer.phone_secondary && <Soft>• {customer.phone_secondary}</Soft>}
+      {customer.mobile_secondary && <Soft>• {customer.mobile_secondary}</Soft>}
+      {false}
+    </div>
+    {false}
+  </div>
+);
\ No newline at end of file
diff --git a/modules/customers/src/web/list/ui/components/index.ts b/modules/customers/src/web/list/ui/components/index.ts
new file mode 100644
index 00000000..6c4ba4bb
--- /dev/null
+++ b/modules/customers/src/web/list/ui/components/index.ts
@@ -0,0 +1,5 @@
+export * from "./initials";
+export * from "./kind-badge";
+export * from "./soft";
+export * from "./contact-cell";
+export * from "./address-cell";
\ No newline at end of file
diff --git a/modules/customers/src/web/list/ui/components/initials.tsx b/modules/customers/src/web/list/ui/components/initials.tsx
new file mode 100644
index 00000000..87b187ca
--- /dev/null
+++ b/modules/customers/src/web/list/ui/components/initials.tsx
@@ -0,0 +1,4 @@
+export const Initials = ({ name }: { name: string }) => {
+  const parts = name.trim().split(/\s+/).slice(0, 2);
+  return <> {parts.map((p) => p[0]?.toUpperCase() ?? "").join("") || "?"} </>;
+};
diff --git a/modules/customers/src/web/list/ui/components/kind-badge.tsx b/modules/customers/src/web/list/ui/components/kind-badge.tsx
new file mode 100644
index 00000000..b0631b4e
--- /dev/null
+++ b/modules/customers/src/web/list/ui/components/kind-badge.tsx
@@ -0,0 +1,9 @@
+import { Badge } from "@repo/shadcn-ui/components";
+import { Building2Icon, User2Icon } from "lucide-react";
+
+export const KindBadge = ({ isCompany }: { isCompany: boolean }) => (
+  <Badge className="gap-1 tracking-wide text-xs text-foreground/70" variant="outline">
+    {isCompany ? <Building2Icon className="size-3.5" /> : <User2Icon className="size-3.5" />}
+    {isCompany ? "Company" : "Person"}
+  </Badge>
+);
diff --git a/modules/customers/src/web/list/ui/components/soft.tsx b/modules/customers/src/web/list/ui/components/soft.tsx
new file mode 100644
index 00000000..7e163f22
--- /dev/null
+++ b/modules/customers/src/web/list/ui/components/soft.tsx
@@ -0,0 +1,5 @@
+import type * as React from "react";
+
+export const Soft = ({ children }: { children: React.ReactNode }) => (
+  <span className="text-muted-foreground">{children}</span>
+);
diff --git a/modules/customers/src/web/list/ui/index.ts b/modules/customers/src/web/list/ui/index.ts
new file mode 100644
index 00000000..fc823583
--- /dev/null
+++ b/modules/customers/src/web/list/ui/index.ts
@@ -0,0 +1,3 @@
+//export * from "./blocks";
+//export * from "./components";
+export * from "./pages";
diff --git a/modules/customers/src/web/list/ui/pages/customer-list-page.tsx b/modules/customers/src/web/list/ui/pages/customer-list-page.tsx
new file mode 100644
index 00000000..ae364c5e
--- /dev/null
+++ b/modules/customers/src/web/list/ui/pages/customer-list-page.tsx
@@ -0,0 +1,73 @@
+import { useNavigate } from "react-router-dom";
+
+import { useTranslation } from "../../../i18n";
+import { useCustomerListPageController } from '../../controllers';
+import { useCustomersGridColumns } from '../blocks';
+import { AppContent, BackHistoryButton } from '@repo/rdx-ui/components';
+import { ErrorAlert } from '../../../ui';
+
+export const CustomerListPage = () => {
+  const { t } = useTranslation();
+  const navigate = useNavigate();
+
+  const { listCtrl } = useCustomerListPageController();
+
+  const columns = useCustomersGridColumns({});
+
+
+
+  if (listCtrl.isError || !listCtrl.data) {
+    return (
+      <AppContent>
+        <ErrorAlert
+          message={(listCtrl.error as Error)?.message || "Error al cargar el listado"}
+          title={t("pages.customers.list.loadErrorTitle")}
+        />
+        <BackHistoryButton />
+      </AppContent>
+    );
+    }
+
+  return <h1>gika</h1>;
+/*
+  return (
+    <>
+      <AppHeader>
+        <PageHeader
+          description={t("pages.customers.list.description")}
+          rightSlot={
+            <Button
+              aria-label={t("pages.customers.create.title")}
+              onClick={() => navigate("/customers/create")}
+            >
+              <PlusIcon aria-hidden className="mr-2 size-4" />
+              {t("pages.customers.create.title")}
+            </Button>
+          }
+          title={t("pages.customers.list.title")}
+        />
+      </AppHeader>
+      <AppContent>
+        <div className="flex items-center justify-between gap-16">
+          <SimpleSearchInput
+            loading={listCtrl.isLoading}
+            onSearchChange={listCtrl.setSearchValue}
+          />
+        </div>
+
+        <CustomersGrid
+          columns={columns}
+          data={listCtrl.data}
+          loading={listCtrl.isLoading}
+          onPageChange={listCtrl.setPageIndex}
+          onPageSizeChange={listCtrl.setPageSize}
+          // acciones rápidas del grid → page controller
+          //onRowClick={(id) => navigate(`/proformas/${id}`)}
+          pageIndex={listCtrl.pageIndex}
+          pageSize={listCtrl.pageSize}
+        />
+      </AppContent>
+    </>
+  );*/
+};
+
diff --git a/modules/customers/src/web/list/ui/pages/index.ts b/modules/customers/src/web/list/ui/pages/index.ts
new file mode 100644
index 00000000..28615bd9
--- /dev/null
+++ b/modules/customers/src/web/list/ui/pages/index.ts
@@ -0,0 +1 @@
+export * from "./customer-list-page";
diff --git a/modules/customers/src/web/pages/create/customer-create-page.tsx b/modules/customers/src/web/pages/create/customer-create-page.tsx
index 889d7c3f..2e428942 100644
--- a/modules/customers/src/web/pages/create/customer-create-page.tsx
+++ b/modules/customers/src/web/pages/create/customer-create-page.tsx
@@ -1,72 +1,79 @@
+import { PageHeader } from "@erp/core/components";
+import { UnsavedChangesProvider, UpdateCommitButtonGroup } from "@erp/core/hooks";
 import { AppContent, AppHeader } from "@repo/rdx-ui/components";
 import { useNavigate } from "react-router-dom";
 
-import { PageHeader } from '@erp/core/components';
-import { UnsavedChangesProvider, UpdateCommitButtonGroup } from "@erp/core/hooks";
 import { CustomerEditForm, ErrorAlert } from "../../components";
 import { useTranslation } from "../../i18n";
-import { useCustomerCreateController } from './use-customer-create-controller';
+
+import { useCustomerCreateController } from "./use-customer-create-controller";
 
 export const CustomerCreatePage = () => {
   const { t } = useTranslation();
   const navigate = useNavigate();
 
   const {
-    form, formId, onSubmit, resetForm,
+    form,
+    formId,
+    onSubmit,
+    resetForm,
 
-    isCreating, isCreateError, createError,
+    isCreating,
+    isCreateError,
+    createError,
 
-    FormProvider
+    FormProvider,
   } = useCustomerCreateController({
     onCreated: (created) =>
-      navigate("/customers/list", { state: { customerId: created.id, isNew: true }, replace: true })
+      navigate("/customers/list", {
+        state: { customerId: created.id, isNew: true },
+        replace: true,
+      }),
   });
 
-
   return (
     <UnsavedChangesProvider isDirty={form.formState.isDirty}>
       <AppHeader>
         <PageHeader
           backIcon
-          title={t("pages.create.title")}
           description={t("pages.create.description")}
           rightSlot={
             <UpdateCommitButtonGroup
-              isLoading={isCreating}
-              disabled={isCreating}
               cancel={{
                 to: "/customers/list",
                 disabled: isCreating,
               }}
+              disabled={isCreating}
+              isLoading={isCreating}
+              onReset={resetForm}
               submit={{
                 formId: formId,
                 disabled: isCreating,
               }}
-              onReset={resetForm}
             />
           }
+          title={t("pages.create.title")}
         />
       </AppHeader>
       <AppContent>
         {/* Alerta de error de actualización (si ha fallado el último intento) */}
         {isCreateError && (
           <ErrorAlert
-            title={t("pages.create.errorTitle", "No se pudo guardar los cambios")}
             message={
               (createError as Error)?.message ??
               t("pages.create.errorMsg", "Revisa los datos e inténtalo de nuevo.")
             }
+            title={t("pages.create.errorTitle", "No se pudo guardar los cambios")}
           />
         )}
 
         <FormProvider {...form}>
           <CustomerEditForm
-            formId={formId} // para que el botón del header pueda hacer submit
+            className="bg-white rounded-xl border shadow-xl max-w-7xl mx-auto mt-6" // para que el botón del header pueda hacer submit
+            formId={formId}
             onSubmit={onSubmit}
-            className="bg-white rounded-xl border shadow-xl max-w-7xl mx-auto mt-6"
           />
         </FormProvider>
-
       </AppContent>
     </UnsavedChangesProvider>
   );
diff --git a/modules/customers/src/web/pages/create/use-customer-create-controller.ts b/modules/customers/src/web/pages/create/use-customer-create-controller.ts
index 67de33d3..5c474bdb 100644
--- a/modules/customers/src/web/pages/create/use-customer-create-controller.ts
+++ b/modules/customers/src/web/pages/create/use-customer-create-controller.ts
@@ -2,11 +2,12 @@ import { useHookForm } from "@erp/core/hooks";
 import { showErrorToast, showSuccessToast } from "@repo/rdx-ui/helpers";
 import { useId } from "react";
 import { FormProvider } from "react-hook-form";
+
 import { useCreateCustomer } from "../../hooks";
 import { useTranslation } from "../../i18n";
 import {
-  Customer,
-  CustomerFormData,
+  type Customer,
+  type CustomerFormData,
   CustomerFormSchema,
   defaultCustomerFormData,
 } from "../../schemas";
diff --git a/modules/customers/src/web/pages/list/customers-list-page.tsx b/modules/customers/src/web/pages/list/customers-list-page.tsx
deleted file mode 100644
index ea1d0077..00000000
--- a/modules/customers/src/web/pages/list/customers-list-page.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import { PageHeader } from "@erp/core/components";
-import { AppContent, AppHeader, BackHistoryButton, useDebounce } from "@repo/rdx-ui/components";
-import { Button } from "@repo/shadcn-ui/components";
-import { PlusIcon } from "lucide-react";
-import { useMemo, useState } from "react";
-import { Outlet, useNavigate } from "react-router-dom";
-
-import { ErrorAlert } from "../../components";
-import { useCustomerListQuery } from "../../hooks";
-import { useTranslation } from "../../i18n";
-
-import { CustomersListGrid } from "./customers-list-grid";
-
-export const CustomersListPage = () => {
-  const { t } = useTranslation();
-  const navigate = useNavigate();
-
-  const [pageIndex, setPageIndex] = useState(0);
-  const [pageSize, setPageSize] = useState(10);
-  const [search, setSearch] = useState("");
-
-  const debouncedQ = useDebounce(search, 300);
-
-  const criteria = useMemo(
-    () => ({
-      q: debouncedQ || "",
-      pageSize,
-      pageNumber: pageIndex,
-    }),
-    [pageSize, pageIndex, debouncedQ]
-  );
-
-  const { data: customersPageData, isLoading, isError, error } = useCustomerListQuery({ criteria });
-
-  const handlePageChange = (newPageIndex: number) => {
-    setPageIndex(newPageIndex);
-  };
-
-  const handlePageSizeChange = (newSize: number) => {
-    setPageSize(newSize);
-    setPageIndex(0);
-  };
-
-  const handleSearchChange = (value: string) => {
-    const cleaned = value.trim().replace(/\s+/g, " ");
-    setSearch(cleaned);
-    setPageIndex(0);
-  };
-
-  if (isError || !customersPageData) {
-    return (
-      <AppContent>
-        <ErrorAlert
-          message={(error as Error)?.message || "Error al cargar el listado"}
-          title={t("pages.list.loadErrorTitle")}
-        />
-        <BackHistoryButton />
-      </AppContent>
-    );
-  }
-
-  return (
-    <>
-      <AppHeader>
-        <PageHeader
-          description={t("pages.list.description")}
-          rightSlot={
-            <div className="flex items-center space-x-2 hidden">
-              <Button
-                aria-label={t("pages.create.title")}
-                className="cursor-pointer"
-                onClick={() => navigate("/customers/create")}
-                variant={"default"}
-              >
-                <PlusIcon aria-hidden className="mr-2 h-4 w-4" />
-                {t("pages.create.title")}
-              </Button>
-            </div>
-          }
-          title={t("pages.list.title")}
-        />
-      </AppHeader>
-      <AppContent>
-        <div className="flex flex-col w-full h-full py-3">
-          <div className={"flex-1"}>
-            <CustomersListGrid
-              customersPage={customersPageData}
-              loading={isLoading}
-              onPageChange={handlePageChange}
-              onPageSizeChange={handlePageSizeChange}
-              onSearchChange={handleSearchChange}
-              pageIndex={pageIndex}
-              pageSize={pageSize}
-              searchValue={search}
-            />
-          </div>
-        </div>
-        <Outlet />
-      </AppContent>
-    </>
-  );
-};
diff --git a/modules/customers/src/web/pages/list/index.ts b/modules/customers/src/web/pages/list/index.ts
index 7cedd24d..cc9c1d70 100644
--- a/modules/customers/src/web/pages/list/index.ts
+++ b/modules/customers/src/web/pages/list/index.ts
@@ -1 +1 @@
-export * from "./customers-list-page";
+export * from "../../list/ui/pages/customer-list-page";
diff --git a/modules/customers/src/web/pages/list/use-customers-list-columns.tsx b/modules/customers/src/web/pages/list/use-customers-list-columns.tsx
index b5519777..045228e4 100644
--- a/modules/customers/src/web/pages/list/use-customers-list-columns.tsx
+++ b/modules/customers/src/web/pages/list/use-customers-list-columns.tsx
@@ -22,8 +22,8 @@ import {
 } from "lucide-react";
 import * as React from "react";
 
-import { CustomerStatusBadge } from "../../components";
 import { useTranslation } from "../../i18n";
+import { AddressCell } from "../../list/ui/components/address-cell";
 import type { CustomerSummaryFormData } from "../../schemas";
 
 type CustomerActionHandlers = {
@@ -43,7 +43,7 @@ const KindBadge = ({ isCompany }: { isCompany: boolean }) => (
   </Badge>
 );
 
-const Soft = ({ children }: { children: React.ReactNode }) => (
+export const Soft = ({ children }: { children: React.ReactNode }) => (
   <span className="text-muted-foreground">{children}</span>
 );
 
@@ -76,18 +76,6 @@ const ContactCell = ({ customer }: { customer: CustomerSummaryFormData }) => (
   </div>
 );
 
-const AddressCell = ({ c }: { c: CustomerSummaryFormData }) => {
-  const line1 = [c.street, c.street2].filter(Boolean).join(", ");
-  const line2 = [c.postal_code, c.city].filter(Boolean).join(" ");
-  const line3 = [c.province, c.country].filter(Boolean).join(", ");
-  return (
-    <address className="not-italic grid gap-1 text-foreground  text-sm">
-      <div>{line1 || <Soft>-</Soft>}</div>
-      <div>{[line2, line3].filter(Boolean).join(" • ")}</div>
-    </address>
-  );
-};
-
 function initials(name: string) {
   const parts = name.trim().split(/\s+/).slice(0, 2);
   return parts.map((p) => p[0]?.toUpperCase() ?? "").join("") || "?";
@@ -169,7 +157,7 @@ export function useCustomersListColumns(
           `${r.street} ${r.street2} ${r.city} ${r.postal_code} ${r.province} ${r.country}`,
         size: 140,
         minSize: 120,
-        cell: ({ row }) => <AddressCell c={row.original} />,
+        cell: ({ row }) => <AddressCell customer={row.original} />,
       },
 
       // Acciones
diff --git a/modules/customers/src/web/pages/update/customer-update-modal.tsx b/modules/customers/src/web/pages/update/customer-update-modal.tsx
index 9040bef7..8faf0227 100644
--- a/modules/customers/src/web/pages/update/customer-update-modal.tsx
+++ b/modules/customers/src/web/pages/update/customer-update-modal.tsx
@@ -14,16 +14,16 @@ import {
   TabsTrigger,
 } from "@repo/shadcn-ui/components";
 import { X } from "lucide-react";
-import { FieldErrors, FormProvider } from "react-hook-form";
-
+import { type FieldErrors, FormProvider } from "react-hook-form";
 import { useNavigate } from "react-router-dom";
+
 import { CustomerEditorSkeleton } from "../../components";
 import { CustomerAdditionalConfigFields } from "../../components/editor/customer-additional-config-fields";
 import { CustomerAddressFields } from "../../components/editor/customer-address-fields";
 import { CustomerBasicInfoFields } from "../../components/editor/customer-basic-info-fields";
 import { useCustomerQuery, useUpdateCustomer } from "../../hooks";
 import { useTranslation } from "../../i18n";
-import { CustomerFormData, CustomerFormSchema, defaultCustomerFormData } from "../../schemas";
+import { type CustomerFormData, CustomerFormSchema, defaultCustomerFormData } from "../../schemas";
 
 interface CustomerEditModalProps {
   customerId: string;
@@ -102,56 +102,56 @@ export function CustomerEditModal({ customerId, open, onOpenChange }: CustomerEd
   return (
     <UnsavedChangesProvider isDirty={form.formState.isDirty}>
       <FormProvider {...form}>
-        <Dialog open={open} onOpenChange={onOpenChange}>
-          <DialogContent className='max-h-[90vh] max-w-3xl overflow-hidden p-0'>
-            <DialogHeader className='border-b px-6 py-4'>
-              <div className='flex items-center justify-between'>
+        <Dialog onOpenChange={onOpenChange} open={open}>
+          <DialogContent className="max-h-[90vh] max-w-3xl overflow-hidden p-0">
+            <DialogHeader className="border-b px-6 py-4">
+              <div className="flex items-center justify-between">
                 <div>
-                  <DialogTitle className='text-xl'>Editar Cliente</DialogTitle>
-                  <DialogDescription className='mt-1'>
+                  <DialogTitle className="text-xl">Editar Cliente</DialogTitle>
+                  <DialogDescription className="mt-1">
                     Modifica la información del cliente
                   </DialogDescription>
                 </div>
                 <Button
-                  variant='ghost'
-                  size='icon'
+                  className="size-8"
                   onClick={() => onOpenChange(false)}
-                  className='size-8'
+                  size="icon"
+                  variant="ghost"
                 >
-                  <X className='h-4 w-4' />
+                  <X className="h-4 w-4" />
                 </Button>
               </div>
             </DialogHeader>
 
-            <Tabs defaultValue='basic' className='flex h-full flex-col'>
-              <TabsList className='mx-6 mt-4 grid w-auto grid-cols-4 gap-2'>
-                <TabsTrigger value='basic'>Información Básica</TabsTrigger>
-                <TabsTrigger value='address'>Dirección</TabsTrigger>
-                <TabsTrigger value='contact'>Contacto</TabsTrigger>
-                <TabsTrigger value='preferences'>Preferencias</TabsTrigger>
+            <Tabs className="flex h-full flex-col" defaultValue="basic">
+              <TabsList className="mx-6 mt-4 grid w-auto grid-cols-4 gap-2">
+                <TabsTrigger value="basic">Información Básica</TabsTrigger>
+                <TabsTrigger value="address">Dirección</TabsTrigger>
+                <TabsTrigger value="contact">Contacto</TabsTrigger>
+                <TabsTrigger value="preferences">Preferencias</TabsTrigger>
               </TabsList>
 
-              <div className='flex-1 overflow-y-auto px-6 py-4'>
-                <TabsContent value='basic' className='mt-0'>
+              <div className="flex-1 overflow-y-auto px-6 py-4">
+                <TabsContent className="mt-0" value="basic">
                   <CustomerBasicInfoFields />
                 </TabsContent>
 
-                <TabsContent value='address' className='mt-0'>
+                <TabsContent className="mt-0" value="address">
                   <CustomerAddressFields />
                 </TabsContent>
 
-                <TabsContent value='contact' className='mt-0'>
+                <TabsContent className="mt-0" value="contact">
                   <CustomerAddressFields />
                 </TabsContent>
 
-                <TabsContent value='preferences' className='mt-0'>
+                <TabsContent className="mt-0" value="preferences">
                   <CustomerAdditionalConfigFields />
                 </TabsContent>
               </div>
 
-              <div className='border-t px-6 py-4'>
-                <div className='flex justify-end gap-3'>
-                  <Button variant='outline' onClick={() => onOpenChange(false)}>
+              <div className="border-t px-6 py-4">
+                <div className="flex justify-end gap-3">
+                  <Button onClick={() => onOpenChange(false)} variant="outline">
                     Cancelar
                   </Button>
                   <Button onClick={handleSubmit}>Guardar</Button>
diff --git a/modules/customers/src/web/pages/update/customer-update-page.tsx b/modules/customers/src/web/pages/update/customer-update-page.tsx
index 8a59f7c8..a0499b89 100644
--- a/modules/customers/src/web/pages/update/customer-update-page.tsx
+++ b/modules/customers/src/web/pages/update/customer-update-page.tsx
@@ -1,11 +1,7 @@
+import { PageHeader } from "@erp/core/components";
+import { UnsavedChangesProvider, UpdateCommitButtonGroup, useUrlParamId } from "@erp/core/hooks";
 import { AppContent, AppHeader, BackHistoryButton } from "@repo/rdx-ui/components";
 
-import { PageHeader } from '@erp/core/components';
-import {
-  UnsavedChangesProvider,
-  UpdateCommitButtonGroup,
-  useUrlParamId
-} from "@erp/core/hooks";
 import {
   CustomerEditForm,
   CustomerEditorSkeleton,
@@ -13,21 +9,29 @@ import {
   NotFoundCard,
 } from "../../components";
 import { useTranslation } from "../../i18n";
-import { useCustomerUpdateController } from './use-customer-update-controller';
+
+import { useCustomerUpdateController } from "./use-customer-update-controller";
 
 export const CustomerUpdatePage = () => {
   const customerId = useUrlParamId();
   const { t } = useTranslation();
 
   const {
-    form, formId, onSubmit, resetForm,
+    form,
+    formId,
+    onSubmit,
+    resetForm,
 
     customerData,
-    isLoading, isLoadError, loadError,
+    isLoading,
+    isLoadError,
+    loadError,
 
-    isUpdating, isUpdateError, updateError,
+    isUpdating,
+    isUpdateError,
+    updateError,
 
-    FormProvider
+    FormProvider,
   } = useCustomerUpdateController(customerId, {});
 
   if (isLoading) {
@@ -37,17 +41,16 @@ export const CustomerUpdatePage = () => {
   if (isLoadError) {
     return (
       <>
-
         <AppContent>
           <ErrorAlert
-            title={t("pages.update.loadErrorTitle", "No se pudo cargar el cliente")}
             message={
               (loadError as Error)?.message ??
               t("pages.update.loadErrorMsg", "Inténtalo de nuevo más tarde.")
             }
+            title={t("pages.update.loadErrorTitle", "No se pudo cargar el cliente")}
           />
 
-          <div className='flex items-center justify-end'>
+          <div className="flex items-center justify-end">
             <BackHistoryButton />
           </div>
         </AppContent>
@@ -58,11 +61,10 @@ export const CustomerUpdatePage = () => {
   if (!customerData)
     return (
       <>
-
         <AppContent>
           <NotFoundCard
-            title={t("pages.update.notFoundTitle", "Cliente no encontrado")}
             message={t("pages.update.notFoundMsg", "Revisa el identificador o vuelve al listado.")}
+            title={t("pages.update.notFoundTitle", "Cliente no encontrado")}
           />
         </AppContent>
       </>
@@ -73,46 +75,45 @@ export const CustomerUpdatePage = () => {
       <AppHeader>
         <PageHeader
           backIcon
-          title={t("pages.update.title")}
           description={t("pages.update.description")}
           rightSlot={
             <UpdateCommitButtonGroup
-              isLoading={isUpdating}
-              disabled={isUpdating}
               cancel={{
                 formId,
                 to: "/customers/list",
                 disabled: isUpdating,
               }}
+              disabled={isUpdating}
+              isLoading={isUpdating}
+              onReset={resetForm}
               submit={{
                 formId,
                 disabled: isUpdating,
               }}
-              onReset={resetForm}
             />
           }
+          title={t("pages.update.title")}
         />
       </AppHeader>
       <AppContent>
         {/* Alerta de error de actualización (si ha fallado el último intento) */}
         {isUpdateError && (
           <ErrorAlert
-            title={t("pages.update.errorTitle", "No se pudo guardar los cambios")}
             message={
               (updateError as Error)?.message ??
               t("pages.update.errorMsg", "Revisa los datos e inténtalo de nuevo.")
             }
+            title={t("pages.update.errorTitle", "No se pudo guardar los cambios")}
           />
         )}
 
         <FormProvider {...form}>
           <CustomerEditForm
-            formId={formId} // para que el botón del header pueda hacer submit
+            className="bg-white rounded-xl border shadow-xl max-w-7xl mx-auto mt-6" // para que el botón del header pueda hacer submit
+            formId={formId}
             onSubmit={onSubmit}
-            className="bg-white rounded-xl border shadow-xl max-w-7xl mx-auto mt-6"
           />
         </FormProvider>
-
       </AppContent>
     </UnsavedChangesProvider>
   );
diff --git a/modules/customers/src/web/pages/update/use-customer-update-controller.ts b/modules/customers/src/web/pages/update/use-customer-update-controller.ts
index 653ef61b..58a5311e 100644
--- a/modules/customers/src/web/pages/update/use-customer-update-controller.ts
+++ b/modules/customers/src/web/pages/update/use-customer-update-controller.ts
@@ -2,12 +2,13 @@ import { formHasAnyDirty, pickFormDirtyValues } from "@erp/core/client";
 import { useHookForm } from "@erp/core/hooks";
 import { showErrorToast, showSuccessToast, showWarningToast } from "@repo/rdx-ui/helpers";
 import { useEffect, useId, useMemo } from "react";
-import { FieldErrors, FormProvider } from "react-hook-form";
+import { type FieldErrors, FormProvider } from "react-hook-form";
+
 import { useCustomerQuery, useUpdateCustomer } from "../../hooks";
 import { useTranslation } from "../../i18n";
 import {
-  Customer,
-  CustomerFormData,
+  type Customer,
+  type CustomerFormData,
   CustomerFormSchema,
   defaultCustomerFormData,
 } from "../../schemas";
diff --git a/modules/customers/src/web/pages/view/customer-view-page.tsx b/modules/customers/src/web/pages/view/customer-view-page.tsx
index 8099d665..0b953bd1 100644
--- a/modules/customers/src/web/pages/view/customer-view-page.tsx
+++ b/modules/customers/src/web/pages/view/customer-view-page.tsx
@@ -22,6 +22,7 @@ import {
   Smartphone,
 } from "lucide-react";
 import { useNavigate } from "react-router-dom";
+
 import { CustomerEditorSkeleton, ErrorAlert } from "../../components";
 import { useCustomerQuery } from "../../hooks";
 import { useTranslation } from "../../i18n";
@@ -48,14 +49,14 @@ export const CustomerViewPage = () => {
       <>
         <AppContent>
           <ErrorAlert
-            title={t("pages.update.loadErrorTitle", "No se pudo cargar el cliente")}
             message={
               (loadError as Error)?.message ??
               t("pages.update.loadErrorMsg", "Inténtalo de nuevo más tarde.")
             }
+            title={t("pages.update.loadErrorTitle", "No se pudo cargar el cliente")}
           />
 
-          <div className='flex items-center justify-end'>
+          <div className="flex items-center justify-end">
             <BackHistoryButton />
           </div>
         </AppContent>
@@ -68,62 +69,62 @@ export const CustomerViewPage = () => {
       <AppHeader>
         <PageHeader
           backIcon
-          title={
-            <div className='flex flex-wrap items-center gap-2'>
-              {customer?.name}{" "}
-              {customer?.trade_name && (
-                <span className='text-muted-foreground'>({customer.trade_name})</span>
-              )}
-            </div>
-          }
           description={
-            <div className='mt-2 flex items-center gap-3'>
-              <Badge variant='secondary' className='font-mono'>
+            <div className="mt-2 flex items-center gap-3">
+              <Badge className="font-mono" variant="secondary">
                 {customer?.tin}
               </Badge>
-              <Badge variant='outline'>{customer?.is_company ? "Empresa" : "Persona"}</Badge>
+              <Badge variant="outline">{customer?.is_company ? "Empresa" : "Persona"}</Badge>
             </div>
           }
           rightSlot={
-            <div className='flex gap-2'>
-              <Button variant='outline' size='icon' onClick={() => navigate("/customers/list")}>
-                <MoreVertical className='h-4 w-4' />
+            <div className="flex gap-2">
+              <Button onClick={() => navigate("/customers/list")} size="icon" variant="outline">
+                <MoreVertical className="h-4 w-4" />
               </Button>
               <Button>
-                <EditIcon className='mr-2 h-4 w-4' />
+                <EditIcon className="mr-2 h-4 w-4" />
                 Editar
               </Button>
             </div>
           }
+          title={
+            <div className="flex flex-wrap items-center gap-2">
+              {customer?.name}{" "}
+              {customer?.trade_name && (
+                <span className="text-muted-foreground">({customer.trade_name})</span>
+              )}
+            </div>
+          }
         />
       </AppHeader>
       <AppContent>
         {/* Main Content Grid */}
-        <div className='grid gap-6 md:grid-cols-2'>
+        <div className="grid gap-6 md:grid-cols-2">
           {/* Información Básica */}
           <Card>
             <CardHeader>
-              <CardTitle className='flex items-center gap-2 text-lg'>
-                <FileText className='size-5 text-primary' />
+              <CardTitle className="flex items-center gap-2 text-lg">
+                <FileText className="size-5 text-primary" />
                 Información Básica
               </CardTitle>
             </CardHeader>
-            <CardContent className='space-y-4'>
+            <CardContent className="space-y-4">
               <div>
-                <dt className='text-sm font-medium text-muted-foreground'>Nombre</dt>
-                <dd className='mt-1 text-base text-foreground'>{customer?.name}</dd>
+                <dt className="text-sm font-medium text-muted-foreground">Nombre</dt>
+                <dd className="mt-1 text-base text-foreground">{customer?.name}</dd>
               </div>
               <div>
-                <dt className='text-sm font-medium text-muted-foreground'>Referencia</dt>
-                <dd className='mt-1 font-mono text-base text-foreground'>{customer?.reference}</dd>
+                <dt className="text-sm font-medium text-muted-foreground">Referencia</dt>
+                <dd className="mt-1 font-mono text-base text-foreground">{customer?.reference}</dd>
               </div>
               <div>
-                <dt className='text-sm font-medium text-muted-foreground'>Registro Legal</dt>
-                <dd className='mt-1 text-base text-foreground'>{customer?.legal_record}</dd>
+                <dt className="text-sm font-medium text-muted-foreground">Registro Legal</dt>
+                <dd className="mt-1 text-base text-foreground">{customer?.legal_record}</dd>
               </div>
               <div>
-                <dt className='text-sm font-medium text-muted-foreground'>Impuestos por Defecto</dt>
-                <dd className='mt-1'>
+                <dt className="text-sm font-medium text-muted-foreground">Impuestos por Defecto</dt>
+                <dd className="mt-1">
                   {customer?.default_taxes.map((tax) => (
                     <Badge key={tax} variant={"secondary"}>
                       {tax}
@@ -137,15 +138,15 @@ export const CustomerViewPage = () => {
           {/* Dirección */}
           <Card>
             <CardHeader>
-              <CardTitle className='flex items-center gap-2 text-lg'>
-                <MapPin className='size-5 text-primary' />
+              <CardTitle className="flex items-center gap-2 text-lg">
+                <MapPin className="size-5 text-primary" />
                 Dirección
               </CardTitle>
             </CardHeader>
-            <CardContent className='space-y-4'>
+            <CardContent className="space-y-4">
               <div>
-                <dt className='text-sm font-medium text-muted-foreground'>Calle</dt>
-                <dd className='mt-1 text-base text-foreground'>
+                <dt className="text-sm font-medium text-muted-foreground">Calle</dt>
+                <dd className="mt-1 text-base text-foreground">
                   {customer?.street}
                   {customer?.street2 && (
                     <>
@@ -155,70 +156,70 @@ export const CustomerViewPage = () => {
                   )}
                 </dd>
               </div>
-              <div className='grid grid-cols-2 gap-4'>
+              <div className="grid grid-cols-2 gap-4">
                 <div>
-                  <dt className='text-sm font-medium text-muted-foreground'>Ciudad</dt>
-                  <dd className='mt-1 text-base text-foreground'>{customer?.city}</dd>
+                  <dt className="text-sm font-medium text-muted-foreground">Ciudad</dt>
+                  <dd className="mt-1 text-base text-foreground">{customer?.city}</dd>
                 </div>
                 <div>
-                  <dt className='text-sm font-medium text-muted-foreground'>Código Postal</dt>
-                  <dd className='mt-1 text-base text-foreground'>{customer?.postal_code}</dd>
+                  <dt className="text-sm font-medium text-muted-foreground">Código Postal</dt>
+                  <dd className="mt-1 text-base text-foreground">{customer?.postal_code}</dd>
                 </div>
               </div>
-              <div className='grid grid-cols-2 gap-4'>
+              <div className="grid grid-cols-2 gap-4">
                 <div>
-                  <dt className='text-sm font-medium text-muted-foreground'>Provincia</dt>
-                  <dd className='mt-1 text-base text-foreground'>{customer?.province}</dd>
+                  <dt className="text-sm font-medium text-muted-foreground">Provincia</dt>
+                  <dd className="mt-1 text-base text-foreground">{customer?.province}</dd>
                 </div>
                 <div>
-                  <dt className='text-sm font-medium text-muted-foreground'>País</dt>
-                  <dd className='mt-1 text-base text-foreground'>{customer?.country}</dd>
+                  <dt className="text-sm font-medium text-muted-foreground">País</dt>
+                  <dd className="mt-1 text-base text-foreground">{customer?.country}</dd>
                 </div>
               </div>
             </CardContent>
           </Card>
 
           {/* Información de Contacto */}
-          <Card className='md:col-span-2'>
+          <Card className="md:col-span-2">
             <CardHeader>
-              <CardTitle className='flex items-center gap-2 text-lg'>
-                <Mail className='size-5 text-primary' />
+              <CardTitle className="flex items-center gap-2 text-lg">
+                <Mail className="size-5 text-primary" />
                 Información de Contacto
               </CardTitle>
             </CardHeader>
             <CardContent>
-              <div className='grid gap-6 md:grid-cols-2'>
+              <div className="grid gap-6 md:grid-cols-2">
                 {/* Contacto Principal */}
-                <div className='space-y-4'>
-                  <h3 className='font-semibold text-foreground'>Contacto Principal</h3>
+                <div className="space-y-4">
+                  <h3 className="font-semibold text-foreground">Contacto Principal</h3>
                   {customer?.email_primary && (
-                    <div className='flex items-start gap-3'>
-                      <Mail className='mt-0.5 h-4 w-4 text-muted-foreground' />
-                      <div className='flex-1'>
-                        <dt className='text-sm font-medium text-muted-foreground'>Email</dt>
-                        <dd className='mt-1 text-base text-foreground'>
+                    <div className="flex items-start gap-3">
+                      <Mail className="mt-0.5 h-4 w-4 text-muted-foreground" />
+                      <div className="flex-1">
+                        <dt className="text-sm font-medium text-muted-foreground">Email</dt>
+                        <dd className="mt-1 text-base text-foreground">
                           {customer?.email_primary}
                         </dd>
                       </div>
                     </div>
                   )}
                   {customer?.mobile_primary && (
-                    <div className='flex items-start gap-3'>
-                      <Smartphone className='mt-0.5 h-4 w-4 text-muted-foreground' />
-                      <div className='flex-1'>
-                        <dt className='text-sm font-medium text-muted-foreground'>Móvil</dt>
-                        <dd className='mt-1 text-base text-foreground'>
+                    <div className="flex items-start gap-3">
+                      <Smartphone className="mt-0.5 h-4 w-4 text-muted-foreground" />
+                      <div className="flex-1">
+                        <dt className="text-sm font-medium text-muted-foreground">Móvil</dt>
+                        <dd className="mt-1 text-base text-foreground">
                           {customer?.mobile_primary}
                         </dd>
                       </div>
                     </div>
                   )}
                   {customer?.phone_primary && (
-                    <div className='flex items-start gap-3'>
-                      <Phone className='mt-0.5 h-4 w-4 text-muted-foreground' />
-                      <div className='flex-1'>
-                        <dt className='text-sm font-medium text-muted-foreground'>Teléfono</dt>
-                        <dd className='mt-1 text-base text-foreground'>
+                    <div className="flex items-start gap-3">
+                      <Phone className="mt-0.5 h-4 w-4 text-muted-foreground" />
+                      <div className="flex-1">
+                        <dt className="text-sm font-medium text-muted-foreground">Teléfono</dt>
+                        <dd className="mt-1 text-base text-foreground">
                           {customer?.phone_primary}
                         </dd>
                       </div>
@@ -227,36 +228,36 @@ export const CustomerViewPage = () => {
                 </div>
 
                 {/* Contacto Secundario */}
-                <div className='space-y-4'>
-                  <h3 className='font-semibold text-foreground'>Contacto Secundario</h3>
+                <div className="space-y-4">
+                  <h3 className="font-semibold text-foreground">Contacto Secundario</h3>
                   {customer?.email_secondary && (
-                    <div className='flex items-start gap-3'>
-                      <Mail className='mt-0.5 h-4 w-4 text-muted-foreground' />
-                      <div className='flex-1'>
-                        <dt className='text-sm font-medium text-muted-foreground'>Email</dt>
-                        <dd className='mt-1 text-base text-foreground'>
+                    <div className="flex items-start gap-3">
+                      <Mail className="mt-0.5 h-4 w-4 text-muted-foreground" />
+                      <div className="flex-1">
+                        <dt className="text-sm font-medium text-muted-foreground">Email</dt>
+                        <dd className="mt-1 text-base text-foreground">
                           {customer?.email_secondary}
                         </dd>
                       </div>
                     </div>
                   )}
                   {customer?.mobile_secondary && (
-                    <div className='flex items-start gap-3'>
-                      <Smartphone className='mt-0.5 h-4 w-4 text-muted-foreground' />
-                      <div className='flex-1'>
-                        <dt className='text-sm font-medium text-muted-foreground'>Móvil</dt>
-                        <dd className='mt-1 text-base text-foreground'>
+                    <div className="flex items-start gap-3">
+                      <Smartphone className="mt-0.5 h-4 w-4 text-muted-foreground" />
+                      <div className="flex-1">
+                        <dt className="text-sm font-medium text-muted-foreground">Móvil</dt>
+                        <dd className="mt-1 text-base text-foreground">
                           {customer?.mobile_secondary}
                         </dd>
                       </div>
                     </div>
                   )}
                   {customer?.phone_secondary && (
-                    <div className='flex items-start gap-3'>
-                      <Phone className='mt-0.5 h-4 w-4 text-muted-foreground' />
-                      <div className='flex-1'>
-                        <dt className='text-sm font-medium text-muted-foreground'>Teléfono</dt>
-                        <dd className='mt-1 text-base text-foreground'>
+                    <div className="flex items-start gap-3">
+                      <Phone className="mt-0.5 h-4 w-4 text-muted-foreground" />
+                      <div className="flex-1">
+                        <dt className="text-sm font-medium text-muted-foreground">Teléfono</dt>
+                        <dd className="mt-1 text-base text-foreground">
                           {customer?.phone_secondary}
                         </dd>
                       </div>
@@ -266,16 +267,16 @@ export const CustomerViewPage = () => {
 
                 {/* Otros Contactos */}
                 {(customer?.website || customer?.fax) && (
-                  <div className='space-y-4 md:col-span-2'>
-                    <h3 className='font-semibold text-foreground'>Otros</h3>
-                    <div className='grid gap-4 md:grid-cols-2'>
+                  <div className="space-y-4 md:col-span-2">
+                    <h3 className="font-semibold text-foreground">Otros</h3>
+                    <div className="grid gap-4 md:grid-cols-2">
                       {customer?.website && (
-                        <div className='flex items-start gap-3'>
-                          <Globe className='mt-0.5 h-4 w-4 text-muted-foreground' />
-                          <div className='flex-1'>
-                            <dt className='text-sm font-medium text-muted-foreground'>Sitio Web</dt>
-                            <dd className='mt-1 text-base text-primary hover:underline'>
-                              <a href={customer?.website} target='_blank' rel='noopener noreferrer'>
+                        <div className="flex items-start gap-3">
+                          <Globe className="mt-0.5 h-4 w-4 text-muted-foreground" />
+                          <div className="flex-1">
+                            <dt className="text-sm font-medium text-muted-foreground">Sitio Web</dt>
+                            <dd className="mt-1 text-base text-primary hover:underline">
+                              <a href={customer?.website} rel="noopener noreferrer" target="_blank">
                                 {customer?.website}
                               </a>
                             </dd>
@@ -283,11 +284,11 @@ export const CustomerViewPage = () => {
                         </div>
                       )}
                       {customer?.fax && (
-                        <div className='flex items-start gap-3'>
-                          <Phone className='mt-0.5 h-4 w-4 text-muted-foreground' />
-                          <div className='flex-1'>
-                            <dt className='text-sm font-medium text-muted-foreground'>Fax</dt>
-                            <dd className='mt-1 text-base text-foreground'>{customer?.fax}</dd>
+                        <div className="flex items-start gap-3">
+                          <Phone className="mt-0.5 h-4 w-4 text-muted-foreground" />
+                          <div className="flex-1">
+                            <dt className="text-sm font-medium text-muted-foreground">Fax</dt>
+                            <dd className="mt-1 text-base text-foreground">{customer?.fax}</dd>
                           </div>
                         </div>
                       )}
@@ -299,27 +300,27 @@ export const CustomerViewPage = () => {
           </Card>
 
           {/* Preferencias */}
-          <Card className='md:col-span-2'>
+          <Card className="md:col-span-2">
             <CardHeader>
-              <CardTitle className='flex items-center gap-2 text-lg'>
-                <Languages className='size-5 text-primary' />
+              <CardTitle className="flex items-center gap-2 text-lg">
+                <Languages className="size-5 text-primary" />
                 Preferencias
               </CardTitle>
             </CardHeader>
             <CardContent>
-              <div className='grid gap-6 md:grid-cols-2'>
-                <div className='flex items-start gap-3'>
-                  <Languages className='mt-0.5 h-4 w-4 text-muted-foreground' />
-                  <div className='flex-1'>
-                    <dt className='text-sm font-medium text-muted-foreground'>Idioma Preferido</dt>
-                    <dd className='mt-1 text-base text-foreground'>{customer?.language_code}</dd>
+              <div className="grid gap-6 md:grid-cols-2">
+                <div className="flex items-start gap-3">
+                  <Languages className="mt-0.5 h-4 w-4 text-muted-foreground" />
+                  <div className="flex-1">
+                    <dt className="text-sm font-medium text-muted-foreground">Idioma Preferido</dt>
+                    <dd className="mt-1 text-base text-foreground">{customer?.language_code}</dd>
                   </div>
                 </div>
-                <div className='flex items-start gap-3'>
-                  <Banknote className='mt-0.5 h-4 w-4 text-muted-foreground' />
-                  <div className='flex-1'>
-                    <dt className='text-sm font-medium text-muted-foreground'>Moneda Preferida</dt>
-                    <dd className='mt-1 text-base text-foreground'>{customer?.currency_code}</dd>
+                <div className="flex items-start gap-3">
+                  <Banknote className="mt-0.5 h-4 w-4 text-muted-foreground" />
+                  <div className="flex-1">
+                    <dt className="text-sm font-medium text-muted-foreground">Moneda Preferida</dt>
+                    <dd className="mt-1 text-base text-foreground">{customer?.currency_code}</dd>
                   </div>
                 </div>
               </div>
diff --git a/modules/customers/src/web/types/customer-summary.web.schema.ts b/modules/customers/src/web/types/customer-summary.web.schema.ts
new file mode 100644
index 00000000..625e1ef6
--- /dev/null
+++ b/modules/customers/src/web/types/customer-summary.web.schema.ts
@@ -0,0 +1,9 @@
+import type { CustomerSummary } from "../schemas";
+
+import type { CustomerSummaryPage } from "./customer.api.schema";
+
+export type CustomerSummaryData = CustomerSummary;
+
+export type CustomerSummaryPageData = CustomerSummaryPage & {
+  items: CustomerSummaryData[];
+};
diff --git a/modules/customers/src/web/types/customer.api.schema.ts b/modules/customers/src/web/types/customer.api.schema.ts
new file mode 100644
index 00000000..6eec62d6
--- /dev/null
+++ b/modules/customers/src/web/types/customer.api.schema.ts
@@ -0,0 +1,17 @@
+import {
+  GetCustomerByIdResponseSchema,
+  type ListCustomersResponseDTO,
+} from "@erp/customers/common";
+import type { ArrayElement } from "@repo/rdx-utils";
+import type { z } from "zod/v4";
+
+// IssuedInvoices
+export const CustomerSchema = GetCustomerByIdResponseSchema.omit({
+  metadata: true,
+});
+
+export type Customer = z.infer<typeof CustomerSchema>;
+
+// Resultado de consulta con criteria (paginado, etc.)
+export type CustomerSummaryPage = Omit<ListCustomersResponseDTO, "metadata">;
+export type CustomerSummary = Omit<ArrayElement<CustomerSummaryPage>, "metadata">;
diff --git a/modules/customers/src/web/types/index.ts b/modules/customers/src/web/types/index.ts
new file mode 100644
index 00000000..532ca68d
--- /dev/null
+++ b/modules/customers/src/web/types/index.ts
@@ -0,0 +1,2 @@
+export * from "./customer.api.schema";
+export * from "./customer-summary.web.schema";
diff --git a/modules/customers/src/web/ui/blocks/customer-layout.tsx b/modules/customers/src/web/ui/blocks/customer-layout.tsx
new file mode 100644
index 00000000..ec1cd087
--- /dev/null
+++ b/modules/customers/src/web/ui/blocks/customer-layout.tsx
@@ -0,0 +1,6 @@
+import type { PropsWithChildren } from "react";
+
+export const CustomerLayout = ({ children }: PropsWithChildren) => {
+  //return <CustomersProvider>{children}</CustomersProvider>;
+  return <div>{children}</div>;
+};
diff --git a/modules/customers/src/web/ui/blocks/index.ts b/modules/customers/src/web/ui/blocks/index.ts
new file mode 100644
index 00000000..7f780d43
--- /dev/null
+++ b/modules/customers/src/web/ui/blocks/index.ts
@@ -0,0 +1 @@
+export * from "./customer-layout";
diff --git a/modules/customers/src/web/components/customer-status-badge.tsx b/modules/customers/src/web/ui/components/customer-status-badge.tsx
similarity index 100%
rename from modules/customers/src/web/components/customer-status-badge.tsx
rename to modules/customers/src/web/ui/components/customer-status-badge.tsx
diff --git a/modules/customers/src/web/ui/components/error-alert.tsx b/modules/customers/src/web/ui/components/error-alert.tsx
new file mode 100644
index 00000000..01098060
--- /dev/null
+++ b/modules/customers/src/web/ui/components/error-alert.tsx
@@ -0,0 +1,16 @@
+// components/ErrorAlert.tsx
+interface ErrorAlertProps {
+  title: string;
+  message: string;
+}
+
+export const ErrorAlert = ({ title, message }: ErrorAlertProps) => (
+  <div
+    className='mb-4 rounded-lg border border-destructive/50 bg-destructive/10 p-4'
+    role='alert'
+    aria-live='assertive'
+  >
+    <p className='font-semibold text-destructive-foreground'>{title}</p>
+    <p className='text-sm text-destructive-foreground/90'>{message}</p>
+  </div>
+);
diff --git a/modules/customers/src/web/ui/components/index.ts b/modules/customers/src/web/ui/components/index.ts
new file mode 100644
index 00000000..31f3586f
--- /dev/null
+++ b/modules/customers/src/web/ui/components/index.ts
@@ -0,0 +1,2 @@
+export * from "./customer-status-badge";
+export * from "./error-alert";
\ No newline at end of file
diff --git a/modules/customers/src/web/ui/index.ts b/modules/customers/src/web/ui/index.ts
new file mode 100644
index 00000000..697f498b
--- /dev/null
+++ b/modules/customers/src/web/ui/index.ts
@@ -0,0 +1,2 @@
+export * from "./blocks";
+export * from "./components";